diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-27 11:58:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-27 16:18:51 +0100 |
commit | 7a63a98f7448a48819154b77d3ee3d2460b4fd66 (patch) | |
tree | 3feb6970c998f98bcb3c966b2a493885447cf508 /meta/recipes-kernel/module-init-tools | |
parent | 6c936b4b1a2fb1bdf1f3f91482af7e33e71b5c10 (diff) | |
download | poky-7a63a98f7448a48819154b77d3ee3d2460b4fd66.tar.gz |
module-init-tools-cross: Drop static binaries patch as a better fix has been merged
(From OE-Core rev: 4f6783b83d722d040707d0b7cd69f27b133bd562)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/module-init-tools')
-rw-r--r-- | meta/recipes-kernel/module-init-tools/files/no-static-binaries.patch | 25 | ||||
-rw-r--r-- | meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb | 2 |
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 @@ | |||
1 | # Building a native, statically-linked insmod can result in ld failing because | ||
2 | # it can't find a static libc. A native, static insmod is unnecessary anyway, | ||
3 | # so this patch just removes it. | ||
4 | # | ||
5 | # - jdike@linux.intel.com | ||
6 | # | ||
7 | # Change to a simpler method by just disabling static link flag, since even | ||
8 | # removing those lines don't prevent insmod.static from compile | ||
9 | # | ||
10 | # by Kevin Tian <kevin.tian@intel.com>, 2010-07-21 | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Index: module-init-tools-3.2.2/Makefile.am | ||
15 | =================================================================== | ||
16 | --- module-init-tools-3.2.2.orig/Makefile.am 2010-05-26 15:43:16.000000000 -0400 | ||
17 | +++ module-init-tools-3.2.2/Makefile.am 2010-05-26 16:04:06.232990785 -0400 | ||
18 | @@ -10,7 +10,6 @@ | ||
19 | modindex_SOURCES = modindex.c zlibsupport.c zlibsupport.h testing.h | ||
20 | |||
21 | insmod_static_SOURCES = insmod.c | ||
22 | -insmod_static_LDFLAGS = -static | ||
23 | # We don't want the $(zlib_flags) here: that makes a dynamic executable | ||
24 | insmod_static_LDADD = libmodtools.a | ||
25 | |||
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" | |||
3 | inherit cross | 3 | inherit cross |
4 | PROVIDES += "virtual/${TARGET_PREFIX}depmod" | 4 | PROVIDES += "virtual/${TARGET_PREFIX}depmod" |
5 | 5 | ||
6 | SRC_URI += "file://no-static-binaries.patch" | ||
7 | |||
8 | SRC_URI[md5sum] = "bc44832c6e41707b8447e2847d2019f5" | 6 | SRC_URI[md5sum] = "bc44832c6e41707b8447e2847d2019f5" |
9 | SRC_URI[sha256sum] = "e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b" | 7 | SRC_URI[sha256sum] = "e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b" |
10 | 8 | ||