[PATCH 01/15] sysvinit: Fix build against glibc 2.36

public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed

* [PATCH 01/15] sysvinit: Fix build against glibc 2.36
@ 2022-08-15 17:17 Michael Tremer
  2022-08-15 17:17 ` [PATCH 02/15] gcc: " Michael Tremer
                   ` (13 more replies)
  0 siblings, 14 replies; 15+ messages in thread
From: Michael Tremer @ 2022-08-15 17:17 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1657 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/sysvinit                                           |  1 +
 src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch

diff --git a/lfs/sysvinit b/lfs/sysvinit
index 0126b283e..ec0a5c292 100644
--- a/lfs/sysvinit
+++ b/lfs/sysvinit
@@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Newer C libraries omit this include from sys/types.h.
 	# https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/sysvinit-2.98_build_mountpoint.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch
 	cd $(DIR_APP) && sed -i src/mountpoint.c src/bootlogd.c \
 		-e "/include.*sys\/stat.h/a#include <sys/sysmacros.h>\n"
 	cd $(DIR_APP) && sed -e "s/libcrypt.a/libcrypt.so/g" -i src/Makefile
diff --git a/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch b/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch
new file mode 100644
index 000000000..ee6f621b5
--- /dev/null
+++ b/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch
@@ -0,0 +1,10 @@
+--- sysvinit-3.00/src/sulogin.c~	2022-08-09 09:43:41.993484098 +0000
++++ sysvinit-3.00/src/sulogin.c	2022-08-09 09:45:04.897252500 +0000
+@@ -51,7 +51,6 @@
+ #ifdef __linux__
+ #  include <sys/statfs.h>
+ #  include <sys/mount.h>
+-#  include <linux/fs.h>
+ #  include <linux/magic.h>
+ #  include <linux/major.h>
+ #  ifndef TMPFS_MAGIC
-- 
2.30.2


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 02/15] gcc: Fix build against glibc 2.36
  2022-08-15 17:17 [PATCH 01/15] sysvinit: Fix build against glibc 2.36 Michael Tremer
@ 2022-08-15 17:17 ` Michael Tremer
  2022-08-15 17:17 ` [PATCH 03/15] binutils: Update to 2.39 Michael Tremer
                   ` (12 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: Michael Tremer @ 2022-08-15 17:17 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 3132 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/gcc                                       |  2 +
 .../gcc-11.3.0-glibc-2.36-headers-fix.patch   | 44 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 src/patches/gcc/gcc-11.3.0-glibc-2.36-headers-fix.patch

diff --git a/lfs/gcc b/lfs/gcc
index d04063a91..f25548892 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -236,6 +236,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	@mkdir $(DIR_SRC)/gcc-build
 
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc/gcc-11.3.0-glibc-2.36-headers-fix.patch
+
 	cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
 	cd $(DIR_APP) && sed -i gcc/Makefile.in \
 		-e 's@\./fixinc\.sh(a)-c true@' \
diff --git a/src/patches/gcc/gcc-11.3.0-glibc-2.36-headers-fix.patch b/src/patches/gcc/gcc-11.3.0-glibc-2.36-headers-fix.patch
new file mode 100644
index 000000000..b9143d462
--- /dev/null
+++ b/src/patches/gcc/gcc-11.3.0-glibc-2.36-headers-fix.patch
@@ -0,0 +1,44 @@
+From d2356ebb0084a0d80dbfe33040c9afe938c15d19 Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska(a)suse.cz>
+Date: Mon, 11 Jul 2022 22:03:14 +0200
+Subject: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream
+
+9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
+
+(cherry picked from commit 2701442d0cf6292f6624443c15813d6d1a3562fe)
+---
+ .../sanitizer_platform_limits_posix.cpp                | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
+index 025e575b5bc..5743516c046 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
+@@ -72,7 +72,9 @@
+ #include <sys/vt.h>
+ #include <linux/cdrom.h>
+ #include <linux/fd.h>
++#if SANITIZER_ANDROID
+ #include <linux/fs.h>
++#endif
+ #include <linux/hdreg.h>
+ #include <linux/input.h>
+ #include <linux/ioctl.h>
+@@ -828,10 +830,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
+   unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
+ #endif
+-  unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
+-  unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
+-  unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
+-  unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
++  unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
++  unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
++  unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
++  unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
+   unsigned IOCTL_GIO_CMAP = GIO_CMAP;
+   unsigned IOCTL_GIO_FONT = GIO_FONT;
+   unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
+-- 
+2.30.2
+
-- 
2.30.2


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 03/15] binutils: Update to 2.39
  2022-08-15 17:17 [PATCH 01/15] sysvinit: Fix build against glibc 2.36 Michael Tremer
  2022-08-15 17:17 ` [PATCH 02/15] gcc: " Michael Tremer
