syslinux: fix stripped file warnings

Fix the following package warnings:
WARNING: File '/usr/bin/memdiskfind' from syslinux was already stripped, this will prevent future debugging!
WARNING: File '/usr/bin/syslinux' from syslinux was already stripped, this will prevent future debugging!
WARNING: File '/usr/bin/gethostip' from syslinux was already stripped, this will prevent future debugging!
WARNING: File '/usr/bin/isohybrid' from syslinux was already stripped, this will prevent future debugging!

(From OE-Core rev: 90bf61226d1bebd846ad9dc028affc334862e794)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/syslinux/files/no-strip.patch b/meta/recipes-devtools/syslinux/files/no-strip.patch
new file mode 100644 (file)
index 0000000..775851a
--- /dev/null
+++ b/meta/recipes-devtools/syslinux/files/no-strip.patch
@@ -0,0 +1,31 @@
+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 <paul.eggleton@linux.intel.com>
+
+--- 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

diff --git a/meta/recipes-devtools/syslinux/syslinux_4.03.bb b/meta/recipes-devtools/syslinux/syslinux_4.03.bb
index 2ab6878..a8a1f94 100644 (file)
--- a/meta/recipes-devtools/syslinux/syslinux_4.03.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_4.03.bb
@@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 # If you really want to run syslinux, you need mtools.  We just want the
 # ldlinux.* stuff for now, so skip mtools-native
 DEPENDS = "nasm-native"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/4.xx/syslinux-${PV}.tar.bz2 \
-           file://cross-build.patch"
+           file://cross-build.patch \
+           file://no-strip.patch"
 
 SRC_URI[md5sum] = "a7ca38a0a5786b6efae8fb01a1ae8070"
 SRC_URI[sha256sum] = "c65567e324f9d1f7f794ae8f9578a0292bbd47d7b8d895a004d2f0152d0bda38"