NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source
This commit is contained in:
Peter Korsgaard 2021-09-04 19:57:30 +02:00
commit 72e1a75820
217 changed files with 1376 additions and 1218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@ -11,8 +11,11 @@ generate-gitlab-ci-yml:
stage: generate-gitlab-ci
script: ./support/scripts/generate-gitlab-ci-yml support/misc/gitlab-ci.yml.in > generated-gitlab-ci.yml
artifacts:
when: always
paths:
- generated-gitlab-ci.yml
- br-test-pkg/*/.config
- br-test-pkg/*/missing.config
buildroot-pipeline:
stage: build
@ -21,3 +24,5 @@ buildroot-pipeline:
- artifact: generated-gitlab-ci.yml
job: generate-gitlab-ci-yml
strategy: depend
variables:
PARENT_PIPELINE_ID: $CI_PIPELINE_ID

10
DEVELOPERS
View File

@ -606,6 +606,9 @@ F: package/odroidc2-firmware/
N: Daniel J. Leach <dleach@belcan.com>
F: package/dacapo/
N: Daniel Lang <d.lang@abatec.at>
F: package/paho-mqtt-cpp/
N: Damien Lanson <damien@kal-host.com>
F: package/libvdpau/
F: package/log4cpp/
@ -1228,6 +1231,7 @@ F: package/python-aiohttp-sse/
F: package/python-aiologstash/
F: package/python-aiomonitor/
F: package/python-aiojobs/
F: package/python-aioprocessing/
F: package/python-aiorwlock/
F: package/python-aiosignal/
F: package/python-aiozipkin/
@ -1870,6 +1874,7 @@ N: Max Filippov <jcmvbkbc@gmail.com>
F: arch/Config.in.xtensa
N: Maxim Kochetkov <fido_max@inbox.ru>
F: package/libgeos/
F: package/libosmium/
F: package/osm2pgsql/
F: package/postgis/
@ -1958,6 +1963,7 @@ N: Naumann Andreas <ANaumann@ultratronik.de>
F: package/evemu/
F: package/libevdev/
F: package/pkg-qmake.mk
F: package/qt5/qt5opcua/
N: Nicola Di Lieto <nicola.dilieto@gmail.com>
F: package/uacme/
@ -2251,7 +2257,10 @@ F: package/python-boto3/
F: package/python-botocore/
F: package/python-jmespath/
F: package/python-pymupdf/
F: package/python-rsa/
F: package/python-s3transfer/
F: support/testing/tests/package/sample_python_rsa.py
F: support/testing/tests/package/test_python_rsa.py
N: Refik Tuzakli <tuzakli.refik@gmail.com>
F: package/freescale-imx/
@ -2561,6 +2570,7 @@ F: package/x265/
N: Thomas Claveirole <thomas.claveirole@green-communications.fr>
F: package/fcgiwrap/
F: package/openlayers/
F: package/vuejs-router/
N: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
F: docs/manual/

20
board/stmicroelectronics/stm32f469-disco/flash_xip.sh Normal file
View File

@ -0,0 +1,20 @@
#!/bin/bash
OUTPUT_DIR=$1
if ! test -d "${OUTPUT_DIR}"; then
echo "ERROR: no output directory specified."
echo "Usage: $0 OUTPUT_DIR"
exit 1
fi
${OUTPUT_DIR}/host/bin/openocd -f board/stm32f469discovery.cfg \
-c "init" \
-c "reset init" \
-c "flash probe 0" \
-c "flash info 0" \
-c "flash write_image erase ${OUTPUT_DIR}/images/stm32f469i-disco.bin 0x08000000" \
-c "flash write_image erase ${OUTPUT_DIR}/images/stm32f469-disco.dtb 0x08004000" \
-c "flash write_image erase ${OUTPUT_DIR}/images/xipImage 0x08010000" \
-c "reset run" \
-c "shutdown"

120
board/stmicroelectronics/stm32f469-disco/linux-xip.config Normal file
View File

@ -0,0 +1,120 @@
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_KERNEL_XZ=y
CONFIG_NO_HZ_IDLE=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_PREEMPT=y
CONFIG_LOG_BUF_SHIFT=12
CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=10
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE="${BR_BINARIES_DIR}/rootfs.cpio"
# CONFIG_RD_GZIP is not set
# CONFIG_RD_BZIP2 is not set
# CONFIG_RD_LZMA is not set
# CONFIG_RD_XZ is not set
# CONFIG_RD_LZO is not set
# CONFIG_RD_LZ4 is not set
# CONFIG_RD_ZSTD is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_MULTIUSER is not set
# CONFIG_SYSFS_SYSCALL is not set
# CONFIG_FHANDLE is not set
# CONFIG_POSIX_TIMERS is not set
# CONFIG_BUG is not set
# CONFIG_BASE_FULL is not set
# CONFIG_FUTEX is not set
# CONFIG_EPOLL is not set
# CONFIG_SIGNALFD is not set
# CONFIG_TIMERFD is not set
# CONFIG_EVENTFD is not set
# CONFIG_AIO is not set
# CONFIG_IO_URING is not set
# CONFIG_ADVISE_SYSCALLS is not set
# CONFIG_MEMBARRIER is not set
# CONFIG_KALLSYMS is not set
CONFIG_KCMP=y
# CONFIG_RSEQ is not set
CONFIG_EMBEDDED=y
# CONFIG_VM_EVENT_COUNTERS is not set
# CONFIG_COMPAT_BRK is not set
CONFIG_SLOB=y
# CONFIG_SLAB_MERGE_DEFAULT is not set
# CONFIG_MMU is not set
CONFIG_ARCH_STM32=y
# CONFIG_MACH_STM32F429 is not set
# CONFIG_MACH_STM32F746 is not set
# CONFIG_MACH_STM32F769 is not set
# CONFIG_MACH_STM32H743 is not set
CONFIG_CPU_V7M_NUM_IRQ=240
# CONFIG_ARM_DMA_MEM_BUFFERABLE is not set
CONFIG_SET_MEM_PARAM=y
CONFIG_DRAM_BASE=0xc0000000
CONFIG_DRAM_SIZE=0x01000000
CONFIG_HZ_1000=y
# CONFIG_ATAGS is not set
CONFIG_XIP_KERNEL=y
CONFIG_XIP_PHYS_ADDR=0x08010000
CONFIG_XIP_DEFLATED_DATA=y
# CONFIG_SUSPEND is not set
# CONFIG_STACKPROTECTOR is not set
# CONFIG_COMPAT_32BIT_TIME is not set
# CONFIG_GCC_PLUGINS is not set
# CONFIG_BLOCK is not set
CONFIG_BINFMT_FLAT=y
CONFIG_BINFMT_SHARED_FLAT=y
# CONFIG_COREDUMP is not set
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
# CONFIG_FW_LOADER is not set
# CONFIG_ALLOW_DEV_COREDUMP is not set
CONFIG_EEPROM_93CX6=y
# CONFIG_INPUT is not set
# CONFIG_VT is not set
# CONFIG_UNIX98_PTYS is not set
# CONFIG_LEGACY_PTYS is not set
# CONFIG_LDISC_AUTOLOAD is not set
CONFIG_SERIAL_STM32=y
CONFIG_SERIAL_STM32_CONSOLE=y
# CONFIG_DEVMEM is not set
# CONFIG_HWMON is not set
CONFIG_WATCHDOG=y
CONFIG_MFD_STM32_TIMERS=y
# CONFIG_USB_SUPPORT is not set
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_STM32=y
CONFIG_DMADEVICES=y
CONFIG_STM32_DMA=y
CONFIG_STM32_DMAMUX=y
CONFIG_STM32_MDMA=y
CONFIG_SYNC_FILE=y
# CONFIG_VIRTIO_MENU is not set
# CONFIG_VHOST_MENU is not set
CONFIG_IIO=y
CONFIG_IIO_BUFFER=y
CONFIG_IIO_TRIGGERED_BUFFER=y
CONFIG_IIO_STM32_TIMER_TRIGGER=y
# CONFIG_FILE_LOCKING is not set
# CONFIG_DNOTIFY is not set
# CONFIG_INOTIFY_USER is not set
# CONFIG_PROC_SYSCTL is not set
CONFIG_CONFIGFS_FS=y
# CONFIG_MISC_FILESYSTEMS is not set
CONFIG_NLS=y
CONFIG_PRINTK_TIME=y
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=15
CONFIG_CONSOLE_LOGLEVEL_QUIET=15
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=7
# CONFIG_SYMBOLIC_ERRNAME is not set
CONFIG_DEBUG_INFO=y
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_MISC is not set
# CONFIG_SCHED_DEBUG is not set
# CONFIG_RCU_TRACE is not set
# CONFIG_RUNTIME_TESTING_MENU is not set

56
board/stmicroelectronics/stm32f469-disco/patches/afboot-stm32/0001-stm32f469-i-Update-kernel-start-address.patch Normal file
View File

