summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 11:58:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 16:16:34 +0100
commit4f6783b83d722d040707d0b7cd69f27b133bd562 (patch)
treea1b7bc06b9c40266bec48a955ccdd95bdc7d4410
parent036faf66c3889cd8bf4cd3c9b97c80f008f3c6e2 (diff)
downloadopenembedded-core-contrib-4f6783b83d722d040707d0b7cd69f27b133bd562.tar.gz
openembedded-core-contrib-4f6783b83d722d040707d0b7cd69f27b133bd562.tar.bz2
openembedded-core-contrib-4f6783b83d722d040707d0b7cd69f27b133bd562.zip
module-init-tools-cross: Drop static binaries patch as a better fix has been merged
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch25
-rw-r--r--meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb2
2 files changed, 0 insertions, 27 deletions
diff --git a/meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch b/meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch
deleted file mode 100644
index 33fb6e0b04..0000000000
--- a/meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# Building a native, statically-linked insmod can result in ld failing because
-# it can't find a static libc. A native, static insmod is unnecessary anyway,
-# so this patch just removes it.
-#
-# - jdike@linux.intel.com
-#
-# Change to a simpler method by just disabling static link flag, since even
-# removing those lines don't prevent insmod.static from compile
-#
-# by Kevin Tian <kevin.tian@intel.com>, 2010-07-21
-
-Upstream-Status: Pending
-
-Index: module-init-tools-3.2.2/Makefile.am
-===================================================================
---- module-init-tools-3.2.2.orig/Makefile.am 2010-05-26 15:43:16.000000000 -0400
-+++ module-init-tools-3.2.2/Makefile.am 2010-05-26 16:04:06.232990785 -0400
-@@ -10,7 +10,6 @@
- modindex_SOURCES = modindex.c zlibsupport.c zlibsupport.h testing.h
-
- insmod_static_SOURCES = insmod.c
--insmod_static_LDFLAGS = -static
- # We don't want the $(zlib_flags) here: that makes a dynamic executable
- insmod_static_LDADD = libmodtools.a
-
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb b/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
index 38f047682b..a6c5d21566 100644
--- a/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
+++ b/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
@@ -3,8 +3,6 @@ PR = "r0"
inherit cross
PROVIDES += "virtual/${TARGET_PREFIX}depmod"
-SRC_URI += "file://no-static-binaries.patch"
-
SRC_URI[md5sum] = "bc44832c6e41707b8447e2847d2019f5"
SRC_URI[sha256sum] = "e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b"