Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (884c8215be4ff91733bce939ca5ae7e6c15c31c9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (884c8215be4ff91733bce939ca5ae7e6c15c31c9)
  • Date: Tue, 22 Jul 2008 05:56:10 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

disk/udev/BUILD | 2 -
disk/udev/CONFIGURE | 71
++++++++++++---------------------------
disk/udev/CONFLICTS | 2 -
disk/udev/DEPENDS | 20 +++++-----
disk/udev/DETAILS | 8 ++--
disk/udev/FINAL | 19 ++++------
disk/udev/HISTORY | 15 ++++++++
disk/udev/INSTALL | 63 ++++++++++++----------------------
disk/udev/Makefile.patch | 14 -------
disk/udev/PRE_BUILD | 31 +++++++----------
disk/udev/PRE_SUB_DEPENDS | 4 +-
disk/udev/SUB_DEPENDS | 17 +++------
disk/udev/UP_TRIGGERS | 6 +--
disk/udev/rules/50-default.rules | 5 --
disk/udev/udev.conf | 4 --
15 files changed, 109 insertions(+), 172 deletions(-)

New commits:
commit 884c8215be4ff91733bce939ca5ae7e6c15c31c9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

udev: => 125 + lots of fixes and cleanups

diff --git a/disk/udev/BUILD b/disk/udev/BUILD
index d84b706..5acf6f5 100755
--- a/disk/udev/BUILD
+++ b/disk/udev/BUILD
@@ -1 +1 @@
-make prefix=$INSTALL_ROOT $OPTS $UDEV_DEBUG V=true EXTRAS="$_EXTRAS_TARG"
+make DESTDIR="$INSTALL_ROOT/" $OPTS $UDEV_DEBUG V=true EXTRAS="$_EXTRAS_TARG"
diff --git a/disk/udev/CONFIGURE b/disk/udev/CONFIGURE
index b259066..1676919 100755
--- a/disk/udev/CONFIGURE
+++ b/disk/udev/CONFIGURE
@@ -1,56 +1,31 @@
-# Added in stable 0.6, remove when appropriate
-if [[ $UDEV_PERSIST ]]
-then
- UDEV_PERSIST_STORAGE=$UDEV_PERSIST &&
- persistent_add UDEV_PERSIST_STORAGE &&
- persistent_remove UDEV_PERSIST
-fi &&
+config_query_option UDEV_DEBUG \
+ "Compile extra debugging messages?" \
+ n \
+ "DEBUG=true" \
+ "DEBUG=false" &&

-config_query UDEV_PERSIST_STORAGE \
- 'Install persistent storage rules?' \
- n &&
+config_query UDEV_EXTRAS \
+ "Build extra helpers?" \
+ y &&

-config_query UDEV_PERSIST_INPUT \
- 'Install persistent input rules?' \
- n &&
+# store extras build options in a var for reuse
+local _EXTRAS_TARG="extras/cdrom_id \
+ extras/firmware extras/rule_generator" &&

-if [[ $UDEV_PERSIST_STORAGE == n ]]
-then
- config_query UDEV_EXTRAS \
- 'Build extra helpers?' \
- y
-fi &&
-
-config_query_option UDEV_DEBUG \
- 'Compile extra debugging messages?' \
- n \
- 'DEBUG=true' \
- 'DEBUG=false' &&
-
-# Store extras build options in a var for reuse
-
-local _EXTRAS_TARG="extras/cdrom_id \
- extras/firmware extras/rule_generator" &&
-
-if [[ $UDEV_EXTRAS == y || $UDEV_PERSIST_STORAGE == y ]]
-then
+if [[ $UDEV_EXTRAS == y ]]; then
_EXTRAS_TARG="$_EXTRAS_TARG extras/ata_id extras/usb_id extras/edd_id \
- extras/floppy extras/scsi_id extras/volume_id"
-elif [[ $UDEV_PERSIST_INPUT == y ]]
-then
- _EXTRAS_TARG="$_EXTRAS_TARG extras/usb_id"
-fi &&
+ extras/floppy extras/scsi_id extras/volume_id extras/usb_id"
+fi &&

-persistent_add _EXTRAS_TARG &&
+persistent_add _EXTRAS_TARG &&

-if spell_ok hotplug
-then
- message "You seem to have hotplug installed. Hotplug has been" \
- "officially\ndeprecated in favor of udev, and it is" \
- "highly recommended that\nhotplug is removed after" \
- "udev has been installed." &&
+if spell_ok hotplug; then
+ message "You seem to have hotplug installed. Hotplug has been" \
+ "officially\ndeprecated in favor of udev, and it is" \
+ "highly recommended that\nhotplug is removed after" \
+ "udev has been installed." &&

- config_query UDEV_DISPEL_HOTPLUG \
- "Dispel hotplug after udev is cast?" \
- y
+ config_query UDEV_DISPEL_HOTPLUG \
+ "Dispel hotplug after udev is cast?" \
+ y
fi
diff --git a/disk/udev/CONFLICTS b/disk/udev/CONFLICTS
index 69f30c7..0006388 100755
--- a/disk/udev/CONFLICTS
+++ b/disk/udev/CONFLICTS
@@ -1 +1 @@
-conflicts udev-old y
+conflicts udev-old y
diff --git a/disk/udev/DEPENDS b/disk/udev/DEPENDS
index e878072..a31ad8e 100755
--- a/disk/udev/DEPENDS
+++ b/disk/udev/DEPENDS
@@ -1,12 +1,12 @@
-depends gnupg &&
-depends smgl-fhs &&
+depends gnupg &&
+depends smgl-fhs &&

-optional_depends libselinux \
- "USE_SELINUX=true" \
- "USE_SELINUX=false" \
- "for SELinux support" &&
+optional_depends libselinux \
+ "USE_SELINUX=true" \
+ "USE_SELINUX=false" \
+ "for SELinux support" &&

-optional_depends SYSTEM-LOGGER \
- "USE_LOG=true" \
- "USE_LOG=false" \
- "for logging to syslog"
+optional_depends SYSTEM-LOGGER \
+ "USE_LOG=true" \
+ "USE_LOG=false" \
+ "for logging to syslog"
diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index 179e256..8430579 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,5 +1,5 @@
SPELL=udev
- VERSION=124
+ VERSION=125
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -12,8 +12,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
DOCS="ChangeLog COPYING FAQ README docs/* RELEASE-NOTES"
LICENSE[0]=GPL
KEYWORDS="disk devices nodes modules"
- SHORT="Udev creates and removes device nodes"
+ SHORT="daemon that creates and removes device nodes"
cat << EOF
-Udev creates and removes device nodes in /dev, based on events the kernel
-sends out on device discovery or removal
+Udev creates and removes device nodes in /dev, based on events the kernel
sends
+out on device discovery or removal
EOF
diff --git a/disk/udev/FINAL b/disk/udev/FINAL
index 24396fd..62df534 100755
--- a/disk/udev/FINAL
+++ b/disk/udev/FINAL
@@ -1,18 +1,17 @@
-#Ensure that all groups used in 50-default.rules exist
-create_group disk
-create_group cdrom
-create_group floppy
-create_group burning
-create_group video
-create_group audio
+# ensure that all groups used in 50-default.rules exist
+create_group disk
+create_group cdrom
+create_group floppy
+create_group burning
+create_group video
+create_group audio

# dispel hotplug
-if [[ $UDEV_DISPEL_HOTPLUG == y ]]
-then
+if [[ $UDEV_DISPEL_HOTPLUG == y ]]; then
# we don't care if these fail
dispel hotplug
persistent_remove UDEV_DISPEL_HOTPLUG
-fi &&
+fi &&

# warn of coming changes
message "\n${PROBLEM_COLOR}About persistent net interfaces naming:" \
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 7d3b743..2fc58cc 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,18 @@
+2008-07-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 125, fixed long desc
+ * PRE_BUILD: makefile patch's no longer needed, cleaned up
+ * CONFIGURE: removed persistent rules configuration (installed by
def),
+ cleaned up
+ * BUILD: use correct DESTDIR instead of prefix
+ * CONFLICTS, DEPENDS, FINAL, UP_TRIGGERS, [PRE_]SUB_DEPENDS: cleaned
up
+ * INSTALL: use `install -d' instead of `mkdir -p', SPELL > SCRIPT,
+ use correct DESTDIR, removed perstitent rules installation like in
+ BUILD (they're installed by def), cleaned up
+ * udev.conf: udev rules are located now in two dirs: /etc/udev/rules.d
+ for the user-defined rules and /lib/udev/rules.d for the system ones
+ * rules/50-default.rules: removed links for non-existent input devices
+ (noted in 2.6.26, they're just /dev/pty*)
+
2008-06-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 124

diff --git a/disk/udev/INSTALL b/disk/udev/INSTALL
index 3824f6f..97a0ed0 100755
--- a/disk/udev/INSTALL
+++ b/disk/udev/INSTALL
@@ -1,44 +1,27 @@
-local file UDEV_CFG="$INSTALL_ROOT/etc/udev" &&
-mkdir -p "$INSTALL_ROOT/sys" "$UDEV_CFG/rules.d" &&
-
-for file in $SCRIPT_DIRECTORY/rules/*
-do
- install_config_file "$file" \
- "$UDEV_CFG/rules.d/$(basename $file)"
-done &&
-
-install_config_file "$SOURCE_DIRECTORY/etc/udev/rules.d/95-udev-late.rules"
\
- "$UDEV_CFG/rules.d/95-udev-late.rules"
&&
-
-if [[ $UDEV_PERSIST_STORAGE == y ]]
-then
- install_config_file etc/udev/rules.d/60-persistent-storage.rules \
- "$UDEV_CFG/rules.d/60-persistent-storage.rules"
-fi &&
-
-if [[ $UDEV_PERSIST_INPUT == y ]]
-then
- install_config_file etc/udev/rules.d/60-persistent-input.rules \
- "$UDEV_CFG/rules.d/60-persistent-input.rules"
-fi &&
+local file UDEV_CFG="$INSTALL_ROOT/etc/udev" &&
+
+install -m 755 -d "$INSTALL_ROOT/sys" \
+ "$UDEV_CFG/rules.d" &&
+
+for file in $SPELL_DIRECTORY/rules/*; do
+ install_config_file $file "$UDEV_CFG/rules.d/$(basename $file)"
+done &&

# Aliases for modprobe
-mkdir -p "$INSTALL_ROOT/etc/modprobe.d" &&
-install_config_file "$SCRIPT_DIRECTORY/modprobe.aliases" \
- "$INSTALL_ROOT/etc/modprobe.d/udev" &&
+install -m 755 -d "$INSTALL_ROOT/etc/modprobe.d" &&
+
+install_config_file "$SPELL_DIRECTORY/modprobe.aliases" \
+ "$INSTALL_ROOT/etc/modprobe.d/udev" &&

# These are used by devices init script, udev.conf also by udev
-install_config_file "$SCRIPT_DIRECTORY/udev.conf" \
- "$UDEV_CFG/udev.conf" &&
-install_config_file "$SCRIPT_DIRECTORY/udev.missing" \
- "$UDEV_CFG/udev.missing" &&
-
-make prefix="$INSTALL_ROOT" $OPTS $UDEV_DEBUG \
- V=true EXTRAS="$_EXTRAS_TARG" install &&
-
-# Persistent rules need path_id helper
-if [[ $UDEV_PERSIST_STORAGE == y || $UDEV_PERSIST_INPUT == y ]]
-then
- install extras/path_id/path_id \
- "$INSTALL_ROOT/lib/udev/"
-fi
+install_config_file "$SPELL_DIRECTORY/udev.conf" \
+ "$UDEV_CFG/udev.conf" &&
+
+install_config_file "$SPELL_DIRECTORY/udev.missing" \
+ "$UDEV_CFG/udev.missing" &&
+
+make DESTDIR="$INSTALL_ROOT/" $OPTS $UDEV_DEBUG \
+ V=true EXTRAS="$_EXTRAS_TARG" install &&
+
+# path_id helper is needed for persistent rules
+install extras/path_id/path_id "$INSTALL_ROOT/lib/udev"
diff --git a/disk/udev/Makefile.patch b/disk/udev/Makefile.patch
deleted file mode 100644
index f8fa883..0000000
--- a/disk/udev/Makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile~ 2008-06-12 00:08:43.000000000 +0200
-+++ Makefile 2008-06-12 08:12:45.000000000 +0200
-@@ -264,11 +264,6 @@
- @extras="$(EXTRAS)"; for target in $$extras; do \
- $(MAKE) -C $$target $@ || exit 1; \
- done;
--ifndef DESTDIR
-- - killall udevd
-- - rm -rf $(udevdir)/.udev
-- - $(sbindir)/udevd --daemon
--endif
- .PHONY: install-bin
-
- uninstall-bin:
diff --git a/disk/udev/PRE_BUILD b/disk/udev/PRE_BUILD
index c074d5b..fd37c04 100755
--- a/disk/udev/PRE_BUILD
+++ b/disk/udev/PRE_BUILD
@@ -1,22 +1,17 @@
# kernel < 2.6.15 can't use udev > 092 because udevsend has been removed

-local KVER=$(get_kernel_version) &&
-local VER2=$(echo $KVER | cut -d. -f2) &&
-local VER3=$(echo $KVER | cut -d. -f3) &&
- VER3=${VER3%%[^0-9]*} &&
+local KVER=$(get_kernel_version) &&
+local VER2=$(echo $KVER | cut -d. -f2) &&
+local VER3=$(echo $KVER | cut -d. -f3) &&
+ VER3=${VER3%%[^0-9]*} &&

-if (( VER2 < 6 )) ||
- (( VER2 == 6 && VER3 < 15 ))
-then
- message "${PROBLEM_COLOR}You have a kernel < 2.6.15, it is too" \
- "old for udev. Please install\na newer kernel.\nIf you" \
- "insist on using your old kernel with hotplug,\nyou" \
- "can install udev-old.$DEFAULT_COLOR" &&
+if [[ VER2 < 6 || VER2 == 6 && VER3 < 15 ]]; then
+ message "${PROBLEM_COLOR}You have a kernel < 2.6.15, it is too" \
+ "old for udev. Please install\na newer kernel.\nIf you" \
+ "insist on using your old kernel with hotplug,\nyou" \
+ "can install udev-old.$DEFAULT_COLOR" &&
return 1
-fi &&
-
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-# Prevent udev restart on 'make install'
-patch -p0 < "$SCRIPT_DIRECTORY/Makefile.patch"
+else
+ default_pre_build &&
+ cd "$SOURCE_DIRECTORY"
+fi
diff --git a/disk/udev/PRE_SUB_DEPENDS b/disk/udev/PRE_SUB_DEPENDS
index 3eb5384..81dbe53 100755
--- a/disk/udev/PRE_SUB_DEPENDS
+++ b/disk/udev/PRE_SUB_DEPENDS
@@ -1,4 +1,4 @@
case $THIS_SUB_DEPENDS in
- VOLUME_ID) list_find "$_EXTRAS_TARG" "extras/volume_id" && return 0 ;;
+ VOLUME_ID) list_find "$_EXTRAS_TARG" "extras/volume_id";;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
esac
-return 1
diff --git a/disk/udev/SUB_DEPENDS b/disk/udev/SUB_DEPENDS
index 4fa5143..ca5ab10 100755
--- a/disk/udev/SUB_DEPENDS
+++ b/disk/udev/SUB_DEPENDS
@@ -1,13 +1,8 @@
case "$THIS_SUB_DEPENDS" in
- VOLUME_ID) if ! list_find "$_EXTRAS_TARG" "extras/volume_id"
- then
- echo "Sub-dependency VOLUME_ID requested, adding build" \
- "target 'extras/volume_id'." &&
- _EXTRAS_TARG="$_EXTRAS_TARG extras/volume_id" &&
- persistent_add _EXTRAS_TARG
- fi
- ;;
- *) echo "Unknown sub-dependency $THIS_SUB_DEPENDS!"
- return 1
- ;;
+ VOLUME_ID) if ! list_find "$_EXTRAS_TARG" "extras/volume_id"; then
+ message "Sub-dependency VOLUME_ID requested, adding build
target 'extras/volume_id'." &&
+ _EXTRAS_TARG="$_EXTRAS_TARG extras/volume_id" &&
+ persistent_add _EXTRAS_TARG
+ fi;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
esac
diff --git a/disk/udev/UP_TRIGGERS b/disk/udev/UP_TRIGGERS
index 7362114..32b044d 100755
--- a/disk/udev/UP_TRIGGERS
+++ b/disk/udev/UP_TRIGGERS
@@ -1,7 +1,5 @@
# when upgrading from udev-old also trigger init.d to refresh its depends

-
-if is_depends_enabled init.d udev-old
-then
- up_trigger init.d cast_self
+if is_depends_enabled init.d udev-old; then
+ up_trigger init.d cast_self
fi
diff --git a/disk/udev/rules/50-default.rules
b/disk/udev/rules/50-default.rules
index e268c06..aaedc4c 100644
--- a/disk/udev/rules/50-default.rules
+++ b/disk/udev/rules/50-default.rules
@@ -12,11 +12,6 @@ KERNEL=="isdn*", NAME="%k"
KERNEL=="dcbri*", NAME="%k"
KERNEL=="ircomm*", NAME="%k"

-# pty devices
-KERNEL=="ptmx", NAME="%k", MODE="0666"
-KERNEL=="pty[p-za-e][0-9a-f]*", NAME="pty/m%n", SYMLINK="%k"
-KERNEL=="tty[p-za-e][0-9a-f]*", NAME="pty/s%n", SYMLINK="%k"
-
# vc devices
KERNEL=="vcs", NAME="vcc/0", SYMLINK="%k"
KERNEL=="vcs[0-9]*", NAME="vcc/%n", SYMLINK="%k"
diff --git a/disk/udev/udev.conf b/disk/udev/udev.conf
index 1dfcbd9..8680f17 100644
--- a/disk/udev/udev.conf
+++ b/disk/udev/udev.conf
@@ -9,10 +9,6 @@
# Specifies where to place the device nodes in the filesystem.
udev_root="/dev"

-# The name of the udev rules file or directory to look for files with
-# the suffix .rules. Multiple rule files are read in lexical order.
-udev_rules="/etc/udev/rules.d"
-
# The logging priority. Valid values are the numerical syslog priorities
# or their textual representations: err, info and debug.
udev_log="err"




Archive powered by MHonArc 2.6.24.

Top of Page