@ -0,0 +1,56 @@
From fe5f3a86d07e378baeeddc1dfecd0686d83aa42f Mon Sep 17 00:00:00 2001
From: Yauheni Saldatsenka <eugentoo@gmail.com>
Date: Sat, 14 Aug 2021 18:54:51 +0300
Subject: [PATCH] stm32f469-i: Update kernel start address
As of GNU/Linux v5.12 kernel device tree binary grows above 0x08008000
and overwrites kernel binary
Therefore this commit moves kernel to the next flash bank
Signed-off-by: Yauheni Saldatsenka <eugentoo@gmail.com>
---
stm32f469i-disco.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/stm32f469i-disco.c b/stm32f469i-disco.c
index 2da1f4b..46fc06a 100644
--- a/stm32f469i-disco.c
+++ b/stm32f469i-disco.c
@@ -6,6 +6,7 @@
#include "gpio.h"
#include "mpu.h"
+#define KERNEL_ADDR 0x08010000
#define CONFIG_HSE_HZ 8000000
#define CONFIG_PLL_M 8
#define CONFIG_PLL_N 360
@@ -85,7 +86,7 @@ static void fmc_wait_busy(void)
void start_kernel(void)
{
- void (*kernel)(uint32_t reserved, uint32_t mach, uint32_t dt) = (void (*)(uint32_t, uint32_t, uint32_t))(0x08008000 | 1);
+ void (*kernel)(uint32_t reserved, uint32_t mach, uint32_t dt) = (void (*)(uint32_t, uint32_t, uint32_t))(KERNEL_ADDR | 1);
kernel(0, ~0UL, 0x08004000);
}
@@ -102,7 +103,7 @@ int main(void)
volatile uint32_t *SYSCFG_MEMRMP = (void *)(SYSCFG_BASE + 0x00);
int i;
- mpu_config(0x0);
+ mpu_config(0xc0000000);
if (*FLASH_CR & FLASH_CR_LOCK) {
*FLASH_KEYR = 0x45670123;
@@ -195,8 +196,6 @@ int main(void)
usart_setup(usart_base, 45000000);
usart_putch(usart_base, '.');
- *SYSCFG_MEMRMP = 0x4;
-
start_kernel();
return 0;
--
2.32.0

38
board/stmicroelectronics/stm32f469-disco/patches/linux/0001-Use-default-dram-address-without-remapping.patch Normal file
View File

@ -0,0 +1,38 @@
From 8ccf9f625d00138d86fb7d70f3efd58a8fb4d7ff Mon Sep 17 00:00:00 2001
From: Yauheni Saldatsenka <eugentoo@gmail.com>
Date: Mon, 23 Aug 2021 02:54:22 +0300
Subject: [PATCH] Use default dram address without remapping
Signed-off-by: Yauheni Saldatsenka <eugentoo@gmail.com>
---
arch/arm/boot/dts/stm32f469-disco.dts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts
index 2e1b3bbbe4b5..06845614a19a 100644
--- a/arch/arm/boot/dts/stm32f469-disco.dts
+++ b/arch/arm/boot/dts/stm32f469-disco.dts
@@ -60,9 +60,9 @@ chosen {
stdout-path = "serial0:115200n8";
};
- memory@00000000 {
+ memory@c0000000 {
device_type = "memory";
- reg = <0x00000000 0x1000000>;
+ reg = <0xc0000000 0x1000000>;
};
aliases {
@@ -84,7 +84,7 @@ vdd_dsi: vdd-dsi {
};
soc {
- dma-ranges = <0xc0000000 0x0 0x10000000>;
+ dma-ranges = <0xc0000000 0xc0000000 0x10000000>;
};
leds {
--
2.32.0

24
board/stmicroelectronics/stm32f469-disco/readme_xip.txt Normal file
View File

@ -0,0 +1,24 @@
STM32F469 Discovery
===================
This tutorial describes how to use the predefined Buildroot
configuration for the STM32F469 Discovery evaluation platform.
Internal flash memory stores simple afboot-stm32 bootloader, device tree and
in place (XIP) kernel with built-in initramfs. No external flash or SD card
is needed.
Kernel is based on tinyconfig.
Building
--------
make stm32f469_disco_xip_defconfig
make
Flashing
--------
./board/stmicroelectronics/stm32f469-disco/flash.sh output/
It will flash binary to internal flash memory.

9
boot/arm-trusted-firmware/Config.in
View File

@ -68,6 +68,15 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM
help
Target plaform to build for.
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH
string "Device Tree Source file paths"
help
Space-separated list of paths to device tree source files
that will be copied to fdts/ before starting the build.
To use this device tree source file, the ATF configuration
file must refer to it.
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP
bool "Build FIP image"
help

5
boot/arm-trusted-firmware/arm-trusted-firmware.mk
View File

@ -165,7 +165,12 @@ endif
ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += \
$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS))
ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH))
define ARM_TRUSTED_FIRMWARE_BUILD_CMDS
$(if $(ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH),
cp -f $(ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH) $(@D)/fdts/
)
$(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL)
$(ARM_TRUSTED_FIRMWARE_MAKE_ENV) $(MAKE) -C $(@D) \
$(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \

8
configs/imx6sx-sdb_defconfig
View File

@ -3,19 +3,19 @@ BR2_cortex_a9=y
BR2_ARM_ENABLE_NEON=y
BR2_ARM_ENABLE_VFP=y
BR2_ARM_FPU_VFPV3=y
# Linux headers same as kernel, a 4.14 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
# Linux headers same as kernel, a 5.10 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01"
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07"
BR2_TARGET_UBOOT_FORMAT_IMX=y
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.14"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.55"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb imx6sx-sdb-reva"

18
configs/stm32f469_disco_xip_defconfig Normal file
View File

@ -0,0 +1,18 @@
BR2_arm=y
BR2_cortex_m4=y
BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f469-disco/patches"
# BR2_UCLIBC_INSTALL_UTILS is not set
BR2_GCC_ENABLE_LTO=y
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f469-disco/linux-xip.config"
BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
BR2_LINUX_KERNEL_XZ=y
BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco"
BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
BR2_TARGET_ROOTFS_INITRAMFS=y
# BR2_TARGET_ROOTFS_TAR is not set
BR2_TARGET_AFBOOT_STM32=y
BR2_PACKAGE_HOST_OPENOCD=y

7
package/Config.in
View File

@ -134,6 +134,7 @@ menu "Debugging, profiling and benchmark"
source "package/ramsmp/Config.in"
source "package/ramspeed/Config.in"
source "package/rt-tests/Config.in"
source "package/rwmem/Config.in"
source "package/sentry-native/Config.in"
source "package/spidev_test/Config.in"
source "package/strace/Config.in"
@ -897,6 +898,7 @@ menu "External python modules"
source "package/python-aiojobs/Config.in"
source "package/python-aiologstash/Config.in"
source "package/python-aiomonitor/Config.in"
source "package/python-aioprocessing/Config.in"
source "package/python-aioredis/Config.in"
source "package/python-aiorwlock/Config.in"
source "package/python-aiosignal/Config.in"
@ -1184,6 +1186,7 @@ menu "External python modules"
source "package/python-requests-toolbelt/Config.in"
source "package/python-rpi-gpio/Config.in"
source "package/python-rpi-ws281x/Config.in"
source "package/python-rsa/Config.in"
source "package/python-rtslib-fb/Config.in"
source "package/python-s3transfer/Config.in"
source "package/python-scandir/Config.in"
@ -1638,6 +1641,10 @@ endif
source "package/openlayers/Config.in"
source "package/popperjs/Config.in"
source "package/vuejs/Config.in"
if BR2_PACKAGE_VUEJS
comment "External Vue.js plugins"
source "package/vuejs-router/Config.in"
endif
endmenu
menu "JSON/XML"

2
package/apparmor/apparmor.hash
View File

@ -1,5 +1,5 @@
# From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace
sha256 8fada772d9a60989525594346d9aa22af938daafc1781adce9a1acb3c75bdf24 apparmor-3.0.1.tar.gz
sha256 153db05d8f491e0596022663c19fb1166806cb473b3c6f0a7279feda2ec25a59 apparmor-3.0.3.tar.gz
# locally computed
sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE

2
package/apparmor/apparmor.mk
View File

@ -6,7 +6,7 @@
# When updating the version here, please also update the libapparmor package
APPARMOR_VERSION_MAJOR = 3.0
APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).1
APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).3
APPARMOR_SITE = https://launchpad.net/apparmor/$(APPARMOR_VERSION_MAJOR)/$(APPARMOR_VERSION)/+download
APPARMOR_DL_SUBDIR = libapparmor
APPARMOR_LICENSE = GPL-2.0

2
package/bitcoin/Config.in
View File

@ -10,7 +10,7 @@ config BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
config BR2_PACKAGE_BITCOIN
bool "bitcoin"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread, boost-filesystem
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future
depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS # boost

29
package/boost/0001-added-missing-brackets.patch Normal file
View File