@ 2022-08-15 17:17 ` Michael Tremer
  2022-08-15 17:17 ` [PATCH 04/15] glibc: Update to 2.36 Michael Tremer
                   ` (11 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: Michael Tremer @ 2022-08-15 17:17 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 10371 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 config/rootfiles/common/aarch64/binutils | 35 ++++++++++-
 config/rootfiles/common/armv6l/binutils  |  8 ++-
 config/rootfiles/common/x86_64/binutils  | 79 ++++++++++--------------
 lfs/binutils                             |  4 +-
 4 files changed, 74 insertions(+), 52 deletions(-)

diff --git a/config/rootfiles/common/aarch64/binutils b/config/rootfiles/common/aarch64/binutils
index cae233bce..80d3aeb79 100644
--- a/config/rootfiles/common/aarch64/binutils
+++ b/config/rootfiles/common/aarch64/binutils
@@ -3,7 +3,13 @@
 #usr/bin/as
 #usr/bin/c++filt
 #usr/bin/elfedit
+#usr/bin/gp-archive
+#usr/bin/gp-collect-app
+#usr/bin/gp-display-html
+#usr/bin/gp-display-src
+#usr/bin/gp-display-text
 #usr/bin/gprof
+#usr/bin/gprofng
 #usr/bin/ld
 #usr/bin/ld.bfd
 #usr/bin/nm
@@ -14,18 +20,32 @@ usr/bin/readelf
 #usr/bin/size
 usr/bin/strings
 #usr/bin/strip
+#usr/etc
+#usr/etc/gprofng.rc
 #usr/include/ansidecl.h
 #usr/include/bfd.h
 #usr/include/bfdlink.h
+#usr/include/collectorAPI.h
 #usr/include/ctf-api.h
 #usr/include/ctf.h
 #usr/include/diagnostics.h
 #usr/include/dis-asm.h
+#usr/include/libcollector.h
+#usr/include/libfcollector.h
 #usr/include/libiberty.h
 #usr/include/plugin-api.h
 #usr/include/symcat.h
 #usr/lib/bfd-plugins
 usr/lib/bfd-plugins/libdep.so
+#usr/lib/gprofng
+#usr/lib/gprofng/libgp-collector.so
+#usr/lib/gprofng/libgp-collectorAPI.so
+#usr/lib/gprofng/libgp-heap.so
+#usr/lib/gprofng/libgp-iotrace.so
+#usr/lib/gprofng/libgp-sync.so
+#usr/lib/gprofng/libgprofng.so
+#usr/lib/gprofng/libgprofng.so.0
+#usr/lib/gprofng/libgprofng.so.0.0.0
 #usr/lib/ldscripts
 #usr/lib/ldscripts/aarch64elf.x
 #usr/lib/ldscripts/aarch64elf.xbn
@@ -291,7 +311,7 @@ usr/lib/bfd-plugins/libdep.so
 #usr/lib/ldscripts/armelfb_linux_eabi.xu
 #usr/lib/ldscripts/armelfb_linux_eabi.xw
 #usr/lib/ldscripts/armelfb_linux_eabi.xwe
-usr/lib/libbfd-2.37.so
+usr/lib/libbfd-2.39.so
 #usr/lib/libbfd.a
 #usr/lib/libbfd.la
 #usr/lib/libbfd.so
@@ -305,14 +325,16 @@ usr/lib/libctf-nobfd.so.0.0.0
 #usr/lib/libctf.so
 usr/lib/libctf.so.0
 usr/lib/libctf.so.0.0.0
-usr/lib/libopcodes-2.37.so
+usr/lib/libopcodes-2.39.so
 #usr/lib/libopcodes.a
 #usr/lib/libopcodes.la
 #usr/lib/libopcodes.so
 #usr/share/info/as.info
 #usr/share/info/bfd.info
 #usr/share/info/binutils.info
+#usr/share/info/ctf-spec.info
 #usr/share/info/gprof.info
+#usr/share/info/gprofng.info
 #usr/share/info/ld.info
 #usr/share/locale/bg/LC_MESSAGES/binutils.mo
 #usr/share/locale/bg/LC_MESSAGES/gprof.mo
@@ -368,6 +390,9 @@ usr/lib/libopcodes-2.37.so
 #usr/share/locale/ja/LC_MESSAGES/gas.mo
 #usr/share/locale/ja/LC_MESSAGES/gprof.mo
 #usr/share/locale/ja/LC_MESSAGES/ld.mo
+#usr/share/locale/ka
+#usr/share/locale/ka/LC_MESSAGES
+#usr/share/locale/ka/LC_MESSAGES/gprof.mo
 #usr/share/locale/ms
 #usr/share/locale/ms/LC_MESSAGES
 #usr/share/locale/ms/LC_MESSAGES/gprof.mo
@@ -435,7 +460,13 @@ usr/lib/libopcodes-2.37.so
 #usr/share/man/man1/c++filt.1
 #usr/share/man/man1/dlltool.1
 #usr/share/man/man1/elfedit.1
+#usr/share/man/man1/gp-archive.1
+#usr/share/man/man1/gp-collect-app.1
+#usr/share/man/man1/gp-display-html.1
+#usr/share/man/man1/gp-display-src.1
+#usr/share/man/man1/gp-display-text.1
 #usr/share/man/man1/gprof.1
+#usr/share/man/man1/gprofng.1
 #usr/share/man/man1/ld.1
 #usr/share/man/man1/nm.1
 #usr/share/man/man1/objcopy.1
diff --git a/config/rootfiles/common/armv6l/binutils b/config/rootfiles/common/armv6l/binutils
index 773315212..6f38f5233 100644
--- a/config/rootfiles/common/armv6l/binutils
+++ b/config/rootfiles/common/armv6l/binutils
@@ -71,7 +71,7 @@ usr/lib/bfd-plugins/libdep.so
 #usr/lib/ldscripts/armelfb_linux_eabi.xu
 #usr/lib/ldscripts/armelfb_linux_eabi.xw
 #usr/lib/ldscripts/armelfb_linux_eabi.xwe
-usr/lib/libbfd-2.37.so
+usr/lib/libbfd-2.39.so
 #usr/lib/libbfd.a
 #usr/lib/libbfd.la
 #usr/lib/libbfd.so
@@ -85,13 +85,14 @@ usr/lib/libctf-nobfd.so.0.0.0
 #usr/lib/libctf.so
 usr/lib/libctf.so.0
 usr/lib/libctf.so.0.0.0
-usr/lib/libopcodes-2.37.so
+usr/lib/libopcodes-2.39.so
 #usr/lib/libopcodes.a
 #usr/lib/libopcodes.la
 #usr/lib/libopcodes.so
 #usr/share/info/as.info
 #usr/share/info/bfd.info
 #usr/share/info/binutils.info
+#usr/share/info/ctf-spec.info
 #usr/share/info/gprof.info
 #usr/share/info/ld.info
 #usr/share/locale/bg/LC_MESSAGES/binutils.mo
@@ -148,6 +149,9 @@ usr/lib/libopcodes-2.37.so
 #usr/share/locale/ja/LC_MESSAGES/gas.mo
 #usr/share/locale/ja/LC_MESSAGES/gprof.mo
 #usr/share/locale/ja/LC_MESSAGES/ld.mo
+#usr/share/locale/ka
+#usr/share/locale/ka/LC_MESSAGES
+#usr/share/locale/ka/LC_MESSAGES/gprof.mo
 #usr/share/locale/ms
 #usr/share/locale/ms/LC_MESSAGES
 #usr/share/locale/ms/LC_MESSAGES/gprof.mo
diff --git a/config/rootfiles/common/x86_64/binutils b/config/rootfiles/common/x86_64/binutils
index 1b3427425..cbf681ce8 100644
--- a/config/rootfiles/common/x86_64/binutils
+++ b/config/rootfiles/common/x86_64/binutils
@@ -3,7 +3,13 @@
 #usr/bin/as
 #usr/bin/c++filt
 #usr/bin/elfedit
+#usr/bin/gp-archive
+#usr/bin/gp-collect-app
+#usr/bin/gp-display-html
+#usr/bin/gp-display-src
+#usr/bin/gp-display-text
 #usr/bin/gprof
+#usr/bin/gprofng
 #usr/bin/ld
 #usr/bin/ld.bfd
 #usr/bin/nm
@@ -14,18 +20,32 @@ usr/bin/readelf
 #usr/bin/size
 usr/bin/strings
 #usr/bin/strip
+#usr/etc
+#usr/etc/gprofng.rc
 #usr/include/ansidecl.h
 #usr/include/bfd.h
 #usr/include/bfdlink.h
+#usr/include/collectorAPI.h
 #usr/include/ctf-api.h
 #usr/include/ctf.h
 #usr/include/diagnostics.h
 #usr/include/dis-asm.h
+#usr/include/libcollector.h
+#usr/include/libfcollector.h
 #usr/include/libiberty.h
 #usr/include/plugin-api.h
 #usr/include/symcat.h
 #usr/lib/bfd-plugins
 #usr/lib/bfd-plugins/libdep.so
+#usr/lib/gprofng
+#usr/lib/gprofng/libgp-collector.so
+#usr/lib/gprofng/libgp-collectorAPI.so
+#usr/lib/gprofng/libgp-heap.so
+#usr/lib/gprofng/libgp-iotrace.so
+#usr/lib/gprofng/libgp-sync.so
+#usr/lib/gprofng/libgprofng.so
+#usr/lib/gprofng/libgprofng.so.0
+#usr/lib/gprofng/libgprofng.so.0.0.0
 #usr/lib/ldscripts
 #usr/lib/ldscripts/elf32_x86_64.x
 #usr/lib/ldscripts/elf32_x86_64.xbn
@@ -93,50 +113,6 @@ usr/bin/strings
 #usr/lib/ldscripts/elf_iamcu.xu
 #usr/lib/ldscripts/elf_iamcu.xw
 #usr/lib/ldscripts/elf_iamcu.xwe
-#usr/lib/ldscripts/elf_k1om.x
-#usr/lib/ldscripts/elf_k1om.xbn
-#usr/lib/ldscripts/elf_k1om.xc
-#usr/lib/ldscripts/elf_k1om.xce
-#usr/lib/ldscripts/elf_k1om.xd
-#usr/lib/ldscripts/elf_k1om.xdc
-#usr/lib/ldscripts/elf_k1om.xdce
-#usr/lib/ldscripts/elf_k1om.xde
-#usr/lib/ldscripts/elf_k1om.xdw
-#usr/lib/ldscripts/elf_k1om.xdwe
-#usr/lib/ldscripts/elf_k1om.xe
-#usr/lib/ldscripts/elf_k1om.xn
-#usr/lib/ldscripts/elf_k1om.xr
-#usr/lib/ldscripts/elf_k1om.xs
-#usr/lib/ldscripts/elf_k1om.xsc
-#usr/lib/ldscripts/elf_k1om.xsce
-#usr/lib/ldscripts/elf_k1om.xse
-#usr/lib/ldscripts/elf_k1om.xsw
-#usr/lib/ldscripts/elf_k1om.xswe
-#usr/lib/ldscripts/elf_k1om.xu
-#usr/lib/ldscripts/elf_k1om.xw
-#usr/lib/ldscripts/elf_k1om.xwe
-#usr/lib/ldscripts/elf_l1om.x
-#usr/lib/ldscripts/elf_l1om.xbn
-#usr/lib/ldscripts/elf_l1om.xc
-#usr/lib/ldscripts/elf_l1om.xce
-#usr/lib/ldscripts/elf_l1om.xd
-#usr/lib/ldscripts/elf_l1om.xdc
-#usr/lib/ldscripts/elf_l1om.xdce
-#usr/lib/ldscripts/elf_l1om.xde
-#usr/lib/ldscripts/elf_l1om.xdw
-#usr/lib/ldscripts/elf_l1om.xdwe
-#usr/lib/ldscripts/elf_l1om.xe
-#usr/lib/ldscripts/elf_l1om.xn
-#usr/lib/ldscripts/elf_l1om.xr
-#usr/lib/ldscripts/elf_l1om.xs
-#usr/lib/ldscripts/elf_l1om.xsc
-#usr/lib/ldscripts/elf_l1om.xsce
-#usr/lib/ldscripts/elf_l1om.xse
-#usr/lib/ldscripts/elf_l1om.xsw
-#usr/lib/ldscripts/elf_l1om.xswe
-#usr/lib/ldscripts/elf_l1om.xu
-#usr/lib/ldscripts/elf_l1om.xw
-#usr/lib/ldscripts/elf_l1om.xwe
 #usr/lib/ldscripts/elf_x86_64.x
 #usr/lib/ldscripts/elf_x86_64.xbn
 #usr/lib/ldscripts/elf_x86_64.xc
@@ -159,7 +135,7 @@ usr/bin/strings
 #usr/lib/ldscripts/elf_x86_64.xu
 #usr/lib/ldscripts/elf_x86_64.xw
 #usr/lib/ldscripts/elf_x86_64.xwe
-usr/lib/libbfd-2.37.so
+usr/lib/libbfd-2.39.so
 #usr/lib/libbfd.a
 #usr/lib/libbfd.la
 #usr/lib/libbfd.so
@@ -173,14 +149,16 @@ usr/lib/libctf-nobfd.so.0.0.0
 #usr/lib/libctf.so
 usr/lib/libctf.so.0
 usr/lib/libctf.so.0.0.0
-usr/lib/libopcodes-2.37.so
+usr/lib/libopcodes-2.39.so
 #usr/lib/libopcodes.a
 #usr/lib/libopcodes.la
 #usr/lib/libopcodes.so
 #usr/share/info/as.info
 #usr/share/info/bfd.info
 #usr/share/info/binutils.info
+#usr/share/info/ctf-spec.info
 #usr/share/info/gprof.info
+#usr/share/info/gprofng.info
 #usr/share/info/ld.info
 #usr/share/locale/bg/LC_MESSAGES/binutils.mo
 #usr/share/locale/bg/LC_MESSAGES/gprof.mo
@@ -236,6 +214,9 @@ usr/lib/libopcodes-2.37.so
 #usr/share/locale/ja/LC_MESSAGES/gas.mo
 #usr/share/locale/ja/LC_MESSAGES/gprof.mo
 #usr/share/locale/ja/LC_MESSAGES/ld.mo
+#usr/share/locale/ka
+#usr/share/locale/ka/LC_MESSAGES
+#usr/share/locale/ka/LC_MESSAGES/gprof.mo
 #usr/share/locale/ms
 #usr/share/locale/ms/LC_MESSAGES
 #usr/share/locale/ms/LC_MESSAGES/gprof.mo
@@ -303,7 +284,13 @@ usr/lib/libopcodes-2.37.so
 #usr/share/man/man1/c++filt.1
 #usr/share/man/man1/dlltool.1
 #usr/share/man/man1/elfedit.1
+#usr/share/man/man1/gp-archive.1
+#usr/share/man/man1/gp-collect-app.1
+#usr/share/man/man1/gp-display-html.1
+#usr/share/man/man1/gp-display-src.1
+#usr/share/man/man1/gp-display-text.1
 #usr/share/man/man1/gprof.1
+#usr/share/man/man1/gprofng.1
 #usr/share/man/man1/ld.1
 #usr/share/man/man1/nm.1
 #usr/share/man/man1/objcopy.1
diff --git a/lfs/binutils b/lfs/binutils
index 8d8506182..eed8643d8 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.37
+VER        = 2.39
 
 THISAPP    = binutils-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -99,7 +99,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = f5a374fdf0300f7734d1e462333296b16c9d5ed6eba167e1742a4da7082f4388c929e286bf76c3933b3e434937380340732a31790723654b491ea0c8ab5b9ba5
+$(DL_FILE)_BLAKE2 = ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f
 
 install : $(TARGET)
 
-- 
2.30.2


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 04/15] glibc: Update to 2.36
  2022-08-15 17:17 [PATCH 01/15] sysvinit: Fix build against glibc 2.36 Michael Tremer
  2022-08-15 17:17 ` [PATCH 02/15] gcc: " Michael Tremer
  2022-08-15 17:17 ` [PATCH 03/15] binutils: Update to 2.39 Michael Tremer
@ 2022-08-15 17:17 ` Michael Tremer
  2022-08-15 17:17 ` [PATCH 05/15] make.sh: Bump toolchain version Michael Tremer
                   ` (10 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: Michael Tremer @ 2022-08-15 17:17 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 11120 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 config/rootfiles/common/aarch64/glibc | 34 +++++++++++++++++++++++++
 config/rootfiles/common/armv6l/glibc  | 34 +++++++++++++++++++++++++
 config/rootfiles/common/x86_64/glibc  | 36 ++++++++++++++++++++++++++-
 lfs/glibc                             |  4 +--
 4 files changed, 105 insertions(+), 3 deletions(-)

diff --git a/config/rootfiles/common/aarch64/glibc b/config/rootfiles/common/aarch64/glibc
index f98c94aab..2179e1d13 100644
--- a/config/rootfiles/common/aarch64/glibc
+++ b/config/rootfiles/common/aarch64/glibc
@@ -115,6 +115,7 @@ usr/bin/locale
 #usr/include/bits/mman-map-flags-generic.h
 #usr/include/bits/mman-shared.h
 #usr/include/bits/mman.h
+#usr/include/bits/mman_ext.h
 #usr/include/bits/monetary-ldbl.h
 #usr/include/bits/mqueue.h
 #usr/include/bits/mqueue2.h
@@ -176,6 +177,7 @@ usr/bin/locale
 #usr/include/bits/stdint-uintn.h
 #usr/include/bits/stdio-ldbl.h
 #usr/include/bits/stdio.h
+#usr/include/bits/stdio2-decl.h
 #usr/include/bits/stdio2.h
 #usr/include/bits/stdio_lim.h
 #usr/include/bits/stdlib-bsearch.h
@@ -223,6 +225,7 @@ usr/bin/locale
 #usr/include/bits/types/clockid_t.h
 #usr/include/bits/types/cookie_io_functions_t.h
 #usr/include/bits/types/error_t.h
+#usr/include/bits/types/idtype_t.h
 #usr/include/bits/types/locale_t.h
 #usr/include/bits/types/mbstate_t.h
 #usr/include/bits/types/res_state.h
@@ -445,6 +448,7 @@ usr/bin/locale
 #usr/include/sys/param.h
 #usr/include/sys/pci.h
 #usr/include/sys/personality.h
+#usr/include/sys/pidfd.h
 #usr/include/sys/poll.h
 #usr/include/sys/prctl.h
 #usr/include/sys/procfs.h
@@ -6090,6 +6094,20 @@ usr/lib/locale
 #usr/lib/locale/raj_IN/LC_PAPER
 #usr/lib/locale/raj_IN/LC_TELEPHONE
 #usr/lib/locale/raj_IN/LC_TIME
+#usr/lib/locale/rif_MA
+#usr/lib/locale/rif_MA/LC_ADDRESS
+#usr/lib/locale/rif_MA/LC_COLLATE
+#usr/lib/locale/rif_MA/LC_CTYPE
+#usr/lib/locale/rif_MA/LC_IDENTIFICATION
+#usr/lib/locale/rif_MA/LC_MEASUREMENT
+#usr/lib/locale/rif_MA/LC_MESSAGES
+#usr/lib/locale/rif_MA/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/rif_MA/LC_MONETARY
+#usr/lib/locale/rif_MA/LC_NAME
+#usr/lib/locale/rif_MA/LC_NUMERIC
+#usr/lib/locale/rif_MA/LC_PAPER
+#usr/lib/locale/rif_MA/LC_TELEPHONE
+#usr/lib/locale/rif_MA/LC_TIME
 #usr/lib/locale/ro_RO
 #usr/lib/locale/ro_RO.utf8
 #usr/lib/locale/ro_RO.utf8/LC_ADDRESS
@@ -6762,6 +6780,20 @@ usr/lib/locale
 #usr/lib/locale/sw_TZ/LC_PAPER
 #usr/lib/locale/sw_TZ/LC_TELEPHONE
 #usr/lib/locale/sw_TZ/LC_TIME
+#usr/lib/locale/syr
+#usr/lib/locale/syr/LC_ADDRESS
+#usr/lib/locale/syr/LC_COLLATE
+#usr/lib/locale/syr/LC_CTYPE
+#usr/lib/locale/syr/LC_IDENTIFICATION
+#usr/lib/locale/syr/LC_MEASUREMENT
+#usr/lib/locale/syr/LC_MESSAGES
+#usr/lib/locale/syr/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/syr/LC_MONETARY
+#usr/lib/locale/syr/LC_NAME
+#usr/lib/locale/syr/LC_NUMERIC
+#usr/lib/locale/syr/LC_PAPER
+#usr/lib/locale/syr/LC_TELEPHONE
+#usr/lib/locale/syr/LC_TIME
 #usr/lib/locale/szl_PL
 #usr/lib/locale/szl_PL/LC_ADDRESS
 #usr/lib/locale/szl_PL/LC_COLLATE
@@ -8163,6 +8195,7 @@ usr/lib/locale
 #usr/share/i18n/locales/pt_PT(a)euro
 #usr/share/i18n/locales/quz_PE
 #usr/share/i18n/locales/raj_IN
+#usr/share/i18n/locales/rif_MA
 #usr/share/i18n/locales/ro_RO
 #usr/share/i18n/locales/ru_RU
 #usr/share/i18n/locales/ru_UA
@@ -8198,6 +8231,7 @@ usr/lib/locale
 #usr/share/i18n/locales/sv_SE
 #usr/share/i18n/locales/sw_KE
 #usr/share/i18n/locales/sw_TZ
+#usr/share/i18n/locales/syr
 #usr/share/i18n/locales/szl_PL
 #usr/share/i18n/locales/ta_IN
 #usr/share/i18n/locales/ta_LK
diff --git a/config/rootfiles/common/armv6l/glibc b/config/rootfiles/common/armv6l/glibc
index d6be0f39a..38d8b5e65 100644
--- a/config/rootfiles/common/armv6l/glibc
+++ b/config/rootfiles/common/armv6l/glibc
@@ -115,6 +115,7 @@ usr/bin/locale
 #usr/include/bits/mman-map-flags-generic.h
 #usr/include/bits/mman-shared.h
 #usr/include/bits/mman.h
+#usr/include/bits/mman_ext.h
 #usr/include/bits/monetary-ldbl.h
 #usr/include/bits/mqueue.h
 #usr/include/bits/mqueue2.h
@@ -176,6 +177,7 @@ usr/bin/locale
 #usr/include/bits/stdint-uintn.h
 #usr/include/bits/stdio-ldbl.h
 #usr/include/bits/stdio.h
+#usr/include/bits/stdio2-decl.h
 #usr/include/bits/stdio2.h
 #usr/include/bits/stdio_lim.h
 #usr/include/bits/stdlib-bsearch.h
@@ -223,6 +225,7 @@ usr/bin/locale
 #usr/include/bits/types/clockid_t.h
 #usr/include/bits/types/cookie_io_functions_t.h
 #usr/include/bits/types/error_t.h
+#usr/include/bits/types/idtype_t.h
 #usr/include/bits/types/locale_t.h
 #usr/include/bits/types/mbstate_t.h
 #usr/include/bits/types/res_state.h
@@ -444,6 +447,7 @@ usr/bin/locale
 #usr/include/sys/param.h
 #usr/include/sys/pci.h
 #usr/include/sys/personality.h
+#usr/include/sys/pidfd.h
 #usr/include/sys/poll.h
 #usr/include/sys/prctl.h
 #usr/include/sys/procfs.h
@@ -6091,6 +6095,20 @@ usr/lib/locale
 #usr/lib/locale/raj_IN/LC_PAPER
 #usr/lib/locale/raj_IN/LC_TELEPHONE
 #usr/lib/locale/raj_IN/LC_TIME
+#usr/lib/locale/rif_MA
+#usr/lib/locale/rif_MA/LC_ADDRESS
+#usr/lib/locale/rif_MA/LC_COLLATE
+#usr/lib/locale/rif_MA/LC_CTYPE
+#usr/lib/locale/rif_MA/LC_IDENTIFICATION
+#usr/lib/locale/rif_MA/LC_MEASUREMENT
+#usr/lib/locale/rif_MA/LC_MESSAGES
+#usr/lib/locale/rif_MA/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/rif_MA/LC_MONETARY
+#usr/lib/locale/rif_MA/LC_NAME
+#usr/lib/locale/rif_MA/LC_NUMERIC
+#usr/lib/locale/rif_MA/LC_PAPER
+#usr/lib/locale/rif_MA/LC_TELEPHONE
+#usr/lib/locale/rif_MA/LC_TIME
 #usr/lib/locale/ro_RO
 #usr/lib/locale/ro_RO.utf8
 #usr/lib/locale/ro_RO.utf8/LC_ADDRESS
@@ -6763,6 +6781,20 @@ usr/lib/locale
 #usr/lib/locale/sw_TZ/LC_PAPER
 #usr/lib/locale/sw_TZ/LC_TELEPHONE
 #usr/lib/locale/sw_TZ/LC_TIME
+#usr/lib/locale/syr
+#usr/lib/locale/syr/LC_ADDRESS
+#usr/lib/locale/syr/LC_COLLATE
+#usr/lib/locale/syr/LC_CTYPE
+#usr/lib/locale/syr/LC_IDENTIFICATION
+#usr/lib/locale/syr/LC_MEASUREMENT
+#usr/lib/locale/syr/LC_MESSAGES
+#usr/lib/locale/syr/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/syr/LC_MONETARY
+#usr/lib/locale/syr/LC_NAME
+#usr/lib/locale/syr/LC_NUMERIC
+#usr/lib/locale/syr/LC_PAPER
+#usr/lib/locale/syr/LC_TELEPHONE
+#usr/lib/locale/syr/LC_TIME
 #usr/lib/locale/szl_PL
 #usr/lib/locale/szl_PL/LC_ADDRESS
 #usr/lib/locale/szl_PL/LC_COLLATE
@@ -8163,6 +8195,7 @@ usr/lib/locale
 #usr/share/i18n/locales/pt_PT(a)euro
 #usr/share/i18n/locales/quz_PE
 #usr/share/i18n/locales/raj_IN
+#usr/share/i18n/locales/rif_MA
 #usr/share/i18n/locales/ro_RO
 #usr/share/i18n/locales/ru_RU
 #usr/share/i18n/locales/ru_UA
@@ -8198,6 +8231,7 @@ usr/lib/locale
 #usr/share/i18n/locales/sv_SE
 #usr/share/i18n/locales/sw_KE
 #usr/share/i18n/locales/sw_TZ
+#usr/share/i18n/locales/syr
 #usr/share/i18n/locales/szl_PL
 #usr/share/i18n/locales/ta_IN
 #usr/share/i18n/locales/ta_LK
diff --git a/config/rootfiles/common/x86_64/glibc b/config/rootfiles/common/x86_64/glibc
index 5014f8a88..6dce1b886 100644
--- a/config/rootfiles/common/x86_64/glibc
+++ b/config/rootfiles/common/x86_64/glibc
@@ -116,6 +116,7 @@ usr/bin/locale
 #usr/include/bits/mman-map-flags-generic.h
 #usr/include/bits/mman-shared.h
 #usr/include/bits/mman.h
+#usr/include/bits/mman_ext.h
 #usr/include/bits/monetary-ldbl.h
 #usr/include/bits/mqueue.h
 #usr/include/bits/mqueue2.h
@@ -179,6 +180,7 @@ usr/bin/locale
 #usr/include/bits/stdint-uintn.h
 #usr/include/bits/stdio-ldbl.h
 #usr/include/bits/stdio.h
+#usr/include/bits/stdio2-decl.h
 #usr/include/bits/stdio2.h
 #usr/include/bits/stdio_lim.h
 #usr/include/bits/stdlib-bsearch.h
@@ -226,6 +228,7 @@ usr/bin/locale
 #usr/include/bits/types/clockid_t.h
 #usr/include/bits/types/cookie_io_functions_t.h
 #usr/include/bits/types/error_t.h
+#usr/include/bits/types/idtype_t.h
 #usr/include/bits/types/locale_t.h
 #usr/include/bits/types/mbstate_t.h
 #usr/include/bits/types/res_state.h
@@ -450,6 +453,7 @@ usr/bin/locale
 #usr/include/sys/pci.h
 #usr/include/sys/perm.h
 #usr/include/sys/personality.h
+#usr/include/sys/pidfd.h
 #usr/include/sys/platform
 #usr/include/sys/platform/x86.h
 #usr/include/sys/poll.h
@@ -808,7 +812,7 @@ usr/lib/gconv
 #usr/lib/libc_nonshared.a
 #usr/lib/libdl.a
 #usr/lib/libg.a
-#usr/lib/libm-2.35.a
+#usr/lib/libm-2.36.a
 #usr/lib/libm.a
 #usr/lib/libm.so
 #usr/lib/libmcheck.a
@@ -6102,6 +6106,20 @@ usr/lib/locale
 #usr/lib/locale/raj_IN/LC_PAPER
 #usr/lib/locale/raj_IN/LC_TELEPHONE
 #usr/lib/locale/raj_IN/LC_TIME
+#usr/lib/locale/rif_MA
+#usr/lib/locale/rif_MA/LC_ADDRESS
+#usr/lib/locale/rif_MA/LC_COLLATE
+#usr/lib/locale/rif_MA/LC_CTYPE
+#usr/lib/locale/rif_MA/LC_IDENTIFICATION
+#usr/lib/locale/rif_MA/LC_MEASUREMENT
+#usr/lib/locale/rif_MA/LC_MESSAGES
+#usr/lib/locale/rif_MA/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/rif_MA/LC_MONETARY
+#usr/lib/locale/rif_MA/LC_NAME
+#usr/lib/locale/rif_MA/LC_NUMERIC
+#usr/lib/locale/rif_MA/LC_PAPER
+#usr/lib/locale/rif_MA/LC_TELEPHONE
+#usr/lib/locale/rif_MA/LC_TIME
 #usr/lib/locale/ro_RO
 #usr/lib/locale/ro_RO.utf8
 #usr/lib/locale/ro_RO.utf8/LC_ADDRESS
@@ -6774,6 +6792,20 @@ usr/lib/locale
 #usr/lib/locale/sw_TZ/LC_PAPER
 #usr/lib/locale/sw_TZ/LC_TELEPHONE
 #usr/lib/locale/sw_TZ/LC_TIME
+#usr/lib/locale/syr
+#usr/lib/locale/syr/LC_ADDRESS
+#usr/lib/locale/syr/LC_COLLATE
+#usr/lib/locale/syr/LC_CTYPE
+#usr/lib/locale/syr/LC_IDENTIFICATION
+#usr/lib/locale/syr/LC_MEASUREMENT
+#usr/lib/locale/syr/LC_MESSAGES
+#usr/lib/locale/syr/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/syr/LC_MONETARY
+#usr/lib/locale/syr/LC_NAME
+#usr/lib/locale/syr/LC_NUMERIC
+#usr/lib/locale/syr/LC_PAPER
+#usr/lib/locale/syr/LC_TELEPHONE
+#usr/lib/locale/syr/LC_TIME
 #usr/lib/locale/szl_PL
 #usr/lib/locale/szl_PL/LC_ADDRESS
 #usr/lib/locale/szl_PL/LC_COLLATE
@@ -8175,6 +8207,7 @@ usr/lib/locale
 #usr/share/i18n/locales/pt_PT(a)euro
 #usr/share/i18n/locales/quz_PE
 #usr/share/i18n/locales/raj_IN
+#usr/share/i18n/locales/rif_MA
 #usr/share/i18n/locales/ro_RO
 #usr/share/i18n/locales/ru_RU
 #usr/share/i18n/locales/ru_UA
@@ -8210,6 +8243,7 @@ usr/lib/locale
 #usr/share/i18n/locales/sv_SE
 #usr/share/i18n/locales/sw_KE
 #usr/share/i18n/locales/sw_TZ
+#usr/share/i18n/locales/syr
 #usr/share/i18n/locales/szl_PL
 #usr/share/i18n/locales/ta_IN
 #usr/share/i18n/locales/ta_LK
diff --git a/lfs/glibc b/lfs/glibc
index d4b1eb0dd..798f3ed8a 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.35
+VER        = 2.36
 
 THISAPP    = glibc-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -79,7 +79,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 623c728884f070cd87ffeb9203f74206197c52405ac9bc44f3dd519a3468b8e8ae2536c883e5d17d94417dbd1e91775de2e674314e4ff7424f9720026d6b7063
+$(DL_FILE)_BLAKE2 = f8375e084043f032609e66fd98c234249df57a595c59672acb1bb8c69aed64d339d526611553449492b097cda900ad1d9bae8873d7f5932b10a9a0d8c9210c55
 
 install : $(TARGET)
 
-- 
2.30.2


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 05/15] make.sh: Bump toolchain version
  2022-08-15 17:17 [PATCH 01/15] sysvinit: Fix build against glibc 2.36 Michael Tremer
                   ` (2 preceding siblings ...)
  2022-08-15 17:17 ` [PATCH 04/15] glibc: Update to 2.36 Michael Tremer
