From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 13/15] syslinux: Fix build against glibc 2.36 Date: Mon, 15 Aug 2022 17:17:51 +0000 Message-ID: <20220815171753.1858688-13-michael.tremer@ipfire.org> In-Reply-To: <20220815171753.1858688-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8419853396492753554==" List-Id: --===============8419853396492753554== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- 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-gli= bc-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-sysmacro= s.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-fco= mmon.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.04-libinsta= ller-Fix-build-with-glibc-2.36.patch =20 # 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.pat= ch 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 +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_comma= nd' + 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 =3D 0, /* Set parameter, supplyin= g no value */ + | ^~~~~~~~~~~~~~~~~ +... + +Upstream-Status: Pending +Signed-off-by: Martin Jansa +--- + 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 /* Floppy geometry */ + #include /* Hard disk geometry */ +=20 +-#include /* FIGETBSZ, FIBMAP, FS_IOC_* */ ++// #include /* 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 +=20 + #undef SECTOR_SIZE /* Defined in msdos_fs.h for no good reason */ + #undef SECTOR_BITS --=20 2.30.2 --===============8419853396492753554==--