@ -0,0 +1,29 @@
From 1be0e4a2d8db15a405f64a6f65507b87c1be7e1a Mon Sep 17 00:00:00 2001
From: tkoecker <tkoecker@gmx.net>
Date: Fri, 21 May 2021 16:31:11 +0200
Subject: [PATCH] added missing brackets (#118)
[Retrieved from:
https://github.com/boostorg/predef/commit/1be0e4a2d8db15a405f64a6f65507b87c1be7e1a]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
include/boost/predef/architecture/sparc.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/boost/predef/architecture/sparc.h b/boost/predef/architecture/sparc.h
index d7b94f0..d01605e 100644
--- a/boost/predef/architecture/sparc.h
+++ b//boost/predef/architecture/sparc.h
@@ -34,10 +34,10 @@ Distributed under the Boost Software License, Version 1.0.
#if defined(__sparc__) || defined(__sparc)
# undef BOOST_ARCH_SPARC
-# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv9) || defined(__sparc_v9__)
+# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv9) || defined(__sparc_v9__))
# define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(9,0,0)
# endif
-# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv8) || defined(__sparc_v8__)
+# if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv8) || defined(__sparc_v8__))
# define BOOST_ARCH_SPARC BOOST_VERSION_NUMBER(8,0,0)
# endif
# if !defined(BOOST_ARCH_SPARC)

37
package/boost/0001-fenv.patch
View File

@ -1,37 +0,0 @@
Disable fenv.h in certain configurations
The boost build system does not properly test whether fenv.h is
available, and if it is, if it supports all the features used by
Boost. This causes build failures with uClibc (reported upstream at
https://svn.boost.org/trac/boost/ticket/11756) but also with glibc on
specific architectures that don't have a full fenv implementation,
such as NIOSII or Microblaze.
To address this, we forcefully disable the use of fenv support in the
affected configurations.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[Thomas: add Microblaze/NIOSII exclusions.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: b/boost/config/platform/linux.hpp
===================================================================
--- a/boost/config/platform/linux.hpp
+++ b/boost/config/platform/linux.hpp
@@ -48,6 +48,16 @@
#endif
//
+// uClibc has no support for fenv.h, and also a few architectures
+// don't have fenv.h support at all (or incomplete support) even with
+// glibc.
+
+//
+#if defined(__UCLIBC__) || defined(__nios2__) || defined(__microblaze__)
+# define BOOST_NO_FENV_H
+#endif
+
+//
// If glibc is past version 2 then we definitely have
// gettimeofday, earlier versions may or may not have it:
//

42
package/boost/0002-src-event-cpp-fix-build-on-riscv32.patch
View File

@ -1,42 +0,0 @@
From d2061419501bdd6761e9380ed5b91233f6c4e67e Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 21 May 2021 21:30:04 +0200
Subject: [PATCH] src/event.cpp: fix build on riscv32
riscv32 fails to build because __NR_futex is not defined on this
architecture:
libs/log/src/event.cpp: In member function 'void boost::log::v2_mt_posix::aux::futex_based_event::wait()':
libs/log/src/event.cpp:38:29: error: '__NR_futex' was not declared in this scope
38 | #define BOOST_LOG_SYS_FUTEX __NR_futex
| ^~~~~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/8c8135fd7c0517c66c9b3975c494da6d7934cc1b
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Retrieved from:
https://github.com/boostorg/log/commit/d2061419501bdd6761e9380ed5b91233f6c4e67e]
---
src/event.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libs/log/src/event.cpp b/libs/log/src/event.cpp
index 5485154d7..f576648c6 100644
--- a/libs/log/src/event.cpp
+++ b/libs/log/src/event.cpp
@@ -34,8 +34,13 @@
// Some Android NDKs (Google NDK and older Crystax.NET NDK versions) don't define SYS_futex
#if defined(SYS_futex)
#define BOOST_LOG_SYS_FUTEX SYS_futex
-#else
+#elif defined(__NR_futex)
#define BOOST_LOG_SYS_FUTEX __NR_futex
+// riscv32 defines a different system call instead of __NR_futex
+#elif defined(__NR_futex_time64)
+#define BOOST_LOG_SYS_FUTEX __NR_futex_time64
+#else
+#error "Unable to find a suitable futex"
#endif
#if defined(FUTEX_WAIT_PRIVATE)

3
package/boost/Config.in
View File

@ -163,6 +163,8 @@ comment "boost-fiber needs a toolchain not affected by GCC bug 64735"
config BR2_PACKAGE_BOOST_FILESYSTEM
bool "boost-filesystem"
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic
select BR2_PACKAGE_BOOST_ATOMIC
select BR2_PACKAGE_BOOST_SYSTEM
help
The Boost Filesystem Library provides portable facilities to
@ -252,6 +254,7 @@ comment "boost-log needs a toolchain not affected by GCC bug 64735"
config BR2_PACKAGE_BOOST_MATH
bool "boost-math"
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
help
Boost.Math includes several contributions in the domain of
mathematics:

4
package/boost/boost.hash
View File

@ -1,5 +1,5 @@
# From https://www.boost.org/users/history/version_1_74_0.html
sha256 953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb boost_1_75_0.tar.bz2
# From https://www.boost.org/users/history/version_1_77_0.html
sha256 fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854 boost_1_77_0.tar.bz2
# Locally computed
sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt

2
package/boost/boost.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
BOOST_VERSION = 1.75.0
BOOST_VERSION = 1.77.0
BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2
BOOST_SITE = https://boostorg.jfrog.io/artifactory/main/release/$(BOOST_VERSION)/source
BOOST_INSTALL_STAGING = YES

4
package/botan/Config.in
View File

@ -18,8 +18,8 @@ config BR2_PACKAGE_BOTAN
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future
select BR2_PACKAGE_BOOST_FILESYSTEM if BR2_PACKAGE_BOOST
select BR2_PACKAGE_BOOST_SYSTEM if BR2_PACKAGE_BOOST
select BR2_PACKAGE_BOOST_FILESYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
select BR2_PACKAGE_BOOST_SYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL
select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL
help

4
package/bubblewrap/bubblewrap.hash
View File

@ -1,5 +1,5 @@
# Locally computed:
sha256 b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03 bubblewrap-0.4.1.tar.xz
# From https://github.com/containers/bubblewrap/releases/tag/v0.5.0
sha256 16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818 bubblewrap-0.5.0.tar.xz
# Hash for license files:
sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING

2
package/bubblewrap/bubblewrap.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
BUBBLEWRAP_VERSION = 0.4.1
BUBBLEWRAP_VERSION = 0.5.0
BUBBLEWRAP_SITE = https://github.com/containers/bubblewrap/releases/download/v$(BUBBLEWRAP_VERSION)
BUBBLEWRAP_SOURCE = bubblewrap-$(BUBBLEWRAP_VERSION).tar.xz
BUBBLEWRAP_DEPENDENCIES = host-pkgconf libcap

10
package/busybox/busybox.mk
View File

@ -332,6 +332,12 @@ define BUSYBOX_INSTALL_TELNET_SCRIPT
$(TARGET_DIR)/etc/init.d/S50telnet ; \
fi
endef
define BUSYBOX_INSTALL_TELNET_SERVICE
if grep -q CONFIG_FEATURE_TELNETD_STANDALONE=y $(@D)/.config; then \
$(INSTALL) -D -m 0644 package/busybox/telnetd.service \
$(TARGET_DIR)/usr/lib/systemd/system/telnetd.service ; \
fi
endef
# Add /bin/{a,hu}sh to /etc/shells otherwise some login tools like dropbear
# can reject the user connection. See man shells.
@ -384,6 +390,10 @@ define BUSYBOX_INSTALL_INIT_OPENRC
$(BUSYBOX_INSTALL_TELNET_SCRIPT)
endef
define BUSYBOX_INSTALL_INIT_SYSTEMD
$(BUSYBOX_INSTALL_TELNET_SERVICE)
endef
define BUSYBOX_INSTALL_INIT_SYSV
$(BUSYBOX_INSTALL_MDEV_SCRIPT)
$(BUSYBOX_INSTALL_LOGGING_SCRIPT)

10
package/busybox/telnetd.service Normal file
View File

@ -0,0 +1,10 @@
[Unit]
Description=Telnetd Service
After=network.target
[Service]
Type=simple
ExecStart=/usr/sbin/telnetd -F
[Install]
WantedBy=multi-user.target

4
package/cage/cage.hash
View File

@ -1,5 +1,5 @@
# Generated locally
sha256 c28aa8230f937c89b564967748451c1eb15d8633a71a1ed6e22d532afa15462e cage-0.1.3.tar.gz
# Generated locally after checking GPG signature
sha256 dfe27fb0c7d43db72d6c82f01e2736580a0791a23ba69d7b56285d08af98ad90 cage-0.1.4.tar.gz
# Hashes for license files:
sha256 e117104073335dbaf78596fb1bedf89dda63c71f60f0b665947b2d369c77ecee LICENSE

2
package/cage/cage.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
CAGE_VERSION = 0.1.3
CAGE_VERSION = 0.1.4
CAGE_SITE = https://github.com/Hjdskes/cage/releases/download/v$(CAGE_VERSION)
CAGE_LICENSE = MIT
CAGE_LICENSE_FILES = LICENSE

2
package/cc-tool/Config.in
View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_CC_TOOL
bool "cc-tool"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem
depends on BR2_USE_WCHAR # boost-filesystem
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb
select BR2_PACKAGE_LIBUSB
@ -18,6 +19,7 @@ config BR2_PACKAGE_CC_TOOL
https://github.com/dashesy/cc-tool/
comment "cc-tool needs a toolchain w/ C++, threads, wchar, gcc >= 4.9 "
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9

2
package/cups-filters/cups-filters.hash
View File

@ -1,3 +1,3 @@
# Locally computed:
sha256 cf90b96b5c7a906a05070e757ee5566d9680db98a279e60567ea5421c38f11de cups-filters-1.28.4.tar.gz
sha256 5bad0b931f8293082f8773b34d5c4fed66415d2bf268b0798889e5f593c0ba61 cups-filters-1.28.9.tar.gz
sha256 38192ffdaca98b718f78b2d4abc38bb087f0bbcc9a16d212c98b903b985f900f COPYING

2
package/cups-filters/cups-filters.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
CUPS_FILTERS_VERSION = 1.28.4
CUPS_FILTERS_VERSION = 1.28.9
CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters
CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause
CUPS_FILTERS_LICENSE_FILES = COPYING

2
package/dav1d/dav1d.hash
View File

@ -1,3 +1,3 @@
# Locally computed
sha256 e0cb645f170e7a087bc76e501324177be51a8db21df22ad37b43d289d7d1f7b5 dav1d-0.9.0.tar.bz2
sha256 fb2a050e6c2410c99104f631e202a02697dfe1a2fc9acc3c50a16422aefb004c dav1d-0.9.1.tar.bz2
sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING

2
package/dav1d/dav1d.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
DAV1D_VERSION = 0.9.0
DAV1D_VERSION = 0.9.1
DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2
DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION)
DAV1D_LICENSE = BSD-2-Clause

4
package/e2fsprogs/e2fsprogs.hash
View File

@ -1,5 +1,5 @@
# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.2/sha256sums.asc
sha256 23aa093295c94e71ef1be490c4004871c5b01d216a8cb4d111fa6c0aac354168 e2fsprogs-1.46.2.tar.xz
# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.3/sha256sums.asc
sha256 86d1580facdd49f2e0e6b027e26b1e6c48af538762dc40aeed2a87153c1f11b7 e2fsprogs-1.46.3.tar.xz
# Locally calculated
sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020 NOTICE
sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h

2
package/e2fsprogs/e2fsprogs.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
E2FSPROGS_VERSION = 1.46.2
E2FSPROGS_VERSION = 1.46.3
E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet)

14
package/fakedate/fakedate
View File

@ -19,15 +19,13 @@
#
DATE_BIN=false
# Do not call `date' directly since it will produce an infinite recursion.
# Instead, find path of true `date' binary.
for P in `echo $PATH | tr ':' ' '`; do
if [ -x "$P/date" ]; then
if ! [ "$P/date" -ef "$0" ]; then
DATE_BIN="$P/date"
break;
fi
# Do not call any 'date' before us in the PATH, or that would create
# an infinite recursion.
for date in $(which -a date |tac); do
if [ "${date}" -ef "$0" ]; then
break
fi
DATE_BIN="${date}"
done
if [ -n "$SOURCE_DATE_EPOCH" ]; then

2
package/fluidsynth/fluidsynth.hash
View File

@ -1,3 +1,3 @@
# Locally computed
sha256 1c56660f23f6c406b36646cc619fc2d2a5265d1d3290e79bcef4505bcd985fdd fluidsynth-2.2.1.tar.gz
sha256 695aedbfd53160fef7a9a1f66cd6d5cc8a5da0fd472eee458d82b848b6065f9a fluidsynth-2.2.2.tar.gz
sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE

2
package/fluidsynth/fluidsynth.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
FLUIDSYNTH_VERSION = 2.2.1
FLUIDSYNTH_VERSION = 2.2.2
FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION))
FLUIDSYNTH_LICENSE = LGPL-2.1+
FLUIDSYNTH_LICENSE_FILES = LICENSE

