[Buildroot] [PATCH v2 00/18] apply patches with fuzz factor 0

[Buildroot] [PATCH v2 00/18] apply patches with fuzz factor 0

[Dario Binacchi]

The series will allow applying package patches with a fuzz factor of 0
instead of 2 (the patch command default value).
By setting the maximum fuzz factor to 0, we avoid that patches which
cannot be applied are incorrectly reported as valid, with positive
side-effects on version bumps.

To avoid regressions, it was necessary to fix all those patches that
were applicable with a fuzz factor of 1 or 2 before implementing this
change. The series was tested on commit 47078cc11862 ("package/zxing-cpp:
add options for enabling readers and/or writers") with a script that
executed the make legal-info command for all defconfigs contained in
Buildroot. Then, for all the affected packages, the compilation was
executed.

Dario Binacchi (18):
  board/orangepi/orangepi-zero: make the patches to be applied with fuzz
    0
  board/pine64/rock64: make the patches to be applied with fuzz 0
  boot/syslinux: update the patches to be applied with fuzz 0
  package/alsa-lib: update the patch to be applied with fuzz 0
  package/bzip2: update the patches to be applied with fuzz 0
  package/elfutils: update the patches to be applied with fuzz 0
  package/ffmpeg: update the patches to be applied with fuzz 0
  package/giflib: update the patches to be applied with fuzz 0
  package/libabseil-cpp: update the patch to be applied with fuzz 0
  package/libglib2: update the patches to be applied with fuzz 0
  package/libnl: update the patch to be applied with fuzz 0
  package/libopenssl: update the patches to be applied with fuzz 0
  package/openocd: update the patch to be applied with fuzz 0
  package/patchelf: update the patch to be applied with fuzz 0
  package/qemu: update the patches to be applied with fuzz 0
  package/qt5/qt5base: update the patches to be applied with fuzz 0
  package/vboot-utils: update the patches to be applied with fuzz 0
  support/scripts/apply-patches.sh: set the maximum fuzz factor to 0

 ...RM-dts-orange-pi-zero-enable-spi-nor.patch | 41 ++++++++--------
 ...ARM-dts-orange-pi-zero-enable-spidev.patch | 23 +++++----
 ...328-needs-itb-image-to-boot-properly.patch | 18 +++----
 .../0015-efi-main.c-include-efisetjmp.h.patch | 10 ++--
 ...01-Don-t-use-fork-on-noMMU-platforms.patch | 19 ++++----
 package/bzip2/0001-build-objects-twice.patch  | 14 +++---
 package/bzip2/0002-improve-build-system.patch | 12 +++--
 ...e-Werror-conditional-to-BUILD_WERROR.patch | 12 +++--
 .../0003-libavutil-Fix-mips-build.patch       | 16 ++++---
 ...dd-targets-to-manage-static-building.patch | 18 +++----
 ...veral-defects-found-by-Coverity-scan.patch | 20 ++++----
 ...0001-force-position-independent-code.patch | 14 +++---
 ...girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 16 ++++---
 ...workaround-to-the-libc-compat.h-copy.patch | 17 ++++---
 .../0003-Revert-Fix-static-builds.patch       | 16 ++++---
 ...01-configure-enable-build-on-uclinux.patch | 12 +++--
 ...ke-the-rpath-relative-under-a-specif.patch | 48 ++++++++++---------
 ...on-t-build-fp-bench-test-if-fenv.h-i.patch |  9 ++--
 .../qt5base/0006-Fix-build-on-riscv32.patch   | 18 +++----
 ...05-include-sys-sysmacros.h-for-major.patch | 12 +++--
 support/scripts/apply-patches.sh              |  2 +-
 21 files changed, 204 insertions(+), 163 deletions(-)

-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 01/18] board/orangepi/orangepi-zero: make the patches to be applied with fuzz 0

[Dario Binacchi]

This commit allows the Linux kernel patches to be applied with fuzz
factor 0. The fuzz factor specifies how many lines of the patch can be
inexactly matched, so the value 0 requires all lines to be exactly
matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 ...RM-dts-orange-pi-zero-enable-spi-nor.patch | 41 ++++++++++---------
 ...ARM-dts-orange-pi-zero-enable-spidev.patch | 23 +++++++----
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch b/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch
index ff0a1db223ea..ff350d68b4cc 100644
--- a/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch
+++ b/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch
@@ -1,4 +1,4 @@
-From 068c3baff3048a3db4ef2518ff917ce749cd8169 Mon Sep 17 00:00:00 2001
+From ddc295a04269437e5c726f63239689786354d44b Mon Sep 17 00:00:00 2001
 From: Sergey Matyukevich <geomatsi@gmail.com>
 Date: Sat, 20 May 2017 11:24:26 +0300
 Subject: [PATCH] ARM: dts: orange-pi-zero: enable SPI NOR
@@ -9,34 +9,37 @@ For more information see:
 - http://linux-sunxi.org/Orange_Pi_Zero#SPI_NOR_flash
 
 Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
- arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
+ .../boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts    | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
-index 4e1a9050c6b4..cdf19821b1f3 100644
+index 6b74cc923e16..4012f8712cd7 100644
 --- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
 +++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
-@@ -161,3 +161,19 @@
- 	/* USB VBUS is always on */
- 	status = "okay";
- };
-+
-+&spi0 {
+@@ -167,14 +167,18 @@ &ohci1 {
+ 
+ &spi0 {
+ 	/* Disable SPI NOR by default: it optional on Orange Pi Zero boards */
+-	status = "disabled";
 +	status = "okay";
-+
-+	flash@0 {
-+		#address-cells = <1>;
-+		#size-cells = <1>;
+ 
+ 	flash@0 {
+ 		#address-cells = <1>;
+ 		#size-cells = <1>;
+-		compatible = "mxicy,mx25l1606e", "jedec,spi-nor";
 +		compatible = "mxicy,mx25l1606e", "winbond,w25q128";
-+		reg = <0>;
-+		spi-max-frequency = <40000000>;
+ 		reg = <0>;
+ 		spi-max-frequency = <40000000>;
 +
 +		partition@00000000 {
 +			reg = <0x00000000 0x200000>;	/* 2Mb */
 +		};
-+	};
-+};
+ 	};
+ };
+ 
 -- 
-2.11.0
+2.43.0
 
diff --git a/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch b/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch
index 04d43c344f29..61dc97fd8b4f 100644
--- a/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch
+++ b/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch
@@ -1,4 +1,4 @@
-From 8dd1b2a696bb7e9914abd11cc6f5c0f54c33d626 Mon Sep 17 00:00:00 2001
+From 208b13119fc0f709935fc2fc13c0295b19edbbf5 Mon Sep 17 00:00:00 2001
 From: Sergey Matyukevich <geomatsi@gmail.com>
 Date: Sat, 20 May 2017 15:36:51 +0300
 Subject: [PATCH] ARM: dts: orange-pi-zero: enable spidev
@@ -7,27 +7,28 @@ On orange-pi-zero board SPI1 pins are accessible via GPIO expansion port.
 This patch enables spidev driver for SPI1.
 
 Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
- arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++
+ .../dts/allwinner/sun8i-h2-plus-orangepi-zero.dts     | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
 diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
-index cdf19821b1f3..7242aaecb14f 100644
+index 4012f8712cd7..3552eb312747 100644
 --- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
 +++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts
-@@ -59,6 +59,7 @@
- 		serial0 = &uart0;
+@@ -59,6 +59,7 @@ aliases {
  		/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
+ 		ethernet0 = &emac;
  		ethernet1 = &xr819;
 +		spi1 = &spi1;
  	};
  
  	chosen {
-@@ -177,3 +178,13 @@
- 		};
+@@ -182,6 +183,16 @@ partition@00000000 {
  	};
  };
-+
+ 
 +&spi1 {
 +	status = "okay";
 +
@@ -37,6 +38,10 @@ index cdf19821b1f3..7242aaecb14f 100644
 +		spi-max-frequency = <10000000>;
 +	};
 +};
++
+ &uart0 {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&uart0_pa_pins>;
 -- 
-2.11.0
+2.43.0
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 02/18] board/pine64/rock64: make the patches to be applied with fuzz 0

[Dario Binacchi]

