Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test grimoire by Flavien Bridault (2974824c79b8ab9fbe52e164f5a9da098c25c24c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Flavien Bridault <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test grimoire by Flavien Bridault (2974824c79b8ab9fbe52e164f5a9da098c25c24c)
  • Date: Sat, 17 Jun 2006 17:37:36 -0500

GIT changes to test grimoire by Flavien Bridault <vlaaad AT sourcemage.org>:

disk/udev/CONFIGURE | 3 +++
disk/udev/DETAILS | 6 +++++-
disk/udev/FINAL | 5 -----
disk/udev/HISTORY | 17 +++++++++++++++++
disk/udev/INSTALL | 34 ++++++++++++++++++++++++----------
disk/udev/PREPARE | 27 ++++++++++++++++-----------
disk/udev/init.d/coldplug | 9 ++++++++-
disk/udev/rules/50-default.rules | 3 +--
smgl/init.d/DETAILS | 2 +-
smgl/init.d/HISTORY | 5 +++++
smgl/init.d/init.d/devices | 4 ----
11 files changed, 80 insertions(+), 35 deletions(-)

New commits:
commit 2974824c79b8ab9fbe52e164f5a9da098c25c24c
Merge: fe9c8a2a68938efae95aed26c1ebb6c61d7c72ff
4450c7f2bd4d9c92cd4d903ad1d45755e1f6d422
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

Merge branch 'master' of ssh://fbridault AT scm.sourcemage.org/smgl/grimoire

commit fe9c8a2a68938efae95aed26c1ebb6c61d7c72ff
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

udev updated to 094 for kernels > 2.6.14. We will now manage two versions
in
order to avoid breaking boxes with old kernels. Lots of changes, please
read HISTORY ;-)

commit a70f57e36897dcfe6661e88977635a6bd2cd410d
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

Removed udevstart for kernel > 2.6.14, coldplug now works well thanks to
udevsettle

diff --git a/disk/udev/CONFIGURE b/disk/udev/CONFIGURE
index bedddb1..065d4ed 100755
--- a/disk/udev/CONFIGURE
+++ b/disk/udev/CONFIGURE
@@ -1,4 +1,7 @@
config_query UDEV_PERSIST 'Install persistent storage rules?' n &&
+if [ "$RECENT_KERNEL" == "y" ]; then
+ config_query UDEV_PERSIST_INPUT 'Install persistent input rules?' n
+fi &&
config_query UDEV_STATIC 'Create static binaries in addition to dynamically
linked ones?' n &&
config_query_option UDEV_DEBUG 'Compile extra debugging messages?' n
'DEBUG=true' 'DEBUG=false' &&
if [[ "$UDEV_STATIC" == 'y' ]]; then
diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index dfe1bcd..7331b92 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,5 +1,9 @@
SPELL=udev
+if [ "$RECENT_KERNEL" == "n" ]; then
VERSION=092
+else
+ VERSION=094
+fi
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -10,7 +14,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL

WEB_SITE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
ENTERED=20030725
UPDATED=20060107
- PATCHLEVEL=11
+ PATCHLEVEL=12
DOCS="ChangeLog COPYING FAQ README docs/* RELEASE-NOTES"
LICENSE[0]=GPL
KEYWORDS="disk devices nodes modules"
diff --git a/disk/udev/FINAL b/disk/udev/FINAL
index 9afbe88..d707d46 100755
--- a/disk/udev/FINAL
+++ b/disk/udev/FINAL
@@ -1,8 +1,3 @@
-# moving the old rules to rules.d
-if [ -f ${UDEV_CFG}/udev.rules ];then
- install_config_file ${UDEV_CFG}/udev.rules
${UDEV_CFG}/rules.d/00-local.rules &&
- rm -f ${UDEV_CFG}/udev.rules
-fi
#Ensure that all groups used in 50-default.rules exist
create_group disk
create_group cdrom
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 15b5e13..7e4d49e 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,20 @@
+2006-06-17 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS: added 094. This one is not compatible with kernels older
+ than 2.6.15rc1 because of udevsend, so we will keep both 092 and
+ > 092 for a while, PATCHLEVEL++ to get the previous update
+ * PREPARE: Removed the warning for the config files move, this stuff
+ has been there for 14 months, added a test to use the right udev
+ version according to the kernel version
+ * CONFIGURE: Prompt for persistent input rules
+ * INSTALL: Removed udevsend and udevstart install for kernels
+ newer than 2.6.15rc1, added persistent input rules installing,
+ added firmware rule generation according to the kernel version
+ * FINAL: Removed the move of the config files
+ * rules/50-default.rules: remove the rule for the firmware, now
+ generated in INSTALL
+ * init.d/coldplug: added udevsettle launching after udevtrigger to
+ wait for udev events before the script exits
+
2006-06-11 Juuso Alasuutari <iuso AT sourcemage.org>
* rules/50-default.rules: Removed deprecated %e from cdrom
rules, rewrote to use new helper script instead. Did some
diff --git a/disk/udev/INSTALL b/disk/udev/INSTALL
index ed297cd..f4fe9b5 100755
--- a/disk/udev/INSTALL
+++ b/disk/udev/INSTALL
@@ -1,12 +1,14 @@
install -d ${INSTALL_ROOT}/sys &&
-local file UDEV_CFG=${INSTALL_ROOT}/etc/udev &&
+local FILE UDEV_CFG=${INSTALL_ROOT}/etc/udev &&
+# udev <= 092 and > 092 gives a different name for the firmware helper
+local FIRMWARE_HELPER_NAME FIRMWARE_RULE &&
mkdir -p ${UDEV_CFG}/rules.d &&