2
package/fmt/fmt.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 5d98c504d0205f912e22449ecdea776b78ce0bb096927334f80781e720084c9f fmt-7.1.3.zip
sha256 a627a56eab9554fc1e5dd9a623d0768583b3a383ff70a4312ba68f94c9d415bf fmt-8.0.1.zip
sha256 825c9324e70f8c839c8ba910543dd4a7daee243b86ef960594c11381a19980b8 LICENSE.rst

2
package/fmt/fmt.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
FMT_VERSION = 7.1.3
FMT_VERSION = 8.0.1
FMT_SITE = https://github.com/fmtlib/fmt/releases/download/$(FMT_VERSION)
FMT_SOURCE = fmt-$(FMT_VERSION).zip
FMT_LICENSE = MIT with exception

49
package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
View File

@ -42,44 +42,35 @@ define IMX_GPU_VIV_EXTRACT_CMDS
$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_GPU_VIV_DL_DIR)/$(IMX_GPU_VIV_SOURCE))
endef
ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb)
define IMX_GPU_VIV_FIXUP_PKGCONFIG
ln -sf egl_linuxfb.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc
endef
else ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland)
define IMX_GPU_VIV_FIXUP_PKGCONFIG
ln -sf egl_wayland.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc
endef
else ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11)
define IMX_GPU_VIV_FIXUP_PKGCONFIG
$(foreach lib,egl gbm glesv1_cm glesv2 vg, \
ln -sf $(lib)_x11.pc $(@D)/gpu-core/usr/lib/pkgconfig/$(lib).pc
)
endef
endif
# Instead of building, we fix up the inconsistencies that exist
# in the upstream archive here. We also remove unused backend files.
# Make sure these commands are idempotent.
define IMX_GPU_VIV_BUILD_CMDS
cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_LIB_TARGET)/* $(@D)/gpu-core/usr/lib/
for backend in fb x11 wayland; do \
$(RM) -r $(@D)/gpu-core/usr/lib/$$backend ; \
done
$(foreach backend,fb x11 wayland, \
$(RM) -r $(@D)/gpu-core/usr/lib/$(backend)
)
$(IMX_GPU_VIV_FIXUP_PKGCONFIG)
endef
ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb)
define IMX_GPU_VIV_FIXUP_PKGCONFIG
ln -sf egl_linuxfb.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc
endef
endif
ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland)
define IMX_GPU_VIV_FIXUP_PKGCONFIG
ln -sf egl_wayland.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc
endef
endif
ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11)
define IMX_GPU_VIV_FIXUP_PKGCONFIG
for lib in egl gbm glesv1_cm glesv2 vg; do \
ln -sf $${lib}_x11.pc $(@D)/gpu-core/usr/lib/pkgconfig/$${lib}.pc || exit 1; \
done
endef
endif
define IMX_GPU_VIV_INSTALL_STAGING_CMDS
cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr
$(IMX_GPU_VIV_FIXUP_PKGCONFIG)
for lib in egl gbm glesv1_cm glesv2 vg; do \
$(INSTALL) -m 0644 -D \
$(@D)/gpu-core/usr/lib/pkgconfig/$${lib}.pc \
$(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \
done
endef
ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES),y)

6
package/gensio/gensio.hash
View File

@ -1,7 +1,7 @@
# From https://sourceforge.net/projects/ser2net/files/ser2net/
md5 3d1135a7bd7a3aca48493997fed1f1a0 gensio-2.2.4.tar.gz
sha1 3c59d94e48c0a8ec5ed57ebb4ea95f3709d108ac gensio-2.2.4.tar.gz
md5 0adab57c4fbb55a280595f6541f202da gensio-2.2.8.tar.gz
sha1 3030b398eef379579680240d0c732d88fdad72a8 gensio-2.2.8.tar.gz
# Locally computed:
sha256 36cadbc790e03e4150a12bca14b20215afdff0a0f8deaf85c10434dca54d0493 gensio-2.2.4.tar.gz
sha256 d495bfdacd30e8fe3879b29baab034eb553e606dbf145243989c97e83ad83115 gensio-2.2.8.tar.gz
sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING
sha256 dcac7d447dd81ab96d28dce00a07a6486e623f7ded94e2a2a8e83312405cdf89 COPYING.LIB

2
package/gensio/gensio.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
GENSIO_VERSION = 2.2.4
GENSIO_VERSION = 2.2.8
GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net
GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
GENSIO_LICENSE_FILES = COPYING.LIB COPYING

2
package/glibc/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/glibc.hash → package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash
View File

@ -1,5 +1,5 @@
# Locally calculated (fetched from Github)
sha256 3e2004b16ec6b79a19a88ed4736719ef9e419f9d8e7013faced654c0339e23dc glibc-2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f.tar.gz
sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz
# Hashes for license files
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING

2
package/glibc/glibc.mk
View File

@ -11,7 +11,7 @@ else
# Generate version string using:
# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
# When updating the version, please also update localedef
GLIBC_VERSION = 2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f
GLIBC_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4
# Upstream doesn't officially provide an https download link.
# There is one (https://sourceware.org/git/glibc.git) but it's not reliable,
# sometimes the connection times out. So use an unofficial github mirror.

2
package/gnuradio/Config.in
View File

@ -14,7 +14,7 @@ config BR2_PACKAGE_GNURADIO
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on BR2_USE_MMU # use fork()
depends on BR2_USE_WCHAR # boost
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic, boost-filesystem
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread
select BR2_PACKAGE_BOOST
select BR2_PACKAGE_BOOST_ATOMIC

2
package/go/go.hash
View File

@ -1,3 +1,3 @@
# From https://golang.org/dl/
sha256 1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac go1.16.7.src.tar.gz
sha256 3a70e5055509f347c0fb831ca07a2bf3b531068f349b14a3c652e9b5b67beb5d go1.17.src.tar.gz
sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE

2
package/go/go.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
GO_VERSION = 1.16.7
GO_VERSION = 1.17
GO_SITE = https://storage.googleapis.com/golang
GO_SOURCE = go$(GO_VERSION).src.tar.gz

43
package/grpc/0001-CMakeLists.txt-fix-cross-compilation-with-gRPC_BUILD.patch
View File

@ -1,43 +0,0 @@
From 268815d74ea34856c686dce9e9c23106b51f2782 Mon Sep 17 00:00:00 2001
From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Date: Tue, 2 Feb 2021 21:46:29 +0100
Subject: [PATCH] CMakeLists.txt: fix cross-compilation with
gRPC_BUILD_GRPC_CPP_PLUGIN=OFF
When cross-compiling gRPC, a native version of 'grpc_cpp_plugin' is searched
in the environment. For most use cases, a cross version of this file is not
needed.
However, when cross-building with -DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF, there
are some build errors, for example:
make[3]: *** No rule to make target 'grpc_cpp_plugin', needed by 'gens/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc'. Stop.
This is because there is still a hard dependency on 'grpc_cpp_plugin' for
these targets, not taking into account the cross-compilation case.
Fix by depending on the variable gRPC_CPP_PLUGIN, which is set correctly for
either cross or native case.
Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bdae22083..08aea609f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -317,7 +317,7 @@ function(protobuf_generate_grpc_cpp)
--plugin=protoc-gen-grpc=${_gRPC_CPP_PLUGIN}
${_protobuf_include_path}
${REL_FIL}
- DEPENDS ${ABS_FIL} ${_gRPC_PROTOBUF_PROTOC} grpc_cpp_plugin
+ DEPENDS ${ABS_FIL} ${_gRPC_PROTOBUF_PROTOC} ${_gRPC_CPP_PLUGIN}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Running gRPC C++ protocol buffer compiler on ${FIL}"
VERBATIM)
--
2.26.2

0
package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch → package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch
View File

8
package/grpc/0003-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch → package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch
View File

@ -20,12 +20,12 @@ diff --git a/src/core/lib/gpr/wrap_memcpy.cc b/src/core/lib/gpr/wrap_memcpy.cc
index 9b8608e056..38b76acf95 100644
--- a/src/core/lib/gpr/wrap_memcpy.cc
+++ b/src/core/lib/gpr/wrap_memcpy.cc
@@ -28,7 +28,7 @@
@@ -29,7 +29,7 @@
extern "C" {
#ifdef __linux__
-#if defined(__x86_64__) && !defined(GPR_MUSL_LIBC_COMPAT)
+#if defined(__x86_64__) && !defined(GPR_MUSL_LIBC_COMPAT) && !defined(GPR_DISABLE_WRAPPED_MEMCPY)
#if defined(__x86_64__) && !defined(GPR_MUSL_LIBC_COMPAT) && \
- !defined(__ANDROID__)
+ !defined(__ANDROID__) && !defined(GPR_DISABLE_WRAPPED_MEMCPY)
__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
void* __wrap_memcpy(void* destination, const void* source, size_t num) {
return memcpy(destination, source, num);

2
package/grpc/grpc.hash
View File

@ -1,3 +1,3 @@
# Locally computed
sha256 f60e5b112913bf776a22c16a3053cc02cf55e60bf27a959fd54d7aaf8e2da6e8 grpc-1.38.1.tar.gz
sha256 b16992aa1c949c10d5d5ce2a62f9d99fa7de77da2943e643fb66dcaf075826d6 grpc-1.39.0.tar.gz
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE

2
package/grpc/grpc.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
GRPC_VERSION = 1.38.1
GRPC_VERSION = 1.39.0
GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION))
GRPC_LICENSE = Apache-2.0
GRPC_LICENSE_FILES = LICENSE

1
package/hostapd/hostapd.mk
View File

@ -31,6 +31,7 @@ HOSTAPD_IGNORE_CVES += CVE-2021-30004
HOSTAPD_IGNORE_CVES += CVE-2021-27803
HOSTAPD_CPE_ID_VENDOR = w1.fi
HOSTAPD_SELINUX_MODULES = hostapd
HOSTAPD_CONFIG_SET =
HOSTAPD_CONFIG_ENABLE = \

3
package/i2pd/Config.in
View File

@ -4,6 +4,7 @@ config BR2_PACKAGE_I2PD
depends on BR2_TOOLCHAIN_HAS_ATOMIC
# pthread_condattr_setclock
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR # boost
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
@ -28,10 +29,12 @@ config BR2_PACKAGE_I2PD
comment "i2pd needs a toolchain w/ C++, NPTL, wchar"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_ATOMIC
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR
comment "i2pd needs exception_ptr"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_ATOMIC
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735

4
package/ipset/ipset.hash
View File

@ -1,4 +1,4 @@
# From https://ipset.netfilter.org/ipset-7.11.tar.bz2.sha512sum.txt
sha512 20890de32c17c04d9d3ae42fff64acfe21a252974bee5843ae39bdda707fcef55fde11cffccab9f987bf7e18f5445443c46c50eb854fb6f93f172f7bad07f922 ipset-7.11.tar.bz2
# From https://ipset.netfilter.org/ipset-7.15.tar.bz2.sha512sum.txt
sha512 0fc936d971c30a0925c585d506c8840e782fdaeec09bc8fd249e874fe838fa55a4dbb697f6e1423a6769abf07a1ce2195abc37cb641e8e4ad70f1b4c7130916a ipset-7.15.tar.bz2
# Locally calculated
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING

2
package/ipset/ipset.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
IPSET_VERSION = 7.11
IPSET_VERSION = 7.15
IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
IPSET_SITE = http://ipset.netfilter.org
IPSET_DEPENDENCIES = libmnl host-pkgconf

4
package/json-for-modern-cpp/json-for-modern-cpp.hash
View File

@ -1,3 +1,3 @@
# Locally computed
sha256 9943db11eeaa5b23e58a88fbc26c453faccef7b546e55063ad00e7caaaf76d0b json-3.9.0.tar.gz
sha256 50be9457e5c9faaba5e60d9c73f8eabe9e0737a2d9c3e58357d856661862c18e LICENSE.MIT
sha256 081ed0f9f89805c2d96335c3acfa993b39a0a5b4b4cef7edb68dd2210a13458c json-3.10.2.tar.gz
sha256 c983d69523377819db3c377b390d5644f5ec53bec9b7c4a0f1ed893bb743d045 LICENSE.MIT

2
package/json-for-modern-cpp/json-for-modern-cpp.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
JSON_FOR_MODERN_CPP_VERSION = 3.9.0
JSON_FOR_MODERN_CPP_VERSION = 3.10.2
JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz
JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION))
JSON_FOR_MODERN_CPP_LICENSE = MIT

46
package/kmsxx/0001-meson-add-use-system-fmt-option.patch
View File

@ -1,46 +0,0 @@
From 61db7d5520f50564da8f2c9ac952eadb31f70727 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Sun, 29 Nov 2020 11:13:41 +0100
Subject: [PATCH] meson: add use-system-fmt option
[Upstream: https://github.com/tomba/kmsxx/pull/60]
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
meson.build | 10 +++++++---
meson_options.txt | 2 ++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 9652009..29080f4 100644
--- a/meson.build
+++ b/meson.build
@@ -31,9 +31,13 @@ endif
add_global_link_arguments(link_arguments, language : 'cpp')
-libfmt_includes = include_directories('ext/fmt/include')
-libfmt_dep = declare_dependency(include_directories : libfmt_includes,
- compile_args : '-DFMT_HEADER_ONLY')
+if get_option('use-system-fmt')
+ libfmt_dep = dependency('fmt')
+else
+ libfmt_includes = include_directories('ext/fmt/include')
+ libfmt_dep = declare_dependency(include_directories : libfmt_includes,
+ compile_args : '-DFMT_HEADER_ONLY')
+endif
pybind11_includes = include_directories('ext/pybind11/include')
pybind11_dep = declare_dependency(include_directories : pybind11_includes)
diff --git a/meson_options.txt b/meson_options.txt
index cd854ab..48176a8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,3 +3,5 @@ option('pykms', type : 'feature', value : 'auto')
option('omap', type : 'feature', value : 'auto')
option('static-libc', type : 'boolean', value : false)
option('utils', type : 'boolean', value : true)
+
+option('use-system-fmt', type : 'boolean', value : false)
--
2.29.2

43
package/kmsxx/0002-meson-add-use-system-pybind11-option.patch
View File

@ -1,43 +0,0 @@
From 27f15549ce67194e4152c57db2b762b7a443b4c7 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Sun, 29 Nov 2020 11:14:41 +0100
Subject: [PATCH] meson: add use-system-pybind11 option
[Upstream: https://github.com/tomba/kmsxx/pull/60]
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
meson.build | 8 ++++++--
meson_options.txt | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 29080f4..4b3e7c3 100644
--- a/meson.build
+++ b/meson.build
@@ -39,8 +39,12 @@ else
compile_args : '-DFMT_HEADER_ONLY')
endif
-pybind11_includes = include_directories('ext/pybind11/include')
-pybind11_dep = declare_dependency(include_directories : pybind11_includes)
+if get_option('use-system-pybind11')
+ pybind11_dep = dependency('pybind11')
+else
+ pybind11_includes = include_directories('ext/pybind11/include')
+ pybind11_dep = declare_dependency(include_directories : pybind11_includes)
+endif
libdrmomap_dep = dependency('libdrm_omap', required : get_option('omap'))
diff --git a/meson_options.txt b/meson_options.txt
index 48176a8..095c6f2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -5,3 +5,4 @@ option('static-libc', type : 'boolean', value : false)
option('utils', type : 'boolean', value : true)
option('use-system-fmt', type : 'boolean', value : false)
+option('use-system-pybind11', type : 'boolean', value : false)
--
2.29.2

48
package/kmsxx/0003-meson-only-build-py-in-case-pykms-is-enabled.patch
View File

@ -1,48 +0,0 @@
From 0ef36b2e22c2ac0331b3096b7adc69fb08044048 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Sun, 29 Nov 2020 11:37:26 +0100
Subject: [PATCH] meson: only build py in case pykms is enabled
[Upstream: https://github.com/tomba/kmsxx/pull/60]
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
meson.build | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index 4b3e7c3..1810b17 100644
--- a/meson.build
+++ b/meson.build
@@ -39,11 +39,13 @@ else
compile_args : '-DFMT_HEADER_ONLY')
endif
-if get_option('use-system-pybind11')
- pybind11_dep = dependency('pybind11')
-else
- pybind11_includes = include_directories('ext/pybind11/include')
- pybind11_dep = declare_dependency(include_directories : pybind11_includes)
+if get_option('pykms').enabled()
+ if get_option('use-system-pybind11')
+ pybind11_dep = dependency('pybind11')
+ else
+ pybind11_includes = include_directories('ext/pybind11/include')
+ pybind11_dep = declare_dependency(include_directories : pybind11_includes)
+ endif
endif
libdrmomap_dep = dependency('libdrm_omap', required : get_option('omap'))
@@ -55,7 +57,9 @@ if get_option('utils')
subdir('utils')
endif
-subdir('py')
+if get_option('pykms').enabled()
+ subdir('py')
+endif
if get_option('kmscube')
subdir('kmscube')
--
2.29.2

2
package/kmsxx/kmsxx.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 4a682328b03c28ff1f6cfcafc48d30c3feb5ef98ed07e5dd3bbd9e6a1d4a47cc kmsxx-548905611c130ea9d31929a0caf7a198d8bac462.tar.gz
sha256 99759fe9334369ccd80ab0bbfe1110ee47e74f1e20abc2d7b2f028067ea0a0c3 kmsxx-824bbb1f4cd062d66b457faca50f904b34dfd96c.tar.gz
sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE

11
package/kmsxx/kmsxx.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
KMSXX_VERSION = 548905611c130ea9d31929a0caf7a198d8bac462
KMSXX_VERSION = 824bbb1f4cd062d66b457faca50f904b34dfd96c
KMSXX_SITE = $(call github,tomba,kmsxx,$(KMSXX_VERSION))
KMSXX_LICENSE = MPL-2.0
KMSXX_LICENSE_FILES = LICENSE
@ -14,14 +14,7 @@ KMSXX_CONF_OPTS = \
-Dkmscube=false \
-Dpykms=disabled \
-Domap=disabled \
-Duse-system-fmt=true \
-Duse-system-pybind11=true
ifeq ($(BR2_STATIC_LIBS),y)
KMSXX_CONF_OPTS += -Dstatic-libc=true
else
KMSXX_CONF_OPTS += -Dstatic-libc=false
endif
-Dsystem-pybind11=enabled
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
KMSXX_CXXFLAGS += $(TARGET_CXXFLAGS) -O0

2
package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash
View File

@ -1,3 +1,3 @@
# Locally computed
sha256 48eea3785dc820ee48cf652483ff91a1589d0fabe3f61c740e04595b5a020288 kodi-inputstream-adaptive-2.6.22-Matrix.tar.gz
sha256 eeb68250725c4e6c990fdb24365188733b6ef944965792bb5b0e42ce306ad836 kodi-inputstream-adaptive-2.6.23-Matrix.tar.gz
sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL

2
package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.6.22-Matrix
KODI_INPUTSTREAM_ADAPTIVE_VERSION = 2.6.23-Matrix
KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION))
KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+
KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL

2
package/kodi-pvr-hts/kodi-pvr-hts.hash
View File

@ -1,3 +1,3 @@
# Locally computed
sha256 98f4250d8d8700741798524ea8a3756c5d02403408c74de2d2d3b22b3f13aa23 kodi-pvr-hts-8.3.4-Matrix.tar.gz
sha256 a8fec6749481999981903f2de48bd9a71ca5b4828eab91b8b115238f66e68140 kodi-pvr-hts-8.4.0-Matrix.tar.gz
sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md

2
package/kodi-pvr-hts/kodi-pvr-hts.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
KODI_PVR_HTS_VERSION = 8.3.4-Matrix
KODI_PVR_HTS_VERSION = 8.4.0-Matrix
KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION))
KODI_PVR_HTS_LICENSE = GPL-2.0+
KODI_PVR_HTS_LICENSE_FILES = LICENSE.md

2
package/libapparmor/libapparmor.hash
View File

@ -1,5 +1,5 @@
# From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace
sha256 8fada772d9a60989525594346d9aa22af938daafc1781adce9a1acb3c75bdf24 apparmor-3.0.1.tar.gz
sha256 153db05d8f491e0596022663c19fb1166806cb473b3c6f0a7279feda2ec25a59 apparmor-3.0.3.tar.gz
# locally computed
sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE

2
package/libapparmor/libapparmor.mk
View File

@ -6,7 +6,7 @@
# When updating the version here, please also update the apparmor package
LIBAPPARMOR_VERSION_MAJOR = 3.0
LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).1
LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).3
LIBAPPARMOR_SOURCE = apparmor-$(LIBAPPARMOR_VERSION).tar.gz
LIBAPPARMOR_SITE = https://launchpad.net/apparmor/$(LIBAPPARMOR_VERSION_MAJOR)/$(LIBAPPARMOR_VERSION)/+download
LIBAPPARMOR_LICENSE = LGPL-2.1

4
package/libbpf/libbpf.hash
View File

@ -1,5 +1,5 @@
# Locally calculated
sha256 0f97295987c745eb07c48f8db992f7df307b5cd45c9a20eb352ee6d08cf7bd36 libbpf-0.2.tar.gz
sha256 21cbee4df093e7fd29e76ed429650d3f3abe3a893f35e346ab9bc3484f6e68c0 libbpf-0.4.0.tar.gz
sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE
sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause
sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LPGL-2.1
sha256 0b9a4febcdee6de55872501d5c1a8f5d8b0d1650cd4d5351995ceb22e889f8ca LICENSE.LGPL-2.1

4
package/libbpf/libbpf.mk
View File

@ -4,10 +4,10 @@
#
################################################################################
LIBBPF_VERSION = 0.2
LIBBPF_VERSION = 0.4.0
LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION))
LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause
LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LPGL-2.1
LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1
LIBBPF_DEPENDENCIES = host-bison host-flex host-pkgconf elfutils zlib
LIBBPF_INSTALL_STAGING = YES

123
package/libcap/0001-Permit-compilation-with-std-c89.patch
View File

@ -1,123 +0,0 @@
From 06ec53d0c9fcddcc071a0e07731e6c83238400e6 Mon Sep 17 00:00:00 2001
From: "Andrew G. Morgan" <morgan@kernel.org>
Date: Mon, 21 Jun 2021 17:46:43 -0700
Subject: Permit compilation with -std=c89.
Tested with
make COPTS="-O2 -std=c89" clean all test sudotest
This addresses the issue reported by Byron Stanoszek:
https://bugzilla.kernel.org/show_bug.cgi?id=213541
Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
[Retrieved from:
https://git.kernel.org/pub/scm/linux/kernel/git/morgan/libcap.git/commit/?id=06ec53d0c9fcddcc071a0e07731e6c83238400e6]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Makefile | 1 +
libcap/cap_test.c | 1 +
psx/psx.c | 2 +-
tests/exploit.c | 9 +++++++--
tests/libcap_launch_test.c | 6 +++---
tests/uns_test.c | 3 ++-
6 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 9666bf0..984d502 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,7 @@ endif
distcheck:
./distcheck.sh
$(MAKE) DYNAMIC=yes clean all test sudotest
+ $(MAKE) DYNAMIC=no COPTS="-O2 -std=c89" clean all test sudotest
$(MAKE) PAM_CAP=no CC=/usr/local/musl/bin/musl-gcc clean all test sudotest
$(MAKE) clean all test sudotest
$(MAKE) distclean
diff --git a/libcap/cap_test.c b/libcap/cap_test.c
index c9e83de..a717217 100644
--- a/libcap/cap_test.c
+++ b/libcap/cap_test.c
@@ -79,4 +79,5 @@ int main(int argc, char **argv) {
exit(1);
}
printf("cap_test PASS\n");
+ exit(0);
}
diff --git a/psx/psx.c b/psx/psx.c
index 12dbbc5..90dcc50 100644
--- a/psx/psx.c
+++ b/psx/psx.c
@@ -229,7 +229,7 @@ static void psx_syscall_start(void) {
psx_tracker.psx_sig = SIGSYS;
psx_confirm_sigaction();
- psx_do_registration(); // register the main thread.
+ psx_do_registration(); /* register the main thread. */
psx_tracker.initialized = 1;
}
diff --git a/tests/exploit.c b/tests/exploit.c
index 28bac88..814337c 100644
--- a/tests/exploit.c
+++ b/tests/exploit.c
@@ -16,6 +16,10 @@
* to execute arbitrary code. As such, if all but one thread drops
* privilege, privilege escalation is somewhat trivial.
*/
+
+/* as per "man sigaction" */
+#define _POSIX_C_SOURCE 200809L
+
#include <pthread.h>
#include <signal.h>
#include <stdio.h>
@@ -148,7 +152,8 @@ int main(int argc, char **argv) {
if (greatest_len != 1) {
printf("exploit succeeded\n");
exit(1);
- } else {
- printf("exploit failed\n");
}
+
+ printf("exploit failed\n");
+ exit(0);
}
diff --git a/tests/libcap_launch_test.c b/tests/libcap_launch_test.c
index 6cbfc43..5286979 100644
--- a/tests/libcap_launch_test.c
+++ b/tests/libcap_launch_test.c
@@ -199,10 +199,10 @@ int main(int argc, char **argv) {
cap_free(final);
cap_free(orig);
- if (success) {
- printf("cap_launch_test: PASSED\n");
- } else {
+ if (!success) {
printf("cap_launch_test: FAILED\n");
exit(1);
}
+ printf("cap_launch_test: PASSED\n");
+ exit(0);
}
diff --git a/tests/uns_test.c b/tests/uns_test.c
index 41aa0a6..d8f5415 100644
--- a/tests/uns_test.c
+++ b/tests/uns_test.c
@@ -115,7 +115,8 @@ int main(int argc, char **argv)
}
close(fds.from[0]);
- for (int i=0; i<2; i++) {
+ int i;
+ for (i=0; i<2; i++) {
char *map_file;
if (asprintf(&map_file, file_formats[i], pid) < 0) {
perror("allocate string");
--
cgit 1.2.3-1.el7

50
package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch Normal file
View File

@ -0,0 +1,50 @@
From dc507a812d931c24f1ac98c811fdd29bffa21da9 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Tue, 24 Aug 2021 00:36:40 +0200
Subject: [PATCH] libcap/Makefile: don't overwrite 'empty' when generating
loader.txt
objcopy takes an input file and an output file as arguments. If the
output file is left out, the input file will be overwritten.
Since the objcopy command used to generate loader.txt only does a
dump-section and no filtering, in practice there is no change to empty.
However, as a side-effect, its timestamp is updated. The timestamp of
empty and of loader.txt will be more or less the same; however,
loader.txt is closed just before the output file is closed, so it's
possible that the timestamp of loader.txt is just a little bit earlier.
If this happens, it causes loader.txt to be rebuilt later, which in turn
causes a number of other object files to be rebuilt.
Usually that's harmless, but it sometimes causes the rebuild to happen
during 'make install'. This is particularly annoying if 'make install'
is done as root, since loader.txt becomes owned by root in that case.
Fix this by specifying a harmless output file: /dev/null.
While we're at it, take in an upstream change that removes the redundant
redirect.
Fixes: ee3b25c0a877fa74d1aec88f325ac45b09963c82
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
libcap/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libcap/Makefile b/libcap/Makefile
index 47cf8f4..18e4f4f 100644
--- a/libcap/Makefile
+++ b/libcap/Makefile
@@ -105,7 +105,7 @@ empty: empty.c
$(CC) -o $@ $<
loader.txt: empty
- $(OBJCOPY) --dump-section .interp=/dev/stdout $< > $@
+ $(OBJCOPY) --dump-section .interp=$@ $< /dev/null
cap_magic.o: execable.h execable.c loader.txt
$(CC) $(CFLAGS) $(IPATH) -DLIBRARY_VERSION=\"$(LIBTITLE)-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat loader.txt)\" -c execable.c -o $@
--
2.31.1

2
package/libcap/libcap.hash
View File

@ -1,5 +1,5 @@
# https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc
sha256 6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9 libcap-2.51.tar.xz
sha256 a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97 libcap-2.52.tar.xz
# Hash for license file:
sha256 f58c80bcce8c929db39a23c32e924876e3311f3ffa54f66076c38056d38fa59b License

2
package/libcap/libcap.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
LIBCAP_VERSION = 2.51
LIBCAP_VERSION = 2.52
LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2
LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz
LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause

2
package/libcpprestsdk/Config.in
View File

@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBCPPRESTSDK
depends on BR2_ENABLE_LOCALE
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR # boost
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic
depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic, boost-filesystem
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
select BR2_PACKAGE_BOOST

37
package/libgeos/0001-CMakeLists.txt-add-BUILD_BENCHMARKS.patch
View File

@ -1,37 +0,0 @@
From 16848d6da27140caf922f71a233f96a508fb061e Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 24 Jan 2021 12:38:37 +0100
Subject: [PATCH] CMakeLists.txt: add BUILD_BENCHMARKS
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/libgeos/geos/pull/395]
---
CMakeLists.txt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8b39bac..8ca6b829 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,6 +48,7 @@ option(BUILD_SHARED_LIBS "Build GEOS with shared libraries" ON)
set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard version to use (default is 11)")
## GEOS custom variables
+option(BUILD_BENCHMARKS "Build GEOS benchmarks" ON)
cmake_dependent_option(GEOS_BUILD_DEVELOPER
"Build with compilation flags useful for development" ON
"GEOS_BUILD_FROM_GIT" OFF)
@@ -292,7 +293,9 @@ endif()
#-----------------------------------------------------------------------------
# Benchmarks
#-----------------------------------------------------------------------------
-add_subdirectory(benchmarks)
+if(BUILD_BENCHMARKS)
+ add_subdirectory(benchmarks)
+endif()
#-----------------------------------------------------------------------------
# Utils
--
2.29.2

2
package/libgeos/libgeos.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 bd8082cf12f45f27630193c78bdb5a3cba847b81e72b20268356c2a4fc065269 geos-3.9.0.tar.bz2
sha256 7e630507dcac9dc07565d249a26f06a15c9f5b0c52dd29129a0e3d381d7e382a geos-3.9.1.tar.bz2
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING

2
package/libgeos/libgeos.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
LIBGEOS_VERSION = 3.9.0
LIBGEOS_VERSION = 3.9.1
LIBGEOS_SITE = http://download.osgeo.org/geos
LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2
LIBGEOS_LICENSE = LGPL-2.1

2
package/libiio/libiio.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 81c414d5c47b715d9bc9275b9fabbfd9e9483e60c035f3001b5977932049595d libiio-0.19.tar.gz
sha256 df1577740ea93dca732e7d7c04786600cb083117901dee793f3d38980754af00 libiio-0.23.tar.gz
sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b COPYING.txt

12
package/libiio/libiio.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
LIBIIO_VERSION = 0.19
LIBIIO_VERSION = 0.23
LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION))
LIBIIO_INSTALL_STAGING = YES
LIBIIO_LICENSE = LGPL-2.1+
@ -54,9 +54,19 @@ else
LIBIIO_CONF_OPTS += -DWITH_IIOD_USBD=OFF
endif
ifeq ($(BR2_PACKAGE_LIBAIO),y)
LIBIIO_DEPENDENCIES += libaio
LIBIIO_CONF_OPTS += -DWITH_AIO=ON
else
LIBIIO_CONF_OPTS += -DWITH_AIO=OFF
endif
# Avahi support in libiio requires avahi-client, which needs avahi-daemon and dbus
ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
LIBIIO_DEPENDENCIES += avahi
LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=ON
else
LIBIIO_CONF_OPTS += -DHAVE_DNS_SD=OFF
endif
ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y)

