From 4948743a02c4bbd2fb2d29181f455e8653ca03bf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 20 Sep 2005 22:22:53 +0000 Subject: module-init-tools: Upgrade to 3.2pre9. Change the update-alternatives priority so the genuine tool takes priority over busybox. This gets pcmciatils working properly. --- .../module-init-tools-3.2-pre7/.mtn2git_empty | 0 .../ignore_arch_directory | 24 --------- .../module-init-tools-3.2-pre7/manpagesopt | 39 -------------- .../module-init-tools-3.2-pre9/.mtn2git_empty | 0 .../ignore_arch_directory | 24 +++++++++ .../module-init-tools-3.2-pre9/manpagesopt | 41 ++++++++++++++ .../module-init-tools_3.2-pre7.bb | 63 ---------------------- .../module-init-tools_3.2-pre9.bb | 63 ++++++++++++++++++++++ 8 files changed, 128 insertions(+), 126 deletions(-) delete mode 100644 packages/module-init-tools/module-init-tools-3.2-pre7/.mtn2git_empty delete mode 100644 packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory delete mode 100644 packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt create mode 100644 packages/module-init-tools/module-init-tools-3.2-pre9/.mtn2git_empty create mode 100644 packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory create mode 100644 packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt delete mode 100644 packages/module-init-tools/module-init-tools_3.2-pre7.bb create mode 100644 packages/module-init-tools/module-init-tools_3.2-pre9.bb diff --git a/packages/module-init-tools/module-init-tools-3.2-pre7/.mtn2git_empty b/packages/module-init-tools/module-init-tools-3.2-pre7/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory b/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory deleted file mode 100644 index 185ea7a3a5..0000000000 --- a/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8 ---- module-init-tools-3.2-pre7/modprobe.8.orig 2005-07-05 13:52:32.000000000 +0200 -+++ module-init-tools-3.2-pre7/modprobe.8 2005-07-05 13:52:42.000000000 +0200 -@@ -31,6 +31,7 @@ - \fI/etc/modprobe.conf\fR configuration file and - \fI/etc/modprobe.d\fR directory - (see \fBmodprobe.conf\fR(5)). -+All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored. - .PP - Note that this version of \fBmodprobe\fR does not - do anything to the module itself: the work of resolving symbols ---- module-init-tools-3.2-pre7/modprobe.c.orig 2005-07-05 13:50:00.000000000 +0200 -+++ module-init-tools-3.2-pre7/modprobe.c 2005-07-05 13:50:15.000000000 +0200 -@@ -1158,6 +1158,10 @@ - DIR *dir; - int ret = 0; - -+ /* ignore everything in this directory */ -+ if (streq(filename, "/etc/modprobe.d/arch")) -+ return 1; -+ - /* Reiser4 has file/directory duality: treat it as both. */ - dir = opendir(filename); - if (dir) { diff --git a/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt b/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt deleted file mode 100644 index ee1454c6ef..0000000000 --- a/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt +++ /dev/null @@ -1,39 +0,0 @@ -Index: module-init-tools-3.1/configure.in -=================================================================== ---- module-init-tools-3.1.orig/configure.in 2004-11-12 00:05:25.000000000 -0500 -+++ module-init-tools-3.1/configure.in 2005-01-20 02:23:16.409792288 -0500 -@@ -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]) ---- module-init-tools-3.2-pre7/Makefile.am.orig 2005-07-05 13:55:06.000000000 +0200 -+++ module-init-tools-3.2-pre7/Makefile.am 2005-07-05 13:55:31.000000000 +0200 -@@ -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 '*~') - --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 diff --git a/packages/module-init-tools/module-init-tools-3.2-pre9/.mtn2git_empty b/packages/module-init-tools/module-init-tools-3.2-pre9/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory b/packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory new file mode 100644 index 0000000000..185ea7a3a5 --- /dev/null +++ b/packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory @@ -0,0 +1,24 @@ +diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8 +--- module-init-tools-3.2-pre7/modprobe.8.orig 2005-07-05 13:52:32.000000000 +0200 ++++ module-init-tools-3.2-pre7/modprobe.8 2005-07-05 13:52:42.000000000 +0200 +@@ -31,6 +31,7 @@ + \fI/etc/modprobe.conf\fR configuration file and + \fI/etc/modprobe.d\fR directory + (see \fBmodprobe.conf\fR(5)). ++All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored. + .PP + Note that this version of \fBmodprobe\fR does not + do anything to the module itself: the work of resolving symbols +--- module-init-tools-3.2-pre7/modprobe.c.orig 2005-07-05 13:50:00.000000000 +0200 ++++ module-init-tools-3.2-pre7/modprobe.c 2005-07-05 13:50:15.000000000 +0200 +@@ -1158,6 +1158,10 @@ + DIR *dir; + int ret = 0; + ++ /* ignore everything in this directory */ ++ if (streq(filename, "/etc/modprobe.d/arch")) ++ return 1; ++ + /* Reiser4 has file/directory duality: treat it as both. */ + dir = opendir(filename); + if (dir) { diff --git a/packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt b/packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt new file mode 100644 index 0000000000..5d5cac609e --- /dev/null +++ b/packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt @@ -0,0 +1,41 @@ +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 diff --git a/packages/module-init-tools/module-init-tools_3.2-pre7.bb b/packages/module-init-tools/module-init-tools_3.2-pre7.bb deleted file mode 100644 index 017f288e7d..0000000000 --- a/packages/module-init-tools/module-init-tools_3.2-pre7.bb +++ /dev/null @@ -1,63 +0,0 @@ -DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ -removing kernel modules for Linux (versions 2.5.48 and above). It serves \ -the same function that the modutils package serves for Linux 2.4." -LICENSE = "GPL" -SECTION = "base" -PR = "r1" - -PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" -RDEPENDS_${PN} += "module-init-tools-depmod" - -FILES_module-init-tools-depmod = "${sbindir}/depmod.26" -FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" - -SRC_URI = "ftp://ftp.kernel.org/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 " -S = "${WORKDIR}/module-init-tools-${PV}" - -EXTRA_OECONF = "--disable-manpages" - -bindir = "/bin" -sbindir = "/sbin" - -inherit autotools - -do_install() { - autotools_do_install - for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do - mv ${D}/$f ${D}/$f.26 - done -} - -pkg_postinst_module-init-tools() { -#!/bin/sh -for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do -bn=`basename $f` - update-alternatives --install /$f $bn /$f.26 20 -done -update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60 -update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60 -} - -pkg_prerm_module-init-tools() { -#!/bin/sh -for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do -bn=`basename $f` - update-alternatives --remove $bn /$f.26 -done -update-alternatives --remove bin-lsmod /bin/lsmod.26 -update-alternatives --remove lsmod /bin/lsmod.26 -} - -pkg_postinst_module-init-tools-depmod() { -#!/bin/sh -update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20 -} - -pkg_prerm_module-init-tools() { -#!/bin/sh -update-alternatives --remove depmod /sbin/depmod.26 -} diff --git a/packages/module-init-tools/module-init-tools_3.2-pre9.bb b/packages/module-init-tools/module-init-tools_3.2-pre9.bb new file mode 100644 index 0000000000..bbd8cca1bf --- /dev/null +++ b/packages/module-init-tools/module-init-tools_3.2-pre9.bb @@ -0,0 +1,63 @@ +DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ +removing kernel modules for Linux (versions 2.5.48 and above). It serves \ +the same function that the modutils package serves for Linux 2.4." +LICENSE = "GPL" +SECTION = "base" +PR = "r0" + +PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" +RDEPENDS_${PN} += "module-init-tools-depmod" + +FILES_module-init-tools-depmod = "${sbindir}/depmod.26" +FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" + +SRC_URI = "ftp://ftp.kernel.org/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 " +S = "${WORKDIR}/module-init-tools-${PV}" + +EXTRA_OECONF = "--disable-manpages" + +bindir = "/bin" +sbindir = "/sbin" + +inherit autotools + +do_install() { + autotools_do_install + for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do + mv ${D}/$f ${D}/$f.26 + done +} + +pkg_postinst_module-init-tools() { +#!/bin/sh +for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do +bn=`basename $f` + update-alternatives --install /$f $bn /$f.26 60 +done +update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60 +update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60 +} + +pkg_prerm_module-init-tools() { +#!/bin/sh +for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do +bn=`basename $f` + update-alternatives --remove $bn /$f.26 +done +update-alternatives --remove bin-lsmod /bin/lsmod.26 +update-alternatives --remove lsmod /bin/lsmod.26 +} + +pkg_postinst_module-init-tools-depmod() { +#!/bin/sh +update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60 +} + +pkg_prerm_module-init-tools() { +#!/bin/sh +update-alternatives --remove depmod /sbin/depmod.26 +} -- cgit v1.2.3