install_config_file $SCRIPT_DIRECTORY/udev.conf ${UDEV_CFG}/udev.conf &&
install_config_file $SCRIPT_DIRECTORY/udev.missing ${UDEV_CFG}/udev.missing
&&

-for file in $SCRIPT_DIRECTORY/rules/* ; do
- install_config_file $file ${UDEV_CFG}/rules.d/$(basename $file)
+for FILE in $SCRIPT_DIRECTORY/rules/* ; do
+ install_config_file $FILE ${UDEV_CFG}/rules.d/$(basename $FILE)
done &&

# install diff default rules on hotplug and non-hotplug systems, install
@@ -27,8 +29,16 @@ # install alsa rules
install_config_file etc/udev/suse/40-alsa.rules \
${UDEV_CFG}/rules.d/40-alsa.rules

-# udevstart and udevsend are nolonger installed by default. we still need
them
-install udevsend udevstart ${INSTALL_ROOT}/sbin &&
+if [ "$RECENT_KERNEL" == "n" ]; then
+ # udevstart and udevsend are nolonger installed by default. we need them
for kernel < 2.6.15rc1
+ install udevsend udevstart ${INSTALL_ROOT}/sbin &&
+ FIRMWARE_HELPER_NAME="firmware_helper"
+else
+ FIRMWARE_HELPER_NAME="firmware.sh"
+fi &&
+
+FIRMWARE_RULE="SUBSYSTEM==\"firmware\", ACTION==\"add\",
RUN+=\"/lib/udev/$FIRMWARE_HELPER_NAME\"" &&
+echo $FIRMWARE_RULE >> ${UDEV_CFG}/rules.d/50-default.rules &&

make prefix=${INSTALL_ROOT}/ exec_prefix=${INSTALL_ROOT}/ V=true ${OPTS}
install &&
make EXTRAS="extras/run_directory extras/cdrom_id extras/firmware" \
@@ -37,8 +47,8 @@ make EXTRAS="extras/run_directory extras

# Install helper scripts
mkdir -p /lib/udev &&
-for file in $SCRIPT_DIRECTORY/helpers/*; do
- install -m 755 $file $INSTALL_ROOT/lib/udev
+for FILE in $SCRIPT_DIRECTORY/helpers/*; do
+ install -m 755 $FILE $INSTALL_ROOT/lib/udev
done &&

if [[ "$UDEV_EXTRAS" == 'y' ]]; then
@@ -49,14 +59,18 @@ if [[ "$UDEV_EXTRAS" == 'y' ]]; then
install_config_file etc/udev/60-persistent-storage.rules
${UDEV_CFG}/rules.d/60-persistent-storage.rules
fi

+ if [ "$RECENT_KERNEL" == "y" ]; then
+ if [[ "$UDEV_PERSIST_INPUT" == 'y' ]];then
+ install_config_file etc/udev/60-persistent-input.rules
${UDEV_CFG}/rules.d/60-persistent-input.rules
+ fi
+ fi
fi &&

if [[ "$UDEV_STATIC" == 'y' ]]; then
pushd __static__ &&
# we are not supposed to use `make install'
- local __FILE
- for __FILE in $UDEV_STATIC_TARGET; do
- install -D $__FILE $INSTALL_ROOT/usr/sbin/$__FILE.static
+ for FILE in $UDEV_STATIC_TARGET; do
+ install -D $FILE $INSTALL_ROOT/usr/sbin/$FILE.static
done &&
popd
fi
diff --git a/disk/udev/PREPARE b/disk/udev/PREPARE
index bc18823..f3a3aa0 100755
--- a/disk/udev/PREPARE
+++ b/disk/udev/PREPARE
@@ -1,3 +1,6 @@
+# Source grimoire FUNCTIONS to have get_kernel_version
+. $SCRIPT_DIRECTORY/../../FUNCTIONS
+
# testing if the install_config_file function is available
# we don't want to spend time building udev if we can't install it properly

@@ -7,16 +10,18 @@ if ! grep -q install_config_file /var/l
return 1
fi
&&

-message "${MESSAGE_COLOR}"
&&
-message "This update will move your current udev.rules to
/etc/udev/rules.d/00-local.rules" &&
-message "As this is a major change, it won't happen unless\
- you answer y to the following question. ${DEFAULT_COLOR}"
&&
-
-config_query UDEV_UPDATE2 "Do you still wish to continue?" n
&&
+KERNEL_VERSION=$(get_kernel_version) &&
+PATCHLEVEL=`echo $KERNEL_VERSION | cut -d. -f2` &&
+SUBLEVEL=`echo $KERNEL_VERSION | cut -d. -f3` &&
+tmp=`echo $KERNEL_VERSION | cut -d. -f3 | sed 's/^[0-9]*//g'` &&
+SUBLEVEL=${SUBLEVEL/$tmp/} &&

