syslinux: Update to 4.06
PATCH v4 1/1 syslinux: Update to 4.06
Patches are now part of upstream or no longer needed. Added new util-linux dependency for isohybrid. Paths updated to reflect directory structure changes.
INCDIR isn't used by the build process during compilation which results in the compiler not finding uuid/uuid.h from util-linux when compiling isohybrid unless it exists on the host system. This was fixed by adding -I${includedir} to CC when calling make.
Signed-off-by Jonathan Liu <[email protected]>
--- meta/classes/boot-directdisk.bbclass | 2 +- .../syslinux/files/cross-build.patch | 71 -- .../libinstaller-Avoid-using-linux-ext2_fs.h.patch | 975 --------------------- .../recipes-devtools/syslinux/files/no-strip.patch | 31 - meta/recipes-devtools/syslinux/syslinux_4.03.bb | 65 -- meta/recipes-devtools/syslinux/syslinux_4.06.bb | 62 ++ 6 files changed, 63 insertions(+), 1143 deletions(-) delete mode 100644 meta/recipes-devtools/syslinux/files/cross-build.patch delete mode 100644 meta/recipes-devtools/syslinux/files/libinstaller-Avoid-using-linux-ext2_fs.h.patch delete mode 100644 meta/recipes-devtools/syslinux/files/no-strip.patch delete mode 100644 meta/recipes-devtools/syslinux/syslinux_4.03.bb create mode 100644 meta/recipes-devtools/syslinux/syslinux_4.06.bb
meta/classes/boot-directdisk.bbclass +1 -1
@@ -82,7 +82,7 @@ build_boot_dd() { parted $IMAGE print OFFSET=`expr $END2 / 512` - dd if=${STAGING_LIBDIR}/syslinux/mbr.bin of=$IMAGE conv=notrunc + dd if=${STAGING_DATADIR}/syslinux/mbr.bin of=$IMAGE conv=notrunc dd if=${HDDIMG} of=$IMAGE conv=notrunc seek=1 bs=512 dd if=${ROOTFS} of=$IMAGE conv=notrunc seek=$OFFSET bs=512
meta/recipes-devtools/syslinux/files/cross-build.patch deleted +0 -71
71 lines not on this page · raw message
meta/recipes-devtools/syslinux/files/libinstaller-Avoid-using-linux-ext2_fs.h.patch deleted +0 -975
975 lines not on this page · raw message
meta/recipes-devtools/syslinux/files/no-strip.patch deleted +0 -31
@@ -1,31 +0,0 @@ -Disable stripping of binaries - -We don't want to strip these as this is handled separately at package -time. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Paul Eggleton <[email protected]> - ---- syslinux-4.03.orig/mtools/Makefile -+++ syslinux-4.03/mtools/Makefile -@@ -4,7 +4,7 @@ include $(topdir)/MCONFIG - OPTFLAGS = -g -Os - INCLUDES = -I. -I.. -I../libfat -I../libinstaller - CFLAGS = $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) --LDFLAGS = -s -+LDFLAGS = - - SRCS = syslinux.c \ - ../libinstaller/fat.c \ ---- syslinux-4.03.orig/utils/Makefile -+++ syslinux-4.03/utils/Makefile -@@ -18,7 +18,7 @@ topdir = .. - include $(topdir)/MCONFIG - - CFLAGS = $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 --LDFLAGS = -O2 -s -+LDFLAGS = -O2 - - TARGETS = mkdiskimage isohybrid gethostip memdiskfind - TARGETS += isohybrid.pl # about to be obsoleted
meta/recipes-devtools/syslinux/syslinux_4.03.bb deleted +0 -65
65 lines not on this page · raw message
meta/recipes-devtools/syslinux/syslinux_4.06.bb new file +62 -0
62 lines not on this page · raw message
Signature · 1 line
1.8.2.1