This commit allows the U-Boot patch to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 ...3328-needs-itb-image-to-boot-properly.patch | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch b/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch
index 2d35b78daaf2..7c8473603457 100644
--- a/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch
+++ b/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch
@@ -1,4 +1,4 @@
-From 211bf049084e6e374dac253138fa813682910146 Mon Sep 17 00:00:00 2001
+From d312c4e40bf816823bdcfd066dd2511b23e83c9c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= <michal.lyszczek@bofc.pl>
 Date: Tue, 5 Feb 2019 22:08:54 +0100
 Subject: [PATCH] Makefile: rk3328 needs itb image to boot properly
@@ -7,16 +7,18 @@ Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Michał Łyszczek <michal.lyszczek@bofc.pl>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  Makefile | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/Makefile b/Makefile
-index 8086f3c93e..a6425b5b03 100644
+index 149f83994814..ebbdf2596b9b 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -799,6 +799,11 @@ ifneq ($(BUILD_ROM),)
- ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom
+@@ -923,6 +923,11 @@ ifeq ($(CONFIG_SYS_COREBOOT)$(CONFIG_SPL),yy)
+ ALL-$(CONFIG_BINMAN) += u-boot-x86-with-spl.bin
  endif
  
 +# rk3328 needs itb image to boot properly
@@ -24,9 +26,9 @@ index 8086f3c93e..a6425b5b03 100644
 +ALL-y += u-boot.itb
 +endif
 +
- # enable combined SPL/u-boot/dtb rules for tegra
- ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy)
- ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin
+ # Build a combined spl + u-boot image for sunxi
+ ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_SPL),yy)
+ ALL-y += u-boot-sunxi-with-spl.bin
 -- 
-2.18.1
+2.43.0
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 03/18] boot/syslinux: update the patches to be applied with fuzz 0

[Dario Binacchi]

This commit allows the syslinux patches to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 .../syslinux/0015-efi-main.c-include-efisetjmp.h.patch | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch b/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch
index 2fd61ecbc8fe..15adfc49f33c 100644
--- a/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch
+++ b/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch
@@ -1,4 +1,4 @@
-From 7d68fa68cd9f2987bd85339f3391913a8b0e58c7 Mon Sep 17 00:00:00 2001
+From 26979f738518404b1d3dc9ecdcf4fa5811412c49 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 Date: Tue, 24 Mar 2020 10:21:27 +0100
 Subject: [PATCH] efi/main.c: include <efisetjmp.h>
@@ -38,13 +38,15 @@ This is due to gnu-efi commit 486ba3c3bdd147b7d98159b9e650be60bce0f027
 So we act as specified, and include <efisetjmp.h> from efi/main.c.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 Upstream: https://www.syslinux.org/archives/2020-March/026621.html
 ---
  efi/main.c | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/efi/main.c b/efi/main.c
-index 6a748412..e924cfb1 100644
+index 71d31a5c1f13..7dc7bca7aeba 100644
 --- a/efi/main.c
 +++ b/efi/main.c
 @@ -12,6 +12,7 @@
@@ -54,7 +56,7 @@ index 6a748412..e924cfb1 100644
 +#include <efisetjmp.h>
  #include "fio.h"
  #include "version.h"
- #include "efi_pxe.h"
+ 
 -- 
-2.25.1
+2.43.0
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 04/18] package/alsa-lib: update the patch to be applied with fuzz 0

[Dario Binacchi]

This commit allows the package patch to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 ...01-Don-t-use-fork-on-noMMU-platforms.patch | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch b/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch
index 0d2b479534a0..87add9ff5666 100644
--- a/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch
+++ b/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch
@@ -1,4 +1,4 @@
-From 41c029755502acf01ed634db437ac06d09be6c41 Mon Sep 17 00:00:00 2001
+From ffc567b790005850c561f9f6590b069b61f5ba20 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 Date: Fri, 13 Apr 2018 09:02:37 +0200
 Subject: [PATCH] Don't use fork() on noMMU platforms
@@ -12,18 +12,21 @@ Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
 Upstream: http://mailman.alsa-project.org/pipermail/alsa-devel/2018-November/141376.html
 [Bernd: update patch for 1.2.4 & 1.2.7]
 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
+
 ---
  configure.ac         |  2 ++
  src/pcm/pcm_direct.c | 10 +++++++++-
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index cce195ae..0c852434 100644
+index 7a152a4abd20..3cf88c37db56 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -52,6 +52,8 @@ dnl Checks for library functions.
- AC_CHECK_FUNCS([uselocale])
- AC_CHECK_FUNCS([eaccess])
+@@ -56,6 +56,8 @@ AC_CHECK_FUNCS([eaccess])
+ dnl Enable largefile support
+ AC_SYS_LARGEFILE
  
 +AC_CHECK_FUNC([fork])
 +
@@ -31,10 +34,10 @@ index cce195ae..0c852434 100644
  AC_SUBST(LIBTOOL_VERSION_INFO)
  
 diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c
-index 2b07eff9..4dc3ea26 100644
+index e53e59238119..cf94c7c1dbf0 100644
 --- a/src/pcm/pcm_direct.c
 +++ b/src/pcm/pcm_direct.c
-@@ -437,13 +437,21 @@ int snd_pcm_direct_server_create(snd_pcm_direct_t *dmix)
+@@ -442,13 +442,21 @@ int snd_pcm_direct_server_create(snd_pcm_direct_t *dmix)
  		close(dmix->server_fd);
  		return ret;
  	}
@@ -58,5 +61,5 @@ index 2b07eff9..4dc3ea26 100644
  			server_job(dmix);
  		_exit(EXIT_SUCCESS);
 -- 
-2.14.3
+2.43.0
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 05/18] package/bzip2: update the patches to be applied with fuzz 0

[Dario Binacchi]

This commit allows the package patches to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 package/bzip2/0001-build-objects-twice.patch  | 14 ++++++++------
 package/bzip2/0002-improve-build-system.patch | 12 +++++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/package/bzip2/0001-build-objects-twice.patch b/package/bzip2/0001-build-objects-twice.patch
index 9bde0f6488c0..52b234f65a8e 100644
--- a/package/bzip2/0001-build-objects-twice.patch
+++ b/package/bzip2/0001-build-objects-twice.patch
@@ -8,14 +8,16 @@ and build the shared objects as *.sho instead of *.o.
 Then, we use these objects to create the shared library.
 
 Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 
 Index: bzip2-1.0.6/Makefile-libbz2_so
 ===================================================================
 --- bzip2-1.0.6.orig/Makefile-libbz2_so
 +++ bzip2-1.0.6/Makefile-libbz2_so
-@@ -25,13 +25,13 @@ SHELL=/bin/sh
- CC=gcc
- override CFLAGS += -fpic -fPIC -Wall
+@@ -26,13 +26,13 @@ CC=gcc
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+ CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
  
 -OBJS= blocksort.o  \
 -      huffman.o    \
@@ -33,10 +35,10 @@ Index: bzip2-1.0.6/Makefile-libbz2_so
 +      bzlib.sho
  
  all: $(OBJS)
- 	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
-@@ -45,17 +45,5 @@ install:
+ 	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
+@@ -43,17 +43,5 @@ all: $(OBJS)
  clean: 
- 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
+ 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared
  
 -blocksort.o: blocksort.c
 -	$(CC) $(CFLAGS) -c blocksort.c
diff --git a/package/bzip2/0002-improve-build-system.patch b/package/bzip2/0002-improve-build-system.patch
index 2d6e2cf900d2..11a856e49c96 100644
--- a/package/bzip2/0002-improve-build-system.patch
+++ b/package/bzip2/0002-improve-build-system.patch
@@ -20,12 +20,14 @@ This patch makes a number of improvements to the bzip2 build system:
    appropriate symbolic links.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 
 Index: b/Makefile
 ===================================================================
 --- a/Makefile
 +++ b/Makefile
-@@ -20,8 +20,7 @@
+@@ -20,8 +20,7 @@ AR=ar
  RANLIB=ranlib
  LDFLAGS=
  
@@ -35,7 +37,7 @@ Index: b/Makefile
  
  # Where you want it installed when you do 'make install'
  PREFIX=/usr/local
-@@ -90,14 +89,14 @@
+@@ -90,14 +89,14 @@ install: bzip2 bzip2recover
  	cp -f libbz2.a $(PREFIX)/lib
  	chmod a+r $(PREFIX)/lib/libbz2.a
  	cp -f bzgrep $(PREFIX)/bin/bzgrep
