summaryrefslogtreecommitdiff
path: root/meta/packages/module-init-tools/files/no-static-binaries.patch
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-07-21 13:21:49 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-21 21:44:37 +0100
commitb376a803cac9c6403ce7ddf2a4a479292ec9ba85 (patch)
treeb642f0fbe43e030348858dde2c564b970d88d2d1 /meta/packages/module-init-tools/files/no-static-binaries.patch
parent8a251accbfd68078fbab23a96411b76928cf1063 (diff)
downloadopenembedded-core-b376a803cac9c6403ce7ddf2a4a479292ec9ba85.tar.gz
openembedded-core-b376a803cac9c6403ce7ddf2a4a479292ec9ba85.tar.bz2
openembedded-core-b376a803cac9c6403ce7ddf2a4a479292ec9ba85.tar.xz
openembedded-core-b376a803cac9c6403ce7ddf2a4a479292ec9ba85.zip
module-init-tools: upgrade to 3.12
[Patches] KEEP _ignore_arch_directory_: ignore /etc/modprobe.d/arch, not sure reason now. keep it and to be verified later REMOVE _module-init-tools-remove-index.patch_: in upstream NEW _disable_man.patch_: a simpler patch to replace below removed two REMOVE _manpagesopt_: due to above new patch REMOVE _no_man_rebuild_: ditto KEEP _modutils_extension_: poky has its own name convention and thus need such knowledge in code [Recipe] - adjust indention - remove some old lines like ${S} and EXTRA_OECONF Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta/packages/module-init-tools/files/no-static-binaries.patch')
-rw-r--r--meta/packages/module-init-tools/files/no-static-binaries.patch24
1 files changed, 10 insertions, 14 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
index a9fbb27bf..ca83ec075 100644
--- a/meta/packages/module-init-tools/files/no-static-binaries.patch
+++ b/meta/packages/module-init-tools/files/no-static-binaries.patch
@@ -3,25 +3,21 @@
# 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
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
-@@ -5,16 +5,10 @@ rmmod_SOURCES = rmmod.c testing.h
- depmod_SOURCES = depmod.c moduleops.c tables.c zlibsupport.c depmod.h moduleops.h tables.h list.h testing.h zlibsupport.h
- modinfo_SOURCES = modinfo.c zlibsupport.c testing.h zlibsupport.h
+@@ -10,7 +10,6 @@
+ modindex_SOURCES = modindex.c zlibsupport.c zlibsupport.h testing.h
--insmod_static_SOURCES = insmod.c
+ 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 =
--
- EXTRA_insmod_SOURCES = backwards_compat.c
- EXTRA_lsmod_SOURCES = backwards_compat.c
- EXTRA_modprobe_SOURCES = backwards_compat.c
- EXTRA_rmmod_SOURCES = backwards_compat.c
--EXTRA_insmod_static_SOURCES = backwards_compat.c
- EXTRA_depmod_SOURCES = moduleops_core.c
- EXTRA_modinfo_SOURCES = backwards_compat.c
+ # We don't want the $(zlib_flags) here: that makes a dynamic executable
+ insmod_static_LDADD = libmodtools.a