6
package/libinput/libinput.hash
View File

@ -1,6 +1,6 @@
# From https://lists.freedesktop.org/archives/wayland-devel/2021-June/041849.html
sha256 18c6a286583268d39841348e561fbb4713bde0c643b360f5d8a3f27800afdb9a libinput-1.18.0.tar.xz
sha512 9a834f075d7a1f892416bb6b241eb052f749d3aa883c4b39c0f1c9616c115d6b9a541b587508646fddaf0d3fe57af92fe4629b522d1d51196499e7b523e0aa90 libinput-1.18.0.tar.xz
# From https://lists.freedesktop.org/archives/wayland-devel/2021-August/041934.html
sha256 9ca14021fbc2523bc0610582c51f368321592040b6ca63becc2fa1ea11f1a7cb libinput-1.18.1.tar.xz
sha512 450e38c0f8245aa0165a8047d25aebee646332f0f2ed442bb2d1bd3e723c2082b6d00d6e3bda308981ece8e29b5cddbd56eab900d2b7497705a45fc27b281828 libinput-1.18.1.tar.xz
# License files
sha256 80de50b2022a840db044c56db804ca3565600a692c0714babface587acc6d1b0 COPYING

2
package/libinput/libinput.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
LIBINPUT_VERSION = 1.18.0
LIBINPUT_VERSION = 1.18.1
LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz
LIBINPUT_SITE = http://www.freedesktop.org/software/libinput
LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev

2
package/libmdbx/libmdbx.hash
View File

@ -1,5 +1,5 @@
# Hashes from: https://github.com/erthink/libmdbx/releases/
sha256 767776d961fadeb51ee895fb70ed82a03051bae855a19396f0067b03076103bb libmdbx-amalgamated-0.10.0.tar.gz
sha256 745555704df76626a6612ad0c6bc6b1a66bfab98b9245b07dfb82640aa46d6fa libmdbx-amalgamated-0.10.2.tar.gz
# Locally calculated
sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE

2
package/libmdbx/libmdbx.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
LIBMDBX_VERSION = 0.10.0
LIBMDBX_VERSION = 0.10.2
LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.gz
LIBMDBX_SITE = https://github.com/erthink/libmdbx/releases/download/v$(LIBMDBX_VERSION)
LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO

4
package/libnss/libnss.hash
View File

@ -1,4 +1,4 @@
# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_68_RTM/src/SHA256SUMS
sha256 c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b nss-3.68.tar.gz
# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_69_RTM/src/SHA256SUMS
sha256 c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799 nss-3.69.tar.gz
# Locally calculated
sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING

10
package/libnss/libnss.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
LIBNSS_VERSION = 3.68
LIBNSS_VERSION = 3.69
LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz
LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src
LIBNSS_DISTDIR = dist
@ -69,12 +69,12 @@ endif
endif
define LIBNSS_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/nss coreconf \
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \
SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \
DIST=$(@D)/$(LIBNSS_DISTDIR) \
CHECKLOC= \
$(LIBNSS_BUILD_VARS)
$(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/nss lib/dbm all \
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \
SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \
DIST=$(@D)/$(LIBNSS_DISTDIR) \
CHECKLOC= \
@ -129,12 +129,12 @@ HOST_LIBNSS_BUILD_VARS += USE_64=1
endif
define HOST_LIBNSS_BUILD_CMDS
$(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/nss coreconf \
$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss coreconf \
SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \
DIST=$(@D)/$(LIBNSS_DISTDIR) \
CHECKLOC= \
$(HOST_LIBNSS_BUILD_VARS)
$(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/nss lib/dbm all \
$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/nss lib/dbm all \
SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \
DIST=$(@D)/$(LIBNSS_DISTDIR) \
CHECKLOC= \

33
package/libqmi/0001-build-meson-fix-introspection-option.patch Normal file
View File

@ -0,0 +1,33 @@
From bfb066419f288764edbade1e27e93a5dda59a5f4 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@aleksander.es>
Date: Fri, 6 Aug 2021 10:32:22 +0200
Subject: [PATCH] build,meson: fix introspection option
Using -Dintrospection=false would actually not disable it. There is no
longer an "auto" option for the introspection support, it will be
either enabled or disabled depending on what the user asks
for (default enabled).
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
meson.build | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index b25bca57..d28e5601 100644
--- a/meson.build
+++ b/meson.build
@@ -218,7 +218,10 @@ version_conf.set10('QMI_QRTR_SUPPORTED', enable_qrtr)
version_conf.set10('QMI_RMNET_SUPPORTED', enable_rmnet)
# introspection support
-enable_gir = dependency('gobject-introspection-1.0', version: '>= 0.9.6', required: get_option('introspection')).found()
+enable_gir = get_option('introspection')
+if enable_gir
+ dependency('gobject-introspection-1.0', version: '>= 0.9.6')
+endif
random_number = qmi_minor_version + meson.version().split('.').get(1).to_int()
--
2.17.0

2
package/libqmi/libqmi.hash
View File

@ -1,4 +1,4 @@
# Locally computed:
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
sha256 cbb890893de1dee06ea5ebdac2d22f0469314a6f93f15f61f2f1206a1c9ae5fd libqmi-1.28.6.tar.xz
sha256 c0421684c12697c448077dd5c0a66c6f745deab3558af578e3f10307c8a0c564 libqmi-1.30.0.tar.gz

36
package/libqmi/libqmi.mk
View File

@ -4,9 +4,8 @@
#
################################################################################
LIBQMI_VERSION = 1.28.6
LIBQMI_SITE = http://www.freedesktop.org/software/libqmi
LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz
LIBQMI_VERSION = 1.30.0
LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION)
LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs)
LIBQMI_LICENSE_FILES = COPYING COPYING.LIB
LIBQMI_CPE_ID_VENDOR = libqmi_project
@ -14,47 +13,52 @@ LIBQMI_INSTALL_STAGING = YES
LIBQMI_DEPENDENCIES = libglib2
LIBQMI_CONF_OPTS = --disable-Werror
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
LIBQMI_DEPENDENCIES += gobject-introspection
LIBQMI_CONF_OPTS += --enable-introspection
LIBQMI_CONF_OPTS += -Dintrospection=true
else
LIBQMI_CONF_OPTS += --disable-introspection
LIBQMI_CONF_OPTS += -Dintrospection=false
endif
# if libgudev available, request udev support for a better
# qmi-firmware-update experience
ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
LIBQMI_DEPENDENCIES += libgudev
LIBQMI_CONF_OPTS += --with-udev
LIBQMI_CONF_OPTS += -Dudev=true
else
LIBQMI_CONF_OPTS += --without-udev
LIBQMI_CONF_OPTS += -Dudev=false
endif
# if libmbim available, request QMI-over-MBIM support
ifeq ($(BR2_PACKAGE_LIBMBIM),y)
LIBQMI_DEPENDENCIES += libmbim
LIBQMI_CONF_OPTS += --enable-mbim-qmux
LIBQMI_CONF_OPTS += -Dmbim_qmux=true
else
LIBQMI_CONF_OPTS += --disable-mbim-qmux
LIBQMI_CONF_OPTS += -Dmbim_qmux=false
endif
# if libqrtr-glib available, enable support for QMI over QRTR
ifeq ($(BR2_PACKAGE_LIBQRTR_GLIB),y)
LIBQMI_DEPENDENCIES += libqrtr-glib
LIBQMI_CONF_OPTS += --enable-qrtr
LIBQMI_CONF_OPTS += -Dqrtr=true
else
LIBQMI_CONF_OPTS += --disable-qrtr
LIBQMI_CONF_OPTS += -Dqrtr=false
endif
# if ModemManager available, enable MM runtime check in
# qmi-firmware-update (note that we don't need to build-depend on
# anything else)
ifeq ($(BR2_PACKAGE_MODEM_MANAGER),y)
LIBQMI_CONF_OPTS += --enable-mm-runtime-check
LIBQMI_CONF_OPTS += -Dmm_runtime_check=true
else
LIBQMI_CONF_OPTS += --disable-mm-runtime-check
LIBQMI_CONF_OPTS += -Dmm_runtime_check=false
endif
$(eval $(autotools-package))
ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
LIBQMI_DEPENDENCIES += bash-completion
LIBQMI_CONF_OPTS += -Dbash_completion=true
else
LIBQMI_CONF_OPTS += -Dbash_completion=false
endif
$(eval $(meson-package))

8
package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0001-HACK-only-build-and-install-localedef.patch → package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch
View File

@ -1,4 +1,4 @@
From 942f45364e7db805f0390c808ef656faa577a419 Mon Sep 17 00:00:00 2001
From 442e9a3f262c49cf61f9e7bdf12882f0a427666b Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Mon, 21 May 2018 16:45:02 +0200
Subject: [PATCH] HACK: only build and install localedef
@ -13,10 +13,10 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/Rules b/Rules
index 082625bb71..2603c96734 100644
index b1137afe71..2aeac31922 100644
--- a/Rules
+++ b/Rules
@@ -212,10 +212,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \
@@ -216,10 +216,16 @@ binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \
$(binaries-all-notests))
ifneq "$(strip $(binaries-shared-notests))" ""
@ -61,5 +61,5 @@ index b7c60681fa..de4cf4003f 100644
libBrokenLocale-routines = broken_cur_max
--
2.31.1
2.33.0