@ 2022-08-15 17:17 ` Michael Tremer
  2022-08-15 17:17 ` [PATCH 06/15] efivars: Fix build with glibc 2.36 Michael Tremer
                   ` (9 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: Michael Tremer @ 2022-08-15 17:17 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 561 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 make.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make.sh b/make.sh
index e5cb873b0..f5abb8a68 100755
--- a/make.sh
+++ b/make.sh
@@ -35,7 +35,7 @@ GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"			# Git Branch
 GIT_TAG="$(git tag | tail -1)"					# Git Tag
 GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)"			# Last commit
 
-TOOLCHAINVER=20220508
+TOOLCHAINVER=20220808
 
 # use multicore and max compression
 ZSTD_OPT="-T0 --ultra -22"
-- 
2.30.2


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 06/15] efivars: Fix build with glibc 2.36
  2022-08-15 17:17 [PATCH 01/15] sysvinit: Fix build against glibc 2.36 Michael Tremer
                   ` (3 preceding siblings ...)
  2022-08-15 17:17 ` [PATCH 05/15] make.sh: Bump toolchain version Michael Tremer
@ 2022-08-15 17:17 ` Michael Tremer
  2022-08-15 17:17 ` [PATCH 07/15] libarchive: " Michael Tremer
                   ` (8 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: Michael Tremer @ 2022-08-15 17:17 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 2775 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/efivar                                  |  1 +
 src/patches/efivar-37-compile-fixes-3.patch | 55 +++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 src/patches/efivar-37-compile-fixes-3.patch

diff --git a/lfs/efivar b/lfs/efivar
index c5d2c8f44..8737c964a 100644
--- a/lfs/efivar
+++ b/lfs/efivar
@@ -74,6 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/efivar-37-compile-fixes-1.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/efivar-37-compile-fixes-2.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/efivar-37-compile-fixes-3.patch
 
 	# -Werror, not even once
 	cd $(DIR_APP) && sed -e "s/-Werror//g" -i gcc.specs
diff --git a/src/patches/efivar-37-compile-fixes-3.patch b/src/patches/efivar-37-compile-fixes-3.patch
new file mode 100644
index 000000000..fcc83aef2
--- /dev/null
+++ b/src/patches/efivar-37-compile-fixes-3.patch
@@ -0,0 +1,55 @@
+From bc65d63ebf8fe6ac8a099ff15ca200986dba1565 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood(a)redhat.com>
+Date: Thu, 28 Jul 2022 16:11:24 -0400
+Subject: [PATCH] Fix glibc 2.36 build (mount.h conflicts)
+
+glibc has decided that sys/mount.h and linux/mount.h are no longer
+usable at the same time.  This broke the build, since linux/fs.h itself
+includes linux/mount.h.  For now, fix the build by only including
+sys/mount.h where we need it.
+
+See-also: https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+Resolves: #227
+Signed-off-by: Robbie Harwood <rharwood(a)redhat.com>
+---
+ src/gpt.c   | 1 +
+ src/linux.c | 1 +
+ src/util.h  | 1 -
+ 3 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/gpt.c b/src/gpt.c
+index 1eda0497..21413c3b 100644
+--- a/src/gpt.c
++++ b/src/gpt.c
+@@ -17,6 +17,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/mount.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/utsname.h>
+diff --git a/src/linux.c b/src/linux.c
+index 47e45ae4..1780816f 100644
+--- a/src/linux.c
++++ b/src/linux.c
+@@ -20,6 +20,7 @@
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <sys/ioctl.h>
++#include <sys/mount.h>
+ #include <sys/socket.h>
+ #include <sys/sysmacros.h>
+ #include <sys/types.h>
+diff --git a/src/util.h b/src/util.h
+index 3300666f..1e67e447 100644
+--- a/src/util.h
++++ b/src/util.h
+@@ -23,7 +23,6 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/ioctl.h>
+-#include <sys/mount.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <tgmath.h>
-- 
2.30.2


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 07/15] libarchive: Fix build with glibc 2.36
  2022-08-15 17:17 [PATCH 01/15] sysvinit: Fix build against glibc 2.36 Michael Tremer
                   ` (4 preceding siblings ...)
  2022-08-15 17:17 ` [PATCH 06/15] efivars: Fix build with glibc 2.36 Michael Tremer