@@ -66,9 +68,9 @@ Index: b/Makefile-libbz2_so
 -CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
 +override CFLAGS += -fpic -fPIC -Wall
  
- OBJS= blocksort.o  \
-       huffman.o    \
-@@ -37,8 +36,11 @@
+ OBJS= blocksort.sho  \
+       huffman.sho    \
+@@ -37,8 +36,11 @@ OBJS= blocksort.sho  \
  all: $(OBJS)
  	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
  	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 06/18] package/elfutils: update the patches to be applied with fuzz 0

[Dario Binacchi]

This commit allows the package patches to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 ...lly-make-Werror-conditional-to-BUILD_WERROR.patch | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch b/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch
index 565a3c1bbb04..f35c2d48aad1 100644
--- a/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch
+++ b/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch
@@ -1,4 +1,4 @@
-From 2688a0238eaf825d6659c16c012db0c16f07e197 Mon Sep 17 00:00:00 2001
+From 064b74d5e19847794072781405eafe8dfbfca331 Mon Sep 17 00:00:00 2001
 From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
 Date: Mon, 29 May 2017 23:24:42 +0300
 Subject: [PATCH] Really make -Werror conditional to BUILD_WERROR
@@ -13,26 +13,28 @@ cc1: all warnings being treated as errors
 
 [Vincent: tweak patch for 0.166]
 [Bernd: rebased patch for 0.177 & 0.189]
+[Dario: make the patch to be applied with fuzz factor 0]
 
 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  config/eu.am | 1 -
  1 file changed, 1 deletion(-)
 
 diff --git a/config/eu.am b/config/eu.am
-index c2cc349ce876..99b368e09060 100644
+index e6c241f9d88a..cad1baa27a5f 100644
 --- a/config/eu.am
 +++ b/config/eu.am
-@@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
+@@ -99,7 +99,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
  	    $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
  	    $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
  	    $(USE_AFTER_FREE3_WARNING) \
 -	    $(if $($(*F)_no_Werror),,-Werror) \
  	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
  	    $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
- 	    $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \
+ 	    $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
 -- 
-2.17.1
+2.43.0
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 07/18] package/ffmpeg: update the patches to be applied with fuzz 0

[Dario Binacchi]

This commit allows the package patches to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 .../ffmpeg/0003-libavutil-Fix-mips-build.patch   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch
index ee2d1db8bdf8..a52d7fc347b4 100644
--- a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch
+++ b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch
@@ -1,4 +1,4 @@
-From 6e8daf0d502a2a822f1f08f42368d7d676dc1a9e Mon Sep 17 00:00:00 2001
+From e9d97f9d29ce57d7a5a62607c2a08e091a06de6e Mon Sep 17 00:00:00 2001
 From: Bernd Kuhls <bernd.kuhls@t-online.de>
 Date: Sun, 6 Jun 2021 08:54:53 +0200
 Subject: [PATCH] libavutil: Fix mips build
@@ -11,16 +11,18 @@ Patch sent upstream:
 http://ffmpeg.org/pipermail/ffmpeg-devel/2021-June/281272.html
 
 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  configure            | 2 ++
  libavutil/mips/cpu.c | 6 +++---
  2 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/configure b/configure
-index 6bfd98b384..773a7d516c 100755
+index a89cfa6d959d..6ec00df75312 100755
 --- a/configure
 +++ b/configure
-@@ -2191,6 +2191,7 @@ HEADERS_LIST="
+@@ -2227,6 +2227,7 @@ HEADERS_LIST="
      opencv2_core_core_c_h
      OpenGL_gl3_h
      poll_h
@@ -28,8 +30,8 @@ index 6bfd98b384..773a7d516c 100755
      sys_param_h
      sys_resource_h
      sys_select_h
-@@ -6361,6 +6361,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa
- check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepareToEncodeFrames -framework VideoToolbox
+@@ -6472,6 +6473,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa
+ check_func_headers VideoToolbox/VideoToolbox.h VTPixelRotationSessionCreate -framework VideoToolbox
  check_headers windows.h
  check_headers asm/types.h
 +check_headers sys/auxv.h
@@ -37,7 +39,7 @@ index 6bfd98b384..773a7d516c 100755
  # it seems there are versions of clang in some distros that try to use the
  # gcc headers, which explodes for stdatomic
 diff --git a/libavutil/mips/cpu.c b/libavutil/mips/cpu.c
-index 59619d54de..19196de50b 100644
+index 59619d54dee3..19196de50b59 100644
 --- a/libavutil/mips/cpu.c
 +++ b/libavutil/mips/cpu.c
 @@ -19,7 +19,7 @@
@@ -68,5 +70,5 @@ index 59619d54de..19196de50b 100644
          return cpu_flags_cpucfg();
      else
 -- 
-2.29.2
+2.34.1
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 08/18] package/giflib: update the patches to be applied with fuzz 0

[Dario Binacchi]

This commit allows the package patches to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 ...dd-targets-to-manage-static-building.patch | 18 +++++++++--------
 ...veral-defects-found-by-Coverity-scan.patch | 20 ++++++++++---------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch
index ba8d426bea11..31d7542e60c9 100644
--- a/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch
+++ b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch
@@ -1,4 +1,4 @@
-From 487407d722714f13e8a06d1a9d89f48a5738191e Mon Sep 17 00:00:00 2001
+From 409af8210f2256eed4d2c73083aa75975f03424b Mon Sep 17 00:00:00 2001
 From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 Date: Fri, 12 Jul 2019 12:20:38 +0200
 Subject: [PATCH] Makefile: add targets to manage static building
@@ -8,16 +8,18 @@ targets to allow the user to build giflib when dynamic library support
 is not available or enable on the toolchain
 
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 Upstream: https://sourceforge.net/p/giflib/code/merge-requests/7
 ---
  Makefile | 18 ++++++++++++++----
  1 file changed, 14 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index b2bf6de..111f52f 100644
+index 87966a96cd4f..4a93aace54b8 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -91,13 +91,20 @@ LIBUTILSO	= libutil.$(SOEXTENSION)
+@@ -87,13 +87,20 @@ LIBUTILSO	= libutil.$(SOEXTENSION)
  LIBUTILSOMAJOR	= libutil.$(LIBMAJOR).$(SOEXTENSION)
  endif
  
@@ -40,7 +42,7 @@ index b2bf6de..111f52f 100644
  
  $(LIBGIFSO): $(OBJECTS) $(HEADERS)
  ifeq ($(UNAME), Darwin)
-@@ -120,7 +127,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS)
+@@ -116,7 +123,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS)
  	$(AR) rcs libutil.a $(UOBJECTS)
  
  clean:
@@ -48,8 +50,8 @@ index b2bf6de..111f52f 100644
 +	rm -f $(UTILS) $(TARGET) libgetarg.a $(SHARED_LIBS) $(STATIC_LIBS) *.o
  	rm -f $(LIBGIFSOVER)
  	rm -f $(LIBGIFSOMAJOR)
- 	rm -fr doc/*.[17] *.html doc/staging
-@@ -145,12 +152,15 @@ install-bin: $(INSTALLABLE)
+ 	rm -fr doc/*.1 *.html doc/staging
+@@ -141,12 +148,15 @@ install-bin: $(INSTALLABLE)
  install-include:
  	$(INSTALL) -d "$(DESTDIR)$(INCDIR)"
  	$(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)"
@@ -64,8 +66,8 @@ index b2bf6de..111f52f 100644
  	ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)"
 +install-lib: install-static-lib install-shared-lib
  install-man:
- 	$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7"
- 	$(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1"
+ 	$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
+ 	$(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1"
 -- 
 2.43.0
 
diff --git a/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch b/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch
index f6816d07530a..77f21b402e95 100644
--- a/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch
+++ b/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch
@@ -1,4 +1,4 @@
-From a1c48b91cd1cf1e9bf7077709b69f4bfd4c4abc7 Mon Sep 17 00:00:00 2001
+From 7c3bce4add77944e5b479ef5da81ae7fd71a7e95 Mon Sep 17 00:00:00 2001
 From: Sandro Mani <manisandro@gmail.com>
 Date: Tue, 5 Dec 2023 16:38:48 -0700
 Subject: [PATCH] Fix several defects found by Coverity scan
@@ -10,15 +10,17 @@ Signed-off-by: Sandro Mani <manisandro@gmail.com>
 Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
 [Fabrice: updated for 5.2.2]
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
- gif2rgb.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
+ gif2rgb.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
 
 diff --git a/gif2rgb.c b/gif2rgb.c
-index d9a469f..02cea41 100644
+index d51226d65d3d..50c43ae44ee2 100644
 --- a/gif2rgb.c
 +++ b/gif2rgb.c
-@@ -170,6 +170,8 @@ static void SaveGif(GifByteType *OutputBuffer,
+@@ -165,6 +165,8 @@ static void SaveGif(GifByteType *OutputBuffer, int Width, int Height,
  	/* Open stdout for the output file: */
  	if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) {
  		PrintGifError(Error);
@@ -27,8 +29,8 @@ index d9a469f..02cea41 100644
  		exit(EXIT_FAILURE);
  	}
  