13
package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch → package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch
View File

@ -1,4 +1,4 @@
From ec4ebe89a7636da63ccff349d0f0c9f38ac3e3e1 Mon Sep 17 00:00:00 2001
From 85412262460f6ba9f6e2cf8da74fc1904c54c854 Mon Sep 17 00:00:00 2001
From: Matt Weber <matthew.weber@rockwellcollins.com>
Date: Thu, 6 Feb 2020 14:36:21 -0600
Subject: [PATCH] relax dependency on GCC to 4.8 and binutils to 2.24
@ -29,10 +29,10 @@ Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 1dc3af60b4..e3ee4e9fd7 100755
index 9619c10991..0c481d2339 100755
--- a/configure
+++ b/configure
@@ -4587,7 +4587,7 @@ $as_echo_n "checking version of $AS... " >&6; }
@@ -4651,7 +4651,7 @@ $as_echo_n "checking version of $AS... " >&6; }
ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@ -41,7 +41,7 @@ index 1dc3af60b4..e3ee4e9fd7 100755
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
@@ -4717,7 +4717,7 @@ $as_echo_n "checking version of $LD... " >&6; }
@@ -4781,7 +4781,7 @@ $as_echo_n "checking version of $LD... " >&6; }
ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@ -50,7 +50,7 @@ index 1dc3af60b4..e3ee4e9fd7 100755
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
@@ -5126,7 +5126,7 @@ int
@@ -5189,7 +5189,7 @@ int
main ()
{
@ -60,5 +60,4 @@ index 1dc3af60b4..e3ee4e9fd7 100755
#endif
;
--
2.31.1
2.33.0

2
package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/localedef.hash → package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash
View File

@ -1,5 +1,5 @@
# Locally calculated (fetched from Github)
sha256 3e2004b16ec6b79a19a88ed4736719ef9e419f9d8e7013faced654c0339e23dc glibc-2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f.tar.gz
sha256 1c7ed0f69ed268bd66f9754d0cb8fb65e0dafc1f9a1048ea50d1e96d60399686 glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4.tar.gz
# Hashes for license files
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING

2
package/localedef/localedef.mk
View File

@ -7,7 +7,7 @@
# Use the same VERSION and SITE as target glibc
# As in glibc.mk, generate version string using:
# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
LOCALEDEF_VERSION = 2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f
LOCALEDEF_VERSION = 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4
LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz
LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION))
HOST_LOCALEDEF_DL_SUBDIR = glibc