@ 2022-08-15 17:17 ` Michael Tremer
  2022-08-15 17:17 ` [PATCH 08/15] hdparm: " Michael Tremer
                   ` (7 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: Michael Tremer @ 2022-08-15 17:17 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 2518 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/libarchive                                |  1 +
 ...ibarchive-3.6-fix-glibc-2.36-headers.patch | 41 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch

diff --git a/lfs/libarchive b/lfs/libarchive
index 42040b6db..f22bbd481 100644
--- a/lfs/libarchive
+++ b/lfs/libarchive
@@ -74,6 +74,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
diff --git a/src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch b/src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch
new file mode 100644
index 000000000..7c88ca1b1
--- /dev/null
+++ b/src/patches/libarchive-3.6-fix-glibc-2.36-headers.patch
@@ -0,0 +1,41 @@
+From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem(a)gmail.com>
+Date: Mon, 25 Jul 2022 10:56:53 -0700
+Subject: [PATCH] libarchive: Do not include sys/mount.h when linux/fs.h is
+ present
+
+These headers are in conflict and only one is needed by
+archive_read_disk_posix.c therefore include linux/fs.h if it exists
+otherwise include sys/mount.h
+
+It also helps compiling with glibc 2.36
+where sys/mount.h conflicts with linux/mount.h see [1]
+
+[1] https://sourceware.org/glibc/wiki/Release/2.36
+---
+ libarchive/archive_read_disk_posix.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
+index 2b39e672b..a96008db7 100644
+--- a/libarchive/archive_read_disk_posix.c
++++ b/libarchive/archive_read_disk_posix.c
+@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$");
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
+-#ifdef HAVE_SYS_MOUNT_H
+-#include <sys/mount.h>
+-#endif
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
+@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$");
+ #endif
+ #ifdef HAVE_LINUX_FS_H
+ #include <linux/fs.h>
++#elif HAVE_SYS_MOUNT_H
++#include <sys/mount.h>
+ #endif
+ /*
+  * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h.
-- 
2.30.2


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 08/15] hdparm: Fix build with glibc 2.36
  2022-08-15 17:17 [PATCH 01/15] sysvinit: Fix build against glibc 2.36 Michael Tremer
                   ` (5 preceding siblings ...)
  2022-08-15 17:17 ` [PATCH 07/15] libarchive: " Michael Tremer
@ 2022-08-15 17:17 ` Michael Tremer
  2022-08-15 17:17 ` [PATCH 09/15] samba: " Michael Tremer
                   ` (6 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: Michael Tremer @ 2022-08-15 17:17 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1331 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/hdparm                                      |  1 +
 src/patches/hdparm-9.64-fix-glibc-headers.patch | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 src/patches/hdparm-9.64-fix-glibc-headers.patch

diff --git a/lfs/hdparm b/lfs/hdparm
index 704317a6a..8d3f6d1cf 100644
--- a/lfs/hdparm
+++ b/lfs/hdparm
@@ -70,6 +70,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hdparm-9.64-fix-glibc-headers.patch
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/src/patches/hdparm-9.64-fix-glibc-headers.patch b/src/patches/hdparm-9.64-fix-glibc-headers.patch
new file mode 100644
index 000000000..7589c861e
--- /dev/null
+++ b/src/patches/hdparm-9.64-fix-glibc-headers.patch
@@ -0,0 +1,11 @@
+--- hdparm-9.64/hdparm.c
++++ hdparm-9.64/hdparm.c
+@@ -24,9 +24,6 @@
+ #include <sys/mount.h>
+ #include <sys/mman.h>
+ #include <sys/user.h>
+-#include <linux/types.h>
+-#include <linux/fs.h>
+-#include <linux/major.h>
+ #include <endian.h>
+ #include <asm/byteorder.h>
-- 
2.30.2


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 09/15] samba: Fix build with glibc 2.36
  2022-08-15 17:17 [PATCH 01/15] sysvinit: Fix build against glibc 2.36 Michael Tremer
                   ` (6 preceding siblings ...)
  2022-08-15 17:17 ` [PATCH 08/15] hdparm: " Michael Tremer
