[Lunar-commits] <moonbase> module-init-tools: move it from kernel to zdeprecated dir. It is recommended to use kmod instead.
Florin Braescu
florin at lunar-linux.org
Sun Mar 4 10:34:13 CET 2012
commit ca81f171f1b0cb20296d0958a2fd0cf0a991801b
Author: Florin Braescu <florin at lunar-linux.org>
Date: Sun Mar 4 10:34:13 2012 +0100
module-init-tools: move it from kernel to zdeprecated dir. It is recommended to use kmod instead.
---
kernel/module-init-tools/BUILD | 28 -----------
kernel/module-init-tools/CONFLICTS | 2 -
kernel/module-init-tools/DEPENDS | 1 -
kernel/module-init-tools/DETAILS | 21 --------
kernel/module-init-tools/POST_INSTALL | 14 ------
kernel/module-init-tools/PRE_BUILD | 5 --
kernel/module-init-tools/init.d/modutils | 51 --------------------
.../profile.d/module_init_tools-completion.rc | 35 --------------
zdeprecated/module-init-tools/BUILD | 28 +++++++++++
zdeprecated/module-init-tools/CONFLICTS | 2 +
zdeprecated/module-init-tools/DEPENDS | 1 +
zdeprecated/module-init-tools/DETAILS | 21 ++++++++
zdeprecated/module-init-tools/POST_INSTALL | 14 ++++++
zdeprecated/module-init-tools/PRE_BUILD | 5 ++
zdeprecated/module-init-tools/init.d/modutils | 51 ++++++++++++++++++++
.../profile.d/module_init_tools-completion.rc | 35 ++++++++++++++
16 files changed, 157 insertions(+), 157 deletions(-)
diff --git a/kernel/module-init-tools/BUILD b/kernel/module-init-tools/BUILD
deleted file mode 100644
index 20f04d4..0000000
--- a/kernel/module-init-tools/BUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-(
-
- bad_flags -malign-double
-
-# if !( module_installed docbook-utils ); then
-# patch_it $SOURCE_CACHE/$SOURCE2 1
-# fi &&
-
- patch_it $SOURCE_CACHE/$SOURCE3 1 &&
-
- # It looks docbook patch presented above does nothing
- # Lets fix this temporary and find better solution later
- sedit 's/docbook2man/docbook2man-fix-it-later/' configure &&
-
- sedit "s:ln -s :ln -sf :" Makefile.in &&
-
- ./configure --prefix=/ \
- --build=$BUILD \
- --mandir=/usr/share/man
-
- mkdir -p /etc/modprobe.d &&
-
- default_make &&
-
- install -m0700 $SCRIPT_DIRECTORY/init.d/modutils /etc/init.d &&
- ln -sf ../init.d/modutils /etc/rcS.d/S20modutils
-
-) > $C_FIFO 2>&1
diff --git a/kernel/module-init-tools/CONFLICTS b/kernel/module-init-tools/CONFLICTS
deleted file mode 100644
index 785b99c..0000000
--- a/kernel/module-init-tools/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts kmod
-
diff --git a/kernel/module-init-tools/DEPENDS b/kernel/module-init-tools/DEPENDS
deleted file mode 100644
index 2cbc478..0000000
--- a/kernel/module-init-tools/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-optional_depends "docbook-utils" "" "" "to generate modules.conf.5 man page"
diff --git a/kernel/module-init-tools/DETAILS b/kernel/module-init-tools/DETAILS
deleted file mode 100644
index 39cbf3b..0000000
--- a/kernel/module-init-tools/DETAILS
+++ /dev/null
@@ -1,21 +0,0 @@
- MODULE=module-init-tools
- VERSION=3.16
- SOURCE=$MODULE-$VERSION.tar.bz2
- SOURCE2=${MODULE}_docbook.patch.bz2
- SOURCE3=$MODULE-$VERSION-man_pages.patch.bz2
- SOURCE_URL=http://anduin.linuxfromscratch.org/sources/LFS/lfs-packages/conglomeration/$MODULE
- SOURCE2_URL=$PATCH_URL
- SOURCE3_URL=$PATCH_URL
- SOURCE_VFY=sha1:919c9fb3e8c73a5790411da1c4d79efda19db195
- SOURCE2_VFY=sha1:673fda8d8c4a9d5a88aa25f5e8c56fc60ff8fcee
- SOURCE3_VFY=sha1:eb254117258542c614f7cd046fb5cd67d95818d9
- WEB_SITE=http://www.kernel.org
- ENTERED=20030410
- UPDATED=20111119
- SHORT="Utilities essential for a modular Linux 2.6.x kernel"
-
-cat << EOF
-This package contains utilities that are intended to make a Linux
-modular kernel manageable for all users, administrators and
-distribution maintainers.
-EOF
diff --git a/kernel/module-init-tools/POST_INSTALL b/kernel/module-init-tools/POST_INSTALL
deleted file mode 100644
index e86a338..0000000
--- a/kernel/module-init-tools/POST_INSTALL
+++ /dev/null
@@ -1,14 +0,0 @@
-test -d /etc/modules.d/ || mkdir -p /etc/modules.d
-test -f /etc/modules || touch /etc/modules
-test -f /etc/modules.conf || touch /etc/modules.conf
-
-source /etc/profile.d/module_init_tools-completion.rc
-
-cat << EOF
-
- Customize /etc/modules.conf
- Execute depmod.
- List all modules that should load during boot in /etc/modules.
-
-EOF
-
diff --git a/kernel/module-init-tools/PRE_BUILD b/kernel/module-init-tools/PRE_BUILD
deleted file mode 100644
index cf35dcb..0000000
--- a/kernel/module-init-tools/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-if module_installed modutils-wrappers; then
- lrm modutils-wrappers
-fi
-default_pre_build
-
diff --git a/kernel/module-init-tools/init.d/modutils b/kernel/module-init-tools/init.d/modutils
deleted file mode 100755
index 9208480..0000000
--- a/kernel/module-init-tools/init.d/modutils
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-#
-# modutils - load modules at startup
-# description: modutils, boot time module loading
-#
-
-start()
-{
- # hide non-significant messages
- dmesg -n5
- if [ -x /sbin/depmod ]; then
- echo -n "Updating Module Dependencies"
- depmod -a &> /dev/null &&
- echo -e $RESULT_OK ||
- echo -e $RESULT_FAIL
- fi
-
- if [ -e /etc/modules ] && [ -x /sbin/modprobe ]; then
- echo "Loading modules: "
- sed 's/#.*$//g' /etc/modules | grep -v '^$' | while read MODULE ARGS; do
- echo -n " * Loading module: $MODULE"
- modprobe $MODULE $ARGS &> /dev/null &&
- echo -e $RESULT_OK ||
- echo -e $RESULT_FAIL
- done
- fi
- # restore message level
- dmesg -n7
-}
-
-
-stop()
-{
- exit 0
-
-}
-
-status()
-{
- lsmod
-}
-
-
-case $1 in
- start|stop|status) : ;;
- *) echo "Usage: $0 {start|stop|status}"; exit 1 ;;
-esac
-
-
-. /lib/lsb/init-functions
-
diff --git a/kernel/module-init-tools/profile.d/module_init_tools-completion.rc b/kernel/module-init-tools/profile.d/module_init_tools-completion.rc
deleted file mode 100644
index 056a4b1..0000000
--- a/kernel/module-init-tools/profile.d/module_init_tools-completion.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-# Per kernel running:
-# this is 2.6 or 3.x code. If 2.6 or 3.x is not running, just quit
-
-UNAMER=`uname -r`
-
-case $UNAMER in
- 2.6.*|3.* ) ;;
- * ) return 0;;
-esac
-
-# Turn on extended globbing
-shopt -s extglob
-
-_modprobe ()
-{
- local cur
- cur=${COMP_WORDS[COMP_CWORD]}
- COMPREPLY=( $( compgen -W "`find /lib/modules/${UNAMER}/kernel/ -type f -name '*.ko' -exec basename {} \; | sed 's:.ko$::'`" $cur ))
-}
-
-complete -F _modprobe modprobe insmod
-
-_rmmod ()
-{
- local cur
- cur=${COMP_WORDS[COMP_CWORD]}
- COMPREPLY=( $( compgen -W "`cat /proc/modules | awk '{print $1}'`" $cur ))
-}
-
-complete -F _rmmod rmmod
-
-# Doing this not only includes the binaries in the PATH but also makes the man automagically accesible too
-export PATH="$PATH:/lib/module-init-tools/sbin:/lib/module-init-tools/bin"
-
-return 0
diff --git a/zdeprecated/module-init-tools/BUILD b/zdeprecated/module-init-tools/BUILD
new file mode 100644
index 0000000..20f04d4
--- /dev/null
+++ b/zdeprecated/module-init-tools/BUILD
@@ -0,0 +1,28 @@
+(
+
+ bad_flags -malign-double
+
+# if !( module_installed docbook-utils ); then
+# patch_it $SOURCE_CACHE/$SOURCE2 1
+# fi &&
+
+ patch_it $SOURCE_CACHE/$SOURCE3 1 &&
+
+ # It looks docbook patch presented above does nothing
+ # Lets fix this temporary and find better solution later
+ sedit 's/docbook2man/docbook2man-fix-it-later/' configure &&
+
+ sedit "s:ln -s :ln -sf :" Makefile.in &&
+
+ ./configure --prefix=/ \
+ --build=$BUILD \
+ --mandir=/usr/share/man
+
+ mkdir -p /etc/modprobe.d &&
+
+ default_make &&
+
+ install -m0700 $SCRIPT_DIRECTORY/init.d/modutils /etc/init.d &&
+ ln -sf ../init.d/modutils /etc/rcS.d/S20modutils
+
+) > $C_FIFO 2>&1
diff --git a/zdeprecated/module-init-tools/CONFLICTS b/zdeprecated/module-init-tools/CONFLICTS
new file mode 100644
index 0000000..785b99c
--- /dev/null
+++ b/zdeprecated/module-init-tools/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts kmod
+
diff --git a/zdeprecated/module-init-tools/DEPENDS b/zdeprecated/module-init-tools/DEPENDS
new file mode 100644
index 0000000..2cbc478
--- /dev/null
+++ b/zdeprecated/module-init-tools/DEPENDS
@@ -0,0 +1 @@
+optional_depends "docbook-utils" "" "" "to generate modules.conf.5 man page"
diff --git a/zdeprecated/module-init-tools/DETAILS b/zdeprecated/module-init-tools/DETAILS
new file mode 100644
index 0000000..39cbf3b
--- /dev/null
+++ b/zdeprecated/module-init-tools/DETAILS
@@ -0,0 +1,21 @@
+ MODULE=module-init-tools
+ VERSION=3.16
+ SOURCE=$MODULE-$VERSION.tar.bz2
+ SOURCE2=${MODULE}_docbook.patch.bz2
+ SOURCE3=$MODULE-$VERSION-man_pages.patch.bz2
+ SOURCE_URL=http://anduin.linuxfromscratch.org/sources/LFS/lfs-packages/conglomeration/$MODULE
+ SOURCE2_URL=$PATCH_URL
+ SOURCE3_URL=$PATCH_URL
+ SOURCE_VFY=sha1:919c9fb3e8c73a5790411da1c4d79efda19db195
+ SOURCE2_VFY=sha1:673fda8d8c4a9d5a88aa25f5e8c56fc60ff8fcee
+ SOURCE3_VFY=sha1:eb254117258542c614f7cd046fb5cd67d95818d9
+ WEB_SITE=http://www.kernel.org
+ ENTERED=20030410
+ UPDATED=20111119
+ SHORT="Utilities essential for a modular Linux 2.6.x kernel"
+
+cat << EOF
+This package contains utilities that are intended to make a Linux
+modular kernel manageable for all users, administrators and
+distribution maintainers.
+EOF
diff --git a/zdeprecated/module-init-tools/POST_INSTALL b/zdeprecated/module-init-tools/POST_INSTALL
new file mode 100644
index 0000000..e86a338
--- /dev/null
+++ b/zdeprecated/module-init-tools/POST_INSTALL
@@ -0,0 +1,14 @@
+test -d /etc/modules.d/ || mkdir -p /etc/modules.d
+test -f /etc/modules || touch /etc/modules
+test -f /etc/modules.conf || touch /etc/modules.conf
+
+source /etc/profile.d/module_init_tools-completion.rc
+
+cat << EOF
+
+ Customize /etc/modules.conf
+ Execute depmod.
+ List all modules that should load during boot in /etc/modules.
+
+EOF
+
diff --git a/zdeprecated/module-init-tools/PRE_BUILD b/zdeprecated/module-init-tools/PRE_BUILD
new file mode 100644
index 0000000..cf35dcb
--- /dev/null
+++ b/zdeprecated/module-init-tools/PRE_BUILD
@@ -0,0 +1,5 @@
+if module_installed modutils-wrappers; then
+ lrm modutils-wrappers
+fi
+default_pre_build
+
diff --git a/zdeprecated/module-init-tools/init.d/modutils b/zdeprecated/module-init-tools/init.d/modutils
new file mode 100755
index 0000000..9208480
--- /dev/null
+++ b/zdeprecated/module-init-tools/init.d/modutils
@@ -0,0 +1,51 @@
+#!/bin/bash
+#
+# modutils - load modules at startup
+# description: modutils, boot time module loading
+#
+
+start()
+{
+ # hide non-significant messages
+ dmesg -n5
+ if [ -x /sbin/depmod ]; then
+ echo -n "Updating Module Dependencies"
+ depmod -a &> /dev/null &&
+ echo -e $RESULT_OK ||
+ echo -e $RESULT_FAIL
+ fi
+
+ if [ -e /etc/modules ] && [ -x /sbin/modprobe ]; then
+ echo "Loading modules: "
+ sed 's/#.*$//g' /etc/modules | grep -v '^$' | while read MODULE ARGS; do
+ echo -n " * Loading module: $MODULE"
+ modprobe $MODULE $ARGS &> /dev/null &&
+ echo -e $RESULT_OK ||
+ echo -e $RESULT_FAIL
+ done
+ fi
+ # restore message level
+ dmesg -n7
+}
+
+
+stop()
+{
+ exit 0
+
+}
+
+status()
+{
+ lsmod
+}
+
+
+case $1 in
+ start|stop|status) : ;;
+ *) echo "Usage: $0 {start|stop|status}"; exit 1 ;;
+esac
+
+
+. /lib/lsb/init-functions
+
diff --git a/zdeprecated/module-init-tools/profile.d/module_init_tools-completion.rc b/zdeprecated/module-init-tools/profile.d/module_init_tools-completion.rc
new file mode 100644
index 0000000..056a4b1
--- /dev/null
+++ b/zdeprecated/module-init-tools/profile.d/module_init_tools-completion.rc
@@ -0,0 +1,35 @@
+# Per kernel running:
+# this is 2.6 or 3.x code. If 2.6 or 3.x is not running, just quit
+
+UNAMER=`uname -r`
+
+case $UNAMER in
+ 2.6.*|3.* ) ;;
+ * ) return 0;;
+esac
+
+# Turn on extended globbing
+shopt -s extglob
+
+_modprobe ()
+{
+ local cur
+ cur=${COMP_WORDS[COMP_CWORD]}
+ COMPREPLY=( $( compgen -W "`find /lib/modules/${UNAMER}/kernel/ -type f -name '*.ko' -exec basename {} \; | sed 's:.ko$::'`" $cur ))
+}
+
+complete -F _modprobe modprobe insmod
+
+_rmmod ()
+{
+ local cur
+ cur=${COMP_WORDS[COMP_CWORD]}
+ COMPREPLY=( $( compgen -W "`cat /proc/modules | awk '{print $1}'`" $cur ))
+}
+
+complete -F _rmmod rmmod
+
+# Doing this not only includes the binaries in the PATH but also makes the man automagically accesible too
+export PATH="$PATH:/lib/module-init-tools/sbin:/lib/module-init-tools/bin"
+
+return 0
More information about the Lunar-commits
mailing list