7
package/log4cxx/log4cxx.mk
View File

@ -22,4 +22,11 @@ LOG4CXX_CONF_OPTS = \
LOG4CXX_DEPENDENCIES = apr apr-util
ifeq ($(BR2_PACKAGE_LIBESMTP),y)
LOG4CXX_DEPENDENCIES += libesmtp
LOG4CXX_CONF_OPTS += --with-SMTP=libesmtp
else
LOG4CXX_CONF_OPTS += --without-SMTP
endif
$(eval $(autotools-package))

2
package/luv/luv.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 4018f293d71c2d75757b64fcdacf982729c9dc8b0bf8eda4015a8818a5a29321 luv-1.41.0-0.tar.gz
sha256 abc3bd9d741aec392203dbf629da58817bd5705e82b2e9f79f4486172674a0a3 luv-1.41.1-0.tar.gz
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt

2
package/luv/luv.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
LUV_VERSION = 1.41.0-0
LUV_VERSION = 1.41.1-0
LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION)
LUV_LICENSE = Apache-2.0
LUV_LICENSE_FILES = LICENSE.txt

2
package/mesa3d-demos/mesa3d-demos.mk
View File

@ -43,7 +43,7 @@ else
MESA3D_DEMOS_CONF_OPTS += --disable-vg
endif
ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
ifeq ($(BR2_PACKAGE_MESA3D_GBM),y)
MESA3D_DEMOS_DEPENDENCIES += mesa3d
MESA3D_DEMOS_CONF_OPTS += --enable-gbm
else

2
package/mesa3d-headers/mesa3d-headers.mk
View File

@ -12,7 +12,7 @@ endif
# Not possible to directly refer to mesa3d variables, because of
# first/second expansion trickery...
MESA3D_HEADERS_VERSION = 21.1.6
MESA3D_HEADERS_VERSION = 21.1.7
MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
MESA3D_HEADERS_SITE = https://archive.mesa3d.org
MESA3D_HEADERS_DL_SUBDIR = mesa3d

Some files were not shown because too many files have changed in this diff Show More