@ 2022-08-15 17:17 ` Michael Tremer
  2022-08-15 17:17 ` [PATCH 10/15] qemu: Fix build against " Michael Tremer
                   ` (5 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: Michael Tremer @ 2022-08-15 17:17 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 3010 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/samba                                    |  1 +
 src/patches/samba-4.16.4-glibc-headers.patch | 62 ++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 src/patches/samba-4.16.4-glibc-headers.patch

diff --git a/lfs/samba b/lfs/samba
index 87d192492..d64d0e2d4 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -80,6 +80,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba-4.16.4-glibc-headers.patch
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
 		--libdir=/usr/lib/ \
diff --git a/src/patches/samba-4.16.4-glibc-headers.patch b/src/patches/samba-4.16.4-glibc-headers.patch
new file mode 100644
index 000000000..8c75a4172
--- /dev/null
+++ b/src/patches/samba-4.16.4-glibc-headers.patch
@@ -0,0 +1,62 @@
+From 766151bf5b7ef95ae4c8c98b8994e5c21c5bbec0 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn(a)samba.org>
+Date: Tue, 2 Aug 2022 07:55:46 +0200
+Subject: [PATCH] lib:replace: Only include <sys/mount.h> on non-Linux systems
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Details at:
+https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=15132
+
+Signed-off-by: Andreas Schneider <asn(a)samba.org>
+Reviewed-by: Ralph Boehme <slow(a)samba.org>
+
+Autobuild-User(master): Ralph BÃ¶hme <slow(a)samba.org>
+Autobuild-Date(master): Tue Aug  2 11:05:14 UTC 2022 on sn-devel-184
+---
+ lib/replace/system/filesys.h | 4 +++-
+ lib/replace/wscript          | 3 +++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/lib/replace/system/filesys.h b/lib/replace/system/filesys.h
+index 034e5d5886c..bb9482c69af 100644
+--- a/lib/replace/system/filesys.h
++++ b/lib/replace/system/filesys.h
+@@ -36,7 +36,8 @@
+ #include <sys/param.h>
+ #endif
+ 
+-#ifdef HAVE_SYS_MOUNT_H
++/* This include is required on UNIX (*BSD, AIX, ...) for statfs() */
++#if !defined(LINUX) && defined(HAVE_SYS_MOUNT_H)
+ #include <sys/mount.h>
+ #endif
+ 
+@@ -44,6 +45,7 @@
+ #include <mntent.h>
+ #endif
+ 
++/* This include is required on Linux for statfs() */
+ #ifdef HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #endif
+diff --git a/lib/replace/wscript b/lib/replace/wscript
+index 4c774d9f0c3..dd9b19219a1 100644
+--- a/lib/replace/wscript
++++ b/lib/replace/wscript
+@@ -31,6 +31,9 @@ def configure(conf):
+ 
+     conf.env.standalone_replace = conf.IN_LAUNCH_DIR()
+ 
++    if sys.platform.rfind('linux') > -1:
++        conf.DEFINE('LINUX', '1')
++
+     conf.DEFINE('BOOL_DEFINED', 1)
+     conf.DEFINE('HAVE_LIBREPLACE', 1)
+     conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1)
+-- 
+2.30.2
+
-- 
2.30.2


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 10/15] qemu: Fix build against glibc 2.36
  2022-08-15 17:17 [PATCH 01/15] sysvinit: Fix build against glibc 2.36 Michael Tremer
                   ` (7 preceding siblings ...)
  2022-08-15 17:17 ` [PATCH 09/15] samba: " Michael Tremer
@ 2022-08-15 17:17 ` Michael Tremer
  2022-08-15 17:17 ` [PATCH 11/15] collected: Fix build with " Michael Tremer
                   ` (4 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: Michael Tremer @ 2022-08-15 17:17 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1395 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/qemu                                       |  1 +
 src/patches/qemu-7.0.0-fix-glibc-headers.patch | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 src/patches/qemu-7.0.0-fix-glibc-headers.patch

diff --git a/lfs/qemu b/lfs/qemu
index 1edab05d1..fe637d93d 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -94,6 +94,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-7.0.0-fix-glibc-headers.patch
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
diff --git a/src/patches/qemu-7.0.0-fix-glibc-headers.patch b/src/patches/qemu-7.0.0-fix-glibc-headers.patch
new file mode 100644
index 000000000..9332563bc
--- /dev/null
+++ b/src/patches/qemu-7.0.0-fix-glibc-headers.patch
@@ -0,0 +1,11 @@
+--- qemu-7.0.0/linux-user/syscall.c~	2022-08-10 14:03:50.721401251 +0000
++++ qemu-7.0.0/linux-user/syscall.c	2022-08-10 14:00:22.569951783 +0000
+@@ -28,7 +28,7 @@
+ #include <sys/ipc.h>
+ #include <sys/msg.h>
+ #include <sys/wait.h>
+-#include <sys/mount.h>
++#include <linux/mount.h>
+ #include <sys/file.h>
+ #include <sys/fsuid.h>
+ #include <sys/personality.h>
-- 
2.30.2


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 11/15] collected: Fix build with glibc 2.36
  2022-08-15 17:17 [PATCH 01/15] sysvinit: Fix build against glibc 2.36 Michael Tremer
                   ` (8 preceding siblings ...)
  2022-08-15 17:17 ` [PATCH 10/15] qemu: Fix build against " Michael Tremer
