From b376a803cac9c6403ce7ddf2a4a479292ec9ba85 Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Wed, 21 Jul 2010 13:21:49 +0800 Subject: 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 --- meta/packages/module-init-tools/files/manpagesopt | 41 ----------------------- 1 file changed, 41 deletions(-) delete mode 100644 meta/packages/module-init-tools/files/manpagesopt (limited to 'meta/packages/module-init-tools/files/manpagesopt') diff --git a/meta/packages/module-init-tools/files/manpagesopt b/meta/packages/module-init-tools/files/manpagesopt deleted file mode 100644 index 5d5cac609e..0000000000 --- a/meta/packages/module-init-tools/files/manpagesopt +++ /dev/null @@ -1,41 +0,0 @@ -Index: module-init-tools-3.2-pre9/configure.in -=================================================================== ---- module-init-tools-3.2-pre9.orig/configure.in 2005-08-09 04:31:26.000000000 +0000 -+++ module-init-tools-3.2-pre9/configure.in 2005-09-20 22:06:10.000000000 +0000 -@@ -41,5 +41,14 @@ - fi]) - AC_SUBST(MODULE_DIR) - --AC_OUTPUT([Makefile]) -+AC_ARG_ENABLE(manpages, -+[ --disable-manpages Disable man page generation.], -+[if test x"$enableval" != x"no"; then -+ enable_manpages=yes -+else -+ enable_manpages=no -+fi], -+[enable_manpages=yes]) -+AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes") - -+AC_OUTPUT([Makefile]) -Index: module-init-tools-3.2-pre9/Makefile.am -=================================================================== ---- module-init-tools-3.2-pre9.orig/Makefile.am 2005-08-09 04:54:28.000000000 +0000 -+++ module-init-tools-3.2-pre9/Makefile.am 2005-09-20 22:09:03.000000000 +0000 -@@ -21,13 +21,14 @@ - MAN5 = modprobe.conf.5 modules.dep.5 - MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8 - SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml)) --man_MANS = $(MAN5) $(MAN8) - # If they haven't overridden mandir, fix it (never /man!) - mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi) - - TESTSUITE := $(shell find tests -type f ! -name '*~') tests/vg-suppressions - --EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE) -+if MANPAGES -+man_MANS = $(MAN5) $(MAN8) -+endif - - sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static - bin_PROGRAMS = lsmod -- cgit v1.2.3