Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (26f02dcf9ad47c77743a45c612980d8f56e61fa4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (26f02dcf9ad47c77743a45c612980d8f56e61fa4)
  • Date: Wed, 29 Oct 2014 22:42:19 -0500

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

kernels/kmod/BUILD | 2
kernels/kmod/CONFLICTS | 1
kernels/kmod/DEPENDS | 4 -
kernels/kmod/DETAILS | 3 -
kernels/kmod/FINAL | 12 +++++
kernels/kmod/HISTORY | 73
++++++++++++++++++++++++++++++++++--
kernels/kmod/INSTALL | 12 ++---
kernels/kmod/POST_RESURRECT | 5 ++
kernels/kmod/PROVIDES | 1
kernels/kmod/init.d/modutils | 42 ++++++++++++++++++++
kernels/kmod/init.d/modutils.conf | 8 +++
kernels/module-init-tools/CONFLICTS | 1
kernels/module-init-tools/HISTORY | 4 +
kernels/module-init-tools/PROVIDES | 1
smgl/basesystem/DEPENDS | 2
smgl/basesystem/DETAILS | 2
smgl/basesystem/HISTORY | 5 ++
17 files changed, 163 insertions(+), 15 deletions(-)

New commits:
commit 535d3864ecdea37ce93f7bd1f7e9e2e9332240e6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

Revert "kmod 18"

This reverts commit 6b450d30c44b44fb1b3f1e23be167846682070f4.

commit 751dd2451dff45c87183fb480e76def401645a90
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

Revert unintentional changes in "pciutils: Add optional dependency on
kmod"

This partially reverts commit e888a83e431812ebb362c25167c3fff87e70884e.

commit 40b91eaf327ef41ce9701ce5ed96bddb4c434d7e
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

kernels/kmod: updated to 18

commit 0ccfb53342e99fd487aa6773f95b04e64e65821c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kmod: => 17

commit d73fb2b6fce8a22b202f7fe58e4b51213688f268
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kmod: => 15

commit 1ec7988df03609abea07b4e6abe844ae1c081527
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kmod: => 14

commit c6ee1ccee21ae6cdeff1e1ad54ea83fb689ac050
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kmod: => 12

commit 334ddb2d533dca3b8573abc7b15ce3f7d2e369f2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kmod: => 11

commit 6b18ed4bb77cc39c238a4a05b6f8ac59c45bd00e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kmod: => 10

commit 6f0d1932e9a201a7d3228cc651918c6929ac4df8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kmod: => 9

commit 76710692a23594f28537559ed575458d868deffc
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kmod - now provides all module-init-tools funtions

Conflicts:

kernels/kmod/BUILD
kernels/kmod/CONFLICTS
kernels/kmod/DETAILS

commit a17d31c37c1fdc96597ada9f51b8b36dd1968972
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kmod - add FINAL

Conflicts:

kernels/kmod/FINAL
kernels/kmod/HISTORY

commit 7504fc0d088c89709b50c3ed146f147606c5b131
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

basesystem: => 0.9.6

commit 520f5ffce07fc744c72b6fde899162406a2b5eab
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

module-init-tools - provides MODTOOLS

commit f36d51b754698d58a02a29ceaa71f9bef0fdd8e3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kmod provides MODTOOLS

commit c114d15e349c13e5c1fdade2b174222c35d7faf1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kmod: => 8

commit e7615d8b7b13439820725b237ad8231c27c3305d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kmod - add default_final to FINAL

Conflicts:

kernels/kmod/FINAL

commit 801e0f4ac38eac3c5c3b635f0e5f8f47b20ab101
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kmod: => 7

commit a45acda54a9b7a908d1ff021a2bfb37d987beff9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kmod: => 6

commit 1397494755f80dd004b2536c61f8c4c3c39117ef
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kmod: => 5

Conflicts:

kernels/kmod/HISTORY

diff --git a/kernels/kmod/BUILD b/kernels/kmod/BUILD
new file mode 100755
index 0000000..4d6e7de
--- /dev/null
+++ b/kernels/kmod/BUILD
@@ -0,0 +1,2 @@
+OPTS="$OPTS --with-rootlibdir=${INSTALL_ROOT}/lib
--bindir=${INSTALL_ROOT}/sbin" &&
+default_build
diff --git a/kernels/kmod/CONFLICTS b/kernels/kmod/CONFLICTS
index ad9421d..10d7c10 100755
--- a/kernels/kmod/CONFLICTS
+++ b/kernels/kmod/CONFLICTS
@@ -1 +1,2 @@
+conflicts modutils &&
conflicts module-init-tools
diff --git a/kernels/kmod/DEPENDS b/kernels/kmod/DEPENDS
index 8d4650e..00e581f 100755
--- a/kernels/kmod/DEPENDS
+++ b/kernels/kmod/DEPENDS
@@ -1,3 +1,3 @@
depends xz-utils '--with-xz' &&
-depends zlib '--with-zlib'
-
+depends zlib '--with-zlib' &&
+optional_depends PYTHON '--enable-python' '' 'Python bindings'
diff --git a/kernels/kmod/DETAILS b/kernels/kmod/DETAILS
index 58fe745..b82ab32 100755
--- a/kernels/kmod/DETAILS
+++ b/kernels/kmod/DETAILS
@@ -4,10 +4,11 @@
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.kernel.org/pub/linux/utils/kernel/$SPELL/$SOURCE
+ SOURCE_URL[0]=${KERNEL_URL}/pub/linux/utils/kernel/kmod/$SOURCE
# SOURCE2_URL[0]=${SOURCE_URL[0]}.sign
# SOURCE_GPG=lucas.demarchi.gpg:$SOURCE.sign:UPSTREAM_KEY
# SOURCE2_IGNORE=signature
+
WEB_SITE=http://git.profusion.mobi/cgit.cgi/kmod.git
LICENSE[0]=GPL
ENTERED=20120113
diff --git a/kernels/kmod/FINAL b/kernels/kmod/FINAL
new file mode 100755
index 0000000..a1413d9
--- /dev/null
+++ b/kernels/kmod/FINAL
@@ -0,0 +1,12 @@
+default_final &&
+# kmod-3 changes
+message "\n${PROBLEM_COLOR}kmod-3 changes:" \
+ "$DEFAULT_COLOR$MESSAGE_COLOR" \
+ "kmod now provides the following programs:\n" \
+ "inmod, rmmod, modprobe, depmod and modinfo\n" \
+ "These were previously provided by module_init_tools\n" \
+ "and are believed to be fully compatible"
+# final warning
+message "\n${PROBLEM_COLOR}Check any local scripts and udev rules !!!\n" \
+ "especially those that parse any output messages\n" \
+ "\n$DEFAULT_COLOR$MESSAGE_COLOR Read the NEWS file"
diff --git a/kernels/kmod/HISTORY b/kernels/kmod/HISTORY
index 8d78a16..cd7cf90 100644
--- a/kernels/kmod/HISTORY
+++ b/kernels/kmod/HISTORY
@@ -1,14 +1,79 @@
-2014-10-25 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: Fixed SOURCE_URL[0]
- updated spell to 18
+2014-06-25 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 18

-2013-04-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+2014-05-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 17
+ * DEPENDS: add optional PYTHON
+
+2013-09-26 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 15
+
+2013-07-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 14
+
+2012-12-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 12
+
+2012-11-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 11
+
+2012-09-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 10
+
+2012-06-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 9
+
+2012-05-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS, PROVIDES: added
+ both kmod and module-init-tools provide MODTOOLS
+ newer version of udev require kmod>=5
+
+2012-05-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 8
+
+2012-03-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * FINAL: add default_final
+
+2012-03-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 7
+
+2012-03-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 6
+ URL now at KERNEL_URL
+
+2012-02-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5

+2012-01-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * FINAL: add missing ", fix spelling, add some newlines
+
2012-01-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4
* PRE_BUILD: removed

+2012-01-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * FINAL: added, to inform of changes
+
+2012-01-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=2
+ * POST_RESURRECT, CONFLICTS: added
+ * BUILD: build the tools which replace module_init_tools
+ put tools in /sbin, for compatabilty with module_init_tools
+ * INSTALL: added, symlinks to /sbin/kmod for all module_init_tools
programs
+ * init.d/modutils: added
+
+2012-01-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=2
+ * POST_RESURRECT, CONFLICTS: added
+ * BUILD: build the tools which replace module_init_tools
+ put tools in /sbin, for compatabilty with module_init_tools
+ * INSTALL: added, symlinks to /sbin/kmod for all module_init_tools
programs
+ * init.d/modutils: added
+
+2012-01-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * BUILD: added, lib and bin should be in /, as they are needed at
boot time
+
2012-01-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3
using key 30CBEA53: public key "Lucas De Marchi
<lucas.demarchi AT profusion.mobi>"
diff --git a/kernels/kmod/INSTALL b/kernels/kmod/INSTALL
index f7e847a..a8d48a9 100755
--- a/kernels/kmod/INSTALL
+++ b/kernels/kmod/INSTALL
@@ -1,7 +1,7 @@
default_install &&
-for i in depmod insmod lsmod modinfo modprobe rmmod; do
- ln -s ../bin/kmod "$INSTALL_ROOT"/sbin/$i
-done
-for i in lsmod modinfo; do
- ln -s kmod "$INSTALL_ROOT"/bin/$i
-done
+ln -sf "$TRACK_ROOT/sbin/kmod" "$INSTALL_ROOT/bin/lsmod"
+ln -sf "$TRACK_ROOT/sbin/kmod" "$INSTALL_ROOT/sbin/depmod"
+ln -sf "$TRACK_ROOT/sbin/kmod" "$INSTALL_ROOT/sbin/rmmod"
+ln -sf "$TRACK_ROOT/sbin/kmod" "$INSTALL_ROOT/sbin/insmod"
+ln -sf "$TRACK_ROOT/sbin/kmod" "$INSTALL_ROOT/sbin/modprobe"
+ln -sf "$TRACK_ROOT/sbin/kmod" "$INSTALL_ROOT/sbin/modinfo"
diff --git a/kernels/kmod/POST_RESURRECT b/kernels/kmod/POST_RESURRECT
new file mode 100755
index 0000000..ee18dc6
--- /dev/null
+++ b/kernels/kmod/POST_RESURRECT
@@ -0,0 +1,5 @@
+#run depmod on all current kernel trees
+for i in `ls ${INSTALL_ROOT}/lib/modules/`; do
+ message "${MESSAGE_COLOR}Rebuilding module dependencies for
$i...${DEFAULT_COLOR}"
+ $INSTALL_ROOT/sbin/depmod -ae $i -b /$INSTALL_ROOT
+done 2> /dev/null
diff --git a/kernels/kmod/PROVIDES b/kernels/kmod/PROVIDES
new file mode 100755
index 0000000..d96a401
--- /dev/null
+++ b/kernels/kmod/PROVIDES
@@ -0,0 +1 @@
+MODTOOLS
diff --git a/kernels/kmod/init.d/modutils b/kernels/kmod/init.d/modutils
new file mode 100644
index 0000000..e7e6dd4
--- /dev/null
+++ b/kernels/kmod/init.d/modutils
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+RUNLEVEL=S
+PROVIDES=modules
+NEEDS="+root_fs"
+RECOMMENDED=yes
+
+. /etc/init.d/smgl_init
+. /etc/sysconfig/modutils
+
+test -x /sbin/depmod || exit 5
+test -x /sbin/modprobe || exit 5
+
+case $1 in
+ start) ;; # Fall through
+ stop) exit 0 ;;
+ *) echo "Usage: $0 {start|stop}"
+ exit 1
+ ;;
+esac
+
+# Handle start action
+
+if [ -x /sbin/depmod ] && [ "$PERFORM_DEPMOD" = "y" ] ; then
+ if [ "$ENABLE_SWAP_BEFORE_DEPMOD" = "y" ] ; then
+ echo "Enabling swap..."
+ loadproc swapon -a
+ fi
+ echo "Running depmod..."
+ loadproc depmod -a
+fi
+
+if [ -e /etc/modules ] && [ -x /sbin/modprobe ] ; then
+ ( cat /etc/modules; builtin echo ) |
+ while read MODULE ARGS; do
+ case $MODULE in
+ \#*|"") continue ;;
+ esac
+ echo "Loading module $MODULE..."
+ loadproc modprobe $MODULE $ARGS
+ done
+fi
diff --git a/kernels/kmod/init.d/modutils.conf
b/kernels/kmod/init.d/modutils.conf
new file mode 100644
index 0000000..e903eb0
--- /dev/null
+++ b/kernels/kmod/init.d/modutils.conf
@@ -0,0 +1,8 @@
+# Perform depmod -a on boot or not.
+# Probably don't want to do this if you are on a laptop and running on
battery.
+PERFORM_DEPMOD=y
+
+# Sometimes low memory machines and with kernels with lots of modules depmod
+# will cause an Out Of Memory (oom) kernel panic. Say yes here if you want to
+# enable swap so the oom error won't happen.
+#ENABLE_SWAP_BEFORE_DEPMOD=y
diff --git a/kernels/module-init-tools/CONFLICTS
b/kernels/module-init-tools/CONFLICTS
index bfe7c2b..eedf5af 100755
--- a/kernels/module-init-tools/CONFLICTS
+++ b/kernels/module-init-tools/CONFLICTS
@@ -1 +1,2 @@
conflicts modutils
+conflicts kmod
diff --git a/kernels/module-init-tools/HISTORY
b/kernels/module-init-tools/HISTORY
index 8d06931..fadb333 100644
--- a/kernels/module-init-tools/HISTORY
+++ b/kernels/module-init-tools/HISTORY
@@ -1,3 +1,7 @@
+2012-05-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFLICTS, PROVIDES: added
+ both kmod and module-init-tools provide MODTOOLS
+
2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: temporarily switched back to hash-checking; quoting paths;
while 3.16 sources are unavailable from the original mirror and
diff --git a/kernels/module-init-tools/PROVIDES
b/kernels/module-init-tools/PROVIDES
new file mode 100755
index 0000000..d96a401
--- /dev/null
+++ b/kernels/module-init-tools/PROVIDES
@@ -0,0 +1 @@
+MODTOOLS
diff --git a/smgl/basesystem/DEPENDS b/smgl/basesystem/DEPENDS
index c198950..54f9f09 100755
--- a/smgl/basesystem/DEPENDS
+++ b/smgl/basesystem/DEPENDS
@@ -24,7 +24,7 @@ local KVER=$(get_kernel_version) &&
if [[ ${KVER:0:3} < 2.6 ]]; then
depends modutils
else
- depends module-init-tools
+ depends MODTOOLS
fi &&
depends net-tools &&
depends ncurses &&
diff --git a/smgl/basesystem/DETAILS b/smgl/basesystem/DETAILS
index 76dc6a3..f27c852 100755
--- a/smgl/basesystem/DETAILS
+++ b/smgl/basesystem/DETAILS
@@ -1,5 +1,5 @@
SPELL=basesystem
- VERSION=0.9.5
+ VERSION=0.9.6
WEB_SITE=http://www.sourcemage.org
ENTERED=20021013
NO_CACHE="--cache=off"
diff --git a/smgl/basesystem/HISTORY b/smgl/basesystem/HISTORY
index 20eaa51..2ee8563 100644
--- a/smgl/basesystem/HISTORY
+++ b/smgl/basesystem/HISTORY
@@ -1,3 +1,8 @@
+2012-05-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.6
+ * DEPENDS: module-init-tools => MODTOOLS
+ kmod also provides this, but newer udev needs kmod
+
2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added xz-utils as a required dependency, since stable
sorcery
handles xz archives out of the box



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (26f02dcf9ad47c77743a45c612980d8f56e61fa4), Ismael Luceno, 10/29/2014

Archive powered by MHonArc 2.6.24.

Top of Page