@ 2022-08-15 17:17 ` Michael Tremer
  2022-08-15 17:17 ` [PATCH 12/15] libvirt: Fix build against " Michael Tremer
                   ` (3 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: Michael Tremer @ 2022-08-15 17:17 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1656 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/collectd                                        |  1 +
 src/patches/collectd-4.10.9-fix-glibc-headers.patch | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 src/patches/collectd-4.10.9-fix-glibc-headers.patch

diff --git a/lfs/collectd b/lfs/collectd
index bc508cb4a..5c4236b3a 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -108,6 +108,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10-libiptc-build-fixes.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10.9-remove-checks-for-SENSORS_API_VERSION-upper-limit.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10-drop-linux-disk-module.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10.9-fix-glibc-headers.patch
 	cd $(DIR_APP) && autoupdate -v configure.in
 	cd $(DIR_APP) && autoreconf -vfi
 	cd $(DIR_APP)/libltdl && autoreconf -vfi
diff --git a/src/patches/collectd-4.10.9-fix-glibc-headers.patch b/src/patches/collectd-4.10.9-fix-glibc-headers.patch
new file mode 100644
index 000000000..fd05c4a59
--- /dev/null
+++ b/src/patches/collectd-4.10.9-fix-glibc-headers.patch
@@ -0,0 +1,10 @@
+--- collectd-4.10.9/src/utils_mount.c~	2022-08-10 13:45:39.424289940 +0000
++++ collectd-4.10.9/src/utils_mount.c	2022-08-10 13:45:58.224239495 +0000
+@@ -31,6 +31,7 @@
+ #include "plugin.h"
+ #include "utils_mount.h"
+ 
++#undef HAVE_XFS_XQM_H
+ #if HAVE_XFS_XQM_H
+ # include <xfs/xqm.h>
+ #define XFS_SUPER_MAGIC_STR "XFSB"
-- 
2.30.2


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 12/15] libvirt: Fix build against glibc 2.36
  2022-08-15 17:17 [PATCH 01/15] sysvinit: Fix build against glibc 2.36 Michael Tremer
                   ` (9 preceding siblings ...)
  2022-08-15 17:17 ` [PATCH 11/15] collected: Fix build with " Michael Tremer
@ 2022-08-15 17:17 ` Michael Tremer
  2022-08-15 17:17 ` [PATCH 13/15] syslinux: " Michael Tremer
                   ` (2 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: Michael Tremer @ 2022-08-15 17:17 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 2473 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/libvirt                                   |  1 +
 .../libvirt-7.10.0-fix-glibc-headers.patch    | 42 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 src/patches/libvirt-7.10.0-fix-glibc-headers.patch

diff --git a/lfs/libvirt b/lfs/libvirt
index 77f75e1d3..d07f19b03 100644
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -83,6 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
 
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libvirt/0001-Change-default-behavior-of-libvirt-guests.sh-for-IPF.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libvirt-7.10.0-fix-glibc-headers.patch
 
 	cd $(DIR_APP) && meson \
 		--prefix=/usr \
diff --git a/src/patches/libvirt-7.10.0-fix-glibc-headers.patch b/src/patches/libvirt-7.10.0-fix-glibc-headers.patch
new file mode 100644
index 000000000..cfe71d4bd
--- /dev/null
+++ b/src/patches/libvirt-7.10.0-fix-glibc-headers.patch
@@ -0,0 +1,42 @@
+From c0d9adf220dc0d223330a7bac37b174132d330ba Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso(a)redhat.com>
+Date: Mon, 1 Aug 2022 15:24:01 -0400
+Subject: [PATCH] virfile: Fix build with glibc 2.36
+
+With glibc 2.36, sys/mount.h and linux/mount.h conflict:
+https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+virfile.c imports sys/mount.h and linux/fs.h, which pulls in
+linux/mount.h.
+
+Manually define the constants we need from linux/fs.h, like was
+done in llvm:
+
+https://reviews.llvm.org/rGb379129c4beb3f26223288627a1291739f33af02
+
+Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
+Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
+---
+ src/util/virfile.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/util/virfile.c b/src/util/virfile.c
+index 99da058db3..ce541b8946 100644
+--- a/src/util/virfile.c
++++ b/src/util/virfile.c
+@@ -71,7 +71,11 @@
+ # endif
+ # include <sys/ioctl.h>
+ # include <linux/cdrom.h>
+-# include <linux/fs.h>
++/* These come from linux/fs.h, but that header conflicts with
++ * sys/mount.h on glibc 2.36+ */
++# define FS_IOC_GETFLAGS _IOR('f', 1, long)
++# define FS_IOC_SETFLAGS _IOW('f', 2, long)
++# define FS_NOCOW_FL 0x00800000
+ #endif
+ 
+ #if WITH_LIBATTR
+-- 
+GitLab
+
-- 
2.30.2


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 13/15] syslinux: Fix build against glibc 2.36
  2022-08-15 17:17 [PATCH 01/15] sysvinit: Fix build against glibc 2.36 Michael Tremer
                   ` (10 preceding siblings ...)
  2022-08-15 17:17 ` [PATCH 12/15] libvirt: Fix build against " Michael Tremer
