diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
commit | 293b05335ab540c4c8402e0a5caf2886b786a318 (patch) | |
tree | 11e5a7c2dce338058f150e08d1ff47c9d4d8eccd /recipes/module-init-tools/module-init-tools.inc | |
parent | 1ee2156592ba17f64f3c9b8970285a259730b871 (diff) | |
parent | e9aacc4ce4784c91cb4908145b8fb7b3ec8aa6e0 (diff) | |
download | openembedded-293b05335ab540c4c8402e0a5caf2886b786a318.tar.gz |
Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010
Conflicts:
recipes/linux/linux-openmoko-devel_git.bb
recipes/openmoko-3rdparty/pisi_0.5.2.bb
recipes/openmoko-3rdparty/pisi_0.5.3.bb
recipes/openmoko-3rdparty/pisi_0.5.bb
recipes/uclibc/uclibc_nptl.bb
Diffstat (limited to 'recipes/module-init-tools/module-init-tools.inc')
-rw-r--r-- | recipes/module-init-tools/module-init-tools.inc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/recipes/module-init-tools/module-init-tools.inc b/recipes/module-init-tools/module-init-tools.inc index 9ad925f82b..3cfaf11901 100644 --- a/recipes/module-init-tools/module-init-tools.inc +++ b/recipes/module-init-tools/module-init-tools.inc @@ -12,14 +12,13 @@ FILES_module-init-tools-depmod = "${sbindir}/depmod.26" FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ - file://ignore_arch_directory;patch=1 \ - file://modutils_extension;patch=1 \ - file://no_man_rebuild;patch=1 \ - file://manpagesopt;patch=1 \ - file://module-init-tools-remove-index.patch;patch=1 " + file://ignore_arch_directory;apply=yes \ + file://modutils_extension;apply=yes \ + file://no_man_rebuild;apply=yes \ + file://manpagesopt;apply=yes \ + file://module-init-tools-remove-index.patch " S = "${WORKDIR}/module-init-tools-${PV}" EXTRA_OECONF = "--disable-manpages" - inherit autotools |