diff options
author | Kevin Tian <kevin.tian@intel.com> | 2010-07-21 13:21:49 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-21 21:44:37 +0100 |
commit | b376a803cac9c6403ce7ddf2a4a479292ec9ba85 (patch) | |
tree | b642f0fbe43e030348858dde2c564b970d88d2d1 /meta/packages/module-init-tools/files/no-static-binaries.patch | |
parent | 8a251accbfd68078fbab23a96411b76928cf1063 (diff) | |
download | poky-b376a803cac9c6403ce7ddf2a4a479292ec9ba85.tar.gz |
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.patch | 24 |
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 a9fbb27bf6..ca83ec0755 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 @@ | |||
3 | # so this patch just removes it. | 3 | # so this patch just removes it. |
4 | # | 4 | # |
5 | # - jdike@linux.intel.com | 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 | ||
6 | 11 | ||
7 | Index: module-init-tools-3.2.2/Makefile.am | 12 | Index: module-init-tools-3.2.2/Makefile.am |
8 | =================================================================== | 13 | =================================================================== |
9 | --- module-init-tools-3.2.2.orig/Makefile.am 2010-05-26 15:43:16.000000000 -0400 | 14 | --- 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 | 15 | +++ 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 | 16 | @@ -10,7 +10,6 @@ |
12 | depmod_SOURCES = depmod.c moduleops.c tables.c zlibsupport.c depmod.h moduleops.h tables.h list.h testing.h zlibsupport.h | 17 | modindex_SOURCES = modindex.c zlibsupport.c zlibsupport.h testing.h |
13 | modinfo_SOURCES = modinfo.c zlibsupport.c testing.h zlibsupport.h | ||
14 | 18 | ||
15 | -insmod_static_SOURCES = insmod.c | 19 | insmod_static_SOURCES = insmod.c |
16 | -insmod_static_LDFLAGS = -static | 20 | -insmod_static_LDFLAGS = -static |
17 | -# We don't want the $(zlib_flags) here: that makes a dynamic executable | 21 | # We don't want the $(zlib_flags) here: that makes a dynamic executable |
18 | -insmod_static_LDADD = | 22 | insmod_static_LDADD = libmodtools.a |
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 | 23 | ||