-@@ -179,6 +181,8 @@ static void SaveGif(GifByteType *OutputBuffer,
- 	     EGifPutImageDesc(GifFile, 0, 0, Width, Height, false, NULL) ==
+@@ -173,6 +175,8 @@ static void SaveGif(GifByteType *OutputBuffer, int Width, int Height,
+ 	    EGifPutImageDesc(GifFile, 0, 0, Width, Height, false, NULL) ==
  	        GIF_ERROR) {
  		PrintGifError(Error);
 +		free(OutputBuffer);
@@ -36,7 +38,7 @@ index d9a469f..02cea41 100644
  		exit(EXIT_FAILURE);
  	}
  
-@@ -187,6 +191,8 @@ static void SaveGif(GifByteType *OutputBuffer,
+@@ -182,6 +186,8 @@ static void SaveGif(GifByteType *OutputBuffer, int Width, int Height,
  
  	for (i = 0; i < Height; i++) {
  		if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) {
@@ -45,7 +47,7 @@ index d9a469f..02cea41 100644
  			exit(EXIT_FAILURE);
  		}
  		GifQprintf("\b\b\b\b%-4d", Height - i - 1);
-@@ -196,6 +203,8 @@ static void SaveGif(GifByteType *OutputBuffer,
+@@ -191,6 +197,8 @@ static void SaveGif(GifByteType *OutputBuffer, int Width, int Height,
  
  	if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) {
  		PrintGifError(Error);
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 09/18] package/libabseil-cpp: update the patch to be applied with fuzz 0

[Dario Binacchi]

This commit allows the package patch to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 .../0001-force-position-independent-code.patch     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/package/libabseil-cpp/0001-force-position-independent-code.patch b/package/libabseil-cpp/0001-force-position-independent-code.patch
index 6bf46bf0cb1b..a6ca9c0f0e9e 100644
--- a/package/libabseil-cpp/0001-force-position-independent-code.patch
+++ b/package/libabseil-cpp/0001-force-position-independent-code.patch
@@ -1,4 +1,4 @@
-From d170b19e500d85381369e379771be8d7816bcc92 Mon Sep 17 00:00:00 2001
+From 832765d12879fabf799dd80af6e8fee9cd298934 Mon Sep 17 00:00:00 2001
 From: Adam Duskett <Aduskett@gmail.com>
 Date: Tue, 21 Jul 2020 13:08:50 -0700
 Subject: [PATCH] force position independent code
@@ -16,17 +16,19 @@ cause relocation errors when shared libraries link against the built static
 libraries.
 
 Signed-off-by: Adam Duskett <Aduskett@gmail.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  CMake/AbseilHelpers.cmake | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake
-index 86ff9eb..bdb7a89 100644
+index 3bd33ce8718d..7f269bd20c21 100644
 --- a/CMake/AbseilHelpers.cmake
 +++ b/CMake/AbseilHelpers.cmake
-@@ -209,6 +209,8 @@ function(absl_cc_library)
-     set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD ${ABSL_CXX_STANDARD})
-     set_property(TARGET ${_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
+@@ -292,6 +292,8 @@ Cflags: -I\${includedir}${PC_CFLAGS}\n")
+       target_compile_features(${_NAME} PUBLIC ${ABSL_INTERNAL_CXX_STD_FEATURE})
+     endif()
  
 +    # Without this setting, other programs such as GRPC will fail when linking.
 +    set_property(TARGET ${_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -34,5 +36,5 @@ index 86ff9eb..bdb7a89 100644
      # to have properly named lib files.  This is a no-op when we are not being
      # installed.
 -- 
-2.26.2
+2.43.0
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 10/18] package/libglib2: update the patches to be applied with fuzz 0

[Dario Binacchi]

This commit allows the package patches to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 ...dd-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch
index fb9905724278..8f87671167f0 100644
--- a/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch
+++ b/package/libglib2/0001-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch
@@ -1,4 +1,4 @@
-From ff3db531608eb0f9de8a88c1bc34fe0f1d93121c Mon Sep 17 00:00:00 2001
+From 03e9cae3f3a7e2bbd5110f1ce2739601571bc024 Mon Sep 17 00:00:00 2001
 From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 Date: Fri, 12 Nov 2021 18:01:05 +0100
 Subject: [PATCH] meson.build: add girdir to gio-2.0.pc and glib-2.0.pc
@@ -14,6 +14,8 @@ Fixes:
  - http://autobuild.buildroot.org/results/3088ef32b03e0bb984291b1227b187f1ff816eb7
 
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 Upstream: Never submitted
 ---
  gio/meson.build  | 1 +
@@ -21,22 +23,22 @@ Upstream: Never submitted
  2 files changed, 2 insertions(+)
 
 diff --git a/gio/meson.build b/gio/meson.build
-index 29473d26b..112d4ada9 100644
+index 462606f3b56c..e6b736167b8d 100644
 --- a/gio/meson.build
 +++ b/gio/meson.build
-@@ -841,6 +841,7 @@ pkg.generate(libgio,
+@@ -880,6 +880,7 @@ pkg.generate(libgio,
    variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')),
                 'schemasdir=' + join_paths('${datadir}', schemas_subdir),
                 'bindir=' + join_paths('${prefix}', get_option('bindir')),
 +               'girdir=' + join_paths('${libdir}', '../share/gir-1.0'),
                 'giomoduledir=' + pkgconfig_giomodulesdir,
                 'gio=' + join_paths('${bindir}', 'gio'),
-                'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
+                'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'),
 diff --git a/glib/meson.build b/glib/meson.build
-index f78f32969..6c5486699 100644
+index da76fc005e46..cde2edb197c7 100644
 --- a/glib/meson.build
 +++ b/glib/meson.build
-@@ -384,6 +384,7 @@ pkg.generate(libglib,
+@@ -441,6 +441,7 @@ pkg.generate(libglib,
    subdirs : ['glib-2.0'],
    extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
    variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
@@ -45,5 +47,5 @@ index f78f32969..6c5486699 100644
                 'gobject_query=' + join_paths('${bindir}', 'gobject-query'),
                 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')],
 -- 
-2.33.0
+2.43.0
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 11/18] package/libnl: update the patch to be applied with fuzz 0

[Dario Binacchi]

This commit allows the package patch to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 ...l-workaround-to-the-libc-compat.h-copy.patch | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch
index 57d1c8747dea..4c833cfb22bc 100644
--- a/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch
+++ b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch
@@ -1,4 +1,4 @@
-From be07fdbc9658de19304defa7538f219cd3f21ec0 Mon Sep 17 00:00:00 2001
+From 5c984c942e2f9dca4a8380ed782519d9cb0f554d Mon Sep 17 00:00:00 2001
 From: Baruch Siach <baruch@tkos.co.il>
 Date: Sun, 12 Mar 2017 08:52:20 +0200
 Subject: [PATCH] Add musl workaround to the libc-compat.h copy
@@ -12,26 +12,25 @@ definitions will be needed. See the Buildroot iproute2 patch
 package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch.
 
 Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: libc-compat.h is a local copy of a kernel headers. A proper
-musl fix must go to the kernel first.
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  include/linux-private/linux/libc-compat.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/linux-private/linux/libc-compat.h b/include/linux-private/linux/libc-compat.h
-index 9bed5b6ae4d9..e2562a819464 100644
+index a1599911e7a9..f6df7193b8b4 100644
 --- a/include/linux-private/linux/libc-compat.h
 +++ b/include/linux-private/linux/libc-compat.h
-@@ -49,7 +49,7 @@
+@@ -50,7 +50,7 @@
  #define _LIBC_COMPAT_H
  
  /* We have included glibc headers... */
 -#if defined(__GLIBC__)
 +#if 1
  
- /* Coordinate with glibc netinet/in.h header. */
- #if defined(_NETINET_IN_H)
+ /* Coordinate with glibc net/if.h header. */
+ #if defined(_NET_IF_H) && defined(__USE_MISC)
 -- 
-2.11.0
+2.43.0
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 11/18] package/libnl: update the patch to be applied with fuzz 0

[Baruch Siach via buildroot]

Hi Dario,

On Wed, May 22 2024, Dario Binacchi wrote:
> This commit allows the package patch to be applied with fuzz factor 0.
> The fuzz factor specifies how many lines of the patch can be inexactly
> matched, so the value 0 requires all lines to be exactly matched.
>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
>  ...l-workaround-to-the-libc-compat.h-copy.patch | 17 ++++++++---------
>  1 file changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch
> index 57d1c8747dea..4c833cfb22bc 100644
> --- a/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch
> +++ b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch
> @@ -1,4 +1,4 @@
> -From be07fdbc9658de19304defa7538f219cd3f21ec0 Mon Sep 17 00:00:00 2001
> +From 5c984c942e2f9dca4a8380ed782519d9cb0f554d Mon Sep 17 00:00:00 2001
>  From: Baruch Siach <baruch@tkos.co.il>
>  Date: Sun, 12 Mar 2017 08:52:20 +0200
>  Subject: [PATCH] Add musl workaround to the libc-compat.h copy
> @@ -12,26 +12,25 @@ definitions will be needed. See the Buildroot iproute2 patch
>  package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch.
>  
>  Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ----
> -Upstream status: libc-compat.h is a local copy of a kernel headers. A proper
> -musl fix must go to the kernel first.
> +[Dario: make the patch to be applied with fuzz factor 0]
> +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

I think this patch is not needed anymore since libnl version 3.5.0.

I have not tested though.

baruch

>  ---
>   include/linux-private/linux/libc-compat.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>  
>  diff --git a/include/linux-private/linux/libc-compat.h b/include/linux-private/linux/libc-compat.h
> -index 9bed5b6ae4d9..e2562a819464 100644
> +index a1599911e7a9..f6df7193b8b4 100644
>  --- a/include/linux-private/linux/libc-compat.h
>  +++ b/include/linux-private/linux/libc-compat.h
> -@@ -49,7 +49,7 @@
> +@@ -50,7 +50,7 @@
>   #define _LIBC_COMPAT_H
>   
>   /* We have included glibc headers... */
>  -#if defined(__GLIBC__)
>  +#if 1
>   
> - /* Coordinate with glibc netinet/in.h header. */
> - #if defined(_NETINET_IN_H)
> + /* Coordinate with glibc net/if.h header. */
> + #if defined(_NET_IF_H) && defined(__USE_MISC)
>  -- 
> -2.11.0
> +2.43.0

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 11/18] package/libnl: update the patch to be applied with fuzz 0

[Arnout Vandecappelle via buildroot]

On 22/05/2024 10:15, Baruch Siach via buildroot wrote:
> Hi Dario,
> 
> On Wed, May 22 2024, Dario Binacchi wrote:
>> This commit allows the package patch to be applied with fuzz factor 0.
>> The fuzz factor specifies how many lines of the patch can be inexactly
>> matched, so the value 0 requires all lines to be exactly matched.
>>
>> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>> ---
>>   ...l-workaround-to-the-libc-compat.h-copy.patch | 17 ++++++++---------
>>   1 file changed, 8 insertions(+), 9 deletions(-)
>>
>> diff --git a/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch
>> index 57d1c8747dea..4c833cfb22bc 100644
>> --- a/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch
>> +++ b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch
>> @@ -1,4 +1,4 @@
>> -From be07fdbc9658de19304defa7538f219cd3f21ec0 Mon Sep 17 00:00:00 2001
>> +From 5c984c942e2f9dca4a8380ed782519d9cb0f554d Mon Sep 17 00:00:00 2001
>>   From: Baruch Siach <baruch@tkos.co.il>
>>   Date: Sun, 12 Mar 2017 08:52:20 +0200
>>   Subject: [PATCH] Add musl workaround to the libc-compat.h copy
>> @@ -12,26 +12,25 @@ definitions will be needed. See the Buildroot iproute2 patch
>>   package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch.
>>   
>>   Signed-off-by: Baruch Siach <baruch@tkos.co.il>
>> ----
>> -Upstream status: libc-compat.h is a local copy of a kernel headers. A proper
>> -musl fix must go to the kernel first.

  This shouldn't have been removed. Instead, I converted it to a proper 
Upstream: tag (and updated .checkpackageignore accordingly).

>> +[Dario: make the patch to be applied with fuzz factor 0]
>> +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> 
> I think this patch is not needed anymore since libnl version 3.5.0.
> 
> I have not tested though.

  Since it's not sure, I've kept the patch.

  Regards,
  Arnout

> 
> baruch
> 
>>   ---
>>    include/linux-private/linux/libc-compat.h | 2 +-
>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>   
>>   diff --git a/include/linux-private/linux/libc-compat.h b/include/linux-private/linux/libc-compat.h
>> -index 9bed5b6ae4d9..e2562a819464 100644
>> +index a1599911e7a9..f6df7193b8b4 100644
>>   --- a/include/linux-private/linux/libc-compat.h
>>   +++ b/include/linux-private/linux/libc-compat.h
>> -@@ -49,7 +49,7 @@
>> +@@ -50,7 +50,7 @@
>>    #define _LIBC_COMPAT_H
>>    
>>    /* We have included glibc headers... */
>>   -#if defined(__GLIBC__)
>>   +#if 1
>>    
>> - /* Coordinate with glibc netinet/in.h header. */
>> - #if defined(_NETINET_IN_H)
>> + /* Coordinate with glibc net/if.h header. */
>> + #if defined(_NET_IF_H) && defined(__USE_MISC)
>>   --
>> -2.11.0
>> +2.43.0
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 12/18] package/libopenssl: update the patches to be applied with fuzz 0

[Dario Binacchi]

This commit allows the package patches to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 .../0003-Revert-Fix-static-builds.patch          | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/package/libopenssl/0003-Revert-Fix-static-builds.patch b/package/libopenssl/0003-Revert-Fix-static-builds.patch
index 149ad54fc53f..b4b78c97fc49 100644
--- a/package/libopenssl/0003-Revert-Fix-static-builds.patch
+++ b/package/libopenssl/0003-Revert-Fix-static-builds.patch
@@ -1,4 +1,4 @@
-From 847a7b744e31b9f57d2a3de495187db1dc0ee6d7 Mon Sep 17 00:00:00 2001
+From a048522f64dbbe90cf77aea0c3f47cccdad50742 Mon Sep 17 00:00:00 2001
 From: Bernd Kuhls <bernd@kuhls.net>
 Date: Fri, 21 Jul 2023 19:30:40 +0200
 Subject: [PATCH] Revert "Fix -static builds"
@@ -8,17 +8,19 @@ This reverts commit cfd7225fbb9507b2e443a494459bdaab5236d29d.
 Upstream: https://github.com/openssl/openssl/issues/14574#issuecomment-817209126
 
 Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  Configure | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Configure b/Configure
-index 2c17f4186b..94cab4c3c4 100755
+index 2a5e58805c3b..0e8c1ce5cc74 100755
 --- a/Configure
 +++ b/Configure
-@@ -1377,10 +1377,6 @@ foreach (keys %useradd) {
- # At this point, we can forget everything about %user and %useradd,
- # because it's now all been merged into the corresponding $config entry
+@@ -1466,10 +1466,6 @@ if ($config{prefix} && !$config{CROSS_COMPILE}) {
+         unless file_name_is_absolute($config{prefix});
+ }
  
 -if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) {
 -    disable('static', 'pic', 'threads');
@@ -27,7 +29,7 @@ index 2c17f4186b..94cab4c3c4 100755
  # Allow overriding the build file name
  $config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile";
  
-@@ -1671,6 +1667,10 @@ if ($strict_warnings)
+@@ -1764,6 +1760,10 @@ if ($strict_warnings)
                  }
          }
  
@@ -39,5 +41,5 @@ index 2c17f4186b..94cab4c3c4 100755
                                ? @strict_warnings_collection
                                : ( $_ ) }
 -- 
-2.39.2
+2.43.0
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 13/18] package/openocd: update the patch to be applied with fuzz 0

[Dario Binacchi]

This commit allows the package patch to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 .../0001-configure-enable-build-on-uclinux.patch     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/package/openocd/0001-configure-enable-build-on-uclinux.patch b/package/openocd/0001-configure-enable-build-on-uclinux.patch
index 2f2d3208405f..d5f1e3295823 100644
--- a/package/openocd/0001-configure-enable-build-on-uclinux.patch
+++ b/package/openocd/0001-configure-enable-build-on-uclinux.patch
@@ -1,19 +1,21 @@
-From 11ea78c4d253bb90296e2dd8c3f7fbf59ba397b6 Mon Sep 17 00:00:00 2001
+From 86dd032d77166b7ed59d08c99fbe47b8b7667406 Mon Sep 17 00:00:00 2001
 From: Bernd Kuhls <bernd.kuhls@t-online.de>
 Date: Thu, 17 Aug 2017 06:30:31 +0200
 Subject: [PATCH] configure: enable build on uclinux
 
 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index c680bda7..1a7980a0 100644
+index eee42d4240f8..b0445f92e0b5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -327,7 +327,7 @@ AC_ARG_ENABLE([sysfsgpio],
-   [build_sysfsgpio=$enableval], [build_sysfsgpio=no])
+@@ -342,7 +342,7 @@ AC_ARG_ENABLE([xlnx_pcie_xvc],
+   [build_xlnx_pcie_xvc=$enableval], [build_xlnx_pcie_xvc=no])
  
  AS_CASE([$host_os],
 -  [linux*], [],
@@ -22,5 +24,5 @@ index c680bda7..1a7980a0 100644
      AS_IF([test "x$build_sysfsgpio" = "xyes"], [
        AC_MSG_ERROR([sysfsgpio is only available on linux])
 -- 
-2.11.0
+2.43.0
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 14/18] package/patchelf: update the patch to be applied with fuzz 0

[Dario Binacchi]

This commit allows the package patch to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 ...ke-the-rpath-relative-under-a-specif.patch | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch b/package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch
index 8710bfb629af..c29fac7d9fb7 100644
--- a/package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch
+++ b/package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch
@@ -1,4 +1,4 @@
-From 618220bfb55c875d6a4d197cb24fe632ac93ec85 Mon Sep 17 00:00:00 2001
+From 6e8915572db65cf63b7a82f9b24af6f9cad92ba7 Mon Sep 17 00:00:00 2001
 From: Wolfgang Grandegger <wg@grandegger.com>
 Date: Mon, 20 Feb 2017 16:29:24 +0100
 Subject: [PATCH] Add option to make the rpath relative under a specified root
@@ -43,15 +43,17 @@ pending.
 Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
 [Fabrice: update for 0.13]
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
- src/patchelf.cc | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 175 insertions(+), 21 deletions(-)
+ src/patchelf.cc | 199 +++++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 171 insertions(+), 28 deletions(-)
 
 diff --git a/src/patchelf.cc b/src/patchelf.cc
-index 1d9a772..35b4a33 100644
+index fd1e7b7b61c3..f3b7ba8867bf 100644
 --- a/src/patchelf.cc
 +++ b/src/patchelf.cc
-@@ -46,6 +46,10 @@ static bool debugMode = false;
+@@ -45,6 +45,10 @@ static bool debugMode = false;
  
  static bool forceRPath = false;
  
@@ -62,8 +64,8 @@ index 1d9a772..35b4a33 100644
  static std::vector<std::string> fileNames;
  static std::string outputFileName;
  static bool alwaysWrite = false;
-@@ -77,6 +81,49 @@ static unsigned int getPageSize(){
-     return pageSize;
+@@ -81,6 +85,49 @@ static bool hasAllowedPrefix(const std::string & s, const std::vector<std::strin
+     return std::any_of(allowedPrefixes.begin(), allowedPrefixes.end(), [&](const std::string & i) { return !s.compare(0, i.size(), i); });
  }
  
 +static bool absolutePathExists(const std::string & path, std::string & canonicalPath)
@@ -112,23 +114,23 @@ index 1d9a772..35b4a33 100644
  
  template<ElfFileParams>
  class ElfFile
-@@ -183,9 +230,13 @@ public:
+@@ -197,9 +244,13 @@ public:
  
-     void setInterpreter(const string & newInterpreter);
+     void setInterpreter(const std::string & newInterpreter);
  
 -    typedef enum { rpPrint, rpShrink, rpSet, rpAdd, rpRemove } RPathOp;
 +    typedef enum { rpPrint, rpShrink, rpMakeRelative, rpSet, rpAdd, rpRemove} RPathOp;
-+
+ 
+-    void modifyRPath(RPathOp op, const std::vector<std::string> & allowedRpathPrefixes, std::string newRPath);
 +    bool libFoundInRPath(const std::string & dirName,
 +                         const std::vector<std::string> neededLibs,
 +                         std::vector<bool> & neededLibFound);
- 
--    void modifyRPath(RPathOp op, const std::vector<std::string> & allowedRpathPrefixes, std::string newRPath);
++
 +    void modifyRPath(RPathOp op, std::string rootDir, const std::vector<std::string> & allowedRpathPrefixes, std::string newRPath, const std::string & fileName);
  
-     void addNeeded(set<string> libs);
+     void addNeeded(const std::set<std::string> & libs);
  
-@@ -1041,8 +1092,28 @@ static void concatToRPath(string & rpath, const string & path)
+@@ -1267,8 +1318,28 @@ static void concatToRPath(std::string & rpath, const std::string & path)
  
  
  template<ElfFileParams>
@@ -157,9 +159,9 @@ index 1d9a772..35b4a33 100644
 +void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op, std::string rootDir,
 +    const std::vector<std::string> & allowedRpathPrefixes, std::string newRPath, const std::string & fileName)
  {
-     Elf_Shdr & shdrDynamic = findSection(".dynamic");
+     auto shdrDynamic = findSection(".dynamic");
  
-@@ -1096,6 +1167,11 @@ void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op, string newRPath)
+@@ -1314,6 +1385,11 @@ void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op,
          return;
      }
  
@@ -171,7 +173,7 @@ index 1d9a772..35b4a33 100644
      if (op == rpShrink && !rpath) {
          debug("no RPATH to shrink\n");
          return;
-@@ -1120,31 +1196,80 @@ void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op, string newRPath)
+@@ -1343,31 +1419,80 @@ void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op,
                  continue;
              }
  
@@ -271,7 +273,7 @@ index 1d9a772..35b4a33 100644
      if (op == rpRemove) {
          if (!rpath) {
              debug("no RPATH to delete\n");
-@@ -1413,7 +1543,9 @@ static bool shrinkRPath = false;
+@@ -1736,7 +1861,9 @@ static bool removeRPath = false;
  static bool setRPath = false;
  static bool addRPath = false;
  static bool printRPath = false;
@@ -281,7 +283,7 @@ index 1d9a772..35b4a33 100644
  static std::set<std::string> neededLibsToRemove;
  static std::map<std::string, std::string> neededLibsToReplace;
  static std::set<std::string> neededLibsToAdd;
-@@ -1438,16 +1570,18 @@ static void patchElf2(ElfFile & elfFile)
+@@ -1760,16 +1887,18 @@ static void patchElf2(ElfFile && elfFile, const FileContents & fileContents, con
          elfFile.setInterpreter(newInterpreter);
  
      if (printRPath)
@@ -305,7 +307,7 @@ index 1d9a772..35b4a33 100644
  
      if (printNeeded) elfFile.printNeededLibs();
  
-@@ -1508,6 +1642,9 @@ void showHelp(const string & progName)
+@@ -1821,6 +1950,9 @@ void showHelp(const std::string & progName)
    [--remove-rpath]\n\
    [--shrink-rpath]\n\
    [--allowed-rpath-prefixes PREFIXES]\t\tWith '--shrink-rpath', reject rpath entries not starting with the allowed prefix\n\
@@ -315,8 +317,8 @@ index 1d9a772..35b4a33 100644
    [--print-rpath]\n\
    [--force-rpath]\n\
    [--add-needed LIBRARY]\n\
-@@ -1564,6 +1701,17 @@ int main(int argc, char * * argv)
-             setRPath = true;
+@@ -1889,6 +2021,17 @@ int mainWrapped(int argc, char * * argv)
+             addRPath = true;
              newRPath = argv[i];
          }
 +        else if (arg == "--make-rpath-relative") {
@@ -334,5 +336,5 @@ index 1d9a772..35b4a33 100644
              printRPath = true;
          }
 -- 
-1.9.1
+2.43.0
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 15/18] package/qemu: update the patches to be applied with fuzz 0

[Dario Binacchi]

This commit allows the package patches to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 ...-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch b/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch
index b7e41d6f232c..f9e523a62786 100644
--- a/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch
+++ b/package/qemu/0001-tests-fp-meson-don-t-build-fp-bench-test-if-fenv.h-i.patch
@@ -1,4 +1,4 @@
-From b4a692f46135af1011bf0adbfeb19abf354ca191 Mon Sep 17 00:00:00 2001
+From d6fea3c321c7eb18e6dd151f5d4b0cc46b77bcc0 Mon Sep 17 00:00:00 2001
 From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 Date: Tue, 30 Apr 2024 09:40:55 +0200
 Subject: [PATCH] tests/fp/meson: don't build fp-bench test if fenv.h is
@@ -14,18 +14,19 @@ find at the following link.
 Link: https://lists.nongnu.org/archive/html/qemu-devel/2021-03/msg00492.html
 Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
+[Dario: make the patch to be applied with fuzz factor 0]
 Upstream: https://patchwork.ozlabs.org/project/qemu-devel/patch/20240430164752.645521-1-dario.binacchi@amarulasolutions.com/
 ---
  tests/fp/meson.build | 14 ++++++++------
  1 file changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/tests/fp/meson.build b/tests/fp/meson.build
-index cbc17392d678..cd052667e940 100644
+index 114b4b483ea7..0e1237be54ed 100644
 --- a/tests/fp/meson.build
 +++ b/tests/fp/meson.build
 @@ -126,12 +126,14 @@ test('fp-test-mulAdd', fptest,
             ['f16_mulAdd', 'f32_mulAdd', 'f64_mulAdd', 'f128_mulAdd'],
-      suite: ['softfloat-slow', 'softfloat-ops-slow', 'slow'], timeout: 90)
+      suite: ['softfloat-slow', 'softfloat-ops-slow', 'slow'], timeout: 180)
  
 -executable(
 -  'fp-bench',
@@ -45,5 +46,5 @@ index cbc17392d678..cd052667e940 100644
  fptestlog2 = executable(
    'fp-test-log2',
 -- 
-2.43.0
+2.34.1
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 16/18] package/qt5/qt5base: update the patches to be applied with fuzz 0

[Dario Binacchi]

This commit allows the package patches to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 .../qt5base/0006-Fix-build-on-riscv32.patch    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch
index 5561acb9ae04..ff24fbff8305 100644
--- a/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch
+++ b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch
@@ -1,7 +1,7 @@
-From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001
+From 25a0057e8d7afaab3492e03efb3f85581f1cf9b2 Mon Sep 17 00:00:00 2001
 From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 Date: Fri, 27 Aug 2021 16:28:32 +0200
-Subject: Fix build on riscv32
+Subject: [PATCH] Fix build on riscv32
 
 riscv32 fails to build because __NR_futex is not defined on this
 architecture:
@@ -21,15 +21,17 @@ Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 [Retrieved from:
 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f]
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  src/corelib/thread/qfutex_p.h | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h
-index 40482b6fc1..037207a5c0 100644
+index f287b752d75f..fd7d09ac8572 100644
 --- a/src/corelib/thread/qfutex_p.h
 +++ b/src/corelib/thread/qfutex_p.h
-@@ -103,6 +103,11 @@ QT_END_NAMESPACE
+@@ -81,6 +81,11 @@ QT_END_NAMESPACE
  // if not defined in linux/futex.h
  #  define FUTEX_PRIVATE_FLAG        128         // added in v2.6.22
  
@@ -38,9 +40,9 @@ index 40482b6fc1..037207a5c0 100644
 +#    define __NR_futex __NR_futex_time64
 +#  endif
 +
- QT_BEGIN_NAMESPACE
- namespace QtLinuxFutex {
-     constexpr inline bool futexAvailable() { return true; }
+ #  if __has_feature(thread_sanitizer) || defined(__SANITIZE_THREAD__)
+ #    include <sanitizer/tsan_interface.h>
+ inline void _q_tsan_acquire(void *addr, void *addr2)
 -- 
-cgit v1.2.1
+2.43.0
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 17/18] package/vboot-utils: update the patches to be applied with fuzz 0

[Dario Binacchi]

This commit allows the package patches to be applied with fuzz factor 0.
The fuzz factor specifies how many lines of the patch can be inexactly
matched, so the value 0 requires all lines to be exactly matched.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 .../0005-include-sys-sysmacros.h-for-major.patch     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch b/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch
index 5d76428eb69c..3ab201fc3a2d 100644
--- a/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch
+++ b/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch
@@ -1,4 +1,4 @@
-From 435fbcee218b37a87368e2b22fa33366875d458c Mon Sep 17 00:00:00 2001
+From 0495287f062a0cef989e02e0aee4f4329ab155b0 Mon Sep 17 00:00:00 2001
 From: Mike Frysinger <vapier@chromium.org>
 Date: Tue, 19 Apr 2016 13:58:49 -0400
 Subject: [PATCH] include sys/sysmacros.h for major()
@@ -17,13 +17,15 @@ Commit-Ready: Mike Frysinger <vapier@chromium.org>
 Tested-by: Mike Frysinger <vapier@chromium.org>
 Reviewed-by: Bill Richardson <wfrichar@google.com>
 Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  cgpt/cgpt_wrapper.c               | 1 +
  futility/dump_kernel_config_lib.c | 1 +
  2 files changed, 2 insertions(+)
 
 diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c
-index dcfaab9c..1716cdde 100644
+index 4d07aadac72d..6fbfb235ba7b 100644
 --- a/cgpt/cgpt_wrapper.c
 +++ b/cgpt/cgpt_wrapper.c
 @@ -18,6 +18,7 @@
@@ -35,17 +37,17 @@ index dcfaab9c..1716cdde 100644
  #include <unistd.h>
  
 diff --git a/futility/dump_kernel_config_lib.c b/futility/dump_kernel_config_lib.c
-index 4fe990c3..abf37ae1 100644
+index c2d59433ba71..448a2f6a831f 100644
 --- a/futility/dump_kernel_config_lib.c
 +++ b/futility/dump_kernel_config_lib.c
 @@ -10,6 +10,7 @@
- #include <string.h>
  #include <sys/mman.h>
+ #include <sys/fcntl.h>
  #include <sys/stat.h>
 +#include <sys/sysmacros.h>
  #include <sys/types.h>
  #include <unistd.h>
  
 -- 
-2.17.1
+2.43.0
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 18/18] support/scripts/apply-patches.sh: set the maximum fuzz factor to 0

[Dario Binacchi]

This patch was created as a fix to a problem that occurred during the
compilation of QEMU:

>>> qemu 8.1.1 Patching

Applying 0001-tests-fp-disable-fp-bench-build-by-default.patch using patch:
patching file tests/fp/meson.build
Hunk #1 succeeded at 138 with fuzz 2 (offset -502 lines).

Applying 0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch using patch:
patching file softmmu/qemu-seccomp.c

Applying 0004-tracing-install-trace-events-file-only-if-necessary.patch using patch:
patching file trace/meson.build

With the bump to version 8.1.1, the patch that disabled the compilation
of the fp-bench test does not report any errors, even though the patch
itself is no longer applicable. The only noticeable message is:

"Hunk #1 succeeded at 138 with fuzz 2 (offset -502 lines)."

As reported by the patch man page:

"With context diffs, and to a lesser extent with normal diffs, patch can
detect when the line numbers mentioned in the patch are incorrect, and
attempts to find the correct place to apply each hunk of the patch.
As a first guess, it takes the line number mentioned for the hunk, plus
or minus any offset used in applying the previous hunk. If that is not
the correct place, patch scans both forwards and backwards for a set of
lines matching the context given in the hunk. First patch looks for a
place where all lines of the context match. If no such place is found,
and it's a context diff, and the maximum fuzz factor is set to 1 or more,
then another scan takes place ignoring the first and last line of
context. If that fails, and the maximum fuzz factor is set to 2 or more,
the first two and last two lines of context are ignored, and another
scan is made. The default maximum fuzz factor is 2.

If the hunk is installed at a different line from the line number
specified in the diff, you are told the offset. A single large offset
may indicate that a hunk was installed in the wrong place. You are also
told if a fuzz factor was used to make the match, in which case you
should also be slightly suspicious."

By setting the maximum fuzz factor to 0, we avoid that patches which
cannot be applied are incorrectly reported as valid, with positive
side-effects on version bumps.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

---

Changes v1 -> v2:
 - Use fuzz factor 0 instead of 1.
 - Add patches from 1 to 17 to adapt package patches to be applicable
   with a fuzz factor of 0, ensuring that this patch does not cause
   regressions.

 support/scripts/apply-patches.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
index 6da83f6826e9..36afe489f2ef 100755
--- a/support/scripts/apply-patches.sh
+++ b/support/scripts/apply-patches.sh
@@ -114,7 +114,7 @@ function apply_patch {
         exit 1
     fi
     echo "${path}/${patch}" >> ${builddir}/.applied_patches_list
-    ${uncomp} "${path}/$patch" | patch -g0 -p1 --no-backup-if-mismatch -d "${builddir}" -t -N $silent
+    ${uncomp} "${path}/$patch" | patch -F0 -g0 -p1 --no-backup-if-mismatch -d "${builddir}" -t -N $silent
     if [ $? != 0 ] ; then
         echo "Patch failed!  Please fix ${patch}!"
         exit 1
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 00/18] apply patches with fuzz factor 0

[Arnout Vandecappelle via buildroot]

On 22/05/2024 09:02, Dario Binacchi wrote:
> The series will allow applying package patches with a fuzz factor of 0
> instead of 2 (the patch command default value).
> By setting the maximum fuzz factor to 0, we avoid that patches which
> cannot be applied are incorrectly reported as valid, with positive
> side-effects on version bumps.
> 
> To avoid regressions, it was necessary to fix all those patches that
> were applicable with a fuzz factor of 1 or 2 before implementing this
> change. The series was tested on commit 47078cc11862 ("package/zxing-cpp:
> add options for enabling readers and/or writers") with a script that
> executed the make legal-info command for all defconfigs contained in
> Buildroot. Then, for all the affected packages, the compilation was
> executed.

  Series applied to master, thanks! Since this was about a month old, chances 
are that some new fuzzy patches have been introduced through version bumps. But 
the autobuilders will report that.

  Regards,
  Arnout

> 
> Dario Binacchi (18):
>    board/orangepi/orangepi-zero: make the patches to be applied with fuzz
>      0
>    board/pine64/rock64: make the patches to be applied with fuzz 0
>    boot/syslinux: update the patches to be applied with fuzz 0
>    package/alsa-lib: update the patch to be applied with fuzz 0
>    package/bzip2: update the patches to be applied with fuzz 0
>    package/elfutils: update the patches to be applied with fuzz 0
>    package/ffmpeg: update the patches to be applied with fuzz 0
>    package/giflib: update the patches to be applied with fuzz 0
>    package/libabseil-cpp: update the patch to be applied with fuzz 0
>    package/libglib2: update the patches to be applied with fuzz 0
>    package/libnl: update the patch to be applied with fuzz 0
>    package/libopenssl: update the patches to be applied with fuzz 0
>    package/openocd: update the patch to be applied with fuzz 0
>    package/patchelf: update the patch to be applied with fuzz 0
>    package/qemu: update the patches to be applied with fuzz 0
>    package/qt5/qt5base: update the patches to be applied with fuzz 0
>    package/vboot-utils: update the patches to be applied with fuzz 0
>    support/scripts/apply-patches.sh: set the maximum fuzz factor to 0
> 
>   ...RM-dts-orange-pi-zero-enable-spi-nor.patch | 41 ++++++++--------
>   ...ARM-dts-orange-pi-zero-enable-spidev.patch | 23 +++++----
>   ...328-needs-itb-image-to-boot-properly.patch | 18 +++----
>   .../0015-efi-main.c-include-efisetjmp.h.patch | 10 ++--
>   ...01-Don-t-use-fork-on-noMMU-platforms.patch | 19 ++++----
>   package/bzip2/0001-build-objects-twice.patch  | 14 +++---
>   package/bzip2/0002-improve-build-system.patch | 12 +++--
>   ...e-Werror-conditional-to-BUILD_WERROR.patch | 12 +++--
>   .../0003-libavutil-Fix-mips-build.patch       | 16 ++++---
>   ...dd-targets-to-manage-static-building.patch | 18 +++----
>   ...veral-defects-found-by-Coverity-scan.patch | 20 ++++----
>   ...0001-force-position-independent-code.patch | 14 +++---
>   ...girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch | 16 ++++---
>   ...workaround-to-the-libc-compat.h-copy.patch | 17 ++++---
>   .../0003-Revert-Fix-static-builds.patch       | 16 ++++---
>   ...01-configure-enable-build-on-uclinux.patch | 12 +++--
>   ...ke-the-rpath-relative-under-a-specif.patch | 48 ++++++++++---------
>   ...on-t-build-fp-bench-test-if-fenv.h-i.patch |  9 ++--
>   .../qt5base/0006-Fix-build-on-riscv32.patch   | 18 +++----
>   ...05-include-sys-sysmacros.h-for-major.patch | 12 +++--
>   support/scripts/apply-patches.sh              |  2 +-
>   21 files changed, 204 insertions(+), 163 deletions(-)
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 00/18] apply patches with fuzz factor 0

[Yann E. MORIN]

Dario, All,

On 2024-05-22 09:02 +0200, Dario Binacchi spake thusly:
> The series will allow applying package patches with a fuzz factor of 0
> instead of 2 (the patch command default value).
> By setting the maximum fuzz factor to 0, we avoid that patches which
> cannot be applied are incorrectly reported as valid, with positive
> side-effects on version bumps.
> 
> To avoid regressions, it was necessary to fix all those patches that
> were applicable with a fuzz factor of 1 or 2 before implementing this
> change. The series was tested on commit 47078cc11862 ("package/zxing-cpp:
> add options for enabling readers and/or writers") with a script that
> executed the make legal-info command for all defconfigs contained in
> Buildroot. Then, for all the affected packages, the compilation was
> executed.

Thanks a lot for all those efforts! 👍

As Arnout said, it is not unexpected that we missed some, and that new
patches added since then would not be fuzz-zero-ready.

So, I came up with a little bit of shell trickedry to start and test all
our patches (or at least the vast majority of them):

    $ cat foo.lst

    # Ignore boot/ and linux/ as they are too special...
    find package/ -type f -name '*.mk' -printf '%h\n' \
    |sort -u \
    |while read dir; do
        [ -e "${dir}/Config.in" ] || continue
        ( find "${dir}" -type f -name '*.patch' -print -quit |grep -q . ) || continue
        pkg="$( basename "${dir}" )"
        [ -e "${dir}/${pkg}.mk" ] || continue
        sed -r -e '/^\$\(eval \$\((host-)?[^-]+-package\)\)$/!d; s//\1'"${pkg}"'-patch/' "${dir}/${pkg}.mk"
    done \
    |grep -v -E 'am335x-pru-package|asterisk|aufs-util|aumix|cgic'


    $ make defconfig

    $ ./utils/config --set-str BR2_BACKUP_SITE ""

    $ make $(. ./foo.lst)

I stopped adding exceptions when I reached cgic...

Exceptions:
  - Patch fuzz:
      - asterisk

  - Others:
      - am335x-pru-package: hash error, github-generated
      - aufs-util: needs a kernel, patches unknwon
      - aumix: 403 forbidden, patches OK, tested with s.b.o.
      - bsdiff: 403 forbidden, patches OK, tested with s.b.o.
      - cgic: hash error, upstream is dead (parking site)

So, I found more download issues than I found patch fuzz issues... I'm
not sure if that's a good or a bad thing? ;-]

Then linux/ and boot/ will have to be checked "manually"...

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot