summaryrefslogtreecommitdiffstats
path: root/meta/packages/module-init-tools
diff options
context:
space:
mode:
authorJeff Dike <jdike@linux.intel.com>2010-06-01 12:34:07 -0400
committerRichard Purdie <rpurdie@linux.intel.com>2010-06-03 12:28:10 +0100
commitfe4e6fc997431751968d51e0bd07098ac51ac7cb (patch)
treed0c4f02913be337604f865cebebd189f860794eb /meta/packages/module-init-tools
parent3161c9b15a39e552b383c704851edead8435365c (diff)
downloadpoky-fe4e6fc997431751968d51e0bd07098ac51ac7cb.tar.gz
module-init-tools: Don't cross-build static binaries
When building the native version, I get errors from ld complaining about not being able to find a static libc. Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Diffstat (limited to 'meta/packages/module-init-tools')
-rw-r--r--meta/packages/module-init-tools/files/no-static-binaries.patch27
-rw-r--r--meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb4
2 files changed, 30 insertions, 1 deletions
diff --git a/meta/packages/module-init-tools/files/no-static-binaries.patch b/meta/packages/module-init-tools/files/no-static-binaries.patch
new file mode 100644
index 0000000000..a9fbb27bf6
--- /dev/null
+++ b/meta/packages/module-init-tools/files/no-static-binaries.patch
@@ -0,0 +1,27 @@
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
7Index: module-init-tools-3.2.2/Makefile.am
8===================================================================
9--- module-init-tools-3.2.2.orig/Makefile.am 2010-05-26 15:43:16.000000000 -0400
10+++ module-init-tools-3.2.2/Makefile.am 2010-05-26 16:04:06.232990785 -0400
11@@ -5,16 +5,10 @@ rmmod_SOURCES = rmmod.c testing.h
12 depmod_SOURCES = depmod.c moduleops.c tables.c zlibsupport.c depmod.h moduleops.h tables.h list.h testing.h zlibsupport.h
13 modinfo_SOURCES = modinfo.c zlibsupport.c testing.h zlibsupport.h
14
15-insmod_static_SOURCES = insmod.c
16-insmod_static_LDFLAGS = -static
17-# We don't want the $(zlib_flags) here: that makes a dynamic executable
18-insmod_static_LDADD =
19-
20 EXTRA_insmod_SOURCES = backwards_compat.c
21 EXTRA_lsmod_SOURCES = backwards_compat.c
22 EXTRA_modprobe_SOURCES = backwards_compat.c
23 EXTRA_rmmod_SOURCES = backwards_compat.c
24-EXTRA_insmod_static_SOURCES = backwards_compat.c
25 EXTRA_depmod_SOURCES = moduleops_core.c
26 EXTRA_modinfo_SOURCES = backwards_compat.c
27
diff --git a/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb b/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
index a86245fde3..02a69193a7 100644
--- a/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
+++ b/meta/packages/module-init-tools/module-init-tools-cross_3.2.2.bb
@@ -1,8 +1,10 @@
1require module-init-tools.inc 1require module-init-tools.inc
2PR = "r3" 2PR = "r4"
3inherit cross 3inherit cross
4PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" 4PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
5 5
6SRC_URI += "file://no-static-binaries.patch;patch=1"
7
6EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" 8EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
7 9
8do_install_append () { 10do_install_append () {