configs/raspberrypi*: bump kernel version to 4f2a4cc
PATCH 1/6 configs/raspberrypi*: bump kernel version to 4f2a4cc
Now based on 4.19.113 (from 4.19.97).
--- configs/raspberrypi0_defconfig | 2 +- configs/raspberrypi0w_defconfig | 2 +- configs/raspberrypi2_defconfig | 2 +- configs/raspberrypi3_64_defconfig | 2 +- configs/raspberrypi3_defconfig | 2 +- configs/raspberrypi3_qt5we_defconfig | 2 +- configs/raspberrypi4_64_defconfig | 2 +- configs/raspberrypi4_defconfig | 2 +- configs/raspberrypi_defconfig | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)
configs/raspberrypi0_defconfig +1 -1
@@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the same
configs/raspberrypi0w_defconfig +1 -1
@@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w"
configs/raspberrypi2_defconfig +1 -1
@@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources
configs/raspberrypi3_64_defconfig +1 -1
@@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sources
configs/raspberrypi3_defconfig +1 -1
@@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources
configs/raspberrypi3_qt5we_defconfig +1 -1
@@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sources
configs/raspberrypi4_64_defconfig +1 -1
@@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources
configs/raspberrypi4_defconfig +1 -1
@@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sources
configs/raspberrypi_defconfig +1 -1
@@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources
Signature · 1 line
2.26.0
PATCH 2/6 package/rpi-userland: bump version to 6fb5973
--- package/rpi-userland/rpi-userland.hash | 4 ++-- package/rpi-userland/rpi-userland.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/rpi-userland/rpi-userland.hash +2 -2
@@ -1,3 +1,3 @@ # Locally computed -sha256 cf4dff40a2f4ec38bc7e42a80b989df1bf88e12d714f7e681f83c4e5a588f5c9 rpi-userland-06bc6daa02137ca72b7a2104afad81e82a44de17.tar.gz -sha256 bee6f1249175683d8610651706e1aa7dffcbfd3f9c4c05bc1e5ab34f313c2db5 LICENCE +sha256 f81fe28c636178645fb406cc87f543efa828ca896df856536f7b1b4ab54dfe0e rpi-userland-6fb59736b1ae80fc62cddfe3309c800f72e1c07e.tar.gz +sha256 bee6f1249175683d8610651706e1aa7dffcbfd3f9c4c05bc1e5ab34f313c2db5 LICENCE
package/rpi-userland/rpi-userland.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -RPI_USERLAND_VERSION = 06bc6daa02137ca72b7a2104afad81e82a44de17 +RPI_USERLAND_VERSION = 6fb59736b1ae80fc62cddfe3309c800f72e1c07e RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3-Clause RPI_USERLAND_LICENSE_FILES = LICENCE
Signature · 1 line
2.26.0
PATCH 3/6 package/rpi-firmware: bump version to 5574077
In reply to Peter Seiderer--- package/rpi-firmware/rpi-firmware.hash | 4 ++-- package/rpi-firmware/rpi-firmware.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/rpi-firmware/rpi-firmware.hash +2 -2
@@ -1,3 +1,3 @@ # Locally computed -sha256 31a84340be08be319570a9d1439f25c0e3513fed73065a56aa5dd61dd605d5d9 rpi-firmware-01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5.tar.gz -sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom +sha256 0596505f529677906fed30e6c3c1d2387a5d287f668a719484e2f9d8a3059176 rpi-firmware-5574077183389cd4c65077ba18b59144ed6ccd6d.tar.gz +sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom
package/rpi-firmware/rpi-firmware.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = 01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5 +RPI_FIRMWARE_VERSION = 5574077183389cd4c65077ba18b59144ed6ccd6d RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
Signature · 1 line
2.26.0
PATCH 4/6 package/rpi-bt-firmware: bump version to d4f7087
In reply to Peter Seiderer--- package/rpi-bt-firmware/rpi-bt-firmware.hash | 4 ++-- package/rpi-bt-firmware/rpi-bt-firmware.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/rpi-bt-firmware/rpi-bt-firmware.hash +2 -2
@@ -1,3 +1,3 @@ # Locally computed -sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-bt-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-bt-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz +sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx
package/rpi-bt-firmware/rpi-bt-firmware.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -RPI_BT_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327 +RPI_BT_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64 RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION)) RPI_BT_FIRMWARE_LICENSE = PROPRIETARY RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
Signature · 1 line
2.26.0
PATCH 4/6 package/rpi-bt-firmware: bump version to d4f7087
Peter, All,
On 2020-03-29 15:25 +0200, Peter Seiderer spake thusly:
Quoted 21 lines
Signed-off-by Peter Seiderer <[email protected]>--- package/rpi-bt-firmware/rpi-bt-firmware.hash | 4 ++-- package/rpi-bt-firmware/rpi-bt-firmware.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)package/rpi-bt-firmware/rpi-bt-firmware.hash +2
-2@@ -1,3 +1,3 @@ # Locally computed -sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-bt-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-bt-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz +sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xxpackage/rpi-bt-firmware/rpi-bt-firmware.mk +0
-0
package/rpi-bt-firmware/rpi-bt-firmware.mk line 8
Quoted 6 lines
package/rpi-bt-firmware/rpi-bt-firmware.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -RPI_BT_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327 +RPI_BT_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64 RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION))
Any reason why rpi-bt-firmware and rpi-wifi-firmware are two different packages, rather than a single one with an option for each of bt and wifi?
(yes I know that in the past, they had different upstreams, but now they've been merged into yet a third upstream, it would have made sense to mnerge them too...)
Yet, as I said to the first patch in the series: applied to master, thanks!
Regards,
Yann E. MORIN.
Quoted 9 lines
package/rpi-bt-firmware/rpi-bt-firmware.mk +0
-0RPI_BT_FIRMWARE_LICENSE = PROPRIETARY RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xxSignature · 6 lines
2.26.0 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 5/6 package/rpi-wifi-firmware: bump version to d4f7087
In reply to Peter Seiderer--- package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 4 ++-- package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/rpi-wifi-firmware/rpi-wifi-firmware.hash +2 -2
@@ -1,3 +1,3 @@ # Locally calculated -sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626 rpi-wifi-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a rpi-wifi-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz +sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx
package/rpi-wifi-firmware/rpi-wifi-firmware.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -RPI_WIFI_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327 +RPI_WIFI_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64 RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION)) RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
Signature · 1 line
2.26.0
PATCH 6/6 package/localedef: fix gcc-10.0.1 compile
In reply to Peter SeidererFixes bug 12711 ([1]):
programs/ld-ctype.c:855:18: error: array subscript 0 is outside the bounds of an interior zero-length array ?unsigned char[0]? [-Werror=zero-length-bounds]
855 | replace[0].bytes[0] = '?';
| ~~~~~~~~~~~~~~~~^~~[1] https://bugs.busybox.net/show_bug.cgi?id=12711
---
Notes:
Patch suggested by Yann E, MORIN, could not test personally (no gcc-10.0.1 available).
--- ...itializer-for-flexible-array-member-.patch | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0003-localedef-Use-initializer-for-flexible-array-member-.patch
package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0003-localedef-Use-initializer-for-flexible-array-member-.patch new file +81 -0
@@ -0,0 +1,81 @@ +From 6fea0a8e33760258c4baa5d0a6f3a145897427fe Mon Sep 17 00:00:00 2001 +From: Florian Weimer <[email protected]> +Date: Tue, 3 Sep 2019 14:01:39 +0200 +Subject: [PATCH] localedef: Use initializer for flexible array member [BZ + #24950] + +struct charseq used a zero-length array instead of a flexible array +member. This required a strange construct to initialize struct +charseq objects, and GCC 10 warns about that: + +cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] +In file included from programs/repertoire.h:24, + from programs/localedef.h:32, + from programs/ld-ctype.c:35: +programs/charmap.h:63:17: note: destination object declared here + 63 | unsigned char bytes[0]; + | ^~~~~ +cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] +programs/charmap.h:63:17: note: destination object declared here +cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] +programs/charmap.h:63:17: note: destination object declared here +cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] +programs/charmap.h:63:17: note: destination object declared here + +The change makes the object physically const, but it is not expected +to be modified. + +[Upstream: https://sourceware.org/git/?p=glibc.git;a=patch;h=1471fa556afb428c4a4c46cf5543a4101d5bcf91] +[Dropped confliciting ChangeLog part] +Signed-off-by: Peter Seiderer <[email protected]> +--- + locale/programs/charmap.h | 2 +- + locale/programs/ld-ctype.c | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/locale/programs/charmap.h b/locale/programs/charmap.h +index 870a9e95..70db330d 100644 +--- a/locale/programs/charmap.h ++++ b/locale/programs/charmap.h +@@ -60,7 +60,7 @@ struct charseq + const char *name; + uint32_t ucs4; + int nbytes; +- unsigned char bytes[0]; ++ unsigned char bytes[]; + }; + + +diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c +index cfc9c43f..9123f64a 100644 +--- a/locale/programs/ld-ctype.c ++++ b/locale/programs/ld-ctype.c +@@ -842,8 +842,6 @@ no input digits defined and none of the standard names in the charmap")); + for (cnt = 0; cnt < 10; ++cnt) + if (ctype->mboutdigits[cnt] == NULL) + { +- static struct charseq replace[2]; +- + if (!warned) + { + record_error (0, 0, _("\ +@@ -851,10 +849,12 @@ not all characters used in `outdigit' are available in the charmap")); + warned = 1; + } + +- replace[0].nbytes = 1; +- replace[0].bytes[0] = '?'; +- replace[0].bytes[1] = '\0'; +- ctype->mboutdigits[cnt] = &replace[0]; ++ static const struct charseq replace = ++ { ++ .nbytes = 1, ++ .bytes = "?", ++ }; ++ ctype->mboutdigits[cnt] = (struct charseq *) &replace; + } + + warned = 0; +-- +2.26.0 +
Signature · 1 line
2.26.0
PATCH 6/6 package/localedef: fix gcc-10.0.1 compile
Hello *,
this one leaked to the wrong branch ;-), ignore...
Regards,
Peter
Quoted 105 lines · Peter Seiderer
Fixes bug 12711 ([1]):
programs/ld-ctype.c:855:18: error: array subscript 0 is outside the bounds of an interior zero-length array ?unsigned char[0]? [-Werror=zero-length-bounds]855 | replace[0].bytes[0] = '?'; | ~~~~~~~~~~~~~~~~^~~[1] https://bugs.busybox.net/show_bug.cgi?id=12711
Signed-off-by Peter Seiderer <[email protected]>---
Notes:
Patch suggested by Yann E, MORIN, could not test personally (no gcc-10.0.1 available).--- ...itializer-for-flexible-array-member-.patch | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 package/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0003-localedef-Use-initializer-for-flexible-array-member-.patchpackage/localedef/2.30-20-g50f20fe506abb8853641006a7b90a81af21d7b91/0003-localedef-Use-initializer-for-flexible-array-member-.patch new file +81
-0@@ -0,0 +1,81 @@ +From 6fea0a8e33760258c4baa5d0a6f3a145897427fe Mon Sep 17 00:00:00 2001 +From: Florian Weimer <[email protected]> +Date: Tue, 3 Sep 2019 14:01:39 +0200 +Subject: [PATCH] localedef: Use initializer for flexible array member [BZ + #24950] + +struct charseq used a zero-length array instead of a flexible array +member. This required a strange construct to initialize struct +charseq objects, and GCC 10 warns about that: + +cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] +In file included from programs/repertoire.h:24, + from programs/localedef.h:32, + from programs/ld-ctype.c:35: +programs/charmap.h:63:17: note: destination object declared here + 63 | unsigned char bytes[0]; + | ^~~~~ +cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] +programs/charmap.h:63:17: note: destination object declared here +cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] +programs/charmap.h:63:17: note: destination object declared here +cc1: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] +programs/charmap.h:63:17: note: destination object declared here + +The change makes the object physically const, but it is not expected +to be modified. + +[Upstream: https://sourceware.org/git/?p=glibc.git;a=patch;h=1471fa556afb428c4a4c46cf5543a4101d5bcf91] +[Dropped confliciting ChangeLog part] +Signed-off-by: Peter Seiderer <[email protected]> +--- + locale/programs/charmap.h | 2 +- + locale/programs/ld-ctype.c | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/locale/programs/charmap.h b/locale/programs/charmap.h +index 870a9e95..70db330d 100644 +--- a/locale/programs/charmap.h ++++ b/locale/programs/charmap.h +@@ -60,7 +60,7 @@ struct charseq + const char *name; + uint32_t ucs4; + int nbytes; +- unsigned char bytes[0]; ++ unsigned char bytes[]; + }; + + +diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c +index cfc9c43f..9123f64a 100644 +--- a/locale/programs/ld-ctype.c ++++ b/locale/programs/ld-ctype.c +@@ -842,8 +842,6 @@ no input digits defined and none of the standard names in the charmap")); + for (cnt = 0; cnt < 10; ++cnt) + if (ctype->mboutdigits[cnt] == NULL) + { +- static struct charseq replace[2]; +- + if (!warned) + { + record_error (0, 0, _("\ +@@ -851,10 +849,12 @@ not all characters used in `outdigit' are available in the charmap")); + warned = 1; + } + +- replace[0].nbytes = 1; +- replace[0].bytes[0] = '?'; +- replace[0].bytes[1] = '\0'; +- ctype->mboutdigits[cnt] = &replace[0]; ++ static const struct charseq replace = ++ { ++ .nbytes = 1, ++ .bytes = "?", ++ }; ++ ctype->mboutdigits[cnt] = (struct charseq *) &replace; + } + + warned = 0; +-- +2.26.0 +
PATCH 1/6 configs/raspberrypi*: bump kernel version to 4f2a4cc
In reply to Peter SeidererPeter, All,
On 2020-03-29 15:25 +0200, Peter Seiderer spake thusly:
Quoted 3 lines
Now based on 4.19.113 (from 4.19.97).
Signed-off-by Peter Seiderer <[email protected]>
Series applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 136 lines
--- configs/raspberrypi0_defconfig | 2 +- configs/raspberrypi0w_defconfig | 2 +- configs/raspberrypi2_defconfig | 2 +- configs/raspberrypi3_64_defconfig | 2 +- configs/raspberrypi3_defconfig | 2 +- configs/raspberrypi3_qt5we_defconfig | 2 +- configs/raspberrypi4_64_defconfig | 2 +- configs/raspberrypi4_defconfig | 2 +- configs/raspberrypi_defconfig | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)configs/raspberrypi0_defconfig +1
-1@@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B from the kernel sources: the zero is the sameconfigs/raspberrypi0w_defconfig +1
-1@@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w"configs/raspberrypi2_defconfig +1
-1@@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sourcesconfigs/raspberrypi3_64_defconfig +1
-1@@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" # Build the DTB from the kernel sourcesconfigs/raspberrypi3_defconfig +1
-1@@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sourcesconfigs/raspberrypi3_qt5we_defconfig +1
-1@@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" # Build the DTB from the kernel sourcesconfigs/raspberrypi4_64_defconfig +1
-1@@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sourcesconfigs/raspberrypi4_defconfig +1
-1@@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" # Build the DTB from the kernel sourcesconfigs/raspberrypi_defconfig +1
-1@@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,64d0a9870ac14d5eb5253f67d984ae348eec1393)/linux-64d0a9870ac14d5eb5253f67d984ae348eec1393.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,4f2a4cc501c428c940549f39d5562e60404ac4f7)/linux-4f2a4cc501c428c940549f39d5562e60404ac4f7.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" # Build the DTBs for A/B, A+/B+ and compute module from the kernel sourcesSignature · 6 lines
2.26.0 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'