@ 2022-08-15 17:17 ` Michael Tremer
  2022-08-15 17:17 ` [PATCH 14/15] installer: " Michael Tremer
  2022-08-15 17:17 ` [PATCH 15/15] u-boot: Ignore LOAD segments with RWX permissions Michael Tremer
  13 siblings, 0 replies; 15+ messages in thread
From: Michael Tremer @ 2022-08-15 17:17 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 4408 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/syslinux                                  |  1 +
 ...binstaller-Fix-build-with-glibc-2.36.patch | 56 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 src/patches/syslinux-6.04-libinstaller-Fix-build-with-glibc-2.36.patch

diff --git a/lfs/syslinux b/lfs/syslinux
index d90032cd9..150e4071e 100644
--- a/lfs/syslinux
+++ b/lfs/syslinux
@@ -79,6 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.03-sysmacros.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.04_replace-builtin-strlen-that-appears-to-get-optimized.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.04_pre1-fcommon.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.04-libinstaller-Fix-build-with-glibc-2.36.patch
 
 	# Build
 	cd $(DIR_APP) && make bios $(MAKETUNING)
diff --git a/src/patches/syslinux-6.04-libinstaller-Fix-build-with-glibc-2.36.patch b/src/patches/syslinux-6.04-libinstaller-Fix-build-with-glibc-2.36.patch
new file mode 100644
index 000000000..b16eec007
--- /dev/null
+++ b/src/patches/syslinux-6.04-libinstaller-Fix-build-with-glibc-2.36.patch
@@ -0,0 +1,56 @@
+From 0c4f97b2dd22365d32b865dd002282e454a7edf0 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa(a)gmail.com>
+Date: Sat, 6 Aug 2022 11:53:55 +0000
+Subject: [PATCH] libinstaller: Fix build with glibc-2.36
+
+* add only necessary definitions from linux/fs.h, because including whole
+  causes conflicts with sys/mount.h:
+  http://errors.yoctoproject.org/Errors/Details/664535/
+
+In file included from TOPDIR/tmp-glibc/work/core2-64-oe-linux/syslinux/6.04-pre2-r1/recipe-sysroot/usr/include/linux/fs.h:19,
+                 from TOPDIR/tmp-glibc/work/core2-64-oe-linux/syslinux/6.04-pre2-r1/syslinux-6.04-pre2/linux/../libinstaller/linuxioctl.h:19,
+                 from TOPDIR/tmp-glibc/work/core2-64-oe-linux/syslinux/6.04-pre2-r1/syslinux-6.04-pre2/linux/../libinstaller/syslxcom.c:34:
+TOPDIR/tmp-glibc/work/core2-64-oe-linux/syslinux/6.04-pre2-r1/recipe-sysroot/usr/include/linux/mount.h:95:6: error: redeclaration of 'enum fsconfig_command'
+   95 | enum fsconfig_command {
+      |      ^~~~~~~~~~~~~~~~
+In file included from TOPDIR/tmp-glibc/work/core2-64-oe-linux/syslinux/6.04-pre2-r1/syslinux-6.04-pre2/linux/../libinstaller/syslxcom.c:31:
+TOPDIR/tmp-glibc/work/core2-64-oe-linux/syslinux/6.04-pre2-r1/recipe-sysroot/usr/include/sys/mount.h:189:6: note: originally defined here
+  189 | enum fsconfig_command
+      |      ^~~~~~~~~~~~~~~~
+TOPDIR/tmp-glibc/work/core2-64-oe-linux/syslinux/6.04-pre2-r1/recipe-sysroot/usr/include/linux/mount.h:96:9: error: redeclaration of enumerator 'FSCONFIG_SET_FLAG'
+   96 |         FSCONFIG_SET_FLAG       = 0,    /* Set parameter, supplying no value */
+      |         ^~~~~~~~~~~~~~~~~
+...
+
+Upstream-Status: Pending
+Signed-off-by: Martin Jansa <Martin.Jansa(a)gmail.com>
+---
+ libinstaller/linuxioctl.h | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/libinstaller/linuxioctl.h b/libinstaller/linuxioctl.h
+index e2731c7..f4a6703 100644
+--- a/libinstaller/linuxioctl.h
++++ b/libinstaller/linuxioctl.h
+@@ -16,7 +16,20 @@
+ #include <linux/fd.h>		/* Floppy geometry */
+ #include <linux/hdreg.h>	/* Hard disk geometry */
+ 
+-#include <linux/fs.h>		/* FIGETBSZ, FIBMAP, FS_IOC_* */
++// #include <linux/fs.h>		/* FIGETBSZ, FIBMAP, FS_IOC_* */
++// linux/fs.h unfortunately causes conflict with sys/mount.h since glibc-2.36
++// https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
++// add the necessary definitions
++
++#define FS_IOC_GETFLAGS                 _IOR('f', 1, long)
++#define FS_IOC_SETFLAGS                 _IOW('f', 2, long)
++#define FIBMAP	   _IO(0x00,1)	/* bmap access */
++#define FIGETBSZ   _IO(0x00,2)	/* get the block size used for bmap */
++#define FS_IMMUTABLE_FL			0x00000010 /* Immutable file */
++#define BLKGETSIZE _IO(0x12,96)	/* return device size /512 (long *arg) */
++
++// for musl we also need limits.h for PATH_MAX
++#include <linux/limits.h>
+ 
+ #undef SECTOR_SIZE		/* Defined in msdos_fs.h for no good reason */
+ #undef SECTOR_BITS
-- 
2.30.2


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 14/15] installer: Fix build against glibc 2.36
  2022-08-15 17:17 [PATCH 01/15] sysvinit: Fix build against glibc 2.36 Michael Tremer
                   ` (11 preceding siblings ...)
  2022-08-15 17:17 ` [PATCH 13/15] syslinux: " Michael Tremer
@ 2022-08-15 17:17 ` Michael Tremer
  2022-08-15 17:17 ` [PATCH 15/15] u-boot: Ignore LOAD segments with RWX permissions Michael Tremer
  13 siblings, 0 replies; 15+ messages in thread
From: Michael Tremer @ 2022-08-15 17:17 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 408 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 src/installer/hw.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/installer/hw.c b/src/installer/hw.c
index 236737c8e..9d11d85de 100644
--- a/src/installer/hw.c
+++ b/src/installer/hw.c
@@ -40,8 +40,6 @@
 #include <sys/utsname.h>
 #include <unistd.h>
 
-#include <linux/fs.h>
-
 #include <libsmooth.h>
 
 #include "hw.h"
-- 
2.30.2


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 15/15] u-boot: Ignore LOAD segments with RWX permissions
  2022-08-15 17:17 [PATCH 01/15] sysvinit: Fix build against glibc 2.36 Michael Tremer
                   ` (12 preceding siblings ...)
  2022-08-15 17:17 ` [PATCH 14/15] installer: " Michael Tremer
@ 2022-08-15 17:17 ` Michael Tremer
  13 siblings, 0 replies; 15+ messages in thread
