From a2de01e75a934f3b56c2a1331ceaac95f3face46 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 3 Aug 2021 18:07:46 +0300 Subject: [PATCH 001/110] package/strace: bump to version 5.13 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/strace/strace.hash | 4 ++-- package/strace/strace.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index f7a634000c..93c9b57f46 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/5.12/strace-5.12.tar.xz.asc -sha256 29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4 strace-5.12.tar.xz +# https://strace.io/files/5.13/strace-5.13.tar.xz.asc +sha256 5acc34888b9d510ad6ac915d4a8df08f51cf1ae920ea24649f6a4bb984d0b656 strace-5.13.tar.xz sha256 f847d5ef26ad1151ca63bb88536b23a4cac5040c67917f3d5ee7ea1316e2b736 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 810f55e82b..29736678d8 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 5.12 +STRACE_VERSION = 5.13 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ From 4545ec800a2c417211a09a35adb57880e01a28c1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 3 Aug 2021 23:12:10 +0200 Subject: [PATCH 002/110] package/netsnmp: add SELinux module Support for netsnmp is added by the services/snmp module in the SELinux refpolicy. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/netsnmp/netsnmp.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index 1a9a776033..985cfeac72 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -11,6 +11,7 @@ NETSNMP_LICENSE = Various BSD-like NETSNMP_LICENSE_FILES = COPYING NETSNMP_CPE_ID_VENDOR = net-snmp NETSNMP_CPE_ID_PRODUCT = $(NETSNMP_CPE_ID_VENDOR) +NETSNMP_SELINUX_MODULES = snmp NETSNMP_INSTALL_STAGING = YES NETSNMP_CONF_ENV = \ ac_cv_NETSNMP_CAN_USE_SYSCTL=no \ From e4eaa1bdb2af99b58eba4601621132e4eef3710c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 3 Aug 2021 23:33:20 +0200 Subject: [PATCH 003/110] package/hostapd: add SELinux module Support for hostapd is added by the services/hostapd module in the SELinux refpolicy. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/hostapd/hostapd.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 8820254f89..e988999d3e 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -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 = \ From 1c671ef163daf2c7de6727f4b8d743c850bfb801 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 3 Aug 2021 23:52:55 +0200 Subject: [PATCH 004/110] package/pcsc-lite: add SELinux module Support for pcsc-lite is added by the services/pcscd module in the SELinux refpolicy. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/pcsc-lite/pcsc-lite.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk index 3091da41a4..94f38b3d85 100644 --- a/package/pcsc-lite/pcsc-lite.mk +++ b/package/pcsc-lite/pcsc-lite.mk @@ -11,6 +11,7 @@ PCSC_LITE_INSTALL_STAGING = YES PCSC_LITE_DEPENDENCIES = host-pkgconf PCSC_LITE_LICENSE = BSD-2-Clause (auth), BSD-3-Clause, GPL-3.0+ (demo, spy, tests), ISC (simclist) PCSC_LITE_LICENSE_FILES = COPYING GPL-3.0.txt +PCSC_LITE_SELINUX_MODULES = pcscd # - libudev and libusb are optional # - libudev and libusb can't be used together From 5220d3c5c62df35e994b4b7c6caecc8d16e72b78 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 4 Aug 2021 00:07:02 +0200 Subject: [PATCH 005/110] package/x11r7/xserver_xorg-server: add SELinux module Support for xserver_xorg-server is added by the services/xserver module in the SELinux refpolicy. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index c326230be0..2d276f90d5 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -9,6 +9,7 @@ XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE_FILES = COPYING +XSERVER_XORG_SERVER_SELINUX_MODULES = xserver XSERVER_XORG_SERVER_INSTALL_STAGING = YES # xfont_font-util is needed only for autoreconf XSERVER_XORG_SERVER_AUTORECONF = YES From 60de609d1770c3ad66b780a8d7a33b5dd41565fa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 4 Aug 2021 12:10:57 +0200 Subject: [PATCH 006/110] package/usbguard: add SELinux module Support for usbguard is added by the admin/usbguard module in the SELinux refpolicy. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/usbguard/usbguard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index 1518f92fc5..4e069a01a0 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -8,6 +8,7 @@ USBGUARD_VERSION = 1.0.0 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE +USBGUARD_SELINUX_MODULES = usbguard USBGUARD_CONF_OPTS = \ --with-bundled-catch \ --with-bundled-pegtl \ From 664f83ec7d1a0d026c03efbe35a6d6fe40c82eec Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 4 Aug 2021 12:17:50 +0200 Subject: [PATCH 007/110] package/rpm: add SELinux module Support for rpm is added by the admin/rpm module in the SELinux refpolicy. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rpm/rpm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 0d8c14a09e..ae324fbeef 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -20,6 +20,7 @@ RPM_DEPENDENCIES = \ RPM_LICENSE = GPL-2.0 or LGPL-2.0 (library only) RPM_LICENSE_FILES = COPYING RPM_CPE_ID_VENDOR = rpm +RPM_SELINUX_MODULES = rpm # Don't set --{dis,en}-openmp as upstream wants to abort the build if # --enable-openmp is provided and OpenMP is < 4.5: From 975ab2fa88a0c94b362499ea8ad99222f335fb45 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 4 Aug 2021 12:22:21 +0200 Subject: [PATCH 008/110] package/wireshark: add SELinux module Support for wireshark is added by the apps/wireshark module in the SELinux refpolicy. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/wireshark/wireshark.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index e852083de6..6006ecaaa5 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -10,6 +10,7 @@ WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license WIRESHARK_LICENSE_FILES = COPYING WIRESHARK_CPE_ID_VENDOR = wireshark +WIRESHARK_SELINUX_MODULES = wireshark WIRESHARK_DEPENDENCIES = \ c-ares \ host-pkgconf \ From 5c89c2386deff575e3e71b4ed10915e5a439e8aa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 4 Aug 2021 12:25:40 +0200 Subject: [PATCH 009/110] package/screen: add SELinux module Support for screen is added by the apps/screen module in the SELinux refpolicy. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/screen/screen.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/screen/screen.mk b/package/screen/screen.mk index f75f92cb47..843c71fc2a 100644 --- a/package/screen/screen.mk +++ b/package/screen/screen.mk @@ -9,6 +9,7 @@ SCREEN_SITE = $(BR2_GNU_MIRROR)/screen SCREEN_LICENSE = GPL-3.0+ SCREEN_LICENSE_FILES = COPYING SCREEN_CPE_ID_VENDOR = gnu +SCREEN_SELINUX_MODULES = screen SCREEN_DEPENDENCIES = ncurses SCREEN_AUTORECONF = YES SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)" From 4945784fbd4bb1e44803d81447dfabd67efed3d3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 4 Aug 2021 12:27:55 +0200 Subject: [PATCH 010/110] package/sigrok-cli: add SELinux module Support for sigrok-cli is added by the apss/sigrok module in the SELinux refpolicy. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/sigrok-cli/sigrok-cli.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/sigrok-cli/sigrok-cli.mk b/package/sigrok-cli/sigrok-cli.mk index 3d1e187882..2c960fdf4f 100644 --- a/package/sigrok-cli/sigrok-cli.mk +++ b/package/sigrok-cli/sigrok-cli.mk @@ -8,6 +8,7 @@ SIGROK_CLI_VERSION = 0.7.1 SIGROK_CLI_SITE = http://sigrok.org/download/source/sigrok-cli SIGROK_CLI_LICENSE = GPL-3.0+ SIGROK_CLI_LICENSE_FILES = COPYING +SIGROK_CLI_SELINUX_MODULES = sigrok SIGROK_CLI_DEPENDENCIES = host-pkgconf libsigrok ifeq ($(BR2_PACKAGE_LIBSIGROKDECODE),y) From 613827c5b0a2bf71320047954639dc9003524db0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 4 Aug 2021 12:30:24 +0200 Subject: [PATCH 011/110] package/xscreensaver: add SELinux module Support for xscreensaver is added by the apps/xscreensaver module in the SELinux refpolicy. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/xscreensaver/xscreensaver.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index c3c9ec89c3..d2c34679cd 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -11,6 +11,7 @@ XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver XSCREENSAVER_LICENSE = MIT-like, GPL-2.0+ XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h XSCREENSAVER_CPE_ID_VENDOR = xscreensaver_project +XSCREENSAVER_SELINUX_MODULES = xscreensaver XSCREENSAVER_DEPENDENCIES = \ gdk-pixbuf \ From a778fbb8ad794ea513101c493971497e20f1bbec Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 4 Aug 2021 12:32:32 +0200 Subject: [PATCH 012/110] package/wine: add SELinux module Support for wine is added by the apps/wine module in the SELinux refpolicy. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/wine/wine.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/wine/wine.mk b/package/wine/wine.mk index 08eadb5b7c..c925a58632 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -10,6 +10,7 @@ WINE_SITE = https://dl.winehq.org/wine/source/6.0 WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_CPE_ID_VENDOR = winehq +WINE_SELINUX_MODULES = wine WINE_DEPENDENCIES = host-bison host-flex host-wine HOST_WINE_DEPENDENCIES = host-bison host-flex From bf44a11cf67fde4ba96928a2a4196103b7ec4ef3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 4 Aug 2021 12:38:22 +0200 Subject: [PATCH 013/110] package/pulseaudio: add SELinux module Support for pulseaudio is added by the apps/pulseaudio module in the SELinux refpolicy. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/pulseaudio/pulseaudio.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk index 19e08f55ae..372cd98da8 100644 --- a/package/pulseaudio/pulseaudio.mk +++ b/package/pulseaudio/pulseaudio.mk @@ -11,6 +11,7 @@ PULSEAUDIO_INSTALL_STAGING = YES PULSEAUDIO_LICENSE = LGPL-2.1+ (specific license for modules, see LICENSE file) PULSEAUDIO_LICENSE_FILES = LICENSE GPL LGPL PULSEAUDIO_CPE_ID_VENDOR = pulseaudio +PULSEAUDIO_SELINUX_MODULES = pulseaudio PULSEAUDIO_CONF_OPTS = \ --disable-default-build-tests \ --disable-legacy-database-entry-format \ From 38b0759432070f7a57c0fab84d44a07caead6f06 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 2 Aug 2021 20:06:16 +0200 Subject: [PATCH 014/110] package/libcap: bump to version 2.52 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/libcap/libcap.hash | 2 +- package/libcap/libcap.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash index ec87a38df7..eb8fe43f6f 100644 --- a/package/libcap/libcap.hash +++ b/package/libcap/libcap.hash @@ -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 diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 3dc09bd551..45700e56ec 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -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 From eb39f4e1462d5f6cdd3e03dd2fd22d61b33872b0 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 2 Aug 2021 21:45:16 +0200 Subject: [PATCH 015/110] package/e2fsprogs: bump to version 1.46.3 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/e2fsprogs/e2fsprogs.hash | 4 ++-- package/e2fsprogs/e2fsprogs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/e2fsprogs/e2fsprogs.hash b/package/e2fsprogs/e2fsprogs.hash index 909394ba44..3661801199 100644 --- a/package/e2fsprogs/e2fsprogs.hash +++ b/package/e2fsprogs/e2fsprogs.hash @@ -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 diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index bd147e737e..5528ecbc34 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -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) From b5b3582bb0c5207c09b26c91c6a8c155aa089e55 Mon Sep 17 00:00:00 2001 From: Leonid Yuriev Date: Tue, 3 Aug 2021 00:04:24 +0300 Subject: [PATCH 016/110] package/libmdbx: bump version to 0.10.2 Release notes: https://github.com/erthink/libmdbx/releases/tag/v0.10.2 Signed-off-by: Leonid Yuriev Signed-off-by: Thomas Petazzoni --- package/libmdbx/libmdbx.hash | 2 +- package/libmdbx/libmdbx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index 8ff8e99810..c8a28ada34 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -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 diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index 8e2eff0c7f..60c5148625 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -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 From d292d139cd5e44d0d70eb89fae3f5ff1d74b336a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 3 Aug 2021 04:06:43 -0600 Subject: [PATCH 017/110] package/gensio: bump to version 2.2.8 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/gensio/gensio.hash | 6 +++--- package/gensio/gensio.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gensio/gensio.hash b/package/gensio/gensio.hash index 03bd85cd0f..94f964faad 100644 --- a/package/gensio/gensio.hash +++ b/package/gensio/gensio.hash @@ -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 diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk index 0b2bb63956..9163c6a37b 100644 --- a/package/gensio/gensio.mk +++ b/package/gensio/gensio.mk @@ -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 From 4185f6dae92c36f6c6bb783f632a7bed2285986c Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Wed, 4 Aug 2021 13:45:37 +0200 Subject: [PATCH 018/110] package/grpc: bump version to 1.39.0 * drop CMakeLists.txt patch applied upstream. * Update patch for wrap_memcpy.cc to match changed target file. * update patch numbering. Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- ...ix-cross-compilation-with-gRPC_BUILD.patch | 43 ------------------- ...he-availability-of-pthread_setname_.patch} | 0 ...y.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch} | 8 ++-- package/grpc/grpc.hash | 2 +- package/grpc/grpc.mk | 2 +- 5 files changed, 6 insertions(+), 49 deletions(-) delete mode 100644 package/grpc/0001-CMakeLists.txt-fix-cross-compilation-with-gRPC_BUILD.patch rename package/grpc/{0002-Properly-detect-the-availability-of-pthread_setname_.patch => 0001-Properly-detect-the-availability-of-pthread_setname_.patch} (100%) rename package/grpc/{0003-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch => 0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch} (85%) diff --git a/package/grpc/0001-CMakeLists.txt-fix-cross-compilation-with-gRPC_BUILD.patch b/package/grpc/0001-CMakeLists.txt-fix-cross-compilation-with-gRPC_BUILD.patch deleted file mode 100644 index 553be8cb99..0000000000 --- a/package/grpc/0001-CMakeLists.txt-fix-cross-compilation-with-gRPC_BUILD.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 268815d74ea34856c686dce9e9c23106b51f2782 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -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 - ---- - 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 - diff --git a/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch b/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch similarity index 100% rename from package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch rename to package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch diff --git a/package/grpc/0003-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch b/package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch similarity index 85% rename from package/grpc/0003-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch rename to package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch index ad64804470..aac92bab13 100644 --- a/package/grpc/0003-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch +++ b/package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch @@ -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); diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index 01dc9ca240..f1153469e7 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -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 diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index f3975316ae..1426158d82 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -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 From 250f33d0ff4b7f687cd7c00d0b66c02c410ae59b Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Tue, 3 Aug 2021 06:29:06 +0000 Subject: [PATCH 019/110] package/paho-mqtt-cpp: bump version to 1.2.0 "This release brings in some missing MQTT v5 features, support for websocket headers and proxies, ALPN protocol lists, adds the builder pattern for options, and fixes a number of bugs in both the C++ library and the underlying C lib." https://github.com/eclipse/paho.mqtt.cpp/releases/tag/v1.2.0 This also makes the patch obsolete, since these changes have been merged upstream. Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 ++ ...FindMahoMqttC.cmake-fix-static-build.patch | 35 ------------------- package/paho-mqtt-cpp/paho-mqtt-cpp.hash | 2 +- package/paho-mqtt-cpp/paho-mqtt-cpp.mk | 2 +- 4 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 package/paho-mqtt-cpp/0001-cmake-FindMahoMqttC.cmake-fix-static-build.patch diff --git a/DEVELOPERS b/DEVELOPERS index 1547ff123b..5c663628b6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -606,6 +606,9 @@ F: package/odroidc2-firmware/ N: Daniel J. Leach F: package/dacapo/ +N: Daniel Lang +F: package/paho-mqtt-cpp/ + N: Damien Lanson F: package/libvdpau/ F: package/log4cpp/ diff --git a/package/paho-mqtt-cpp/0001-cmake-FindMahoMqttC.cmake-fix-static-build.patch b/package/paho-mqtt-cpp/0001-cmake-FindMahoMqttC.cmake-fix-static-build.patch deleted file mode 100644 index 934dca219e..0000000000 --- a/package/paho-mqtt-cpp/0001-cmake-FindMahoMqttC.cmake-fix-static-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8aeafa1c2ec90b0e95ba5944266eda115457e10d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 15 Jun 2020 13:40:22 +0200 -Subject: [PATCH] cmake/FindMahoMqttC.cmake: fix static build - -Static libraries of paho-mqtt-c are not suffixed with -static since -version 1.3.2 and -https://github.com/eclipse/paho.mqtt.c/commit/8cc51c78b76a1eabd1df3124b0887ce8b01070ff - -See: https://github.com/eclipse/paho.mqtt.c/pull/704 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/eclipse/paho.mqtt.cpp/pull/275] ---- - cmake/FindPahoMqttC.cmake | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/cmake/FindPahoMqttC.cmake b/cmake/FindPahoMqttC.cmake -index 53f15a3..0ec95bd 100644 ---- a/cmake/FindPahoMqttC.cmake -+++ b/cmake/FindPahoMqttC.cmake -@@ -5,10 +5,6 @@ if(PAHO_WITH_SSL) - else() - set(_PAHO_MQTT_C_LIB_NAME paho-mqtt3a) - endif() --# add suffix when using static Paho MQTT C library variant --if(PAHO_BUILD_STATIC) -- set(_PAHO_MQTT_C_LIB_NAME ${_PAHO_MQTT_C_LIB_NAME}-static) --endif() - - find_library(PAHO_MQTT_C_LIBRARIES NAMES ${_PAHO_MQTT_C_LIB_NAME}) - unset(_PAHO_MQTT_C_LIB_NAME) --- -2.26.2 - diff --git a/package/paho-mqtt-cpp/paho-mqtt-cpp.hash b/package/paho-mqtt-cpp/paho-mqtt-cpp.hash index e5406e0b81..d9b86ce207 100644 --- a/package/paho-mqtt-cpp/paho-mqtt-cpp.hash +++ b/package/paho-mqtt-cpp/paho-mqtt-cpp.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 cb0343349ed91ef51d0e76ae860d19435a730d3d355e57886bb090014cb70bbe paho-mqtt-cpp-1.1.tar.gz +sha256 435e97e4d5b1da13daa26cadd3e83fe9d154930abaa78b8ff1b8c854b5345d8b paho-mqtt-cpp-1.2.0.tar.gz sha256 83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c edl-v10 sha256 44277b2bec6093e4ac313afec251a4de599d24c4e768f8574d95b13a9d2d97b5 epl-v10 diff --git a/package/paho-mqtt-cpp/paho-mqtt-cpp.mk b/package/paho-mqtt-cpp/paho-mqtt-cpp.mk index 161e53d484..827946605a 100644 --- a/package/paho-mqtt-cpp/paho-mqtt-cpp.mk +++ b/package/paho-mqtt-cpp/paho-mqtt-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -PAHO_MQTT_CPP_VERSION = 1.1 +PAHO_MQTT_CPP_VERSION = 1.2.0 PAHO_MQTT_CPP_SITE = $(call github,eclipse,paho.mqtt.cpp,v$(PAHO_MQTT_CPP_VERSION)) PAHO_MQTT_CPP_LICENSE = EPL-1.0 or BSD-3-Clause PAHO_MQTT_CPP_LICENSE_FILES = epl-v10 edl-v10 From 908072116163561ce8b1803a1c32ad88b75bcaeb Mon Sep 17 00:00:00 2001 From: Thomas Claveirole Date: Mon, 2 Aug 2021 16:20:56 +0200 Subject: [PATCH 020/110] package/vuejs: bump version to 3.1.5 Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/vuejs/vuejs.hash | 3 ++- package/vuejs/vuejs.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/vuejs/vuejs.hash b/package/vuejs/vuejs.hash index db4a5bbe3e..c2804961d2 100644 --- a/package/vuejs/vuejs.hash +++ b/package/vuejs/vuejs.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 a69f04bf138af09a956150675151edb9354aeec8bd627c21cbcfa646248214fa vue-3.0.5.tgz +sha256 ddd5e07483d18d2abd645c01200f57d5ffd1c3bf262cdb9f9e1a66a7b855d84a vue-3.1.5.tgz +sha256 1bb85cc9b13b81ef41c81c51866172fc345e0503c86726a6755b796590b70175 LICENSE diff --git a/package/vuejs/vuejs.mk b/package/vuejs/vuejs.mk index 43b45e00b7..18e12f69d4 100644 --- a/package/vuejs/vuejs.mk +++ b/package/vuejs/vuejs.mk @@ -4,10 +4,11 @@ # ################################################################################ -VUEJS_VERSION = 3.0.5 +VUEJS_VERSION = 3.1.5 VUEJS_SOURCE = vue-$(VUEJS_VERSION).tgz VUEJS_SITE = https://registry.npmjs.org/vue/- VUEJS_LICENSE = MIT +VUEJS_LICENSE_FILES = LICENSE # Install .min.js as .js define VUEJS_INSTALL_TARGET_CMDS From 58c99c957b002a9d6fa7de8df24c87df379c9faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Fri, 7 Feb 2020 15:16:28 +0100 Subject: [PATCH 021/110] package/python-rsa: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Python-RSA is a pure-Python RSA implementation. Signed-off-by: Raphaël Mélotte Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/python-rsa/Config.in | 11 +++++++++++ package/python-rsa/python-rsa.hash | 5 +++++ package/python-rsa/python-rsa.mk | 14 ++++++++++++++ support/testing/tests/package/sample_python_rsa.py | 2 ++ support/testing/tests/package/test_python_rsa.py | 11 +++++++++++ 7 files changed, 47 insertions(+) create mode 100644 package/python-rsa/Config.in create mode 100644 package/python-rsa/python-rsa.hash create mode 100644 package/python-rsa/python-rsa.mk create mode 100644 support/testing/tests/package/sample_python_rsa.py create mode 100644 support/testing/tests/package/test_python_rsa.py diff --git a/DEVELOPERS b/DEVELOPERS index 5c663628b6..8bf15686a7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2281,7 +2281,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 F: package/freescale-imx/ diff --git a/package/Config.in b/package/Config.in index 046c04e994..1b9a960bf7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1184,6 +1184,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" diff --git a/package/python-rsa/Config.in b/package/python-rsa/Config.in new file mode 100644 index 0000000000..bc9ec2feab --- /dev/null +++ b/package/python-rsa/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_RSA + bool "python-rsa" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_PYASN1 # runtime + help + Python-RSA is a pure-Python RSA implementation. It supports + encryption and decryption, signing and verifying signatures, + and key generation according to PKCS\#1 version 1.5. It can + be used as a Python library as well as on the command line. + + https://stuvel.eu/rsa diff --git a/package/python-rsa/python-rsa.hash b/package/python-rsa/python-rsa.hash new file mode 100644 index 0000000000..9fbbf0ac88 --- /dev/null +++ b/package/python-rsa/python-rsa.hash @@ -0,0 +1,5 @@ +# From https://pypi.org/project/rsa/ +sha256 9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9 rsa-4.7.2.tar.gz + +# Locally computed +sha256 073f28b7d389c8fe74f607e17c27f81eaa5ace69edc43a884f23f41b41c5c726 LICENSE diff --git a/package/python-rsa/python-rsa.mk b/package/python-rsa/python-rsa.mk new file mode 100644 index 0000000000..eaa47e8037 --- /dev/null +++ b/package/python-rsa/python-rsa.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-rsa +# +################################################################################ + +PYTHON_RSA_VERSION = 4.7.2 +PYTHON_RSA_SOURCE = rsa-$(PYTHON_RSA_VERSION).tar.gz +PYTHON_RSA_SITE = https://files.pythonhosted.org/packages/db/b5/475c45a58650b0580421746504b680cd2db4e81bc941e94ca53785250269 +PYTHON_RSA_SETUP_TYPE = setuptools +PYTHON_RSA_LICENSE = Apache-2.0 +PYTHON_RSA_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_rsa.py b/support/testing/tests/package/sample_python_rsa.py new file mode 100644 index 0000000000..6f246f4d62 --- /dev/null +++ b/support/testing/tests/package/sample_python_rsa.py @@ -0,0 +1,2 @@ +import rsa +(pubkey, privkey) = rsa.newkeys(512) diff --git a/support/testing/tests/package/test_python_rsa.py b/support/testing/tests/package/test_python_rsa.py new file mode 100644 index 0000000000..e63d63e1de --- /dev/null +++ b/support/testing/tests/package/test_python_rsa.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3RSA(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_RSA=y + """ + sample_scripts = ["tests/package/sample_python_rsa.py"] From 74974d5e2f916e0794676c99b8b7a1ce791e90ca Mon Sep 17 00:00:00 2001 From: Thomas Claveirole Date: Mon, 2 Aug 2021 11:51:42 +0200 Subject: [PATCH 022/110] package/openlayers: bump to version 6.6.1 Signed-off-by: Thomas Claveirole Signed-off-by: Thomas Petazzoni --- package/openlayers/openlayers.hash | 2 +- package/openlayers/openlayers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash index 23683bd6e9..e6debd49ba 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 ab80014b15963404ec269a71f563fd3568581c55de160d5663600ea0787cf568 v6.5.0-dist.zip +sha256 c8695a15c3570ca0c8f84c79391f81a89b925a5fcca28dc5cd60942c0dade247 v6.6.1-dist.zip diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index db464ef8a6..c8d2c07ee7 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.5.0 +OPENLAYERS_VERSION = 6.6.1 OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause From 60f7c478e4682eb6d562b1f38fbfa44ce4b37675 Mon Sep 17 00:00:00 2001 From: Illia Bitkov Date: Thu, 5 Aug 2021 18:16:53 +0200 Subject: [PATCH 023/110] package/libcap: fix build failure due to unessesary patch Fix the following build failure which is raised since bump to version 2.52 in commit 38b0759432070f7a57c0fab84d44a07caead6f06 Applying 0001-Permit-compilation-with-std-c89.patch using patch: patching file Makefile Reversed (or previously applied) patch detected! Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file Makefile.rej patching file libcap/cap_test.c Reversed (or previously applied) patch detected! Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file libcap/cap_test.c.rej patching file psx/psx.c Reversed (or previously applied) patch detected! Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file psx/psx.c.rej patching file tests/exploit.c Reversed (or previously applied) patch detected! Skipping patch. 2 out of 2 hunks ignored -- saving rejects to file tests/exploit.c.rej patching file tests/libcap_launch_test.c Reversed (or previously applied) patch detected! Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file tests/libcap_launch_test.c.rej patching file tests/uns_test.c Reversed (or previously applied) patch detected! Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file tests/uns_test.c.rej Problem is because patch was integrated into package repo Fixes: http://autobuild.buildroot.net/results/2f619b233e2cfb4d7eeb3cc178c849c74d11f2ca/ Signed-off-by: Illia Bitkov Signed-off-by: Yann E. MORIN --- ...0001-Permit-compilation-with-std-c89.patch | 123 ------------------ 1 file changed, 123 deletions(-) delete mode 100644 package/libcap/0001-Permit-compilation-with-std-c89.patch diff --git a/package/libcap/0001-Permit-compilation-with-std-c89.patch b/package/libcap/0001-Permit-compilation-with-std-c89.patch deleted file mode 100644 index 0219f09f52..0000000000 --- a/package/libcap/0001-Permit-compilation-with-std-c89.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 06ec53d0c9fcddcc071a0e07731e6c83238400e6 Mon Sep 17 00:00:00 2001 -From: "Andrew G. Morgan" -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 - -[Retrieved from: -https://git.kernel.org/pub/scm/linux/kernel/git/morgan/libcap.git/commit/?id=06ec53d0c9fcddcc071a0e07731e6c83238400e6] -Signed-off-by: Fabrice Fontaine ---- - 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 - #include - #include -@@ -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 - From 0f0e913f10caf21f23c2e46f210519a7a3bc0b32 Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Wed, 4 Aug 2021 23:56:50 +0200 Subject: [PATCH 024/110] package/zstd: rework build and install Create libzstd.pc in the build step instead of triggering a lazy build during installation when it is missing. Move PREFIX=/usr to ZSTD_OPTS. It is needed for building libzstd.pc during the build step; for consistency, make sure it's available in all steps. Attach '-release' to the targets, since the default is to build lib-release and zstd-release. Its only effect is to clear DEBUGFLAGS (which are just warning flags). Signed-off-by: Norbert Lange [Arnout: add check-package disable] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/zstd/zstd.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 5a96c11309..9c97eb0e11 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -12,6 +12,7 @@ ZSTD_LICENSE_FILES = LICENSE COPYING ZSTD_CPE_ID_VENDOR = facebook ZSTD_CPE_ID_PRODUCT = zstandard +ZSTD_OPTS += PREFIX=/usr ZSTD_OPTS += ZSTD_LEGACY_SUPPORT=0 ifeq ($(BR2_PACKAGE_ZLIB),y) ZSTD_DEPENDENCIES += zlib @@ -60,12 +61,14 @@ else ZSTD_OPTS += HAVE_THREAD=0 ZSTD_BUILD_LIBS := $(addsuffix -nomt,$(ZSTD_BUILD_LIBS)) endif +# check-package disable OverriddenVariable - override intended +ZSTD_BUILD_LIBS := $(addsuffix -release,$(ZSTD_BUILD_LIBS)) define ZSTD_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \ - -C $(@D)/lib $(ZSTD_BUILD_LIBS) + -C $(@D)/lib $(ZSTD_BUILD_LIBS) libzstd.pc $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \ - -C $(@D) zstd + -C $(@D) zstd-release endef define ZSTD_INSTALL_STAGING_CMDS @@ -76,9 +79,9 @@ endef define ZSTD_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \ - DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D)/programs install + DESTDIR=$(TARGET_DIR) -C $(@D)/programs install $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \ - DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D)/lib $(ZSTD_INSTALL_LIBS) + DESTDIR=$(TARGET_DIR) -C $(@D)/lib $(ZSTD_INSTALL_LIBS) endef HOST_ZSTD_OPTS += PREFIX=$(HOST_DIR) From 32041f050e42ac15af463622274a889ff8d044ed Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Wed, 4 Aug 2021 23:56:51 +0200 Subject: [PATCH 025/110] package/zstd: Prefer dynamically linked tool If the libzstd DSO is available, then link the tool against it. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/zstd/zstd.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 9c97eb0e11..e970d87cbf 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -49,6 +49,13 @@ ZSTD_BUILD_LIBS = lib ZSTD_INSTALL_LIBS = install-static install-shared endif +# prefer zstd-dll unless no library is available +ifeq ($(BR2_STATIC_LIBS),y) +ZSTD_BUILD_PROG_TARGET = zstd-release +else +ZSTD_BUILD_PROG_TARGET = zstd-dll +endif + # The HAVE_THREAD flag is read by the 'programs' makefile but not by the 'lib' # one. Building a multi-threaded binary with a static library (which defaults # to single-threaded) gives a runtime error when compressing files. @@ -68,7 +75,7 @@ define ZSTD_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \ -C $(@D)/lib $(ZSTD_BUILD_LIBS) libzstd.pc $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \ - -C $(@D) zstd-release + -C $(@D)/programs $(ZSTD_BUILD_PROG_TARGET) endef define ZSTD_INSTALL_STAGING_CMDS From 208e98beb2d550529d39b098ebd6a692d6ce822d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 28 Jun 2021 22:15:12 +0200 Subject: [PATCH 026/110] support/misc/gitlab-ci.yml.in: templatise the make command In a followup commit, the make command used to log and display the last lines on error will be used in another job. Factorize it by introducing .run_make template. Signed-off-by: Romain Naour Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN Reviewed-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/misc/gitlab-ci.yml.in | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index fcfff5c6aa..1ee3772154 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -26,20 +26,24 @@ paths: - .config +.run_make: &run_make + | + make O=${OUTPUT_DIR} > >(tee build.log |grep '>>>') 2>&1 || { + echo 'Failed build last output' + tail -200 build.log + exit 1 + } + .defconfig_base: before_script: - DEFCONFIG_NAME=${CI_JOB_NAME} + - OUTPUT_DIR=output script: - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - make ${DEFCONFIG_NAME} - ./support/scripts/check-dotconfig.py .config ./configs/${DEFCONFIG_NAME} - echo 'Build buildroot' - - | - make > >(tee build.log |grep '>>>') 2>&1 || { - echo 'Failed build last output' - tail -200 build.log - exit 1 - } + - *run_make - | ./support/scripts/boot-qemu-image.py "${DEFCONFIG_NAME}" > >(tee runtime-test.log) 2>&1 || { echo 'Failed runtime test last output' From 3418a068befff3cf15c0a49ba1539a162f6bce53 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 28 Jun 2021 22:15:13 +0200 Subject: [PATCH 027/110] utils/test-pkg: remove configurations that are skipped When the config fragment provided by the user is not usable with a specific toolchain configuration, the resulting .config file was kept around. In a follow up commit, we'll need to know, from outside test-pkg, if a specific configuration was indeed usable or not. So, unless if the user actually requested to keep the build directories, remove the .config file when it contains a configration that would be skipped. Signed-off-by: Yann E. MORIN Cc: Romain Naour Cc: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/test-pkg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/test-pkg b/utils/test-pkg index a317d8c17a..54c6c5e8fe 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -161,6 +161,10 @@ build_one() { # done in the same locale. comm -23 <(sort "${cfg}") <(sort "${dir}/.config") >"${dir}/missing.config" if [ -s "${dir}/missing.config" ]; then + if [ ${keep} -ne 1 ]; then + # Invalid configuration, drop it + rm -f "${dir}/.config" + fi return 1 fi # Remove file, it's empty anyway. From 95ad161fe933b01986b426c47f019d58900d62a2 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Fri, 6 Aug 2021 15:50:46 +0300 Subject: [PATCH 028/110] package/kmsxx: remove erroneous use of static-libc option Currently, for a static-only build, we pass -Dstatic-libc=true. The reason for that was not recorded when the package was converted to meson. The -Dstatic-libc=true option, despite its name, is not about linking statically against libc, but against libgcc and libstdc++. In Buildroot, we forcibly pass -static when calling the compiler and linker, so everything is already linked statically. For a shared build, -Dstatic-libc=false has no effect at all. Drop this option altogether, as it is not needed, and is confusing. Signed-off-by: Tomi Valkeinen [yann.morin.1998@free.fr: expand commit log] Signed-off-by: Yann E. MORIN --- package/kmsxx/kmsxx.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/kmsxx/kmsxx.mk b/package/kmsxx/kmsxx.mk index fd40ff8e73..871ecaf85c 100644 --- a/package/kmsxx/kmsxx.mk +++ b/package/kmsxx/kmsxx.mk @@ -17,12 +17,6 @@ KMSXX_CONF_OPTS = \ -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 - ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) KMSXX_CXXFLAGS += $(TARGET_CXXFLAGS) -O0 endif From ecb72b118a3d2b25cbfe2e1dfd3c9d9f3d3df91d Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Fri, 6 Aug 2021 15:50:47 +0300 Subject: [PATCH 029/110] package/kmsxx: update to latest We can drop all the patches as they have been sorted out in upstream. The wrapped fmt was dropped, so drop the corresponding option. The option to use a system pybind11 was named differently upstream, as a feature rather as a boolean. Adapt accordingly. Signed-off-by: Tomi Valkeinen [yann.morin.1998@free.fr: explain dropped/changed options] Signed-off-by: Yann E. MORIN --- ...0001-meson-add-use-system-fmt-option.patch | 46 ------------------ ...meson-add-use-system-pybind11-option.patch | 43 ----------------- ...ly-build-py-in-case-pykms-is-enabled.patch | 48 ------------------- package/kmsxx/kmsxx.hash | 2 +- package/kmsxx/kmsxx.mk | 5 +- 5 files changed, 3 insertions(+), 141 deletions(-) delete mode 100644 package/kmsxx/0001-meson-add-use-system-fmt-option.patch delete mode 100644 package/kmsxx/0002-meson-add-use-system-pybind11-option.patch delete mode 100644 package/kmsxx/0003-meson-only-build-py-in-case-pykms-is-enabled.patch diff --git a/package/kmsxx/0001-meson-add-use-system-fmt-option.patch b/package/kmsxx/0001-meson-add-use-system-fmt-option.patch deleted file mode 100644 index e9d67b1202..0000000000 --- a/package/kmsxx/0001-meson-add-use-system-fmt-option.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 61db7d5520f50564da8f2c9ac952eadb31f70727 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -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 ---- - 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 - diff --git a/package/kmsxx/0002-meson-add-use-system-pybind11-option.patch b/package/kmsxx/0002-meson-add-use-system-pybind11-option.patch deleted file mode 100644 index be58b65b42..0000000000 --- a/package/kmsxx/0002-meson-add-use-system-pybind11-option.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 27f15549ce67194e4152c57db2b762b7a443b4c7 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -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 ---- - 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 - diff --git a/package/kmsxx/0003-meson-only-build-py-in-case-pykms-is-enabled.patch b/package/kmsxx/0003-meson-only-build-py-in-case-pykms-is-enabled.patch deleted file mode 100644 index a908521381..0000000000 --- a/package/kmsxx/0003-meson-only-build-py-in-case-pykms-is-enabled.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0ef36b2e22c2ac0331b3096b7adc69fb08044048 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -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 ---- - 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 - diff --git a/package/kmsxx/kmsxx.hash b/package/kmsxx/kmsxx.hash index 1eeb1e6a7e..c141ef7e07 100644 --- a/package/kmsxx/kmsxx.hash +++ b/package/kmsxx/kmsxx.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4a682328b03c28ff1f6cfcafc48d30c3feb5ef98ed07e5dd3bbd9e6a1d4a47cc kmsxx-548905611c130ea9d31929a0caf7a198d8bac462.tar.gz +sha256 99759fe9334369ccd80ab0bbfe1110ee47e74f1e20abc2d7b2f028067ea0a0c3 kmsxx-824bbb1f4cd062d66b457faca50f904b34dfd96c.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/kmsxx/kmsxx.mk b/package/kmsxx/kmsxx.mk index 871ecaf85c..8ebdffaad1 100644 --- a/package/kmsxx/kmsxx.mk +++ b/package/kmsxx/kmsxx.mk @@ -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,8 +14,7 @@ KMSXX_CONF_OPTS = \ -Dkmscube=false \ -Dpykms=disabled \ -Domap=disabled \ - -Duse-system-fmt=true \ - -Duse-system-pybind11=true + -Dsystem-pybind11=enabled ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) KMSXX_CXXFLAGS += $(TARGET_CXXFLAGS) -O0 From 0610d838d82a46141d762a498b09762e8f423c68 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Tue, 10 Aug 2021 11:23:36 +0300 Subject: [PATCH 030/110] package/timescaledb: bump version to 2.4.0 Release notes: https://github.com/timescale/timescaledb/releases/tag/2.4.0 Starting from 2.4.0 timescaledb runs TAP tests by default so disable it by -DTAP_CHECKS=OFF. Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index e97045f7d5..4b6d6f77a8 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 730e61e48f471c1d643494421d21e43766128cbcb62a5c4b138c171379195cf2 timescaledb-2.3.0.tar.gz +sha256 1adbff3ae7f8f39d1b5ac2189d60b9bd0a8154c0c3603e53b030a204f72d86af timescaledb-2.4.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 27e9142b0c..900bac5a7e 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.3.0 +TIMESCALEDB_VERSION = 2.4.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE @@ -16,6 +16,7 @@ TIMESCALEDB_DEPENDENCIES = postgresql # pg_config replacement doesn't implement --cppflags --cflags # --ldflags and --libs. TIMESCALEDB_CONF_OPTS = \ + -DTAP_CHECKS=OFF \ -DREGRESS_CHECKS=OFF \ -DWARNINGS_AS_ERRORS=OFF \ -DPG_PKGLIBDIR=lib/postgresql \ From 43b69dbac811e509ad38c959b0238d565669de6a Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Tue, 10 Aug 2021 13:24:40 +0300 Subject: [PATCH 031/110] package/libgeos: bump version to 3.9.1 Remove upstream patch. Add myself to DEVELOPERS Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + ...-CMakeLists.txt-add-BUILD_BENCHMARKS.patch | 37 ------------------- package/libgeos/libgeos.hash | 2 +- package/libgeos/libgeos.mk | 2 +- 4 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 package/libgeos/0001-CMakeLists.txt-add-BUILD_BENCHMARKS.patch diff --git a/DEVELOPERS b/DEVELOPERS index b82f36f776..a102ce4af4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1871,6 +1871,7 @@ N: Max Filippov F: arch/Config.in.xtensa N: Maxim Kochetkov +F: package/libgeos/ F: package/libosmium/ F: package/osm2pgsql/ F: package/postgis/ diff --git a/package/libgeos/0001-CMakeLists.txt-add-BUILD_BENCHMARKS.patch b/package/libgeos/0001-CMakeLists.txt-add-BUILD_BENCHMARKS.patch deleted file mode 100644 index 94748dcdbd..0000000000 --- a/package/libgeos/0001-CMakeLists.txt-add-BUILD_BENCHMARKS.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 16848d6da27140caf922f71a233f96a508fb061e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 24 Jan 2021 12:38:37 +0100 -Subject: [PATCH] CMakeLists.txt: add BUILD_BENCHMARKS - -Signed-off-by: Fabrice Fontaine -[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 - diff --git a/package/libgeos/libgeos.hash b/package/libgeos/libgeos.hash index 5b5e44c7c5..3508ba9077 100644 --- a/package/libgeos/libgeos.hash +++ b/package/libgeos/libgeos.hash @@ -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 diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index a355732af8..ab2035c62a 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -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 From b7f9192acf4fca94eac40266aa15ffdd1e708ae1 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Tue, 10 Aug 2021 00:31:47 +0200 Subject: [PATCH 032/110] package/apparmor: bump to version 3.0.3 This patch bumps apparmor and libapparmor to maintenance release 3.0.3 Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/apparmor/apparmor.hash | 2 +- package/apparmor/apparmor.mk | 2 +- package/libapparmor/libapparmor.hash | 2 +- package/libapparmor/libapparmor.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/apparmor/apparmor.hash b/package/apparmor/apparmor.hash index ddbe87c569..88280cbfcf 100644 --- a/package/apparmor/apparmor.hash +++ b/package/apparmor/apparmor.hash @@ -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 diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index 6c23e1bb89..400ea349ae 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -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 diff --git a/package/libapparmor/libapparmor.hash b/package/libapparmor/libapparmor.hash index 37e1ff5228..6a19aef77a 100644 --- a/package/libapparmor/libapparmor.hash +++ b/package/libapparmor/libapparmor.hash @@ -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 diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index 255432e455..0d5822a56d 100644 --- a/package/libapparmor/libapparmor.mk +++ b/package/libapparmor/libapparmor.mk @@ -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 From cd8d483e5222927df2ba5e3e6318bf84fddcc141 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Tue, 10 Aug 2021 15:47:53 +0200 Subject: [PATCH 033/110] package/cups-filters: bump to version 1.28.9 Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/cups-filters/cups-filters.hash | 2 +- package/cups-filters/cups-filters.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash index 8c2526ae9d..3b65e702c5 100644 --- a/package/cups-filters/cups-filters.hash +++ b/package/cups-filters/cups-filters.hash @@ -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 diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index b6ab7f1cda..bc69b3832d 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -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 From a71661ffb216c7423dcd02ec9e8d703252dbcbad Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Tue, 10 Aug 2021 15:18:49 +0300 Subject: [PATCH 034/110] package/osm2pgsql: bump version 1.5.1 Release-notes: https://github.com/openstreetmap/osm2pgsql/releases/tag/1.5.1 Signed-off-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni --- package/osm2pgsql/osm2pgsql.hash | 2 +- package/osm2pgsql/osm2pgsql.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index 13e8de4b51..c488949b62 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fc68283930ccd468ed9b28685150741b16083fec86800a4b011884ae22eb061c osm2pgsql-1.4.2.tar.gz +sha256 4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e osm2pgsql-1.5.1.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index bb8dba419e..74193c62cf 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.4.2 +OSM2PGSQL_VERSION = 1.5.1 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING From 38a154f142d6dd752c6661ad60f62c62fca60ca3 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Aug 2021 04:13:11 -0600 Subject: [PATCH 035/110] package/python-txaio: bump to version 21.2.1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-txaio/python-txaio.hash | 4 ++-- package/python-txaio/python-txaio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-txaio/python-txaio.hash b/package/python-txaio/python-txaio.hash index 15b1f5f2c9..5e05f02d3a 100644 --- a/package/python-txaio/python-txaio.hash +++ b/package/python-txaio/python-txaio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/txaio/json -md5 c998be8d5837218c809266c0fce94687 txaio-20.4.1.tar.gz -sha256 17938f2bca4a9cabce61346758e482ca4e600160cbc28e861493eac74a19539d txaio-20.4.1.tar.gz +md5 7e80b80ed7797245a5eef803043bdede txaio-21.2.1.tar.gz +sha256 7d6f89745680233f1c4db9ddb748df5e88d2a7a37962be174c0fd04c8dba1dc8 txaio-21.2.1.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/package/python-txaio/python-txaio.mk b/package/python-txaio/python-txaio.mk index 2dd028f4f7..750d9e3d3d 100644 --- a/package/python-txaio/python-txaio.mk +++ b/package/python-txaio/python-txaio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TXAIO_VERSION = 20.4.1 +PYTHON_TXAIO_VERSION = 21.2.1 PYTHON_TXAIO_SOURCE = txaio-$(PYTHON_TXAIO_VERSION).tar.gz -PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/e7/dd/c0c90b080c3fad0ac8e2382eddbe86591d4fa1a5c1aea652de0adf245fc0 +PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/c5/39/2e715062283f8443d8ceeea32276db71741664d78d43c3edd3675498e926 PYTHON_TXAIO_LICENSE = MIT PYTHON_TXAIO_LICENSE_FILES = LICENSE PYTHON_TXAIO_SETUP_TYPE = setuptools From 37f75b756182dd17871d1cd9e8bca83f326de690 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 11 Aug 2021 22:14:40 +0200 Subject: [PATCH 036/110] package/tvheadend: always use host-python3 According to https://elinux.org/Buildroot:Python2Packages#Python_in_the_build_system tvheadend needs to be updated to follow "We aim at removing dependencies on host-python(2) where possible" Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/tvheadend/tvheadend.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index b694c44e3b..cd8fedf1f0 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -12,7 +12,7 @@ TVHEADEND_DEPENDENCIES = \ host-gettext \ host-pkgconf \ host-pngquant \ - $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) \ + host-python3 \ openssl ifeq ($(BR2_PACKAGE_AVAHI),y) From 4e6084833816701fa940afb22f2b1ed64a163c93 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 11 Aug 2021 22:25:52 +0200 Subject: [PATCH 037/110] package/libinput: bump version to 1.18.1 For details see [1]. [1] https://lists.freedesktop.org/archives/wayland-devel/2021-August/041934.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/libinput/libinput.hash | 6 +++--- package/libinput/libinput.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index 7958cbac88..8b6a5466ed 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -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 diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 32b822edb7..844a4ae8ba 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -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 From 24780dbad44f0720edc82fccae83357e0f43b882 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 11 Aug 2021 22:42:49 +0200 Subject: [PATCH 038/110] package/xmrig: bump version to 6.14.0 Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 199959690f..c698670bc9 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c444e53f8692ad10e0daa73df57892cf9a066d20fe25db377022cd481b1440ad xmrig-6.13.1.tar.gz +sha256 a6b5e7f3ca1dad6513e34a34cda81c4a1f1415fade87e8d7a4692fb10c77745c xmrig-6.14.0.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index b8a3957d54..28433f1376 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.13.1 +XMRIG_VERSION = 6.14.0 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From d1e863f893a176691bf40ae8298515f8c3fb22c0 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 12 Aug 2021 01:58:28 -0600 Subject: [PATCH 039/110] package/python-dbus-next: bump to version 0.2.3 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-dbus-next/python-dbus-next.hash | 4 ++-- package/python-dbus-next/python-dbus-next.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-dbus-next/python-dbus-next.hash b/package/python-dbus-next/python-dbus-next.hash index fa1cbc9da7..57bfaaf547 100644 --- a/package/python-dbus-next/python-dbus-next.hash +++ b/package/python-dbus-next/python-dbus-next.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dbus-next/json -md5 fcf7443b379ef69f95727bec0221ebc9 dbus_next-0.2.2.tar.gz -sha256 f656a3d3450b670f228248ffb1c3a703a69c4a8cb10cce63b108f17c8bd6c3de dbus_next-0.2.2.tar.gz +md5 0e31605bd90f3460aebcd0bb7fe0dc20 dbus_next-0.2.3.tar.gz +sha256 f4eae26909332ada528c0a3549dda8d4f088f9b365153952a408e28023a626a5 dbus_next-0.2.3.tar.gz # Locally computed sha256 checksums sha256 c454ab6b8e0653a8eab828a8cbaaa368a1bbfba982178bb18b6177e311eae4cc LICENSE diff --git a/package/python-dbus-next/python-dbus-next.mk b/package/python-dbus-next/python-dbus-next.mk index 9aab9ac92b..f35a32cb3a 100644 --- a/package/python-dbus-next/python-dbus-next.mk +++ b/package/python-dbus-next/python-dbus-next.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DBUS_NEXT_VERSION = 0.2.2 +PYTHON_DBUS_NEXT_VERSION = 0.2.3 PYTHON_DBUS_NEXT_SOURCE = dbus_next-$(PYTHON_DBUS_NEXT_VERSION).tar.gz -PYTHON_DBUS_NEXT_SITE = https://files.pythonhosted.org/packages/cb/fb/5ab0485c6460e39be75e16af95c0e23c2531c1ac5a482fffb9ee7d576e6f +PYTHON_DBUS_NEXT_SITE = https://files.pythonhosted.org/packages/ce/45/6a40fbe886d60a8c26f480e7d12535502b5ba123814b3b9a0b002ebca198 PYTHON_DBUS_NEXT_SETUP_TYPE = setuptools PYTHON_DBUS_NEXT_LICENSE = MIT PYTHON_DBUS_NEXT_LICENSE_FILES = LICENSE From 54a5036562f9fb6c1e953a9ee50074e10197d570 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 12 Aug 2021 02:22:10 -0600 Subject: [PATCH 040/110] package/libbpf: bump to version 0.4.0 License name typo fixed upsteam. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/libbpf/libbpf.hash | 4 ++-- package/libbpf/libbpf.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash index 1afda50c9c..afc7aec1bf 100644 --- a/package/libbpf/libbpf.hash +++ b/package/libbpf/libbpf.hash @@ -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 diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index a1aeb7d894..3f09cc38dc 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -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 From d6ac118637b032f41c990cb1201664ce4b1bfd1e Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Thu, 12 Aug 2021 15:41:28 +0200 Subject: [PATCH 041/110] package/python-pillow: bump to version 8.3.1 Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/python-pillow/python-pillow.hash | 4 ++-- package/python-pillow/python-pillow.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index 562cb2c1a2..fb1ec53a00 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pillow/json -md5 21c03274a9f59b9c00419852a8faebe7 Pillow-8.2.0.tar.gz -sha256 a787ab10d7bb5494e5f76536ac460741788f1fbce851068d73a87ca7c35fc3e1 Pillow-8.2.0.tar.gz +md5 e42fc66e41b5309436a573af49cec47c Pillow-8.3.1.tar.gz +sha256 2cac53839bfc5cece8fdbe7f084d5e3ee61e1303cccc86511d351adcb9e2c792 Pillow-8.3.1.tar.gz # Locally computed sha256 checksums sha256 5bb11d96b393a698df70018069a986248021f286344c437a13f299c3daf1dfd4 LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 42607e0bbd..a55a937c11 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 8.2.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/21/23/af6bac2a601be6670064a817273d4190b79df6f74d8012926a39bc7aa77f +PYTHON_PILLOW_VERSION = 8.3.1 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/8f/7d/1e9c2d8989c209edfd10f878da1af956059a1caab498e5bc34fa11b83f71 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE From d241c64897b86b2dc30b261017b5649565dec77e Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Thu, 12 Aug 2021 16:18:00 +0200 Subject: [PATCH 042/110] package/python-pydal: bump to version v20200321.1 Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/python-pydal/python-pydal.hash | 2 +- package/python-pydal/python-pydal.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-pydal/python-pydal.hash b/package/python-pydal/python-pydal.hash index 224f32856f..911734c8bf 100644 --- a/package/python-pydal/python-pydal.hash +++ b/package/python-pydal/python-pydal.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 df54be164bcdab8ffc8db88cb72333cc4b27997ce58c302dd8ade36462d799ea python-pydal-20200910.1.tar.gz +sha256 32faf0b7123bc19b5f70da654fc99a22f4ce6fb20f5e4b38aba819e0ab4060aa python-pydal-20200321.1.tar.gz sha256 1f711e93f1e0c2eec576e2e60597dc2ed6f0a661e4749c6b8a39f0d4a72be468 LICENSE.txt diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk index 2cac839a9e..2aeade322e 100644 --- a/package/python-pydal/python-pydal.mk +++ b/package/python-pydal/python-pydal.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 20200910.1 +PYTHON_PYDAL_VERSION = 20200321.1 PYTHON_PYDAL_SITE = $(call github,web2py,pydal,v$(PYTHON_PYDAL_VERSION)) PYTHON_PYDAL_LICENSE = BSD-3-Clause PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt From d3b0a4dcdd7f397dacbd833e16f31ea9896e7508 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Thu, 12 Aug 2021 16:18:01 +0200 Subject: [PATCH 043/110] package/python-web2py: bump to version v2.21.1 Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/python-web2py/python-web2py.hash | 2 +- package/python-web2py/python-web2py.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash index 4ff85668a1..2ef52b0a5c 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 e3f05266b4b97650b76bfb85028df5e2194955674c9b98cfc065c72ed5791690 python-web2py-2.20.4.tar.gz +sha256 44556376468139de874e9c29c9ef56e60ecd5f7536c7bee46d74b1f9d4178825 python-web2py-2.21.1.tar.gz sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 26214a8110..910efbe617 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = 2.20.4 +PYTHON_WEB2PY_VERSION = 2.21.1 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE From 2ff40658acf667f957051ef5975cc8131d13fdff Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Thu, 12 Aug 2021 16:29:40 +0200 Subject: [PATCH 044/110] package/sshguard: bump to version 2.4.2 Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/sshguard/sshguard.hash | 4 ++-- package/sshguard/sshguard.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sshguard/sshguard.hash b/package/sshguard/sshguard.hash index 9bbb41336f..b1752f1c68 100644 --- a/package/sshguard/sshguard.hash +++ b/package/sshguard/sshguard.hash @@ -1,4 +1,4 @@ -# sha256 from https://sourceforge.net/projects/sshguard/files/sshguard/2.4.1/sshguard-2.4.1.sha256 -sha256 875d02e6e67dced614790ed5e36aef1160edea940f353a79306cbb1852af3c67 sshguard-2.4.1.tar.gz +# sha256 from https://sourceforge.net/projects/sshguard/files/sshguard/2.4.2/sshguard-2.4.2.sha256 +sha256 2770b776e5ea70a9bedfec4fd84d57400afa927f0f7522870d2dcbbe1ace37e8 sshguard-2.4.2.tar.gz # Locally calculated sha256 c3ae64f12153a1bc55bc234d09f40a08ab0e0149fffc972c0b7f02d5a12c1a5c COPYING diff --git a/package/sshguard/sshguard.mk b/package/sshguard/sshguard.mk index 3616fba780..d27c76e63f 100644 --- a/package/sshguard/sshguard.mk +++ b/package/sshguard/sshguard.mk @@ -4,7 +4,7 @@ # ################################################################################ -SSHGUARD_VERSION = 2.4.1 +SSHGUARD_VERSION = 2.4.2 SSHGUARD_SITE = https://sourceforge.net/projects/sshguard/files/sshguard/$(SSHGUARD_VERSION) SSHGUARD_LICENSE = ISC, Public Domain (fnv hash), BSD-3-Clause (SimCList) SSHGUARD_LICENSE_FILES = COPYING From 372ccf6a19ec86bebecd40a584bb415f77db97ad Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 12 Aug 2021 15:43:20 -0600 Subject: [PATCH 045/110] package/meson: bump to version 0.59.0 Rebase patches on 0.59.0. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...atic-libs-when-default-library-static.patch | 8 ++++---- ...ndencies-base.py-add-pkg_config_stati.patch | 18 +++++++++--------- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch b/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch index 4a1325bd6b..9cedcd0942 100644 --- a/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch +++ b/package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch @@ -1,4 +1,4 @@ -From cf9ad9b79a924081ce3d1e045bba3544815ea5f8 Mon Sep 17 00:00:00 2001 +From c1359a49b61016031287d62f44a363cb76242c91 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Sat, 26 Oct 2019 09:17:29 -0500 Subject: [PATCH] Prefer ext static libs when --default-library=static @@ -29,10 +29,10 @@ Signed-off-by: Peter Seiderer 1 file changed, 3 insertions(+) diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py -index ad3bfae..4733910 100644 +index 09ad837b1..b7f6b9f22 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py -@@ -999,6 +999,9 @@ class CLikeCompiler(Compiler): +@@ -978,6 +978,9 @@ class CLikeCompiler(Compiler): elif env.machines[self.for_machine].is_cygwin(): shlibext = ['dll', 'dll.a'] prefixes = ['cyg'] + prefixes @@ -43,5 +43,5 @@ index ad3bfae..4733910 100644 # Linux/BSDs shlibext = ['so'] -- -2.30.1 +2.25.1 diff --git a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch index 9dbe22c83f..8e15d3210c 100644 --- a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch +++ b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch @@ -1,4 +1,4 @@ -From 885af6ab2e02cca6bd190b8b29a355fdb6516936 Mon Sep 17 00:00:00 2001 +From 3d6a2db2270346236dd6247e0648ea0c949ba468 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 15 Feb 2020 15:13:59 +0100 Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static @@ -21,23 +21,23 @@ Signed-off-by: Romain Naour [Rebased on 0.57.1] Signed-off-by: Peter Seiderer --- - mesonbuild/dependencies/base.py | 3 ++- + mesonbuild/dependencies/pkgconfig.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index cd77b4b..08675e6 100644 ---- a/mesonbuild/dependencies/base.py -+++ b/mesonbuild/dependencies/base.py -@@ -883,7 +883,8 @@ class PkgConfigDependency(ExternalDependency): +diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py +index 1e8d9132e..d902ba215 100644 +--- a/mesonbuild/dependencies/pkgconfig.py ++++ b/mesonbuild/dependencies/pkgconfig.py +@@ -338,7 +338,8 @@ class PkgConfigDependency(ExternalDependency): env = None libcmd = ['--libs'] - if self.static: + if self.static or \ -+ (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): ++ (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): libcmd.append('--static') libcmd.append(self.name) -- -2.30.1 +2.25.1 diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 96ca379a25..9bb7ec9f40 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.58.2/meson-0.58.2.tar.gz.asc -sha256 7634ec32955d3f897d623b88e9d2988451035f43d73c17a29caf767387baedb7 meson-0.58.2.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.59.0/meson-0.59.0.tar.gz.asc +sha256 e376c298df64b643dfe01eccb2d7b6f1e02e95aa38c19f19d120d129612ce476 meson-0.59.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index d093dc9fea..134411625a 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.58.2 +MESON_VERSION = 0.59.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From 5edce579d548c5029a652da2030454b616c0cd4d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 13 Aug 2021 06:38:44 +0200 Subject: [PATCH 046/110] package/{mesa3d, mesa3d-headers}: bump version to 21.1.7 Release notes for this bugfix release: https://lists.freedesktop.org/archives/mesa-announce/2021-August/000642.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 64587b4bcd..f569b53285 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -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 diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 4b63e0cece..3ff58f028e 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2021-July/000640.html -sha256 b1cb0122f911dfa9fe1f209a7061378c61a1448a280e711511ca72dad9999e37 mesa-21.1.6.tar.xz -sha512 5daf389aad4fe7ab3574f6af3aabc62ba8b3034004a0a0853dcc18ef6c8003d2f2195cc377dc57b30863ae4cf158149e3156247445ca2b11e401700011cb878c mesa-21.1.6.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2021-August/000642.html +sha256 e9e67c10654f2e4bf15b944bb048007a614292aa4792b1b7512eb700b7b3a7bb mesa-21.1.7.tar.xz +sha512 1fd677437f292c30fbf08bfef8c1088557841f426090ccba20ab2a222b08fb5c3ec48a7a0301466e03a23019d09414c700a4f5e299479cacd6972a9f3ba030c8 mesa-21.1.7.tar.xz # License sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 6a53d203ef..54b50f684f 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.1.6 +MESA3D_VERSION = 21.1.7 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From 4af8b52506a3653d494ea9b11980d89cb2ad1e51 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 13 Aug 2021 06:54:29 +0200 Subject: [PATCH 047/110] package/dav1d: bump version to 0.9.1 Release notes: https://code.videolan.org/videolan/dav1d/-/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/dav1d/dav1d.hash | 2 +- package/dav1d/dav1d.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index 0a8b2cc3a1..66f48a9923 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -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 diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 251330929f..a4280e4ac7 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -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 From 0b694a008de0ae06e2d0bb0283ebeb82ca272870 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Wed, 11 Aug 2021 14:11:56 +0300 Subject: [PATCH 048/110] package/wayland-protocols: bump to version 1.21 Update to version 1.21, which is required by newer wlroots releases. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- package/wayland-protocols/wayland-protocols.hash | 8 ++++---- package/wayland-protocols/wayland-protocols.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash index 321fc62de5..fd6b9925eb 100644 --- a/package/wayland-protocols/wayland-protocols.hash +++ b/package/wayland-protocols/wayland-protocols.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2020-February/041269.html -md5 b0836533a3f2dc6585b1dae00341157f wayland-protocols-1.20.tar.xz -sha1 e78c739a3a85477ed524b81e8bb75efe7f8bf4df wayland-protocols-1.20.tar.xz -sha256 9782b7a1a863d82d7c92478497d13c758f52e7da4f197aa16443f73de77e4de7 wayland-protocols-1.20.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2021-April/041815.html +md5 8196416baac07cd833bcb86b69da41a7 wayland-protocols-1.21.tar.xz +sha1 6e0e2a05edb43d32e3b2e3f681ef266a287a186e wayland-protocols-1.21.tar.xz +sha256 b99945842d8be18817c26ee77dafa157883af89268e15f4a5a1a1ff3ffa4cde5 wayland-protocols-1.21.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk index 84028b97d5..3d7a0e472d 100644 --- a/package/wayland-protocols/wayland-protocols.mk +++ b/package/wayland-protocols/wayland-protocols.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.20 +WAYLAND_PROTOCOLS_VERSION = 1.21 WAYLAND_PROTOCOLS_SITE = https://wayland.freedesktop.org/releases WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT From cce9eeac8b70878cb0a0f6a990aa99e517529e10 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Wed, 11 Aug 2021 14:11:57 +0300 Subject: [PATCH 049/110] package/wlroots: bump to version 0.14.1 Update to version 0.14.1, and adapt to upstream changes: - seatd/libseat is now used unconditionally, the logind/elogind build options have been removed (which can be used through seatd, no functionality is lost). - Now wlroots includes a software-based renderer (which uses pixman), and the OpenGL ES one is optional. For now it is left always enabled (as it was before) but this could be changed in the future. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- package/wlroots/Config.in | 1 + package/wlroots/wlroots.hash | 4 ++-- package/wlroots/wlroots.mk | 19 +++---------------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 41f8986772..8d485992f5 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -20,6 +20,7 @@ config BR2_PACKAGE_WLROOTS select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBXKBCOMMON select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_SEATD select BR2_PACKAGE_WAYLAND select BR2_PACKAGE_WAYLAND_PROTOCOLS help diff --git a/package/wlroots/wlroots.hash b/package/wlroots/wlroots.hash index 024ea93cae..fdebe1ef68 100644 --- a/package/wlroots/wlroots.hash +++ b/package/wlroots/wlroots.hash @@ -1,5 +1,5 @@ -# Generated locally, after checking https://github.com/swaywm/wlroots/releases/download/0.13.0/wlroots-0.13.0.tar.gz.sig -sha256 f6bea37fd4a6f5e5f552b83d61adae8c73e64b0bcb9ae0ab464ebcd9309d3cf3 wlroots-0.13.0.tar.gz +# Generated locally, after checking https://github.com/swaywm/wlroots/releases/download/0.14.1/wlroots-0.14.1.tar.gz.sig +sha256 448a83d579ac280357c8a4e902b9477bacbab81cc4d9c140e443642d458869db wlroots-0.14.1.tar.gz # Hashes for license files: sha256 ffd3737a478b83a8b51b42757d3bf909ef36694508355879722e11fc1fa6736b LICENSE diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 0696d037df..89d5024176 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -4,7 +4,7 @@ # ################################################################################ -WLROOTS_VERSION = 0.13.0 +WLROOTS_VERSION = 0.14.1 WLROOTS_SITE = https://github.com/swaywm/wlroots/releases/download/$(WLROOTS_VERSION) WLROOTS_LICENSE = MIT WLROOTS_LICENSE_FILES = LICENSE @@ -18,11 +18,12 @@ WLROOTS_DEPENDENCIES = \ libegl \ libgles \ pixman \ + seatd \ udev \ wayland \ wayland-protocols -WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled +WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled -Drenderers=gles2 ifeq ($(BR2_PACKAGE_FFMPEG),y) WLROOTS_DEPENDENCIES += ffmpeg @@ -32,13 +33,6 @@ ifeq ($(BR2_PACKAGE_LIBPNG),y) WLROOTS_DEPENDENCIES += libpng endif -ifeq ($(BR2_PACKAGE_SYSTEMD_LOGIND),y) -WLROOTS_CONF_OPTS += -Dlogind=enabled -Dlogind-provider=systemd -WLROOTS_DEPENDENCIES += systemd -else -WLROOTS_CONF_OPTS += -Dlogind=disabled -endif - ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) WLROOTS_CONF_OPTS += -Dx11-backend=enabled -Dxwayland=enabled WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xcb-util-renderutil xlib_libX11 @@ -46,11 +40,4 @@ else WLROOTS_CONF_OPTS += -Dx11-backend=disabled -Dxwayland=disabled endif -ifeq ($(BR2_PACKAGE_SEATD),y) -WLROOTS_CONF_OPTS += -Dlibseat=enabled -WLROOTS_DEPENDENCIES += seatd -else -WLROOTS_CONF_OPTS += -Dlibseat=disabled -endif - $(eval $(meson-package)) From ceb79e472da6d1a1b66d36530cd40ae76ce05ec0 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Wed, 11 Aug 2021 14:11:58 +0300 Subject: [PATCH 050/110] package/cage: bump to version 0.1.4 Update Cage to version 0.1.4, which is a bug fix release that supports using wlroots 0.14.x. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- package/cage/cage.hash | 4 ++-- package/cage/cage.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cage/cage.hash b/package/cage/cage.hash index 6e312bbf5f..31ae25bacc 100644 --- a/package/cage/cage.hash +++ b/package/cage/cage.hash @@ -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 diff --git a/package/cage/cage.mk b/package/cage/cage.mk index 0950c70474..a661857a95 100644 --- a/package/cage/cage.mk +++ b/package/cage/cage.mk @@ -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 From 43c19b1e39aa3f2db2c4d90b9c83861c93c400ff Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 18 Aug 2021 19:49:41 +0200 Subject: [PATCH 051/110] package/xmrig: bump version to 6.14.1 Changelog: https://github.com/xmrig/xmrig/blob/master/CHANGELOG.md Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index c698670bc9..0af163de8a 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a6b5e7f3ca1dad6513e34a34cda81c4a1f1415fade87e8d7a4692fb10c77745c xmrig-6.14.0.tar.gz +sha256 5342632664a01efc7d512ce404f580d9ee380899afb144b4afc05c43e76cf446 xmrig-6.14.1.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 28433f1376..d04a783254 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.14.0 +XMRIG_VERSION = 6.14.1 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From b3b610b72ea2bf865631dc92992fb87748814d4c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 19 Aug 2021 18:37:13 +0300 Subject: [PATCH 052/110] package/usbutils: bump to version 014 Drop autoreconf; tarball now ships the configure script. Rename license files and update hashes. Added SPDX markers. No license change. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/usbutils/usbutils.hash | 6 +++--- package/usbutils/usbutils.mk | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/usbutils/usbutils.hash b/package/usbutils/usbutils.hash index 96426aeea2..f5d55bb4a0 100644 --- a/package/usbutils/usbutils.hash +++ b/package/usbutils/usbutils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/usb/usbutils/sha256sums.asc -sha256 9e23494fcc78b7a80ee29a07dd179c95ae2f71509c35728dbbabc2d1cca41338 usbutils-013.tar.xz +sha256 3a079cfad60560227b67192482d7813bf96326fcbb66c04254839715f276fc69 usbutils-014.tar.xz # Locally calculated -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0.txt -sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0.txt +sha256 91412672119c72352b76c1d48fa1a8b7cdc7f70be7929e468c8805db468e23e4 LICENSES/GPL-2.0-only.txt +sha256 4631da83311d27f99078d0d102e31bd34a4fcbcc2dae2aa40f1454a5b48125dc LICENSES/GPL-3.0-only.txt diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index ef5fd12013..50b1a5a0cc 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -4,14 +4,12 @@ # ################################################################################ -USBUTILS_VERSION = 013 +USBUTILS_VERSION = 014 USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils USBUTILS_DEPENDENCIES = host-pkgconf libusb udev USBUTILS_LICENSE = GPL-2.0+ (utils) GPL-2.0 or GPL-3.0 (lsusb.py) -USBUTILS_LICENSE_FILES = LICENSES/GPL-2.0.txt LICENSES/GPL-3.0.txt -# Missing configure script -USBUTILS_AUTORECONF = YES +USBUTILS_LICENSE_FILES = LICENSES/GPL-2.0-only.txt LICENSES/GPL-3.0-only.txt # Nice lsusb.py script only if there's python 3.x ifeq ($(BR2_PACKAGE_PYTHON3),) From c80fbf269c020c53a6140ffbf328d64674a8ada0 Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Mon, 16 Aug 2021 09:52:10 +0200 Subject: [PATCH 053/110] package/sdl2: bump version to 2.0.16 Signed-off-by: Michael Fischer Signed-off-by: Thomas Petazzoni --- package/sdl2/sdl2.hash | 6 +++--- package/sdl2/sdl2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 6b818fb002..6dee461258 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.14.tar.gz.sig -sha256 d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc SDL2-2.0.14.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.16.tar.gz.sig +sha256 65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b SDL2-2.0.16.tar.gz # Locally calculated -sha256 ae4df3759a726538607b84c00ab8f8a5567d9f38ad5397486eb9b5c5f626caef COPYING.txt +sha256 52d41d0c82507721ca1fd92c20dc2bf9ca531b3a288ef845a8275c550f118804 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 5aad92eda8..0620c56062 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.0.14 +SDL2_VERSION = 2.0.16 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From 76f7ab635ec2f0aefcec57493099fcc4bc662ce4 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 16 Aug 2021 19:45:53 +0200 Subject: [PATCH 054/110] package/libnss: enable parallel building Parallel Makefile building has been fixed with version 3.62 on commit [1], so enable parallel building by substituting $(MAKE1) with $(MAKE) in libnss.mk. [1]: https://hg.mozilla.org/projects/nss/rev/a5c857139b37476ca10032504ea876b97e066424 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libnss/libnss.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 0db543e34b..100ce2f8aa 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -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= \ From 6b408a4d80053ee7915f42670409d7e2c9c88e05 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Mon, 16 Aug 2021 16:31:08 -0700 Subject: [PATCH 055/110] package/go: bump to version 1.17 The latest Go release, version 1.17, arrives six months after Go 1.16. Most of its changes are in the implementation of the toolchain, runtime, and libraries. https://golang.org/doc/go1.17 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index cd7f2b3813..d35d6ed572 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d go1.16.6.src.tar.gz +sha256 3a70e5055509f347c0fb831ca07a2bf3b531068f349b14a3c652e9b5b67beb5d go1.17.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 7d6355df92..09d9f60cd4 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.16.6 +GO_VERSION = 1.17 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 3bb1d7572462ff336666297a22bc181318693968 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Sat, 14 Aug 2021 13:50:29 +0200 Subject: [PATCH 056/110] package/fmt: bump version to 8.0.1 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/fmt/fmt.hash | 2 +- package/fmt/fmt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fmt/fmt.hash b/package/fmt/fmt.hash index 7947a17456..e735704023 100644 --- a/package/fmt/fmt.hash +++ b/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5d98c504d0205f912e22449ecdea776b78ce0bb096927334f80781e720084c9f fmt-7.1.3.zip +sha256 a627a56eab9554fc1e5dd9a623d0768583b3a383ff70a4312ba68f94c9d415bf fmt-8.0.1.zip sha256 825c9324e70f8c839c8ba910543dd4a7daee243b86ef960594c11381a19980b8 LICENSE.rst diff --git a/package/fmt/fmt.mk b/package/fmt/fmt.mk index 332957982f..6ec86de7f3 100644 --- a/package/fmt/fmt.mk +++ b/package/fmt/fmt.mk @@ -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 From ab3b93bc9f2335388e00ab986ddf22eeb7a35ebd Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Sat, 14 Aug 2021 13:50:30 +0200 Subject: [PATCH 057/110] package/spdlog: bump version to 1.9.2 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/spdlog/spdlog.hash | 2 +- package/spdlog/spdlog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/spdlog/spdlog.hash b/package/spdlog/spdlog.hash index 5d1ff2f520..02756fc98c 100644 --- a/package/spdlog/spdlog.hash +++ b/package/spdlog/spdlog.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 944d0bd7c763ac721398dca2bb0f3b5ed16f67cef36810ede5061f35a543b4b8 spdlog-1.8.5.tar.gz +sha256 6fff9215f5cb81760be4cc16d033526d1080427d236e86d70bb02994f85e3d38 spdlog-1.9.2.tar.gz sha256 a7241a379cb98d37788f82c2fc2e484c3ae85dae881fd3406f0637644850926f LICENSE diff --git a/package/spdlog/spdlog.mk b/package/spdlog/spdlog.mk index ee875ae560..b5dfc0c7b4 100644 --- a/package/spdlog/spdlog.mk +++ b/package/spdlog/spdlog.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPDLOG_VERSION = 1.8.5 +SPDLOG_VERSION = 1.9.2 SPDLOG_SITE = $(call github,gabime,spdlog,v$(SPDLOG_VERSION)) SPDLOG_LICENSE = MIT SPDLOG_LICENSE_FILES = LICENSE From daa90d691844c2fc3c853d5e45f81a5530bbbed2 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Sat, 14 Aug 2021 21:08:18 +0200 Subject: [PATCH 058/110] package/ipset: bump to version 7.15 This includes the following changes: 7.15 - Kernel part changes - netfilter: ipset: Fix maximal range check in hash_ipportnet4_uadt() (Nathan Chancellor) 7.14 - Userspace changes - Add missing function to libipset.map and bump library version (reported by Jan Engelhardt) - Kernel part changes - 64bit division isn't allowed on 32bit, replace it with shift 7.13 - Userspace changes - When parsing protocols by number, do not check it in /etc/protocols. - Add missing hunk to patch "Allow specifying protocols by number" - Kernel part changes - Limit the maximal range of consecutive elements to add/delete fix 7.12 - Userspace changes - Allow specifying protocols by number (Haw Loeung) - Fix example in ipset.8 manpage discovered by Pablo Neira Ayuso. - tests: add tests ipset to nftables (Pablo Neira Ayuso) - add ipset to nftables translation infrastructure (Pablo Neira Ayuso) - lib: Detach restore routine from parser (Pablo Neira Ayuso) - lib: split parser from command execution (Pablo Neira Ayuso) - Fix patch "Parse port before trying by service name" - Kernel part changes - Limit the maximal range of consecutive elements to add/delete (reported by Brad Spengler) - Backport "netfilter: use nfnetlink_unicast()" - Backport "netfilter: nfnetlink: consolidate callback type" - Backport "netfilter: nfnetlink: add struct nfnl_info and pass it to callbacks" - Backport "netfilter: add helper function to set up the nfnetlink header and use it" Signed-off-by: Pierre-Jean Texier Signed-off-by: Thomas Petazzoni --- package/ipset/ipset.hash | 4 ++-- package/ipset/ipset.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ipset/ipset.hash b/package/ipset/ipset.hash index afe83f6dce..9c251be27e 100644 --- a/package/ipset/ipset.hash +++ b/package/ipset/ipset.hash @@ -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 diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk index 07f865d4ec..4eda65e81b 100644 --- a/package/ipset/ipset.mk +++ b/package/ipset/ipset.mk @@ -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 From 5d4cf52204b7c5c4366ec029f83c87610722f6f0 Mon Sep 17 00:00:00 2001 From: Sam Voss Date: Sat, 14 Aug 2021 14:51:43 -0500 Subject: [PATCH 059/110] package/ripgrep: bump to version 13.0.0 Also adds patch to make the jemalloc feature optional on musl, due to toolchains not being supported by upstream project. Signed-off-by: Sam Voss Signed-off-by: Thomas Petazzoni --- ...llocator-behind-a-cargo-feature-flag.patch | 131 ++++++++++++++++++ package/ripgrep/ripgrep.hash | 4 +- package/ripgrep/ripgrep.mk | 2 +- 3 files changed, 134 insertions(+), 3 deletions(-) create mode 100644 package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch diff --git a/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch b/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch new file mode 100644 index 0000000000..e2ba68f389 --- /dev/null +++ b/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch @@ -0,0 +1,131 @@ +From 68c2a4d7a5d9b46f65121958fdb12d5270bfd1b6 Mon Sep 17 00:00:00 2001 +From: Jonathan Stites +Date: Wed, 6 May 2020 12:55:35 +0000 +Subject: [PATCH] puts jemalloc allocator behind a cargo feature flag + +Retrieved from: https://github.com/BurntSushi/ripgrep/pull/1569 + +Moves jemalloc behind a feature for musl builds, where it is not +supported by the upstream project, so ripgrep will fail to build. + +Signed-off-by: Sam Voss +--- + .github/workflows/ci.yml | 6 ++++++ + .github/workflows/release.yml | 8 +++++++- + Cargo.toml | 8 +++++++- + README.md | 9 +++++++++ + crates/core/main.rs | 8 ++++++-- + 5 files changed, 35 insertions(+), 4 deletions(-) + +diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml +index ab154ec..aa567d9 100644 +--- a/.github/workflows/ci.yml ++++ b/.github/workflows/ci.yml +@@ -149,6 +149,12 @@ jobs: + if: matrix.target != '' + run: ${{ env.CARGO }} test --verbose --workspace ${{ env.TARGET_FLAGS }} + ++ - name: Run tests with jemalloc (Musl) ++ # We only use the jemalloc allocator when building with musl. ++ # The system allocator is good enough for other platforms. ++ if: matrix.os == 'nightly-musl' ++ run: ${{ env.CARGO }} test --verbose --all --features jemalloc ${{ env.TARGET_FLAGS }} ++ + - name: Test for existence of build artifacts (Windows) + if: matrix.os == 'windows-2019' + shell: bash +diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml +index 7cfb6a4..ad6b82d 100644 +--- a/.github/workflows/release.yml ++++ b/.github/workflows/release.yml +@@ -133,7 +133,13 @@ jobs: + echo "target flag is: ${{ env.TARGET_FLAGS }}" + echo "target dir is: ${{ env.TARGET_DIR }}" + +- - name: Build release binary ++ - name: Build release binary (linux) ++ if: matrix.build == 'linux' ++ # Use jemalloc allocator for much better performance over the musl default allocator ++ run: ${{ env.CARGO }} build --verbose --release --features "pcre2 jemalloc" ${{ env.TARGET_FLAGS }} ++ ++ - name: Build release binary (non-linux) ++ if: matrix.build != 'linux' + run: ${{ env.CARGO }} build --verbose --release --features pcre2 ${{ env.TARGET_FLAGS }} + + - name: Strip release binary (linux and macos) +diff --git a/Cargo.toml b/Cargo.toml +index fb78fcb..0d34b1e 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -56,8 +56,9 @@ version = "2.33.0" + default-features = false + features = ["suggestions"] + +-[target.'cfg(all(target_env = "musl", target_pointer_width = "64"))'.dependencies.jemallocator] ++[dependencies.jemallocator] + version = "0.3.0" ++optional = true + + [build-dependencies] + lazy_static = "1.1.0" +@@ -75,6 +76,11 @@ walkdir = "2" + [features] + simd-accel = ["grep/simd-accel"] + pcre2 = ["grep/pcre2"] ++# The jemalloc allocator is used for improved ++# performance on x86 musl builds. ++# Cargo does not yet support platform-specific features ++# https://github.com/rust-lang/cargo/issues/1197 ++jemalloc = ["jemallocator"] + + [profile.release] + debug = 1 +diff --git a/README.md b/README.md +index 46938bc..9917b29 100644 +--- a/README.md ++++ b/README.md +@@ -406,6 +406,15 @@ build a static executable with MUSL and with PCRE2, then you will need to have + `musl-gcc` installed, which might be in a separate package from the actual + MUSL library, depending on your Linux distribution. + ++When building with the MUSL target on Linux, it is recommended to use the ++jemalloc allocator for performance: ++ ++``` ++$ rustup target add x86_64-unknown-linux-musl ++$ cargo build --release --target x86_64-unknown-linux-musl --features jemalloc ++``` ++ ++ + + ### Running tests + +diff --git a/crates/core/main.rs b/crates/core/main.rs +index 47385de..c9dae5a 100644 +--- a/crates/core/main.rs ++++ b/crates/core/main.rs +@@ -31,7 +31,7 @@ mod subject; + // have the fastest version of everything. Its goal is to be small and amenable + // to static compilation.) Even though ripgrep isn't particularly allocation + // heavy, musl's allocator appears to slow down ripgrep quite a bit. Therefore, +-// when building with musl, we use jemalloc. ++// we expose a feature for using jemalloc when building with musl. + // + // We don't unconditionally use jemalloc because it can be nice to use the + // system's default allocator by default. Moreover, jemalloc seems to increase +@@ -39,7 +39,11 @@ mod subject; + // + // Moreover, we only do this on 64-bit systems since jemalloc doesn't support + // i686. +-#[cfg(all(target_env = "musl", target_pointer_width = "64"))] ++#[cfg(all( ++ target_env = "musl", ++ target_pointer_width = "64", ++ feature = "jemalloc" ++))] + #[global_allocator] + static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; + +-- +2.32.0 + diff --git a/package/ripgrep/ripgrep.hash b/package/ripgrep/ripgrep.hash index 0841c0185c..b2f03a95e6 100644 --- a/package/ripgrep/ripgrep.hash +++ b/package/ripgrep/ripgrep.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7035379fce0c1e32552e8ee528b92c3d01b8d3935ea31d26c51a73287be74bb3 ripgrep-0.8.1.tar.gz -sha256 0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f LICENSE-MIT +sha256 0fb17aaf285b3eee8ddab17b833af1e190d73de317ff9648751ab0660d763ed2 ripgrep-13.0.0.tar.gz +sha256 0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f LICENSE-MIT diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk index 450bb020e3..2d9dd3ee2f 100644 --- a/package/ripgrep/ripgrep.mk +++ b/package/ripgrep/ripgrep.mk @@ -4,7 +4,7 @@ # ################################################################################ -RIPGREP_VERSION = 0.8.1 +RIPGREP_VERSION = 13.0.0 RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION)) RIPGREP_LICENSE = MIT RIPGREP_LICENSE_FILES = LICENSE-MIT From c4b6ae4d732d9cc91bcf6d2efcd858e826863ce4 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Fri, 13 Aug 2021 20:23:28 +0200 Subject: [PATCH 060/110] package/re2: bump version to 2021-08-01 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index abe8a4bbea..87fa095e35 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 26155e050b10b5969e986dab35654247a3b1b295e0532880b5a9c13c0a700ceb re2-2021-06-01.tar.gz +sha256 cd8c950b528f413e02c12970dce62a7b6f37733d7f68807e73a2d9bc9db79bc8 re2-2021-08-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index f6772a10dd..29c141ea81 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2021-06-01 +RE2_VERSION = 2021-08-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE From 885e8792d3478a73a7a27b7ffd8a7c8303234cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= Date: Thu, 19 Aug 2021 10:57:58 +0300 Subject: [PATCH 061/110] package/policycoreutils: Install scripts folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This folder includes the fixfiles script that is used by selinux autorelabel feature. Currently it installs it under /usr/sbin. Signed-off-by: José Pekkarinen Signed-off-by: Yann E. MORIN --- package/policycoreutils/policycoreutils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index a486f8ddc3..60575ac644 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -43,7 +43,7 @@ POLICYCOREUTILS_MAKE_OPTS += \ POLICYCOREUTILS_MAKE_DIRS = \ load_policy newrole run_init \ secon semodule sestatus setfiles \ - setsebool + setsebool scripts # We need to pass DESTDIR at build time because it's used by # policycoreutils build system to find headers and libraries. From 39ed837e137d9f043504150933038ab24d751ca4 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 9 Aug 2021 17:22:30 +0200 Subject: [PATCH 062/110] package/libnss: bump to version 3.69 Release Notes (not yet available, but should eventually land): https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.69_release_notes Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index b8c58e3425..a35b382050 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -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 diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 100ce2f8aa..63364ccb27 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -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 From 95cfc71779eeb07894128f6de49bf1284106717a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 7 Aug 2021 12:16:01 +0200 Subject: [PATCH 063/110] package/kodi-inputstream-adaptive: bump version to 2.6.23-Matrix Changelog of this bugfix release: https://github.com/xbmc/inputstream.adaptive/blob/Matrix/inputstream.adaptive/addon.xml.in#L18 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index 1abf28d89e..ef2435cae9 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -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 diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 1d95b8e97a..8e2c1d2a8a 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -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 From 55746e44c43da92742610c58a218144563dc1076 Mon Sep 17 00:00:00 2001 From: Zeno Endemann Date: Fri, 13 Aug 2021 12:56:18 +0200 Subject: [PATCH 064/110] package/mpv: add staging install MPV is not only an application, but also a library, which should be avaliable in staging. Signed-off-by: Zeno Endemann Signed-off-by: Yann E. MORIN --- package/mpv/mpv.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index d4d4d4811d..98a7328c83 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -12,6 +12,7 @@ MPV_DEPENDENCIES = \ MPV_LICENSE = GPL-2.0+ MPV_LICENSE_FILES = LICENSE.GPL MPV_CPE_ID_VENDOR = mpv +MPV_INSTALL_STAGING = YES MPV_NEEDS_EXTERNAL_WAF = YES From a2e9f3fbdd55d93b0f2770c8d016829bc36e2fba Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 5 Aug 2021 21:30:13 -0300 Subject: [PATCH 065/110] configs/imx6sx-sdb: bump U-Boot and kernel versions Bump U-Boot to version 2021.07 and kernel to 5.10.55. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/imx6sx-sdb_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/imx6sx-sdb_defconfig b/configs/imx6sx-sdb_defconfig index a87bdf84f6..7ad662aa2c 100644 --- a/configs/imx6sx-sdb_defconfig +++ b/configs/imx6sx-sdb_defconfig @@ -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" From 68933bf19560c180379c34906281d49187a4e6ea Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Aug 2021 08:44:33 -0600 Subject: [PATCH 066/110] package/python-autobahn: bump to version 21.3.1 Strip xbr contracts which are used only for the xbr feature which is entirely unsupported by buildroot. Add patch to fix some xbr assets getting accidentially included. Enable the optimized nvx cffi extension module when available. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...r-packages-and-xbr-templates-package.patch | 54 +++++++++++++++++ ...y-default-and-don-t-publish-universa.patch | 60 +++++++++++++++++++ package/python-autobahn/Config.in | 2 + package/python-autobahn/python-autobahn.hash | 4 +- package/python-autobahn/python-autobahn.mk | 6 +- 5 files changed, 122 insertions(+), 4 deletions(-) create mode 100644 package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch create mode 100644 package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch diff --git a/package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch b/package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch new file mode 100644 index 0000000000..f239345dc7 --- /dev/null +++ b/package/python-autobahn/0001-Fix-duplicate-xbr-packages-and-xbr-templates-package.patch @@ -0,0 +1,54 @@ +From b13b7e38b38e2c79c0a13be32e05f0451483cd01 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Sat, 12 Jun 2021 15:32:37 -0600 +Subject: [PATCH] Fix duplicate xbr packages and xbr templates package_data. + (#1492) + +Signed-off-by: James Hilliard +[james.hilliard1@gmail.com: backport from upstream commit +a370f9e7154e59b313cb675bfcaf8cad6011bd52] +--- + MANIFEST.in | 1 - + setup.py | 10 ++++++++-- + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/MANIFEST.in b/MANIFEST.in +index f4cb6da1..1dd32f0e 100644 +--- a/MANIFEST.in ++++ b/MANIFEST.in +@@ -1,4 +1,3 @@ + include LICENSE + include autobahn/nvx/_utf8validator.c + recursive-include autobahn/wamp/gen/schema * +-recursive-include autobahn/xbr/templates * +diff --git a/setup.py b/setup.py +index cf4e29ba..f27006da 100644 +--- a/setup.py ++++ b/setup.py +@@ -166,6 +166,12 @@ packages = [ + 'twisted.plugins', + ] + ++xbr_packages = [ ++ 'autobahn.xbr', ++ 'autobahn.asyncio.xbr', ++ 'autobahn.twisted.xbr', ++] ++ + package_data = {'autobahn.asyncio': ['./test/*']} + + entry_points = { +@@ -179,8 +185,8 @@ if 'AUTOBAHN_STRIP_XBR' in os.environ: + shutil.rmtree('autobahn.egg-info', ignore_errors=True) + else: + extras_require_all += extras_require_xbr +- packages += ['autobahn.xbr', 'autobahn.asyncio.xbr', 'autobahn.twisted.xbr'] +- package_data['xbr'] = ['./xbr/contracts/*.json'] ++ packages += xbr_packages ++ package_data['xbr'] = ['./xbr/templates/*.py.jinja2'] + entry_points['console_scripts'] += ["xbrnetwork = autobahn.xbr._cli:_main"] + + # development dependencies +-- +2.25.1 + diff --git a/package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch b/package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch new file mode 100644 index 0000000000..c2c2cf5777 --- /dev/null +++ b/package/python-autobahn/0002-Build-with-nvx-by-default-and-don-t-publish-universa.patch @@ -0,0 +1,60 @@ +From 1e3162bab59cbc2f7cf8b9ef6cadf55ee273c1d8 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Thu, 22 Jul 2021 06:56:51 -0600 +Subject: [PATCH] Build with nvx by default and don't publish universal wheel. + (#1493) + +Signed-off-by: James Hilliard +[james.hilliard1@gmail.com: backport from upstream commit +a35f22eeaafca7568f1deb35c4a1b82ae78f77d4] +--- + Makefile | 8 ++++---- + autobahn/nvx/_utf8validator.py | 7 ++++++- + setup.py | 7 +------ + 3 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/autobahn/nvx/_utf8validator.py b/autobahn/nvx/_utf8validator.py +index e72fc872..34393356 100644 +--- a/autobahn/nvx/_utf8validator.py ++++ b/autobahn/nvx/_utf8validator.py +@@ -44,13 +44,18 @@ ffi.cdef(""" + int nvx_utf8vld_get_impl(void* utf8vld); + """) + ++optional = True ++if 'AUTOBAHN_USE_NVX' in os.environ and os.environ['AUTOBAHN_USE_NVX'] in ['1', 'true']: ++ optional = False ++ + with open(os.path.join(os.path.dirname(__file__), '_utf8validator.c')) as fd: + c_source = fd.read() + ffi.set_source( + "_nvx_utf8validator", + c_source, + libraries=[], +- extra_compile_args=['-std=c99', '-Wall', '-Wno-strict-prototypes', '-O3', '-march=native'] ++ extra_compile_args=['-std=c99', '-Wall', '-Wno-strict-prototypes', '-O3', '-march=native'], ++ optional=optional + ) + + +diff --git a/setup.py b/setup.py +index f27006da..4889a39e 100644 +--- a/setup.py ++++ b/setup.py +@@ -110,12 +110,7 @@ extras_require_nvx = [ + + # cffi based extension modules to build, currently only NVX + cffi_modules = [] +-if 'AUTOBAHN_USE_NVX' in os.environ: +- # FIXME: building this extension will make the wheel +- # produced no longer universal (as in "autobahn-18.4.1-py2.py3-none-any.whl"). +- # on the other hand, I don't know how to selectively include this +- # based on the install flavor the user has chosen (eg pip install autobahn[nvx] +- # should make the following be included) ++if 'AUTOBAHN_USE_NVX' not in os.environ or os.environ['AUTOBAHN_USE_NVX'] not in ['0', 'false']: + cffi_modules.append('autobahn/nvx/_utf8validator.py:ffi') + + extras_require_xbr = [ +-- +2.25.1 + diff --git a/package/python-autobahn/Config.in b/package/python-autobahn/Config.in index 78b16897bc..f719dcc8f1 100644 --- a/package/python-autobahn/Config.in +++ b/package/python-autobahn/Config.in @@ -2,7 +2,9 @@ config BR2_PACKAGE_PYTHON_AUTOBAHN bool "python-autobahn" depends on BR2_INSTALL_LIBSTDCPP # python-cryptography -> python-pyasn depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_CFFI # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime + select BR2_PACKAGE_PYTHON_HYPERLINK # runtime select BR2_PACKAGE_PYTHON_TXAIO # runtime help WebSocket client and server library, WAMP real-time diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash index a5aa2a5a7d..7de1e7e673 100644 --- a/package/python-autobahn/python-autobahn.hash +++ b/package/python-autobahn/python-autobahn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/autobahn/json -md5 dcae3cf26203aa4bbd9912137e5c9512 autobahn-20.4.3.tar.gz -sha256 c6fe745d52ba9f9eecf791cd31f558df42aebfc4f9ee558a8f1d18c707e1ae1f autobahn-20.4.3.tar.gz +md5 dcba839ee61be33d05042a09c008c6bc autobahn-21.3.1.tar.gz +sha256 e126c1f583e872fb59e79d36977cfa1f2d0a8a79f90ae31f406faae7664b8e03 autobahn-21.3.1.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk index 81e2b7a4ca..4ec47f54ce 100644 --- a/package/python-autobahn/python-autobahn.mk +++ b/package/python-autobahn/python-autobahn.mk @@ -4,13 +4,15 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 20.4.3 +PYTHON_AUTOBAHN_VERSION = 21.3.1 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/cb/16/38d27874ef827974f44acb6dd64a92a9248b624734c0e84b91083c2d9350 +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/4c/9e/f5bdfb55d1eab67c4b6d24d1397f95feec792071ff1b2f5a893d6d5247f3 PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar PYTHON_AUTOBAHN_CPE_ID_PRODUCT = autobahn PYTHON_AUTOBAHN_SETUP_TYPE = setuptools +PYTHON_AUTOBAHN_DEPENDENCIES = host-python-cffi +PYTHON_AUTOBAHN_ENV = AUTOBAHN_STRIP_XBR=1 $(eval $(python-package)) From 82f5b3724bfe3ab262a384af61f3d2faf9c6c0a5 Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Fri, 9 Jul 2021 11:49:25 +0200 Subject: [PATCH 067/110] boot/arm-trusted-firmware: Add out-of-source ATF device tree support Similarly to Uboot, this patch adds the ability to copy in and build out-of-source device tree sources during an ATF build. Signed-off-by: Kory Maincent Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 9 +++++++++ boot/arm-trusted-firmware/arm-trusted-firmware.mk | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index 7e46a10270..20a121c2fc 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -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 diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 1f08f5dabb..d1eb72e7ae 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -162,7 +162,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) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \ $(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS) From 60bde2995b65d4f326cf2706bd784193ec1531bf Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 20 Aug 2021 22:27:02 +0200 Subject: [PATCH 068/110] package/sdl2: fix licensing info Commit c80fbf269c02 (package/sdl2: bump version to 2.0.16) properly updated the hash and license filename in sdl2.hash, but forgot to update the license filename in sdl2.mk. Fix that. Fixes: http://autobuild.buildroot.org/results/0d607b1e81fcca7f01c8243df28b9c3d59040711/ Signed-off-by: Yann E. MORIN --- package/sdl2/sdl2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 0620c56062..103dc107d2 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -8,7 +8,7 @@ SDL2_VERSION = 2.0.16 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib -SDL2_LICENSE_FILES = COPYING.txt +SDL2_LICENSE_FILES = LICENSE.txt SDL2_CPE_ID_VENDOR = libsdl SDL2_CPE_ID_PRODUCT = simple_directmedia_layer SDL2_INSTALL_STAGING = YES From 99896b841b30043f05a7dd2e9d9a9a48376f3aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= Date: Fri, 20 Aug 2021 14:23:22 +0300 Subject: [PATCH 069/110] package/restorecond: Add new init script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current restorecond upstream init script is no good fit for the user space generated by buildroot, so we provide our own one. Signed-off-by: José Pekkarinen Signed-off-by: Thomas Petazzoni --- package/restorecond/S02restorecond | 54 ++++++++++++++++++++++++++++++ package/restorecond/restorecond.mk | 4 +-- 2 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 package/restorecond/S02restorecond diff --git a/package/restorecond/S02restorecond b/package/restorecond/S02restorecond new file mode 100644 index 0000000000..796b07a32f --- /dev/null +++ b/package/restorecond/S02restorecond @@ -0,0 +1,54 @@ +#!/bin/sh + +DAEMON=restorecond +PIDFILE=/var/run/$DAEMON.pid + +RESTORECOND_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() +{ + printf 'Starting %s: ' "$DAEMON" + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ + -- $RESTORECOND_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() +{ + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p $PIDFILE -R TERM/30/KILL/5 -n $DAEMON + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() +{ + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + restart;; + *) + echo $"Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index d08e0a722e..671f071b1d 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -27,8 +27,8 @@ define RESTORECOND_BUILD_CMDS endef define RESTORECOND_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D $(@D)/restorecond.init \ - $(TARGET_DIR)/etc/init.d/S20restorecond + $(INSTALL) -m 0755 -D package/restorecond/S02restorecond \ + $(TARGET_DIR)/etc/init.d/S02restorecond endef define RESTORECOND_INSTALL_INIT_SYSTEMD From 1c52337143309d0ffd58a7f06ef85fdfdaa5a7a2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 5 Aug 2021 23:27:32 +0200 Subject: [PATCH 070/110] package/freescale-imx/imx-gpu-viv: move pkg-config files fixup to the build step The fixup of the pkg-config files modifies files in the build directory (@D) but is done in the staging installation step, which doesn't make much sense, especially since the build step already has some fixup logic. So we move the fixup logic of the pkg-config files into the build step. Signed-off-by: Thomas Petazzoni Reviewed-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- .../freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 103c0341e3..51b04f82d4 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -42,16 +42,6 @@ define IMX_GPU_VIV_EXTRACT_CMDS $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_GPU_VIV_DL_DIR)/$(IMX_GPU_VIV_SOURCE)) endef -# 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 -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 @@ -72,9 +62,19 @@ define IMX_GPU_VIV_FIXUP_PKGCONFIG 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 + $(IMX_GPU_VIV_FIXUP_PKGCONFIG) +endef + 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 \ From 1e09dd3e4439579ec4d984dc79c7a05153074ecd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 5 Aug 2021 23:27:33 +0200 Subject: [PATCH 071/110] package/freescale-imx/imx-gpu-viv: drop pkg-config files installation We manually install pkg-config files from $(@D)/gpu-core/usr/lib/pkgconfig to the STAGING_DIR right after copying the entire $(@D)/gpu-core/usr/* files to STAGING_DIR. This makes the manual copying of pkg-config files pretty useless. Signed-off-by: Thomas Petazzoni Reviewed-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 51b04f82d4..9d974cac41 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -75,11 +75,6 @@ endef define IMX_GPU_VIV_INSTALL_STAGING_CMDS cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr - 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) From 880228044b1ee3f16b5e7fee065e8a2f57d31ee6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 5 Aug 2021 23:27:34 +0200 Subject: [PATCH 072/110] package/freescale-imx/imx-gpu-viv: make pkg-config fixups mutually exclusive The IMX_GPU_VIV_FIXUP_PKGCONFIG fixup is defined conditionally depending on the value of IMX_GPU_VIV_LIB_TARGET, which means that obviously only one of the definitions is possible. Make this clear by using a ifeq ... else ifeq ... else ifeq ... endif logic. Signed-off-by: Thomas Petazzoni Reviewed-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 9d974cac41..df39d3ddc2 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -46,15 +46,11 @@ 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) +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 -endif - -ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) +else 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; \ From a75ef4ade159a00c329d376a86390e2a69051d47 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 5 Aug 2021 23:27:35 +0200 Subject: [PATCH 073/110] package/freescale-imx/imx-gpu-viv: use make loops instead of shell loops We generally prefer using make loops instead of shell loops. They bring automatic error handling, as they abort the loop when there is an error, without the need for "|| exit 1". Signed-off-by: Thomas Petazzoni Reviewed-by: Gary Bisson Signed-off-by: Thomas Petazzoni --- package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index df39d3ddc2..fec19523a3 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -52,9 +52,9 @@ define IMX_GPU_VIV_FIXUP_PKGCONFIG endef else 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 + $(foreach lib,egl gbm glesv1_cm glesv2 vg, \ + ln -sf $(lib)_x11.pc $(@D)/gpu-core/usr/lib/pkgconfig/$(lib).pc + ) endef endif @@ -63,9 +63,9 @@ endif # 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 From 1f4ba521cd3a2534643aad021d0bb7c619c206af Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Tue, 24 Aug 2021 01:31:13 +0200 Subject: [PATCH 074/110] package/libcap: don't overwrite 'empty' when generating loader.txt Upstream commit [1] introduced an invocation of objcopy to generat loader.txt. However, objcopy, if not provided with an output file, will overwrite the input file. This is usually harmless because it will be identical, but the timestamp is updated. This may cause 'empty' to be newer than 'loader.txt', which causes 'loader.txt' and its dependencies to be rebuilt during 'make install' We provide a different set of parameters during 'make install'. In particular, we no longer pass in HOST_CONFIGURE_OPTS, so we no longer set LDFLAGS. Thus, there is no -Wl,rpath option that is passed in, which causes the resulting binaries to have an incorrect RPATH. Fix this by adding /dev/null as the output file in the objcopy invocation. Patch was sent upstream, but there's no mailing list, just a single person. Fixes: http://autobuild.buildroot.net/results/600/600aff5b839b48db80751cace5fa9670b7a3d698 (hopefully) [1] https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=efd293947f940180eedd8d0915b124f4aedccc08 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN --- ...don-t-overwrite-empty-when-generatin.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch diff --git a/package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch b/package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch new file mode 100644 index 0000000000..a47a2c788e --- /dev/null +++ b/package/libcap/0001-libcap-Makefile-don-t-overwrite-empty-when-generatin.patch @@ -0,0 +1,50 @@ +From dc507a812d931c24f1ac98c811fdd29bffa21da9 Mon Sep 17 00:00:00 2001 +From: "Arnout Vandecappelle (Essensium/Mind)" +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) +--- + 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 + From 50b6d7d69f880e940d7c281c493a6a6694d6ebe3 Mon Sep 17 00:00:00 2001 From: Paul Cercueil Date: Mon, 23 Aug 2021 09:43:03 +0100 Subject: [PATCH 075/110] package/libiio: bump to version 0.23 In versions > 0.21, the CMake script doesn't auto-enable features according to what it detects in the environment; options have to be explicitely enabled. Update the libiio.mk script accordingly. Signed-off-by: Paul Cercueil Signed-off-by: Thomas Petazzoni --- package/libiio/libiio.hash | 2 +- package/libiio/libiio.mk | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/package/libiio/libiio.hash b/package/libiio/libiio.hash index dd85ffa695..b0a901ca98 100644 --- a/package/libiio/libiio.hash +++ b/package/libiio/libiio.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 81c414d5c47b715d9bc9275b9fabbfd9e9483e60c035f3001b5977932049595d libiio-0.19.tar.gz +sha256 df1577740ea93dca732e7d7c04786600cb083117901dee793f3d38980754af00 libiio-0.23.tar.gz sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b COPYING.txt diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index af5b27ba5f..aec251e9a1 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -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) From f4367444f02111f4456a0de526949fa077ee8d01 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 23 Aug 2021 19:59:32 +0200 Subject: [PATCH 076/110] package/fluidsynth: bump to version 2.2.2 For change log since v2.2.1, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.2.2 ./utils/test-pkg --package fluidsynth 6 builds, 2 skipped, 0 build failed, 0 legal-info failed Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/fluidsynth/fluidsynth.hash | 2 +- package/fluidsynth/fluidsynth.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 08a19e23f8..65e19438d4 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -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 diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 1355c06c4a..ceb9e574e8 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -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 From 6976d7df495943ad8d46372a7b46b936754b996b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 23 Aug 2021 22:59:51 +0200 Subject: [PATCH 077/110] package/kodi-pvr-hts: bump version to 8.4.0-Matrix Changelog: https://github.com/kodi-pvr/pvr.hts/blob/Matrix/pvr.hts/changelog.txt Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +- package/kodi-pvr-hts/kodi-pvr-hts.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index b282eaf083..be638be6c9 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -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 diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index 70240116a9..28c6d6ea1f 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -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 From b9ed05a03fbbdca6d5c0e638479b5cdd49e65ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Sun, 22 Aug 2021 18:55:44 +0000 Subject: [PATCH 078/110] package/mpd: bump to version 0.22.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 1079ccf367..3847fc6724 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 9617ed08c9ffafcf5f925819251f6b90df3f4f73cf2838c41033e1962104286d mpd-0.22.8.tar.xz +sha256 07c82535e9999c3d4a099d8e652c88724635125b3c9f265ba9b6f2974ff9e614 mpd-0.22.10.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index e5e5097048..62e31860c0 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.22 -MPD_VERSION = $(MPD_VERSION_MAJOR).8 +MPD_VERSION = $(MPD_VERSION_MAJOR).10 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost From d39d8f7cee9b4634e6f490020204f63fae419e8e Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Thu, 19 Aug 2021 15:12:44 +0200 Subject: [PATCH 079/110] package/boost: bump version to 1.77.0 * drop 0001-fenv.patch, issue [0] was marked fixed since boost 1.64 (commit [1]) * drop upstreamed patch 0002 * filesystem now depends on boost-atomic * math broke the build without always lockfree atomic ints, disable for now. reported at [2]. [0] https://svn.boost.org/trac/boost/ticket/11756 [1] https://github.com/boostorg/test/commit/cb2a1c2488dc77b9baf1b05781208a9639dfcd69 [2] https://github.com/boostorg/math/issues/673 Signed-off-by: Michael Nosthoff [Arnout: improve propagation of reverse dependencies: - also update comment of cc-tool; - add boost-filesystem to reason of gnuradio, libcpprestsdk, uhd; - move dependency to arch-deps of mongodb] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bitcoin/Config.in | 2 +- package/boost/0001-fenv.patch | 37 ---------------- ...2-src-event-cpp-fix-build-on-riscv32.patch | 42 ------------------- package/boost/Config.in | 3 ++ package/boost/boost.hash | 4 +- package/boost/boost.mk | 2 +- package/botan/Config.in | 4 +- package/cc-tool/Config.in | 2 + package/gnuradio/Config.in | 2 +- package/i2pd/Config.in | 3 ++ package/libcpprestsdk/Config.in | 2 +- package/mongodb/Config.in | 1 + package/osm2pgsql/Config.in | 2 + package/pulseview/Config.in | 2 + package/supertux/Config.in | 2 + package/uhd/Config.in | 2 +- 16 files changed, 24 insertions(+), 88 deletions(-) delete mode 100644 package/boost/0001-fenv.patch delete mode 100644 package/boost/0002-src-event-cpp-fix-build-on-riscv32.patch diff --git a/package/bitcoin/Config.in b/package/bitcoin/Config.in index 7ce4f80656..a344811d6b 100644 --- a/package/bitcoin/Config.in +++ b/package/bitcoin/Config.in @@ -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 diff --git a/package/boost/0001-fenv.patch b/package/boost/0001-fenv.patch deleted file mode 100644 index 9dc7848c93..0000000000 --- a/package/boost/0001-fenv.patch +++ /dev/null @@ -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 -[Thomas: add Microblaze/NIOSII exclusions.] -Signed-off-by: Thomas Petazzoni - -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: - // diff --git a/package/boost/0002-src-event-cpp-fix-build-on-riscv32.patch b/package/boost/0002-src-event-cpp-fix-build-on-riscv32.patch deleted file mode 100644 index f1b84284ee..0000000000 --- a/package/boost/0002-src-event-cpp-fix-build-on-riscv32.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d2061419501bdd6761e9380ed5b91233f6c4e67e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -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 -[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) diff --git a/package/boost/Config.in b/package/boost/Config.in index 9248c574f4..d9ce841a92 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -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: diff --git a/package/boost/boost.hash b/package/boost/boost.hash index e6d44a76b6..96419506cd 100644 --- a/package/boost/boost.hash +++ b/package/boost/boost.hash @@ -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 diff --git a/package/boost/boost.mk b/package/boost/boost.mk index e72ddf897c..98ec30f98f 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -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 diff --git a/package/botan/Config.in b/package/botan/Config.in index 341fa7c622..635fe1836d 100644 --- a/package/botan/Config.in +++ b/package/botan/Config.in @@ -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 diff --git a/package/cc-tool/Config.in b/package/cc-tool/Config.in index 2661592d7f..fa5674b36d 100644 --- a/package/cc-tool/Config.in +++ b/package/cc-tool/Config.in @@ -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 diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 738088802e..183b49fe9b 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -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 diff --git a/package/i2pd/Config.in b/package/i2pd/Config.in index 5b9ac33e28..c1ba08ef75 100644 --- a/package/i2pd/Config.in +++ b/package/i2pd/Config.in @@ -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 diff --git a/package/libcpprestsdk/Config.in b/package/libcpprestsdk/Config.in index 97f00e3383..e533b30393 100644 --- a/package/libcpprestsdk/Config.in +++ b/package/libcpprestsdk/Config.in @@ -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 diff --git a/package/mongodb/Config.in b/package/mongodb/Config.in index 493c592413..1ea4282573 100644 --- a/package/mongodb/Config.in +++ b/package/mongodb/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_MONGODB_ARCH_SUPPORTS # ARM needs LDREX/STREX, so ARMv6+ default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 default y if BR2_aarch64 || BR2_x86_64 + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem config BR2_PACKAGE_MONGODB bool "mongodb" diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in index 1f1200cf46..70d59e6c6f 100644 --- a/package/osm2pgsql/Config.in +++ b/package/osm2pgsql/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_OSM2PGSQL depends on BR2_INSTALL_LIBSTDCPP # boost, fmt, libosmium, protozero depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, libosmium, protozero depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libosmium + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem depends on BR2_USE_WCHAR # boost, fmt, libosmium select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_SYSTEM @@ -22,5 +23,6 @@ config BR2_PACKAGE_OSM2PGSQL https://osm2pgsql.org comment "osm2pgsql needs a toolchain w/ C++, wchar, threads, gcc >= 4.7" + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/pulseview/Config.in b/package/pulseview/Config.in index b8d94332a3..e7a73e3765 100644 --- a/package/pulseview/Config.in +++ b/package/pulseview/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_PULSEVIEW # libsigrok->libglib2: depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem depends on BR2_USE_MMU depends on BR2_INSTALL_LIBSTDCPP # libsigrok->libzip @@ -32,6 +33,7 @@ config BR2_PACKAGE_PULSEVIEW comment "pulseview needs a toolchain w/ locale, wchar, threads, dynamic library, C++, gcc >= 4.9, host gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_PACKAGE_QT5 + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ || BR2_STATIC_LIBS || !BR2_ENABLE_LOCALE || \ diff --git a/package/supertux/Config.in b/package/supertux/Config.in index 5cacdd658e..285f19694b 100644 --- a/package/supertux/Config.in +++ b/package/supertux/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_SUPERTUX depends on BR2_PACKAGE_XORG7 # libglew, SDL2 OpenGL (GLX) depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem depends on BR2_USE_MMU # SDL2 OpenGL (GLX) depends on !BR2_STATIC_LIBS # SDL2 depends on BR2_USE_WCHAR # Boost @@ -36,6 +37,7 @@ comment "supertux needs OpenGL and a toolchain w/ C++, gcc >= 6, NPTL, dynamic l depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_HAS_LIBGL || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_6 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ BR2_STATIC_LIBS || !BR2_USE_WCHAR diff --git a/package/uhd/Config.in b/package/uhd/Config.in index f61bbf0e8f..0d68fda171 100644 --- a/package/uhd/Config.in +++ b/package/uhd/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_UHD bool "uhd" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS - 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 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU # use fork() From ef5b6158b64390024ba063e57045c27d0ff96fac Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 23 Aug 2021 15:56:28 +0300 Subject: [PATCH 080/110] package/bubblewrap: bump to version 0.5.0 Not much new, but has a few interesting bug fixes. Release notes: https://github.com/containers/bubblewrap/releases/tag/v0.5.0 Signed-off-by: Adrian Perez de Castro Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/bubblewrap/bubblewrap.hash | 4 ++-- package/bubblewrap/bubblewrap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bubblewrap/bubblewrap.hash b/package/bubblewrap/bubblewrap.hash index d3ccb4cb1f..88aba150cd 100644 --- a/package/bubblewrap/bubblewrap.hash +++ b/package/bubblewrap/bubblewrap.hash @@ -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 diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 18c175951a..5f3d95e826 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -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 From e17e37bcea2a1e96bd3caf608a0265fac9e05bfa Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Sun, 22 Aug 2021 21:02:50 +0200 Subject: [PATCH 081/110] package/glibc: bump version to 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 Signed-off-by: Petr Vorel Reviewed-by: Alistair Francis Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../glibc.hash | 2 +- package/glibc/glibc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename package/glibc/{2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f => 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4}/glibc.hash (70%) diff --git a/package/glibc/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/glibc.hash b/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash similarity index 70% rename from package/glibc/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/glibc.hash rename to package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash index 4b8d8297ec..595de95a58 100644 --- a/package/glibc/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/glibc.hash +++ b/package/glibc/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/glibc.hash @@ -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 diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 1eff245588..c911c29554 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -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. From 61730de4c0a83e7309bfd766df58c14410a543b3 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Sun, 22 Aug 2021 21:02:51 +0200 Subject: [PATCH 082/110] package/localedef: bump to version 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4 resync the version with glibc package. Dropped 2 patches (fixes backported from previous releases), rebased 2 which are kept (only line numbers changed). Suggested-by: Romain Naour Signed-off-by: Petr Vorel [Arnout: resolve conflicts] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...0001-HACK-only-build-and-install-localedef.patch | 8 ++++---- ...endency-on-GCC-to-4.8-and-binutils-to-2.24.patch | 13 ++++++------- .../localedef.hash | 2 +- package/localedef/localedef.mk | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) rename package/localedef/{2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f => 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4}/0001-HACK-only-build-and-install-localedef.patch (92%) rename package/localedef/{2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f => 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4}/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch (90%) rename package/localedef/{2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f => 2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4}/localedef.hash (70%) diff --git a/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch similarity index 92% rename from package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0001-HACK-only-build-and-install-localedef.patch rename to package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch index 0dcecc1a70..b289000c8a 100644 --- a/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0001-HACK-only-build-and-install-localedef.patch +++ b/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0001-HACK-only-build-and-install-localedef.patch @@ -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 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 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 diff --git a/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch b/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch similarity index 90% rename from package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch rename to package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch index 54c45650d5..297c96cc5e 100644 --- a/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch +++ b/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch @@ -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 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 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 diff --git a/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/localedef.hash b/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash similarity index 70% rename from package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/localedef.hash rename to package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash index 4b8d8297ec..595de95a58 100644 --- a/package/localedef/2.33-46-gedfd11197ecf3629bbb4b66c5814da09a61a7f9f/localedef.hash +++ b/package/localedef/2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/localedef.hash @@ -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 diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index d8dfdffaa2..87d921cffe 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -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 From e1ddac352de6c86511a1a27efd8e79495519bcd8 Mon Sep 17 00:00:00 2001 From: Sam Voss Date: Thu, 26 Aug 2021 16:02:40 -0500 Subject: [PATCH 083/110] package/busybox: add systemd service for telnetd Signed-off-by: Sam Voss Reviewed-by: Arnout Vandecappelle (Essensium/Mind) [yann.morin.1998@free.fr: - introduce BUSYBOX_INSTALL_TELNET_SERVICE - move _INSTALL_INIT_SYSTEMD alphabetically between openrc and sysv - drop the comment about Type=simple (Arnout) ] Signed-off-by: Yann E. MORIN --- package/busybox/busybox.mk | 10 ++++++++++ package/busybox/telnetd.service | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 package/busybox/telnetd.service diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 4b1fbade1d..560c4fe7b6 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -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) diff --git a/package/busybox/telnetd.service b/package/busybox/telnetd.service new file mode 100644 index 0000000000..8a640b761f --- /dev/null +++ b/package/busybox/telnetd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Telnetd Service +After=network.target + +[Service] +Type=simple +ExecStart=/usr/sbin/telnetd -F + +[Install] +WantedBy=multi-user.target From ba56bce06552ddb4fc10cf67e9daf13b17f0ad2c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 28 Aug 2021 12:58:07 +0200 Subject: [PATCH 084/110] package/boost: fix sparc build Fix the following build failure on sparc raised since bump to version 1.77.0 in commit d39d8f7cee9b4634e6f490020204f63fae419e8e: ./boost/predef/architecture/sparc.h:37:38: error: missing ')' in expression 37 | # if !defined(BOOST_ARCH_SPARC) && (defined(__sparcv9) || defined(__sparc_v9__) | ^ Fixes: - http://autobuild.buildroot.org/results/c1f15e3a0cefb7e65e5288fb4564d59a3b06a0bd Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../boost/0001-added-missing-brackets.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/boost/0001-added-missing-brackets.patch diff --git a/package/boost/0001-added-missing-brackets.patch b/package/boost/0001-added-missing-brackets.patch new file mode 100644 index 0000000000..1a2d5e67ec --- /dev/null +++ b/package/boost/0001-added-missing-brackets.patch @@ -0,0 +1,29 @@ +From 1be0e4a2d8db15a405f64a6f65507b87c1be7e1a Mon Sep 17 00:00:00 2001 +From: tkoecker +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 +--- + 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) From cc5e056508fba8b7561dcbe2a76cdacef8619a2a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 28 Aug 2021 13:05:13 +0200 Subject: [PATCH 085/110] package/sdl2: drop patch Drop patch (and so SDL2_RUN_AUTOGEN) as patch is already in version 2.0.16 which was applied to next by commit c80fbf269c020c53a6140ffbf328d64674a8ada0 Fixes: - http://autobuild.buildroot.org/results/4f9026e94373fb31ef7e45f8b4fd55adc178013a Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-building-with-KMSDRM-support-if-EGL.patch | 433 ------------------ package/sdl2/sdl2.mk | 8 - 2 files changed, 441 deletions(-) delete mode 100644 package/sdl2/0001-Buildsystem-Add-guards-for-not-building-with-KMSDRM-support-if-EGL.patch diff --git a/package/sdl2/0001-Buildsystem-Add-guards-for-not-building-with-KMSDRM-support-if-EGL.patch b/package/sdl2/0001-Buildsystem-Add-guards-for-not-building-with-KMSDRM-support-if-EGL.patch deleted file mode 100644 index b58c989f13..0000000000 --- a/package/sdl2/0001-Buildsystem-Add-guards-for-not-building-with-KMSDRM-support-if-EGL.patch +++ /dev/null @@ -1,433 +0,0 @@ -From 2fc987c28f14668a9ce360331f591e32e20c3906 Mon Sep 17 00:00:00 2001 -From: Manuel Alfayate Corchete -Date: Tue, 22 Dec 2020 14:15:33 +0100 -Subject: [PATCH] [Buildsystem] Add guards for not building with KMSDRM support - if EGL is not available. - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/libsdl-org/SDL/commit/2fc987c28f14668a9ce360331f591e32e20c3906] ---- - configure.ac | 29 ++++++++++++++++++- - src/video/kmsdrm/SDL_kmsdrmopengles.c | 4 +-- - src/video/kmsdrm/SDL_kmsdrmopengles.h | 4 +-- - src/video/kmsdrm/SDL_kmsdrmvideo.c | 22 +++++--------- - src/video/kmsdrm/SDL_kmsdrmvideo.h | 8 ----- - .../SDL_kmsdrm_legacy_opengles.c | 4 +-- - .../SDL_kmsdrm_legacy_opengles.h | 4 +-- - .../kmsdrm_legacy/SDL_kmsdrm_legacy_video.c | 20 ++----------- - .../kmsdrm_legacy/SDL_kmsdrm_legacy_video.h | 6 ++-- - 9 files changed, 47 insertions(+), 54 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b7e519b8f..acff858ba 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2236,7 +2236,10 @@ CheckKMSDRM() - AS_HELP_STRING([--enable-video-kmsdrm], [use KMSDRM video driver [[default=no]]]), - , enable_video_kmsdrm=no) - -- if test x$enable_video = xyes -a x$enable_video_kmsdrm = xyes; then -+ if test x$enable_video = xyes && \ -+ test x$enable_video_kmsdrm = xyes && \ -+ test x$video_opengl_egl = xyes; then -+ - video_kmsdrm=no - - PKG_CHECK_MODULES([LIBDRM], [libdrm >= 1.4.82], libdrm_avail=yes, libdrm_avail=no) -@@ -2418,6 +2421,28 @@ CheckOpenGLESX11() - fi - } - -+dnl Find EGL -+CheckEGLKMSDRM() -+{ -+ AC_MSG_CHECKING(for EGL support) -+ video_opengl_egl=no -+ AC_TRY_COMPILE([ -+ #define LINUX -+ #define EGL_API_FB -+ #define MESA_EGL_NO_X11_HEADERS -+ #define EGL_NO_X11 -+ #include -+ #include -+ ],[ -+ ],[ -+ video_opengl_egl=yes -+ ]) -+ AC_MSG_RESULT($video_opengl_egl) -+ if test x$video_opengl_egl = xyes; then -+ AC_DEFINE(SDL_VIDEO_OPENGL_EGL, 1, [ ]) -+ fi -+} -+ - dnl Check for Windows OpenGL - CheckWINDOWSGL() - { -@@ -3555,6 +3580,8 @@ case "$host" in - CheckRPI - CheckX11 - CheckDirectFB -+ # Need to check for EGL first because KMSDRM depends on it. -+ CheckEGLKMSDRM - CheckKMSDRM - CheckOpenGLX11 - CheckOpenGLESX11 -diff --git a/src/video/kmsdrm/SDL_kmsdrmopengles.c b/src/video/kmsdrm/SDL_kmsdrmopengles.c -index c9ec554b4..664621d2b 100644 ---- a/src/video/kmsdrm/SDL_kmsdrmopengles.c -+++ b/src/video/kmsdrm/SDL_kmsdrmopengles.c -@@ -22,7 +22,7 @@ - - #include "../../SDL_internal.h" - --#if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL -+#if SDL_VIDEO_DRIVER_KMSDRM - - #include "SDL_kmsdrmvideo.h" - #include "SDL_kmsdrmopengles.h" -@@ -376,6 +376,6 @@ KMSDRM_GLES_SwapWindow(_THIS, SDL_Window * window) - - SDL_EGL_MakeCurrent_impl(KMSDRM) - --#endif /* SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL */ -+#endif /* SDL_VIDEO_DRIVER_KMSDRM */ - - /* vi: set ts=4 sw=4 expandtab: */ -diff --git a/src/video/kmsdrm/SDL_kmsdrmopengles.h b/src/video/kmsdrm/SDL_kmsdrmopengles.h -index f81b0c3dc..c8db7da86 100644 ---- a/src/video/kmsdrm/SDL_kmsdrmopengles.h -+++ b/src/video/kmsdrm/SDL_kmsdrmopengles.h -@@ -24,7 +24,7 @@ - #ifndef SDL_kmsdrmopengles_h_ - #define SDL_kmsdrmopengles_h_ - --#if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL -+#if SDL_VIDEO_DRIVER_KMSDRM - - #include "../SDL_sysvideo.h" - #include "../SDL_egl_c.h" -@@ -42,7 +42,7 @@ extern SDL_GLContext KMSDRM_GLES_CreateContext(_THIS, SDL_Window * window); - extern int KMSDRM_GLES_SwapWindow(_THIS, SDL_Window * window); - extern int KMSDRM_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context); - --#endif /* SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL */ -+#endif /* SDL_VIDEO_DRIVER_KMSDRM */ - - #endif /* SDL_kmsdrmopengles_h_ */ - -diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c -index e84bd5ebc..663bc2170 100644 ---- a/src/video/kmsdrm/SDL_kmsdrmvideo.c -+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c -@@ -846,7 +846,6 @@ KMSDRM_CreateDevice(int devindex) - device->SetWindowGrab = KMSDRM_SetWindowGrab; - device->DestroyWindow = KMSDRM_DestroyWindow; - device->GetWindowWMInfo = KMSDRM_GetWindowWMInfo; --#if SDL_VIDEO_OPENGL_EGL - device->GL_DefaultProfileConfig = KMSDRM_GLES_DefaultProfileConfig; - device->GL_LoadLibrary = KMSDRM_GLES_LoadLibrary; - device->GL_GetProcAddress = KMSDRM_GLES_GetProcAddress; -@@ -857,9 +856,7 @@ KMSDRM_CreateDevice(int devindex) - device->GL_GetSwapInterval = KMSDRM_GLES_GetSwapInterval; - device->GL_SwapWindow = KMSDRM_GLES_SwapWindow; - device->GL_DeleteContext = KMSDRM_GLES_DeleteContext; --#endif -- device->PumpEvents = KMSDRM_PumpEvents; -- device->free = KMSDRM_DeleteDevice; -+ - #if SDL_VIDEO_VULKAN - device->Vulkan_LoadLibrary = KMSDRM_Vulkan_LoadLibrary; - device->Vulkan_UnloadLibrary = KMSDRM_Vulkan_UnloadLibrary; -@@ -867,6 +864,10 @@ KMSDRM_CreateDevice(int devindex) - device->Vulkan_CreateSurface = KMSDRM_Vulkan_CreateSurface; - device->Vulkan_GetDrawableSize = KMSDRM_Vulkan_GetDrawableSize; - #endif -+ -+ device->PumpEvents = KMSDRM_PumpEvents; -+ device->free = KMSDRM_DeleteDevice; -+ - return device; - - cleanup: -@@ -1327,9 +1328,7 @@ KMSDRM_DestroySurfaces(_THIS, SDL_Window *window) - SDL_DisplayData *dispdata = (SDL_DisplayData *)SDL_GetDisplayDriverData(0); - KMSDRM_PlaneInfo plane_info = {0}; - --#if SDL_VIDEO_OPENGL_EGL - EGLContext egl_context; --#endif - - /********************************************************************/ - /* BLOCK 1: protect the PRIMARY PLANE before destroying the buffers */ -@@ -1380,7 +1379,6 @@ KMSDRM_DestroySurfaces(_THIS, SDL_Window *window) - /* will get wrong info and we will be in trouble. */ - /***************************************************************************/ - --#if SDL_VIDEO_OPENGL_EGL - egl_context = (EGLContext)SDL_GL_GetCurrentContext(); - SDL_EGL_MakeCurrent(_this, EGL_NO_SURFACE, egl_context); - -@@ -1388,7 +1386,6 @@ KMSDRM_DestroySurfaces(_THIS, SDL_Window *window) - SDL_EGL_DestroySurface(_this, windata->egl_surface); - windata->egl_surface = EGL_NO_SURFACE; - } --#endif - - if (windata->gs) { - KMSDRM_gbm_surface_destroy(windata->gs); -@@ -1431,7 +1428,6 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window) - return SDL_SetError("Could not create GBM surface"); - } - --#if SDL_VIDEO_OPENGL_EGL - /* We can't get the EGL context yet because SDL_CreateRenderer has not been called, - but we need an EGL surface NOW, or GL won't be able to render into any surface - and we won't see the first frame. */ -@@ -1448,8 +1444,6 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window) - egl_context = (EGLContext)SDL_GL_GetCurrentContext(); - ret = SDL_EGL_MakeCurrent(_this, windata->egl_surface, egl_context); - --#endif -- - cleanup: - - if (ret) { -@@ -1478,11 +1472,11 @@ KMSDRM_DestroyWindow(_THIS, SDL_Window *window) - - if (!is_vulkan) { - KMSDRM_DestroySurfaces(_this, window); --#if SDL_VIDEO_OPENGL_EGL -+ - if (_this->egl_data) { - SDL_EGL_UnloadLibrary(_this); - } --#endif -+ - if (dispdata->gbm_init) { - KMSDRM_DeinitMouse(_this); - KMSDRM_GBMDeinit(_this, dispdata); -@@ -1754,7 +1748,6 @@ KMSDRM_CreateWindow(_THIS, SDL_Window * window) - goto cleanup; - } - --#if SDL_VIDEO_OPENGL_EGL - /* Manually load the EGL library. KMSDRM_EGL_LoadLibrary() has already - been called by SDL_CreateWindow() but we don't do anything there, - precisely to be able to load it here. -@@ -1766,7 +1759,6 @@ KMSDRM_CreateWindow(_THIS, SDL_Window * window) - goto cleanup; - } - } --#endif - - /* Can't init mouse stuff sooner because cursor plane is not ready. */ - KMSDRM_InitMouse(_this); -diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.h b/src/video/kmsdrm/SDL_kmsdrmvideo.h -index 2cf34522b..e58c922a8 100644 ---- a/src/video/kmsdrm/SDL_kmsdrmvideo.h -+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.h -@@ -34,10 +34,8 @@ - - #include - #include --#if SDL_VIDEO_OPENGL_EGL - #include - #include --#endif - - /****************************************************************************************/ - /* Driverdata pointers are void struct* used to store backend-specific variables */ -@@ -101,10 +99,6 @@ typedef struct SDL_DisplayData - EGLSyncKHR kms_fence; - EGLSyncKHR gpu_fence; - --#if SDL_VIDEO_OPENGL_EGL -- EGLSurface old_egl_surface; --#endif -- - SDL_bool modeset_pending; - SDL_bool gbm_init; - -@@ -129,9 +123,7 @@ typedef struct SDL_WindowData - struct gbm_bo *bo; - struct gbm_bo *next_bo; - --#if SDL_VIDEO_OPENGL_EGL - EGLSurface egl_surface; --#endif - - /* For scaling and AR correction. */ - int32_t src_w; -diff --git a/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_opengles.c b/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_opengles.c -index 890801891..a886eb326 100644 ---- a/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_opengles.c -+++ b/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_opengles.c -@@ -21,7 +21,7 @@ - - #include "../../SDL_internal.h" - --#if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL -+#if SDL_VIDEO_DRIVER_KMSDRM - - #include "SDL_log.h" - -@@ -147,6 +147,6 @@ KMSDRM_LEGACY_GLES_SwapWindow(_THIS, SDL_Window * window) { - - SDL_EGL_MakeCurrent_impl(KMSDRM_LEGACY) - --#endif /* SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL */ -+#endif /* SDL_VIDEO_DRIVER_KMSDRM */ - - /* vi: set ts=4 sw=4 expandtab: */ -diff --git a/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_opengles.h b/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_opengles.h -index 5e5ba96dc..2926cbe58 100644 ---- a/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_opengles.h -+++ b/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_opengles.h -@@ -23,7 +23,7 @@ - #ifndef SDL_kmsdrmopengles_h_ - #define SDL_kmsdrmopengles_h_ - --#if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL -+#if SDL_VIDEO_DRIVER_KMSDRM - - #include "../SDL_sysvideo.h" - #include "../SDL_egl_c.h" -@@ -41,7 +41,7 @@ extern SDL_GLContext KMSDRM_LEGACY_GLES_CreateContext(_THIS, SDL_Window * window - extern int KMSDRM_LEGACY_GLES_SwapWindow(_THIS, SDL_Window * window); - extern int KMSDRM_LEGACY_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context); - --#endif /* SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL */ -+#endif /* SDL_VIDEO_DRIVER_KMSDRM */ - - #endif /* SDL_kmsdrmopengles_h_ */ - -diff --git a/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.c b/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.c -index 36b1899bd..acddfc29a 100644 ---- a/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.c -+++ b/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.c -@@ -213,7 +213,7 @@ KMSDRM_LEGACY_CreateDevice(int devindex) - device->SetWindowGrab = KMSDRM_LEGACY_SetWindowGrab; - device->DestroyWindow = KMSDRM_LEGACY_DestroyWindow; - device->GetWindowWMInfo = KMSDRM_LEGACY_GetWindowWMInfo; --#if SDL_VIDEO_OPENGL_EGL -+ - device->GL_LoadLibrary = KMSDRM_LEGACY_GLES_LoadLibrary; - device->GL_GetProcAddress = KMSDRM_LEGACY_GLES_GetProcAddress; - device->GL_UnloadLibrary = KMSDRM_LEGACY_GLES_UnloadLibrary; -@@ -223,7 +223,7 @@ KMSDRM_LEGACY_CreateDevice(int devindex) - device->GL_GetSwapInterval = KMSDRM_LEGACY_GLES_GetSwapInterval; - device->GL_SwapWindow = KMSDRM_LEGACY_GLES_SwapWindow; - device->GL_DeleteContext = KMSDRM_LEGACY_GLES_DeleteContext; --#endif -+ - device->PumpEvents = KMSDRM_LEGACY_PumpEvents; - device->free = KMSDRM_LEGACY_DeleteDevice; - -@@ -369,14 +369,12 @@ KMSDRM_LEGACY_DestroySurfaces(_THIS, SDL_Window * window) - windata->next_bo = NULL; - } - --#if SDL_VIDEO_OPENGL_EGL - SDL_EGL_MakeCurrent(_this, EGL_NO_SURFACE, EGL_NO_CONTEXT); - - if (windata->egl_surface != EGL_NO_SURFACE) { - SDL_EGL_DestroySurface(_this, windata->egl_surface); - windata->egl_surface = EGL_NO_SURFACE; - } --#endif - - if (windata->gs) { - KMSDRM_LEGACY_gbm_surface_destroy(windata->gs); -@@ -394,18 +392,14 @@ KMSDRM_LEGACY_CreateSurfaces(_THIS, SDL_Window * window) - Uint32 height = dispdata->mode.vdisplay; - Uint32 surface_fmt = GBM_FORMAT_XRGB8888; - Uint32 surface_flags = GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING; --#if SDL_VIDEO_OPENGL_EGL - EGLContext egl_context; --#endif - - if (!KMSDRM_LEGACY_gbm_device_is_format_supported(viddata->gbm, surface_fmt, surface_flags)) { - SDL_LogWarn(SDL_LOG_CATEGORY_VIDEO, "GBM surface format not supported. Trying anyway."); - } - --#if SDL_VIDEO_OPENGL_EGL - SDL_EGL_SetRequiredVisualId(_this, surface_fmt); - egl_context = (EGLContext)SDL_GL_GetCurrentContext(); --#endif - - KMSDRM_LEGACY_DestroySurfaces(_this, window); - -@@ -415,7 +409,6 @@ KMSDRM_LEGACY_CreateSurfaces(_THIS, SDL_Window * window) - return SDL_SetError("Could not create GBM surface"); - } - --#if SDL_VIDEO_OPENGL_EGL - windata->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType)windata->gs); - - if (windata->egl_surface == EGL_NO_SURFACE) { -@@ -425,7 +418,6 @@ KMSDRM_LEGACY_CreateSurfaces(_THIS, SDL_Window * window) - SDL_EGL_MakeCurrent(_this, windata->egl_surface, egl_context); - - windata->egl_surface_dirty = 0; --#endif - - return 0; - } -@@ -734,15 +726,9 @@ KMSDRM_LEGACY_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode - SDL_Window *window = viddata->windows[i]; - SDL_WindowData *windata = (SDL_WindowData *)window->driverdata; - --#if SDL_VIDEO_OPENGL_EGL - /* Can't recreate EGL surfaces right now, need to wait until SwapWindow - so the correct thread-local surface and context state are available */ - windata->egl_surface_dirty = 1; --#else -- if (KMSDRM_LEGACY_CreateSurfaces(_this, window)) { -- return -1; -- } --#endif - - /* Tell app about the resize */ - SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, mode->w, mode->h); -@@ -758,13 +744,11 @@ KMSDRM_LEGACY_CreateWindow(_THIS, SDL_Window * window) - SDL_WindowData *windata; - SDL_VideoDisplay *display; - --#if SDL_VIDEO_OPENGL_EGL - if (!_this->egl_data) { - if (SDL_GL_LoadLibrary(NULL) < 0) { - goto error; - } - } --#endif - - /* Allocate window internal data */ - windata = (SDL_WindowData *)SDL_calloc(1, sizeof(SDL_WindowData)); -diff --git a/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.h b/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.h -index 28e1bc4fe..9df2bcfa3 100644 ---- a/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.h -+++ b/src/video/kmsdrm_legacy/SDL_kmsdrm_legacy_video.h -@@ -31,9 +31,7 @@ - #include - #include - #include --#if SDL_VIDEO_OPENGL_EGL - #include --#endif - - typedef struct SDL_VideoData - { -@@ -71,10 +69,10 @@ typedef struct SDL_WindowData - struct gbm_bo *crtc_bo; - SDL_bool waiting_for_flip; - SDL_bool double_buffer; --#if SDL_VIDEO_OPENGL_EGL -+ - int egl_surface_dirty; - EGLSurface egl_surface; --#endif -+ - } SDL_WindowData; - - typedef struct KMSDRM_LEGACY_FBInfo diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index f93c3fa879..1708180626 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -22,14 +22,6 @@ SDL2_CONF_OPTS += \ --disable-pulseaudio \ --disable-video-wayland -# We're patching configure.ac but autoreconf breaks the build -# The script only uses autoconf, not automake or libtool -SDL2_DEPENDENCIES += host-autoconf -define SDL2_RUN_AUTOGEN - cd $(@D) && PATH=$(BR_PATH) ./autogen.sh -endef -SDL2_PRE_CONFIGURE_HOOKS += SDL2_RUN_AUTOGEN - # We are using autotools build system for sdl2, so the sdl2-config.cmake # include path are not resolved like for sdl2-config script. # Change the absolute /usr path to resolve relatively to the sdl2-config.cmake location. From 0fe536b797cc0ae11bd54ed7046cd39b73780c18 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 28 Aug 2021 15:08:47 +0200 Subject: [PATCH 086/110] package/fakedate: avoid recursion if not first in the PATH With BR2_REPRODUCIBLE, our 'fakedate' wrapper script will end up in host/bin/date. Currently, it iterates over all the 'date' found in PATH, until it finds one that is not the script itself, in an attempt to avoid infinite recursion by calling itself again and again. This heuristic works OK in Buildroot, because host/bin/ is first in the PATH, and so that means the first entry in the PATH is skipped. However, this is going to fail as soon as our wrapper is not the first in the PATH. Indeed, in that situation, the current heuristic will stop on the first 'date' in the PATH, as it is not the script itself, and since our script was executed, that probably means the first 'date' was itself a wrapper that ended up calling us. So, calling it again will eventually trickle to calling us again, and thus creating the loop our heuristic was made to avoid. This situation currently does not occur in Buildroot, because host/bin/ is first, *and* we have no package that provide their own 'date' wrapper during their build steps. But when we generate an SDK with BR2_REPRODUCIBLE, then our wrapper script will be in sdk/bin/, and there is no longer any guarantee this comes first in the PATH, thus opening the possibility that another buildsystem based on our SDK, but which has its own 'date' wrapper, will trigger this infinite recursion. We fix that by iterating, in reverse order, over all the 'date' we can find in PATH, and when we find ourselves, then we know the one we found in the iteration just before is the one that we should call. 'which -a' is old enough that we can expect it to be always available; it has been present at least since Debian Squeeze, released 2011. Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/fakedate/fakedate | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/package/fakedate/fakedate b/package/fakedate/fakedate index a64d9b9cdf..9bef113357 100755 --- a/package/fakedate/fakedate +++ b/package/fakedate/fakedate @@ -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 From a4f83d39cf4bb4dd155b8f79d13b4349dd103c49 Mon Sep 17 00:00:00 2001 From: Herve Codina Date: Tue, 17 Aug 2021 10:39:15 +0200 Subject: [PATCH 087/110] package/pkg-python: fix PKG_PYTHON_FIXUP_SYSCONFIGDATA Find used by PKG_PYTHON_FIXUP_SYSCONFIGDATA can fail if directories are not present. This failure is silently ignored because find is on the LHS of a pipe. This commit fixes the find failure. HOST_DIR is used as the starting point and the search is filtered on the expected directories. This commit also adds -print0 and the $(Q) verbosity flag as minor changes. Signed-off-by: Herve Codina [yann.morin.1998@free.fr: - split long line with the two -path options - move "| xargs ..." onto its own line ] Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 59a48e5a87..8b24aeb3b1 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -92,11 +92,25 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --root=/ \ --single-version-externally-managed +# Make sure python _sysconfigdata*.py files only reference the current +# per-package directory. +# +# Can't use $(foreach d, $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python*, ...) +# because those directories may be created in the same recipe this macro will +# be expanded in. +# Additionally, either or both may be missing, which would make find whine and +# fail. +# So we just use HOST_DIR as a starting point, and filter on the two directories +# of interest. ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) define PKG_PYTHON_FIXUP_SYSCONFIGDATA - find $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python* \ - -name "_sysconfigdata*.py" | xargs --no-run-if-empty \ - $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g" + $(Q)find $(HOST_DIR) \ + \( -path '$(HOST_DIR)/lib/python*' \ + -o -path '$(STAGING_DIR)/usr/lib/python*' \ + \) \ + -name "_sysconfigdata*.py" -print0 \ + | xargs -0 --no-run-if-empty \ + $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' endef endif From afde8fb8f36267e7b025c26e700f76e9bb75706f Mon Sep 17 00:00:00 2001 From: Herve Codina Date: Tue, 17 Aug 2021 10:39:16 +0200 Subject: [PATCH 088/110] package/pkg-python: invalidate precompiled _sysconfigdata*.pyc For per-package directories, we fixup the _sysconfigdata*.py files, so that they get proper path pointing to the current package's direcotry structure. However, the corresponding, pre-compiled blobs _sysconfigdata*.pyc were left around, and thus are inconsistent with their source. They might also be regenerated when a package would install a python module; this regeneration would trigger the soon-to-be-introduced overwrite detection. This commit simply removes _sysconfigdata*.pyc files; they will anyway be regenerated by the PYTHON{,3}_CREATE_PYC_FILES target finalize hooks. This is an efficient way to guarantee the consistency between the source and precompiled versions, and to not trigger the overwrite detection. Signed-off-by: Herve Codina [yann.morin.1998@free.frs: reword the commit log] Signed-off-by: Yann E. MORIN --- package/pkg-python.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 8b24aeb3b1..ddf9e733fd 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -108,7 +108,9 @@ define PKG_PYTHON_FIXUP_SYSCONFIGDATA \( -path '$(HOST_DIR)/lib/python*' \ -o -path '$(STAGING_DIR)/usr/lib/python*' \ \) \ - -name "_sysconfigdata*.py" -print0 \ + \( \( -name "_sysconfigdata*.pyc" -delete \) \ + -o \( -name "_sysconfigdata*.py" -print0 \) \ + \) \ | xargs -0 --no-run-if-empty \ $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' endef From 6c1d9995b5c418080db2b18208a9823b9826aa0f Mon Sep 17 00:00:00 2001 From: Herve Codina Date: Tue, 17 Aug 2021 10:39:17 +0200 Subject: [PATCH 089/110] package/pkg-generic.mk: move python fixup to generic package infrastructure Fixing _sysconfigdata*.{py,pyc} was previously done by python package infrastructure. Some packages use python stuff without using python package infrastructure. These packages perform overwrites and need the specific python fixup to fix them. In order to be sure to fix all of these packages, the python fixup is moved to the generic package infrastructure and applied to all packages. This follows the same principle as for the .la libtool files fixup. Signed-off-by: Herve Codina Signed-off-by: Yann E. MORIN --- package/pkg-generic.mk | 27 ++++++++++++++++++++++++++- package/pkg-python.mk | 26 -------------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 97ee204b80..ded5176428 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -103,6 +103,30 @@ define fixup-libtool-files endef endif +# Make sure python _sysconfigdata*.py files only reference the current +# per-package directory. +# +# Can't use $(foreach d, $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python*, ...) +# because those directories may be created in the same recipe this macro will +# be expanded in. +# Additionally, either or both may be missing, which would make find whine and +# fail. +# So we just use HOST_DIR as a starting point, and filter on the two directories +# of interest. +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define FIXUP_PYTHON_SYSCONFIGDATA + $(Q)find $(HOST_DIR) \ + \( -path '$(HOST_DIR)/lib/python*' \ + -o -path '$(STAGING_DIR)/usr/lib/python*' \ + \) \ + \( \( -name "_sysconfigdata*.pyc" -delete \) \ + -o \( -name "_sysconfigdata*.py" -print0 \) \ + \) \ + | xargs -0 --no-run-if-empty \ + $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' +endef +endif + # Functions to collect statistics about installed files # $(1): base directory to search in @@ -836,7 +860,8 @@ $(2)_PRE_LEGAL_INFO_HOOKS ?= $(2)_POST_LEGAL_INFO_HOOKS ?= $(2)_TARGET_FINALIZE_HOOKS ?= $(2)_ROOTFS_PRE_CMD_HOOKS ?= -$(2)_POST_PREPARE_HOOKS ?= + +$(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA ifeq ($$($(2)_TYPE),target) ifneq ($$(HOST_$(2)_KCONFIG_VAR),) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index ddf9e733fd..e6b81bdfd3 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -92,30 +92,6 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --root=/ \ --single-version-externally-managed -# Make sure python _sysconfigdata*.py files only reference the current -# per-package directory. -# -# Can't use $(foreach d, $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python*, ...) -# because those directories may be created in the same recipe this macro will -# be expanded in. -# Additionally, either or both may be missing, which would make find whine and -# fail. -# So we just use HOST_DIR as a starting point, and filter on the two directories -# of interest. -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define PKG_PYTHON_FIXUP_SYSCONFIGDATA - $(Q)find $(HOST_DIR) \ - \( -path '$(HOST_DIR)/lib/python*' \ - -o -path '$(STAGING_DIR)/usr/lib/python*' \ - \) \ - \( \( -name "_sysconfigdata*.pyc" -delete \) \ - -o \( -name "_sysconfigdata*.py" -print0 \) \ - \) \ - | xargs -0 --no-run-if-empty \ - $(SED) 's:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$($(PKG)_NAME)/:g' -endef -endif - ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -260,8 +236,6 @@ $(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/$$($(2)_NEEDS_HOST_PYTHON) endif endif -$(2)_PRE_CONFIGURE_HOOKS += PKG_PYTHON_FIXUP_SYSCONFIGDATA - # # Build step. Only define it if not already defined by the package .mk # file. From 2f910229ef0c6a94b97db73f3fd22e878a64dcdd Mon Sep 17 00:00:00 2001 From: Herve Codina Date: Tue, 17 Aug 2021 10:39:18 +0200 Subject: [PATCH 090/110] package/owfs: remove Python sysconfigdata fixup This fixup is done at pkg-generic level for all packages. So, it is no more needed in owfs package. Signed-off-by: Herve Codina Reviewed-by: Yann E. MORIN Signed-off-by: Yann E. MORIN --- package/owfs/owfs.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/owfs/owfs.mk b/package/owfs/owfs.mk index ffc0b3098d..10543d3698 100644 --- a/package/owfs/owfs.mk +++ b/package/owfs/owfs.mk @@ -88,15 +88,6 @@ OWFS_DEPENDENCIES += python host-swig # override the PYSITEDIR variable in make. OWFS_EXTRA_MAKE_OPTS += PYSITEDIR=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define OWFS_FIXUP_PYTHON_SYSCONFIGDATA - find $(HOST_DIR)/lib/python* $(STAGING_DIR)/usr/lib/python* \ - -name "_sysconfigdata*.py" | xargs --no-run-if-empty \ - $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/owfs/:g" -endef -OWFS_PRE_CONFIGURE_HOOKS += OWFS_FIXUP_PYTHON_SYSCONFIGDATA -endif - else OWFS_CONF_OPTS += --disable-owpython --without-python endif From a3e3d9c198294e1848b692bfac4fa06d10706c1e Mon Sep 17 00:00:00 2001 From: Yauheni Saldatsenka Date: Wed, 25 Aug 2021 21:18:56 +0300 Subject: [PATCH 091/110] configs/stm32f469_disco_xip_defconfig: alternative defconfig for XIP Update STM32F469-disco configuration files to operate with new kernel. Result of make tinyconfig was taken as a starting point to fit kernel into flash memory. Current setup kernel + rootfs fits in 1.6MB on-chip flash memory Fixes: - Move kernel to new flash bank due to growth of dtb size - Fix kernel start address in bootloader - Remove outdated path which doesn't affect normal operation mode For better binary size optimization gcc LTO is turned on. Signed-off-by: Yauheni Saldatsenka [Arnout: - squash 3 patches into 1; - remove unused dts file; - move linux/linux.config to linux-xip.config; - add a sentence to readme to say SD card is not needed. ] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .../stm32f469-disco/flash_xip.sh | 20 +++ .../stm32f469-disco/linux-xip.config | 120 ++++++++++++++++++ ...32f469-i-Update-kernel-start-address.patch | 56 ++++++++ ...fault-dram-address-without-remapping.patch | 38 ++++++ .../stm32f469-disco/readme_xip.txt | 24 ++++ configs/stm32f469_disco_xip_defconfig | 18 +++ 6 files changed, 276 insertions(+) create mode 100644 board/stmicroelectronics/stm32f469-disco/flash_xip.sh create mode 100644 board/stmicroelectronics/stm32f469-disco/linux-xip.config create mode 100644 board/stmicroelectronics/stm32f469-disco/patches/afboot-stm32/0001-stm32f469-i-Update-kernel-start-address.patch create mode 100644 board/stmicroelectronics/stm32f469-disco/patches/linux/0001-Use-default-dram-address-without-remapping.patch create mode 100644 board/stmicroelectronics/stm32f469-disco/readme_xip.txt create mode 100644 configs/stm32f469_disco_xip_defconfig diff --git a/board/stmicroelectronics/stm32f469-disco/flash_xip.sh b/board/stmicroelectronics/stm32f469-disco/flash_xip.sh new file mode 100644 index 0000000000..b5a067cee5 --- /dev/null +++ b/board/stmicroelectronics/stm32f469-disco/flash_xip.sh @@ -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" diff --git a/board/stmicroelectronics/stm32f469-disco/linux-xip.config b/board/stmicroelectronics/stm32f469-disco/linux-xip.config new file mode 100644 index 0000000000..2d0ce59b31 --- /dev/null +++ b/board/stmicroelectronics/stm32f469-disco/linux-xip.config @@ -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 diff --git a/board/stmicroelectronics/stm32f469-disco/patches/afboot-stm32/0001-stm32f469-i-Update-kernel-start-address.patch b/board/stmicroelectronics/stm32f469-disco/patches/afboot-stm32/0001-stm32f469-i-Update-kernel-start-address.patch new file mode 100644 index 0000000000..d5d1e5a8ad --- /dev/null +++ b/board/stmicroelectronics/stm32f469-disco/patches/afboot-stm32/0001-stm32f469-i-Update-kernel-start-address.patch @@ -0,0 +1,56 @@ +From fe5f3a86d07e378baeeddc1dfecd0686d83aa42f Mon Sep 17 00:00:00 2001 +From: Yauheni Saldatsenka +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 +--- + 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 + diff --git a/board/stmicroelectronics/stm32f469-disco/patches/linux/0001-Use-default-dram-address-without-remapping.patch b/board/stmicroelectronics/stm32f469-disco/patches/linux/0001-Use-default-dram-address-without-remapping.patch new file mode 100644 index 0000000000..68fe8380a2 --- /dev/null +++ b/board/stmicroelectronics/stm32f469-disco/patches/linux/0001-Use-default-dram-address-without-remapping.patch @@ -0,0 +1,38 @@ +From 8ccf9f625d00138d86fb7d70f3efd58a8fb4d7ff Mon Sep 17 00:00:00 2001 +From: Yauheni Saldatsenka +Date: Mon, 23 Aug 2021 02:54:22 +0300 +Subject: [PATCH] Use default dram address without remapping + +Signed-off-by: Yauheni Saldatsenka +--- + 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 + diff --git a/board/stmicroelectronics/stm32f469-disco/readme_xip.txt b/board/stmicroelectronics/stm32f469-disco/readme_xip.txt new file mode 100644 index 0000000000..632d221ba1 --- /dev/null +++ b/board/stmicroelectronics/stm32f469-disco/readme_xip.txt @@ -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. diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig new file mode 100644 index 0000000000..1ceffe4026 --- /dev/null +++ b/configs/stm32f469_disco_xip_defconfig @@ -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 From 2ff70353948f60047d2e7c747378cc1402d59dce Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 21 Aug 2021 12:44:03 +0200 Subject: [PATCH 092/110] package/log4cxx: add libesmtp optional dependency libesmtp is an optional dependency (disabled by default) since version 0.10.0 and https://github.com/apache/logging-log4cxx/commit/8a35b429c6b1bc73635d9b6db482523619199a90 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/log4cxx/log4cxx.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk index 0ddea9466a..075f8cb371 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -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)) From a30204b005f484937a8b0a6a8b58a514394bfcfb Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 21 Aug 2021 15:46:45 +0200 Subject: [PATCH 093/110] utils/test-pkg: add mode to only prepare .config files Currently, running test-pkg is only done locally on the developers machine. In a follow up commit, we'll add the possibility to run test-pkg in a gitlab-ci pipeline and, to speed things up, with one job per buildable configuration. As such, we will need to make sure that test-pkg only prepares the configurations, and that it does not build them. Add such a mode, with a new option, --prepare-only Signed-off-by: Yann E. MORIN Cc: Romain Naour Cc: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/test-pkg | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/utils/test-pkg b/utils/test-pkg index 54c6c5e8fe..526b95b1fb 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -12,13 +12,13 @@ do_clean() { main() { local o O opts - local cfg dir pkg random toolchains_csv toolchain all number mode + local cfg dir pkg random toolchains_csv toolchain all number mode prepare_only local ret nb nb_skip nb_fail nb_legal nb_tc build_dir keep local -a toolchains local pkg_br_name o='hakc:d:n:p:r:t:' - O='help,all,keep,config-snippet:,build-dir:,number:,package:,random:,toolchains-csv:' + O='help,all,keep,prepare-only,config-snippet:,build-dir:,number:,package:,random:,toolchains-csv:' opts="$(getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}")" eval set -- "${opts}" @@ -27,6 +27,7 @@ main() { keep=0 number=0 mode=0 + prepare_only=0 toolchains_csv="${TOOLCHAINS_CSV}" while [ ${#} -gt 0 ]; do case "${1}" in @@ -39,6 +40,9 @@ main() { (-k|--keep) keep=1; shift 1 ;; + (--prepare-only) + prepare_only=1; shift 1 + ;; (-c|--config-snippet) cfg="${2}"; shift 2 ;; @@ -127,7 +131,7 @@ main() { toolchain="$(basename "${toolchainconfig}" .config)" build_dir="${dir}/${toolchain}" printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} ${nb} ${nb_tc} - build_one "${build_dir}" "${toolchainconfig}" "${cfg}" "${pkg}" && ret=0 || ret=${?} + build_one "${build_dir}" "${toolchainconfig}" "${cfg}" "${pkg}" "${prepare_only}" && ret=0 || ret=${?} case ${ret} in (0) printf "OK\n";; (1) : $((nb_skip++)); printf "SKIPPED\n";; @@ -147,6 +151,7 @@ build_one() { local toolchainconfig="${2}" local cfg="${3}" local pkg="${4}" + local prepare_only="${5}" mkdir -p "${dir}" @@ -170,6 +175,11 @@ build_one() { # Remove file, it's empty anyway. rm -f "${dir}/missing.config" + # Defer building the job to the caller (e.g. a gitlab pipeline) + if [ ${prepare_only} -eq 1 ]; then + return 0 + fi + if [ -n "${pkg}" ]; then if ! make O="${dir}" "${pkg}-dirclean" >> "${dir}/logfile" 2>&1; then return 2 @@ -257,6 +267,10 @@ Options: Note: the logfile and configuration is always retained, even without this option. + --prepare-only + Only prepare the .config files, but do not build them. Output the + list of build directories to stdout, and the status on stderr. + Example: Testing libcec would require a config snippet that contains: From 12c7a05da154f2056d0a2a1a72f5d066b8d7b87e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 21 Aug 2021 15:46:46 +0200 Subject: [PATCH 094/110] utils/test-pkg: add gitlab-ci support The gitlab-ci support in test-pkg allows to parallelize the test-pkg work into several gitlab jobs. It's much faster than local serialized testing. To trigger this, a developer will have to add, in the latest commit of their branch, a token on its own line, followed by a configuration fragment, e.g.: test-pkg config: SOME_OPTION=y # OTHER_OPTION is not set SOME_VARIABLE="some value" This configuration fragment is used as input to test-pkg. To be able to generate one job per test to run, we need the list of tests in the parent pipeline, and the individual .config files (one per test) in the child pipeline. We use the newly-introduced --prepare-only mode to test-pkg, and collect all the generated .config files as artefacts; those are inherited in the child pipeline via the "needs::pipeline" and "needs::job" directives. This is a bit tricky, and is best described by the Gitlab-CI documentation [0]. We also list those .config files to generate the actual list of jobs to run in the child pipeline. Notes: - if the user provides an empty fragment, this is considered an error: indeed, without a fragment (and the package name), there is no way to know what to test; - if that fragment yields an empty list of tests, then there is nothing to test either, so that is also considered an error. [0] https://docs.gitlab.com/ee/ci/yaml/README.html#artifact-downloads-to-child-pipelines Signed-off-by: Romain Naour Cc: Arnout Vandecappelle (Essensium/Mind) [yann.morin.1998@free.fr: - split the change to test-pkg to its own patch - generate the actual yml snippet in support/scripts/generate-gitlab-ci-yml, listing the .config files created by test-pkg - some code-style-candies... ] Signed-off-by: Yann E. MORIN Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .gitlab-ci.yml | 5 +++++ support/misc/gitlab-ci.yml.in | 22 +++++++++++++++++++++ support/scripts/generate-gitlab-ci-yml | 27 +++++++++++++++++++++++++- 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e85ac32033..bf9f2dca6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 1ee3772154..be7951b3d2 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -80,3 +80,25 @@ - test-output/*/.config - test-output/*/images/* +.test_pkg: + stage: build + before_script: + - OUTPUT_DIR=${CI_JOB_NAME} + script: + - echo "Configure Buildroot for ${OUTPUT_DIR}" + - make O=${OUTPUT_DIR} syncconfig + - make O=${OUTPUT_DIR} savedefconfig + - echo 'Build buildroot' + - *run_make + needs: + - pipeline: $PARENT_PIPELINE_ID + job: generate-gitlab-ci-yml + artifacts: + when: always + expire_in: 2 weeks + paths: + - build.log + - br-test-pkg/*/.config + - br-test-pkg/*/defconfig + - br-test-pkg/*/build/build-time.log + - br-test-pkg/*/build/packages-file-list*.txt diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml index 3f498e08fd..063c5081da 100755 --- a/support/scripts/generate-gitlab-ci-yml +++ b/support/scripts/generate-gitlab-ci-yml @@ -23,7 +23,7 @@ _EOF_ gen_tests() { local -a basics defconfigs runtimes - local do_basics do_defconfigs do_runtime + local do_basics do_defconfigs do_runtime do_testpkg local defconfigs_ext cfg tst basics=( DEVELOPERS flake8 package ) @@ -77,9 +77,30 @@ gen_tests() { esac fi + # Retrieve defconfig for test-pkg from the git commit message (if any) + if grep -q -E '^test-pkg config:$' <<<"${CI_COMMIT_DESCRIPTION}"; then + sed -r -n -e '/^test-pkg config:$/{:a;n;p;ba;}' \ + <<<"${CI_COMMIT_DESCRIPTION}" \ + >defconfig.frag + if [ ! -s defconfig.frag ]; then + printf "Empty configuration fragment.\n" >&2; exit 1 + fi + # Use --all since we expect the user having already pre-tested the + # new package with the default subset of toolchains. + ./utils/test-pkg \ + --all --prepare-only \ + --config-snippet defconfig.frag \ + --build-dir br-test-pkg >&2 + do_testpkg=( $(ls -1 br-test-pkg/*/.config 2>/dev/null |xargs -r dirname ) ) + if [ "${#do_testpkg[@]}" -eq 0 ]; then + printf "Configuration fragment enables no test.\n" >&2; exit 1 + fi + fi + # If nothing else, at least do the basics to generate a valid pipeline if [ -z "${do_defconfigs}" \ -a -z "${do_runtime}" \ + -a -z "${do_testpkg}" \ ] then do_basics=true @@ -101,6 +122,10 @@ gen_tests() { if ${do_runtime:-false}; then printf '%s: { extends: .runtime_test_base }\n' "${runtimes[@]}" fi + + if [ -n "${do_testpkg}" ]; then + printf '%s: { extends: .test_pkg }\n' "${do_testpkg[@]}" + fi } main "${@}" From 8c8a2973c7aaa42be1b057c45f42c7bd98c0d10b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Sun, 22 Aug 2021 18:41:21 +0000 Subject: [PATCH 095/110] package/luv: bump to version 1.41.1-0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/luv/luv.hash | 2 +- package/luv/luv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/luv/luv.hash b/package/luv/luv.hash index a619db2c76..2711328f3f 100644 --- a/package/luv/luv.hash +++ b/package/luv/luv.hash @@ -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 diff --git a/package/luv/luv.mk b/package/luv/luv.mk index 1a24a33bb2..b9f0d6a070 100644 --- a/package/luv/luv.mk +++ b/package/luv/luv.mk @@ -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 From 6d664e9cfe6475cf7020e0f7e802b53f082c2250 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 24 Aug 2021 08:43:57 +0200 Subject: [PATCH 096/110] package/sdl2: use BR2_PACKAGE_MESA3D_GBM BR2_PACKAGE_MESA3D_GBM should be used instead of BR2_PACKAGE_MESA3D_OPENGL_EGL as spotted by Arnout in review of https://patchwork.ozlabs.org/project/buildroot/patch/20210821093908.677218-1-fontaine.fabrice@gmail.com/ Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/sdl2/Config.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/sdl2/Config.in b/package/sdl2/Config.in index 07de75a4d5..2ad45e4d00 100644 --- a/package/sdl2/Config.in +++ b/package/sdl2/Config.in @@ -32,14 +32,13 @@ comment "X11 video driver needs X.org" config BR2_PACKAGE_SDL2_KMSDRM bool "KMS/DRM video driver" depends on BR2_PACKAGE_LIBDRM - # requires libgbm from mesa3d - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL + depends on BR2_PACKAGE_MESA3D_GBM comment "KMS/DRM video driver needs libdrm" depends on !BR2_PACKAGE_LIBDRM -comment "KMS/DRM video driver needs an OpenGL EGL backend provided by mesa3d" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL +comment "KMS/DRM video driver needs mesa3d w/ GBM" + depends on !BR2_PACKAGE_MESA3D_GBM config BR2_PACKAGE_SDL2_OPENGL bool "OpenGL (GLX)" From 17a7abbafee9bf4a971e00da7870ae439910e47e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 24 Aug 2021 08:49:16 +0200 Subject: [PATCH 097/110] package/mpv: use BR2_PACKAGE_MESA3D_GBM Use BR2_PACKAGE_MESA3D_GBM instead of BR2_PACKAGE_MESA3D_OPENGL_EGL as GBM can also be provided by a DRI driver Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mpv/Config.in | 2 +- package/mpv/mpv.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/mpv/Config.in b/package/mpv/Config.in index 81b1e24b5f..51c9799de8 100644 --- a/package/mpv/Config.in +++ b/package/mpv/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_MPV_SUPPORTS_VAAPI bool - default y if BR2_PACKAGE_LIBDRM && BR2_PACKAGE_MESA3D_OPENGL_EGL + default y if BR2_PACKAGE_LIBDRM && BR2_PACKAGE_MESA3D_GBM default y if BR2_PACKAGE_WAYLAND default y if BR2_PACKAGE_XORG7 diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index acda93f381..a71a4b3114 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -47,8 +47,7 @@ else MPV_CONF_OPTS += --disable-alsa endif -# GBM support is provided by mesa3d when EGL=y -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) +ifeq ($(BR2_PACKAGE_MESA3D_GBM),y) MPV_CONF_OPTS += --enable-gbm MPV_DEPENDENCIES += mesa3d ifeq ($(BR2_PACKAGE_LIBDRM),y) @@ -185,7 +184,7 @@ endif ifeq ($(BR2_PACKAGE_LIBVA)$(BR2_PACKAGE_MPV_SUPPORTS_VAAPI),yy) MPV_CONF_OPTS += --enable-vaapi MPV_DEPENDENCIES += libva -ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),yy) +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_MESA3D_GBM),yy) MPV_CONF_OPTS += --enable-vaapi-drm else MPV_CONF_OPTS += --disable-vaapi-drm From 21ccfccd93ea42971e7e2df779d69d883beadca3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 24 Aug 2021 09:01:41 +0200 Subject: [PATCH 098/110] package/mesa3d-demos: use BR2_PACKAGE_MESA3D_GBM Use BR2_PACKAGE_MESA3D_GBM introduced by commit b6c051acf787c804e732bc58ba8d7e440701a168 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/mesa3d-demos/mesa3d-demos.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index 4289acfffb..6b5262a2e9 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -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 From 50c5495f81d3418a0f63fc642dc6beb41cd316e0 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Thu, 26 Aug 2021 16:02:58 +0200 Subject: [PATCH 099/110] package/libqmi: bump to version 1.30.0 This release introduces meson build system support. As meson files are only available in git, switch the location to https://gitlab.freedesktop.org. Add support for bash-completion. Add an upstream patch fixing the compilation without gobject-intorspection. Signed-off-by: Yegor Yefremov Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...build-meson-fix-introspection-option.patch | 33 +++++++++++++++++ package/libqmi/libqmi.hash | 2 +- package/libqmi/libqmi.mk | 36 ++++++++++--------- 3 files changed, 54 insertions(+), 17 deletions(-) create mode 100644 package/libqmi/0001-build-meson-fix-introspection-option.patch diff --git a/package/libqmi/0001-build-meson-fix-introspection-option.patch b/package/libqmi/0001-build-meson-fix-introspection-option.patch new file mode 100644 index 0000000000..0528868025 --- /dev/null +++ b/package/libqmi/0001-build-meson-fix-introspection-option.patch @@ -0,0 +1,33 @@ +From bfb066419f288764edbade1e27e93a5dda59a5f4 Mon Sep 17 00:00:00 2001 +From: Aleksander Morgado +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 +--- + 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 diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index 0bfc63f4a4..0373bb4e75 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -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 diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index 7b1d76a0c1..05fd3ae9af 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -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)) From d3ab39fe09b691550adafebc02dc566929808675 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Thu, 26 Aug 2021 21:11:58 +0200 Subject: [PATCH 100/110] package/stunnel: bump to version 5.60 This release includes the following changes: - New features - New 'sessionResume' service-level option to allow or disallow session resumption - Added support for the new SSL_set_options() values. - Download fresh ca-certs.pem for each new release. - Bugfixes - Fixed 'redirect' with 'protocol'. This combination is not supported by 'smtp', 'pop3' and 'imap' protocols. - Enforced minimum WIN32 log window size. - Fixed support for password-protected private keys with OpenSSL 3.0 (thx to Dmitry Belyavskiy). - Added missing TLS options supported in OpenSSL 1.1.1k. Signed-off-by: Pierre-Jean Texier Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/stunnel/stunnel.hash | 4 ++-- package/stunnel/stunnel.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/stunnel/stunnel.hash b/package/stunnel/stunnel.hash index 0ae20cb906..b8cc62be13 100644 --- a/package/stunnel/stunnel.hash +++ b/package/stunnel/stunnel.hash @@ -1,5 +1,5 @@ -# From https://www.stunnel.org/downloads/stunnel-5.59.tar.gz.sha256 -sha256 137776df6be8f1701f1cd590b7779932e123479fb91e5192171c16798815ce9f stunnel-5.59.tar.gz +# From https://www.stunnel.org/downloads/stunnel-5.60.tar.gz.sha256 +sha256 c45d765b1521861fea9b03b425b9dd7d48b3055128c0aec673bba5ef9b8f787d stunnel-5.60.tar.gz # Locally calculated sha256 28b55d0157efd5ceb63640faeebb50fda13b1f49aec0b9c1240b9a3ea9f0eb4c COPYING.md sha256 62f171d4d8b6726df61f18a6bbc0a70f79c4bc2134d837d35c81fc6289a2d84d COPYRIGHT.md diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index cf2e29cb9b..cc56eb39a8 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -5,7 +5,7 @@ ################################################################################ STUNNEL_VERSION_MAJOR = 5 -STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).59 +STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).60 STUNNEL_SITE = http://www.usenix.org.uk/mirrors/stunnel/archive/$(STUNNEL_VERSION_MAJOR).x STUNNEL_DEPENDENCIES = host-pkgconf openssl STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \ From 8132216e0ecb1cd115ec9d1a211b967e5bda3054 Mon Sep 17 00:00:00 2001 From: Andreas Naumann Date: Tue, 17 Aug 2021 10:39:19 +0200 Subject: [PATCH 101/110] qt5: Fix sporadic build failure during top-level parallel build When using top level parallel build, independent qt5 packages may be built in parallel. Because of their staging dirs being hardlinked, they all use the same qt.conf file to manipulate during configure, while another qt5 package might already use it. This leads to weird build failures because the folders qmake is using are diverted in erratic ways. Fix this by actually recreating a non-shared qt.conf file for every package. Signed-off-by: Andreas Naumann Reviewed-by: Herve Codina Signed-off-by: Yann E. MORIN --- package/qt5/qt5.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index db6ccd2b42..3ffb7b0063 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -15,6 +15,7 @@ include $(sort $(wildcard package/qt5/*/*.mk)) # compiled into the Qt library. We need it to make "qmake" relocatable and # tweak the per-package install pathes define QT5_INSTALL_QT_CONF + rm -f $(HOST_DIR)/bin/qt.conf sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ $(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf endef From 040f75aa06829595ef8f3d9dea9382ba152ee34e Mon Sep 17 00:00:00 2001 From: Herve Codina Date: Tue, 17 Aug 2021 10:39:20 +0200 Subject: [PATCH 102/110] package/pkg-qmake.mk: Move QT5_QT_CONF_FIXUP to post-prepare hook QT5_QT_CONF_FIXUP tweaks files for per-package directory build. This is typically the kind of operation expected to be in post-prepare hook. Signed-off-by: Herve Codina Signed-off-by: Yann E. MORIN --- package/pkg-qmake.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index a77286fe3a..deb033c1d6 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -56,13 +56,14 @@ $(2)_DEPENDENCIES += host-perl $(2)_PRE_CONFIGURE_HOOKS += QT_HEADERS_SYNC_HOOK endif +$(2)_POST_PREPARE_HOOKS += QT5_QT_CONF_FIXUP + # # Configure step. Only define it if not already defined by the package # .mk file. # ifndef $(2)_CONFIGURE_CMDS define $(2)_CONFIGURE_CMDS - $$(QT5_QT_CONF_FIXUP) cd $$($(2)_BUILDDIR) && \ $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT5_QMAKE) $$($(2)_CONF_OPTS) endef From 1259d40b0ab2d436fad088f4b9288b9899ef19a4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 17 Aug 2021 10:39:27 +0200 Subject: [PATCH 103/110] support/testing/infra: add log_file_path() function Some tests will need to grep through the build log to verify that some features are working are expected. In order to allow them to open the build log, we provide a new function called log_file_path(), which returns the path to the log file if available. We also use this function in open_log_file(). Note that open_log_file() cannot be used directly to grep through the log file at the end of a build: because it opens in "a+" mode, it greps starting from the end of the file. Signed-off-by: Thomas Petazzoni Signed-off-by: Herve Codina Signed-off-by: Yann E. MORIN --- support/testing/infra/__init__.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/support/testing/infra/__init__.py b/support/testing/infra/__init__.py index b10a7601a3..1f003f24c6 100644 --- a/support/testing/infra/__init__.py +++ b/support/testing/infra/__init__.py @@ -10,17 +10,18 @@ ARTIFACTS_URL = "http://autobuild.buildroot.net/artefacts/" BASE_DIR = os.path.realpath(os.path.join(os.path.dirname(__file__), "../../..")) +def log_file_path(builddir, stage, logtofile=True): + """Return path to log file""" + return "{}-{}.log".format(builddir, stage) if logtofile else None + + def open_log_file(builddir, stage, logtofile=True): """ Open a file for logging and return its handler. If logtofile is True, returns sys.stdout. Otherwise opens a file with a suitable name in the build directory. """ - if logtofile: - fhandle = open("{}-{}.log".format(builddir, stage), 'a+') - else: - fhandle = sys.stdout - return fhandle + return open(log_file_path(builddir, stage, logtofile), 'a+') if logtofile else sys.stdout def basepath(relpath=""): From c938698b4a9e537d3e43c692a5c2a3a15c5d8d37 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 17 Aug 2021 10:39:28 +0200 Subject: [PATCH 104/110] support/testing/tests: add test for check_bin_arch This tests build a bogus package that installs a binary built for the host architecture into $(TARGET_DIR), which should cause a build failure, at least as long as the host architecture isn't ARM. Signed-off-by: Thomas Petazzoni Signed-off-by: Herve Codina [yann.morin.1998@free.fr: drop uneeded subprocess import to fix flake8] Signed-off-by: Yann E. MORIN --- .../br2-external/detect-bad-arch/Config.in | 1 + .../br2-external/detect-bad-arch/external.desc | 1 + .../br2-external/detect-bad-arch/external.mk | 1 + .../package/detect-bad-arch/Config.in | 4 ++++ .../package/detect-bad-arch/detect-bad-arch.mk | 15 +++++++++++++++ support/testing/tests/core/test_bad_arch.py | 18 ++++++++++++++++++ 6 files changed, 40 insertions(+) create mode 100644 support/testing/tests/core/br2-external/detect-bad-arch/Config.in create mode 100644 support/testing/tests/core/br2-external/detect-bad-arch/external.desc create mode 100644 support/testing/tests/core/br2-external/detect-bad-arch/external.mk create mode 100644 support/testing/tests/core/br2-external/detect-bad-arch/package/detect-bad-arch/Config.in create mode 100644 support/testing/tests/core/br2-external/detect-bad-arch/package/detect-bad-arch/detect-bad-arch.mk create mode 100644 support/testing/tests/core/test_bad_arch.py diff --git a/support/testing/tests/core/br2-external/detect-bad-arch/Config.in b/support/testing/tests/core/br2-external/detect-bad-arch/Config.in new file mode 100644 index 0000000000..530c077bbe --- /dev/null +++ b/support/testing/tests/core/br2-external/detect-bad-arch/Config.in @@ -0,0 +1 @@ +source "$BR2_EXTERNAL_DETECT_BAD_ARCH_PATH/package/detect-bad-arch/Config.in" diff --git a/support/testing/tests/core/br2-external/detect-bad-arch/external.desc b/support/testing/tests/core/br2-external/detect-bad-arch/external.desc new file mode 100644 index 0000000000..3c4232c90d --- /dev/null +++ b/support/testing/tests/core/br2-external/detect-bad-arch/external.desc @@ -0,0 +1 @@ +name: DETECT_BAD_ARCH diff --git a/support/testing/tests/core/br2-external/detect-bad-arch/external.mk b/support/testing/tests/core/br2-external/detect-bad-arch/external.mk new file mode 100644 index 0000000000..71b9821ddc --- /dev/null +++ b/support/testing/tests/core/br2-external/detect-bad-arch/external.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_DETECT_BAD_ARCH_PATH)/package/*/*.mk)) diff --git a/support/testing/tests/core/br2-external/detect-bad-arch/package/detect-bad-arch/Config.in b/support/testing/tests/core/br2-external/detect-bad-arch/package/detect-bad-arch/Config.in new file mode 100644 index 0000000000..9893e9afc1 --- /dev/null +++ b/support/testing/tests/core/br2-external/detect-bad-arch/package/detect-bad-arch/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_DETECT_BAD_ARCH + bool + default y + diff --git a/support/testing/tests/core/br2-external/detect-bad-arch/package/detect-bad-arch/detect-bad-arch.mk b/support/testing/tests/core/br2-external/detect-bad-arch/package/detect-bad-arch/detect-bad-arch.mk new file mode 100644 index 0000000000..5e78c55f1f --- /dev/null +++ b/support/testing/tests/core/br2-external/detect-bad-arch/package/detect-bad-arch/detect-bad-arch.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# detect-bad-arch +# +################################################################################ + +define DETECT_BAD_ARCH_BUILD_CMDS + echo "int main(void) { return 0; }" | $(HOSTCC) -x c -o $(@D)/foo - +endef + +define DETECT_BAD_ARCH_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/foo $(TARGET_DIR)/usr/bin/foo +endef + +$(eval $(generic-package)) diff --git a/support/testing/tests/core/test_bad_arch.py b/support/testing/tests/core/test_bad_arch.py new file mode 100644 index 0000000000..316231e28e --- /dev/null +++ b/support/testing/tests/core/test_bad_arch.py @@ -0,0 +1,18 @@ +import infra +import infra.basetest + + +class DetectBadArchTest(infra.basetest.BRConfigTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + infra.basetest.MINIMAL_CONFIG + br2_external = [infra.filepath("tests/core/br2-external/detect-bad-arch")] + + def test_run(self): + with self.assertRaises(SystemError): + self.b.build() + logf_path = infra.log_file_path(self.b.builddir, "build", + infra.basetest.BRConfigTest.logtofile) + if logf_path: + s = 'ERROR: architecture for "/usr/bin/foo" is' + with open(logf_path, "r") as f: + lines = [l for l in f.readlines() if l.startswith(s)] + self.assertEqual(len(lines), 1) From 62b135af5e1e2ad9ea38e33125b40b3ed074cf57 Mon Sep 17 00:00:00 2001 From: Thomas Claveirole Date: Mon, 2 Aug 2021 17:48:12 +0200 Subject: [PATCH 105/110] package/vuejs-router: new package Vue Router is the official router for Vue.js. Signed-off-by: Thomas Claveirole [Arnout: use comment instead of submenu] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 4 ++++ package/vuejs-router/Config.in | 6 ++++++ package/vuejs-router/vuejs-router.hash | 3 +++ package/vuejs-router/vuejs-router.mk | 19 +++++++++++++++++++ 5 files changed, 33 insertions(+) create mode 100644 package/vuejs-router/Config.in create mode 100644 package/vuejs-router/vuejs-router.hash create mode 100644 package/vuejs-router/vuejs-router.mk diff --git a/DEVELOPERS b/DEVELOPERS index 31bcd27747..66c5a6703c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2568,6 +2568,7 @@ F: package/x265/ N: Thomas Claveirole F: package/fcgiwrap/ F: package/openlayers/ +F: package/vuejs-router/ N: Thomas De Schampheleire F: docs/manual/ diff --git a/package/Config.in b/package/Config.in index 2dc105defa..2dbe511de0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1639,6 +1639,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" diff --git a/package/vuejs-router/Config.in b/package/vuejs-router/Config.in new file mode 100644 index 0000000000..ac79b3ea61 --- /dev/null +++ b/package/vuejs-router/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_VUEJS_ROUTER + bool "vuejs-router" + help + The official router for Vue.js. + + http://router.vuejs.org diff --git a/package/vuejs-router/vuejs-router.hash b/package/vuejs-router/vuejs-router.hash new file mode 100644 index 0000000000..62b16505ea --- /dev/null +++ b/package/vuejs-router/vuejs-router.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 d85cb70686cad36a087ad9586f1839c9997f707eb0065445fb1ea3d9218494f6 vue-router-4.0.10.tgz +sha256 9c0015250f592a09d7787efc07152afcf661fff6bda2554359f6d00987828c02 LICENSE diff --git a/package/vuejs-router/vuejs-router.mk b/package/vuejs-router/vuejs-router.mk new file mode 100644 index 0000000000..60e751e1d1 --- /dev/null +++ b/package/vuejs-router/vuejs-router.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# vuejs-router +# +################################################################################ + +VUEJS_ROUTER_VERSION = 4.0.10 +VUEJS_ROUTER_SOURCE = vue-router-$(VUEJS_ROUTER_VERSION).tgz +VUEJS_ROUTER_SITE = https://registry.npmjs.org/vue-router/- +VUEJS_ROUTER_LICENSE = MIT +VUEJS_ROUTER_LICENSE_FILES = LICENSE + +# Install .prod.js as .js +define VUEJS_ROUTER_INSTALL_TARGET_CMDS + $(INSTALL) -m 644 -D $(@D)/dist/vue-router.global.prod.js \ + $(TARGET_DIR)/var/www/vue-router.js +endef + +$(eval $(generic-package)) From dd1621b067cf2569198227a25080a127a05f7dc4 Mon Sep 17 00:00:00 2001 From: Andreas Naumann Date: Wed, 4 Aug 2021 16:02:11 +0200 Subject: [PATCH 106/110] package/qt5/qt5opcua: new package The Qt OPC UA module implements a Qt API to interact with OPC UA on top of a 3rd party OPC UA stack. The default is open62541, which is bundled by qt5opcua in version 1.0, so we dont need to provide/depend on br's own open62541 package. Another dependency is mbedtls, but it's optional. Signed-off-by: Andreas Naumann Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/qt5/Config.in | 1 + package/qt5/qt5opcua/Config.in | 9 +++++++++ package/qt5/qt5opcua/qt5opcua.hash | 10 ++++++++++ package/qt5/qt5opcua/qt5opcua.mk | 19 +++++++++++++++++++ 5 files changed, 40 insertions(+) create mode 100644 package/qt5/qt5opcua/Config.in create mode 100644 package/qt5/qt5opcua/qt5opcua.hash create mode 100644 package/qt5/qt5opcua/qt5opcua.mk diff --git a/DEVELOPERS b/DEVELOPERS index 66c5a6703c..1bc4a1370c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1962,6 +1962,7 @@ N: Naumann Andreas F: package/evemu/ F: package/libevdev/ F: package/pkg-qmake.mk +F: package/qt5/qt5opcua/ N: Nicola Di Lieto F: package/uacme/ diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 6714c6271d..6f2428d800 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -51,6 +51,7 @@ source "package/qt5/qt5location/Config.in" source "package/qt5/qt5lottie/Config.in" source "package/qt5/qt5mqtt/Config.in" source "package/qt5/qt5multimedia/Config.in" +source "package/qt5/qt5opcua/Config.in" source "package/qt5/qt5quickcontrols/Config.in" source "package/qt5/qt5quickcontrols2/Config.in" source "package/qt5/qt5quicktimeline/Config.in" diff --git a/package/qt5/qt5opcua/Config.in b/package/qt5/qt5opcua/Config.in new file mode 100644 index 0000000000..2b0ba37af3 --- /dev/null +++ b/package/qt5/qt5opcua/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_QT5OPCUA + bool "qt5opcua" + depends on BR2_PACKAGE_QT5 + help + Qt is a cross-platform application and UI framework for + developers using C++. + + The Qt OPC UA module implements a Qt API to interact with + OPC UA on top of a 3rd party OPC UA stack. diff --git a/package/qt5/qt5opcua/qt5opcua.hash b/package/qt5/qt5opcua/qt5opcua.hash new file mode 100644 index 0000000000..e55fb17743 --- /dev/null +++ b/package/qt5/qt5opcua/qt5opcua.hash @@ -0,0 +1,10 @@ +# Hash locally calculated +sha256 562171c6dfd6f4f072316ddb6d7c5bcc8907a68ba31005cb8c20ed75beff34fb qt5opcua-5.15.2-br1.tar.gz + +# Hashes for license files: +sha256 d93cc415382f0013088fa276d9cf82373badf244c78220a926f15ee46f0fe3c4 LICENSE-CC0 +sha256 f827ad079686ba92cc94811e35492d0e8966f704008b6da9eeda0b659fb58a8d LICENSE.FDL +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 +sha256 75d800e60c8d58c2e7f0338e8552ea6123a9ce7e5dd8e1cdf2095e013b737488 LICENSE.LGPLv3 diff --git a/package/qt5/qt5opcua/qt5opcua.mk b/package/qt5/qt5opcua/qt5opcua.mk new file mode 100644 index 0000000000..a58c4c5e14 --- /dev/null +++ b/package/qt5/qt5opcua/qt5opcua.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# qt5opcua +# +################################################################################ + +QT5OPCUA_VERSION = $(QT5_VERSION) +QT5OPCUA_SITE = https://code.qt.io/qt/qtopcua.git +QT5OPCUA_SITE_METHOD = git +QT5OPCUA_INSTALL_STAGING = YES +QT5OPCUA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) CC0-1.0 +QT5OPCUA_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL LICENSE-CC0 +QT5OPCUA_SYNC_QT_HEADERS = YES + +ifeq ($(BR2_PACKAGE_MBEDTLS),y) +QT5OPCUA_DEPENDENCIES += mbedtls +endif + +$(eval $(qmake-package)) From 51a282bcb8dfc26d3a27723383c5a1767653a19d Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Fri, 6 Aug 2021 15:48:54 +0300 Subject: [PATCH 107/110] package/rwmem: new package rwmem is small tool to read & write device registers. Some of the features include: - support mmaped and i2c devices - addressing with 8/16/32/64 bit addresses - accessing 8/16/32/64 bit memory locations - little and big endian addressess and accesses - bitfields - address ranges - register description database Python bindings are disabled for now. Signed-off-by: Tomi Valkeinen Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/Config.in | 1 + package/rwmem/Config.in | 10 ++++++++++ package/rwmem/rwmem.hash | 2 ++ package/rwmem/rwmem.mk | 14 ++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/rwmem/Config.in create mode 100644 package/rwmem/rwmem.hash create mode 100644 package/rwmem/rwmem.mk diff --git a/package/Config.in b/package/Config.in index 2dbe511de0..1fc8381048 100644 --- a/package/Config.in +++ b/package/Config.in @@ -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" diff --git a/package/rwmem/Config.in b/package/rwmem/Config.in new file mode 100644 index 0000000000..0fd9142e92 --- /dev/null +++ b/package/rwmem/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_RWMEM + bool "rwmem" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_FMT + select BR2_PACKAGE_INIH + help + Simple program to read/write from/to any location in memory. + + https://github.com/tomba/rwmem diff --git a/package/rwmem/rwmem.hash b/package/rwmem/rwmem.hash new file mode 100644 index 0000000000..9becbc5b21 --- /dev/null +++ b/package/rwmem/rwmem.hash @@ -0,0 +1,2 @@ +sha256 55d28f029c0cd5c21d3e1c89371e2905d5217f571ef5389ed0fce163804d1c4a rwmem-c8291705c82bb0686be9adf6a427a2b72114719a.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rwmem/rwmem.mk b/package/rwmem/rwmem.mk new file mode 100644 index 0000000000..24c4e92efc --- /dev/null +++ b/package/rwmem/rwmem.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# rwmem +# +################################################################################ + +RWMEM_VERSION = c8291705c82bb0686be9adf6a427a2b72114719a +RWMEM_SITE = $(call github,tomba,rwmem,$(RWMEM_VERSION)) +RWMEM_LICENSE = GPL-2.0 +RWMEM_LICENSE_FILES = LICENSE +RWMEM_CONF_OPTS = -Dpyrwmem=disabled +RWMEM_DEPENDENCIES = host-pkgconf fmt inih + +$(eval $(meson-package)) From 8dcd6ae36170282156e0522f9a1e9533d8c4c43d Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 13 Aug 2021 20:12:23 -0600 Subject: [PATCH 108/110] package/python-aioprocessing: new package Signed-off-by: James Hilliard [Arnout: add to DEVELOPERS] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-aioprocessing/Config.in | 8 ++++++++ .../python-aioprocessing/python-aioprocessing.hash | 5 +++++ .../python-aioprocessing/python-aioprocessing.mk | 14 ++++++++++++++ 5 files changed, 29 insertions(+) create mode 100644 package/python-aioprocessing/Config.in create mode 100644 package/python-aioprocessing/python-aioprocessing.hash create mode 100644 package/python-aioprocessing/python-aioprocessing.mk diff --git a/DEVELOPERS b/DEVELOPERS index 1bc4a1370c..5cedb8d6ea 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1231,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/ diff --git a/package/Config.in b/package/Config.in index 1fc8381048..899b493180 100644 --- a/package/Config.in +++ b/package/Config.in @@ -898,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" diff --git a/package/python-aioprocessing/Config.in b/package/python-aioprocessing/Config.in new file mode 100644 index 0000000000..2e76bc562b --- /dev/null +++ b/package/python-aioprocessing/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_AIOPROCESSING + bool "python-aioprocessing" + depends on BR2_PACKAGE_PYTHON3 + help + A Python 3.5+ library that integrates the multiprocessing + module with asyncio. + + https://github.com/dano/aioprocessing diff --git a/package/python-aioprocessing/python-aioprocessing.hash b/package/python-aioprocessing/python-aioprocessing.hash new file mode 100644 index 0000000000..cf92a72d4a --- /dev/null +++ b/package/python-aioprocessing/python-aioprocessing.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aioprocessing/json +md5 838b6aa073f1373bd42204f86b0e3196 aioprocessing-2.0.0.tar.gz +sha256 469dfb746e8c4e0c727ba135cfabf9e034c554f6a73c27f908bfe3625dd74b9e aioprocessing-2.0.0.tar.gz +# Locally computed sha256 checksums +sha256 53c809e8f0b91a68a39477e5fbdf77fe2b74dd6a1647c2dd9b7b22fed135239e LICENSE.txt diff --git a/package/python-aioprocessing/python-aioprocessing.mk b/package/python-aioprocessing/python-aioprocessing.mk new file mode 100644 index 0000000000..e1e919de2d --- /dev/null +++ b/package/python-aioprocessing/python-aioprocessing.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aioprocessing +# +################################################################################ + +PYTHON_AIOPROCESSING_VERSION = 2.0.0 +PYTHON_AIOPROCESSING_SOURCE = aioprocessing-$(PYTHON_AIOPROCESSING_VERSION).tar.gz +PYTHON_AIOPROCESSING_SITE = https://files.pythonhosted.org/packages/8e/3e/54266241660fb026bfd27f660d44cd81a4b7f8a145d8e2db010de12622a0 +PYTHON_AIOPROCESSING_SETUP_TYPE = setuptools +PYTHON_AIOPROCESSING_LICENSE = BSD-2-Clause +PYTHON_AIOPROCESSING_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) From 92207bc03f2358b28e0fd2cc3a41e40504b5d3d4 Mon Sep 17 00:00:00 2001 From: Jonah Petri Date: Thu, 26 Aug 2021 15:34:24 -0400 Subject: [PATCH 109/110] toolchain: handle toolchains with multiple ld*.so.* files Some 3rd party vendor toolchains have multiple files which match these glob patterns. In this case, the shell script failed. Switching to use find and xargs solves the issue. Signed-off-by: Jonah Petri Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- toolchain/helpers.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index dfb2581ed5..1dfb52ac38 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -135,10 +135,8 @@ copy_toolchain_sysroot = \ $(call simplify_symlink,$$i,$(STAGING_DIR)) ; \ done ; \ fi ; \ - if [ ! -e $(STAGING_DIR)/lib/ld*.so.* ]; then \ - if [ -e $${ARCH_SYSROOT_DIR}/lib/ld*.so.* ]; then \ - cp -a $${ARCH_SYSROOT_DIR}/lib/ld*.so.* $(STAGING_DIR)/lib/ ; \ - fi ; \ + if [[ ! $$(find $(STAGING_DIR)/lib -name 'ld*.so.*' -print -quit) ]]; then \ + find $${ARCH_SYSROOT_DIR}/lib -name 'ld*.so.*' -print0 | xargs -0 -I % cp % $(STAGING_DIR)/lib/; \ fi ; \ if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \ if [ ! -d $${ARCH_SYSROOT_DIR}/usr/include ] ; then \ From d7f0a9bd932b5fee8541f0fbb2c83c6da09d0575 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Thu, 26 Aug 2021 21:55:46 +0200 Subject: [PATCH 110/110] package/json-for-modern-cpp: bump version to 3.10.2 License file year changed to 2021. Signed-off-by: Michael Nosthoff [Arnout: update license hash] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/json-for-modern-cpp/json-for-modern-cpp.hash | 4 ++-- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.hash b/package/json-for-modern-cpp/json-for-modern-cpp.hash index eb9270b311..068868c048 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.hash +++ b/package/json-for-modern-cpp/json-for-modern-cpp.hash @@ -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 diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk index b644f3354c..14843380ee 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -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