-if [ "$UDEV_UPDATE2" == "n" ]; then
- return 1
+# kernel < 2.6.15-rc1 can't use udev > 0.93 tarballs because udevsend has
been removed
+if [ $SUBLEVEL -ge 15 -a $PATCHLEVEL -ge 6 ]; then
+ RECENT_KERNEL="y"
else
- message "A default udev.rules will be placed in
/etc/udev/rules.d/50-default.rules" &&
- message "And some examples in /etc/udev/rules.d/rules.examples"
-fi
+ RECENT_KERNEL="n" &&
+ message "You have a kernel < 2.6.15, it is too old for latest udev." &&
+ message "Switching to 092..."
+fi &&
+persistent_add RECENT_KERNEL
diff --git a/disk/udev/init.d/coldplug b/disk/udev/init.d/coldplug
index b173432..a2442b9 100644
--- a/disk/udev/init.d/coldplug
+++ b/disk/udev/init.d/coldplug
@@ -1,6 +1,6 @@
#!/bin/bash

-PROGRAM=/sbin/udevtrigger
+PROGRAM=/bin/false
RUNLEVEL=DEV
ESSENTIAL=yes
NEEDS="devices udevd"
@@ -8,6 +8,13 @@ NEEDS="devices udevd"
# source function library
. /etc/init.d/smgl_init

+start()
+{
+ /sbin/udevtrigger
+ # Wait for udev events
+ /sbin/udevsettle
+}
+
stop() { exit 0; }
restart() { exit 3; }
reload() { exit 3; }
diff --git a/disk/udev/rules/50-default.rules
b/disk/udev/rules/50-default.rules
index dac5953..e6f573d 100644
--- a/disk/udev/rules/50-default.rules
+++ b/disk/udev/rules/50-default.rules
@@ -220,5 +220,4 @@ # infiniband devices
KERNEL=="umad*", NAME="infiniband/%k"
KERNEL=="issm*", NAME="infiniband/%k"

-# load firmware
-SUBSYSTEM=="firmware", ACTION=="add", RUN+="/lib/udev/firmware_helper"
+# load firmware - rule generated by udev spell
diff --git a/smgl/init.d/DETAILS b/smgl/init.d/DETAILS
index 5676e3e..973ef72 100755
--- a/smgl/init.d/DETAILS
+++ b/smgl/init.d/DETAILS
@@ -1,7 +1,7 @@
SPELL=init.d
VERSION=2.2.0
LICENSE[0]=GPL
- PATCHLEVEL=8
+ PATCHLEVEL=9
BUILD_API=2
KEYWORDS="smgl"
ENTERED=20030505
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index cac916c..f778ceb 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,8 @@
+2006-06-17 Flavien Bridault <vlaaad AT sourcemage.org>
+ * init.d/devices: removed udevstart for kernels > 2.6.14, coldplug is
+ now working well
+ * DETAILS: PATCHLEVEL++
+
2006-06-09 Eric Sandall <eric AT sandall.us>
* init.d/mountall.sh: cifs is also a network filesystem, don't mount
it here
Corrected comment to refer to mountnetwork instead of mountnfs
diff --git a/smgl/init.d/init.d/devices b/smgl/init.d/init.d/devices
index 2dc83b3..e69c318 100755
--- a/smgl/init.d/init.d/devices
+++ b/smgl/init.d/init.d/devices
@@ -56,10 +56,6 @@ # since we don't support 1.x linux kerne
if [ $SUBLEVEL -ge 15 -a $PATCHLEVEL -ge 6 ]; then
echo "don't need hotplug for this kernel"
builtin echo > /proc/sys/kernel/hotplug
- # Note: udevstart should be removed from here once coldplug works
- # reliably for everyone
- echo "Creating initial udev device nodes"
- /sbin/udevstart
else
# Now uses udevsend as the hotplug multiplexer
echo "Setting udevsend as hotplug agent"



  • [SM-Commit] GIT changes to test grimoire by Flavien Bridault (2974824c79b8ab9fbe52e164f5a9da098c25c24c), Flavien Bridault, 06/17/2006

Archive powered by MHonArc 2.6.24.

Top of Page