From: Michael Tremer @ 2022-08-15 17:17 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1757 bytes --]

This is a new check in binutils which has to be disabled for some legacy
bootloaders.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/u-boot | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lfs/u-boot b/lfs/u-boot
index f7341675d..3488204ee 100644
--- a/lfs/u-boot
+++ b/lfs/u-boot
@@ -34,6 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-$(MKIMAGE)
 SUP_ARCH   = armv6l aarch64
 
 CFLAGS    := $(patsubst -fstack-protector-strong,,$(CFLAGS))
+LDFLAGS   += --no-warn-rwx-segments
 
 ATF_VER    = 2.6
 
@@ -189,7 +190,7 @@ else
 	# OrangePi Zero Plus
 	cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER)
 	cd $(DIR_APP) && tar axf $(DIR_DL)/arm-trusted-firmware-$(ATF_VER).tar.gz
-	cd $(DIR_APP)/arm-trusted-firmware-$(ATF_VER) && make PLAT=sun50i_a64 DEBUG=0 bl31
+	cd $(DIR_APP)/arm-trusted-firmware-$(ATF_VER) && make PLAT=sun50i_a64 DEBUG=0 bl31 LDFLAGS="$(LDFLAGS)"
 	cd $(DIR_APP) && cp arm-trusted-firmware-$(ATF_VER)/build/sun50i_a64/release/bl31.bin bl31.bin
 	cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER)
 	-mkdir -pv /usr/share/u-boot/orangepi_zero_plus
@@ -204,7 +205,7 @@ else
 	# Nanopi R2S
 	cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER)
 	cd $(DIR_APP) && tar axf $(DIR_DL)/arm-trusted-firmware-$(ATF_VER).tar.gz
-	cd $(DIR_APP)/arm-trusted-firmware-$(ATF_VER) && make PLAT=rk3328 ARCH=aarch64 DEBUG=0 bl31
+	cd $(DIR_APP)/arm-trusted-firmware-$(ATF_VER) && make PLAT=rk3328 ARCH=aarch64 DEBUG=0 bl31 LDFLAGS="$(LDFLAGS)"
 	cd $(DIR_APP) && cp arm-trusted-firmware-$(ATF_VER)/build/rk3328/release/bl31/bl31.elf bl31.elf
 	cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER)
 	-mkdir -pv /usr/share/u-boot/nanopi_r2s
-- 
2.30.2


^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2022-08-15 17:17 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-15 17:17 [PATCH 01/15] sysvinit: Fix build against glibc 2.36 Michael Tremer
2022-08-15 17:17 ` [PATCH 02/15] gcc: " Michael Tremer
2022-08-15 17:17 ` [PATCH 03/15] binutils: Update to 2.39 Michael Tremer
2022-08-15 17:17 ` [PATCH 04/15] glibc: Update to 2.36 Michael Tremer
2022-08-15 17:17 ` [PATCH 05/15] make.sh: Bump toolchain version Michael Tremer
2022-08-15 17:17 ` [PATCH 06/15] efivars: Fix build with glibc 2.36 Michael Tremer
2022-08-15 17:17 ` [PATCH 07/15] libarchive: " Michael Tremer
2022-08-15 17:17 ` [PATCH 08/15] hdparm: " Michael Tremer
2022-08-15 17:17 ` [PATCH 09/15] samba: " Michael Tremer
2022-08-15 17:17 ` [PATCH 10/15] qemu: Fix build against " Michael Tremer
2022-08-15 17:17 ` [PATCH 11/15] collected: Fix build with " Michael Tremer
2022-08-15 17:17 ` [PATCH 12/15] libvirt: Fix build against " Michael Tremer
2022-08-15 17:17 ` [PATCH 13/15] syslinux: " Michael Tremer
2022-08-15 17:17 ` [PATCH 14/15] installer: " Michael Tremer
2022-08-15 17:17 ` [PATCH 15/15] u-boot: Ignore LOAD segments with RWX permissions Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox