summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-03-21 12:12:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-21 15:33:05 +0000
commite3a848699e891c019c974c6f9f9f8597ac6d633f (patch)
tree7cd91dbbcf4e9c1b3ae3f85d9d662b9ad7f47336
parent8ad75a6e7834cef95905f688fb7d593361cd3fdd (diff)
downloadpoky-e3a848699e891c019c974c6f9f9f8597ac6d633f.tar.gz
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>
-rw-r--r--meta/recipes-devtools/syslinux/files/no-strip.patch31
-rw-r--r--meta/recipes-devtools/syslinux/syslinux_4.03.bb5
2 files changed, 34 insertions, 2 deletions
diff --git a/meta/recipes-devtools/syslinux/files/no-strip.patch b/meta/recipes-devtools/syslinux/files/no-strip.patch
new file mode 100644
index 0000000000..775851a75d
--- /dev/null
+++ b/meta/recipes-devtools/syslinux/files/no-strip.patch
@@ -0,0 +1,31 @@
1Disable stripping of binaries
2
3We don't want to strip these as this is handled separately at package
4time.
5
6Upstream-Status: Inappropriate [configuration]
7
8Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
9
10--- syslinux-4.03.orig/mtools/Makefile
11+++ syslinux-4.03/mtools/Makefile
12@@ -4,7 +4,7 @@ include $(topdir)/MCONFIG
13 OPTFLAGS = -g -Os
14 INCLUDES = -I. -I.. -I../libfat -I../libinstaller
15 CFLAGS = $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
16-LDFLAGS = -s
17+LDFLAGS =
18
19 SRCS = syslinux.c \
20 ../libinstaller/fat.c \
21--- syslinux-4.03.orig/utils/Makefile
22+++ syslinux-4.03/utils/Makefile
23@@ -18,7 +18,7 @@ topdir = ..
24 include $(topdir)/MCONFIG
25
26 CFLAGS = $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
27-LDFLAGS = -O2 -s
28+LDFLAGS = -O2
29
30 TARGETS = mkdiskimage isohybrid gethostip memdiskfind
31 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 2ab6878c4d..a8a1f9475e 100644
--- 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 \
7# If you really want to run syslinux, you need mtools. We just want the 7# If you really want to run syslinux, you need mtools. We just want the
8# ldlinux.* stuff for now, so skip mtools-native 8# ldlinux.* stuff for now, so skip mtools-native
9DEPENDS = "nasm-native" 9DEPENDS = "nasm-native"
10PR = "r6" 10PR = "r7"
11 11
12SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/4.xx/syslinux-${PV}.tar.bz2 \ 12SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/4.xx/syslinux-${PV}.tar.bz2 \
13 file://cross-build.patch" 13 file://cross-build.patch \
14 file://no-strip.patch"
14 15
15SRC_URI[md5sum] = "a7ca38a0a5786b6efae8fb01a1ae8070" 16SRC_URI[md5sum] = "a7ca38a0a5786b6efae8fb01a1ae8070"
16SRC_URI[sha256sum] = "c65567e324f9d1f7f794ae8f9578a0292bbd47d7b8d895a004d2f0152d0bda38" 17SRC_URI[sha256sum] = "c65567e324f9d1f7f794ae8f9578a0292bbd47d7b8d895a004d2f0152d0bda38"