Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (e113eecb6592bfa3031641af926e5b960006e3fc)

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 devel-xorg-modular grimoire by Vlad Glagolev (e113eecb6592bfa3031641af926e5b960006e3fc)
  • Date: Fri, 13 Jan 2012 17:22:53 -0600

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

disk/udev/BUILD | 2 ++
disk/udev/DEPENDS | 1 -
disk/udev/DETAILS | 14 ++++++--------
disk/udev/FINAL | 12 ------------
disk/udev/HISTORY | 15 +--------------
disk/udev/INSTALL | 2 +-
disk/udev/PRE_BUILD | 4 ++--
disk/udev/init.d/coldplug | 4 ++--
disk/udev/init.d/udevd | 2 +-
9 files changed, 15 insertions(+), 41 deletions(-)

New commits:
commit 981b53e4736808ec182946b3948d92d924d1f2a6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

such major change isn't acceptable for the most number of setups,
and won't be acceptable until the sane solution is found globally.

It MUST be done in a branch for the first, then take a discussion
and development process.

I haven't seen /usr on the same partition as root on _good_ setups
for a long time (maybe eight or nine years). And braking this is
more than stupid, especially for those who has at least one
production servers.

We're not Lennarts to brake everything we touch.

Revert "udev: => 177"

This reverts commit bb547a9aed0a8daad21f1ec332105650042aa26b.

diff --git a/disk/udev/BUILD b/disk/udev/BUILD
index 40d7aa2..1ae0c50 100755
--- a/disk/udev/BUILD
+++ b/disk/udev/BUILD
@@ -3,6 +3,8 @@ if spell_ok systemd; then
OPTS="$OPTS --with-systemdsystemunitdir=${INSTALL_ROOT}/lib/systemd/system"
fi &&
OPTS="--prefix=$INSTALL_ROOT/usr \
+ --sbindir=$INSTALL_ROOT/sbin \
+ --libexecdir=$INSTALL_ROOT/lib/udev \
--with-rootlibdir=$INSTALL_ROOT/lib \
$UDEV_OPTS $UDEV_HWDB \
$OPTS" &&
diff --git a/disk/udev/DEPENDS b/disk/udev/DEPENDS
index 0138f20..5fff845 100755
--- a/disk/udev/DEPENDS
+++ b/disk/udev/DEPENDS
@@ -2,7 +2,6 @@ depends gnupg &&
depends smgl-fhs &&
depends gperf &&
depends pkgconfig &&
-depends kmod &&
if [[ "${UDEV_HWDB}" == '--enable-hwdb' ]]; then
depends USBIDS &&
depends PCIIDS
diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index 8802ccf..4050919 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,15 +1,13 @@
SPELL=udev
- VERSION=177
-
SOURCE_HASH=sha512:b420f8f8aa4c3c77e8e0cc904cde8fb582a6a8d3e8eacc25feaff8045d9293b3c0e0d68d12d7aabac6fae91504e332fcb281503a31d56b5b8a677ffcafbad18f
+ VERSION=175
PATCHLEVEL=0
SOURCE=$SPELL-$VERSION.tar.bz2
-# SOURCE2=$SPELL-$VERSION.tar.sign
+ SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- URL=$KERNEL_URL/pub/linux/utils/kernel/hotplug
- SOURCE_URL=$URL/$SOURCE
-# SOURCE2_URL=$URL/$SOURCE2
-# SOURCE2_IGNORE=signature
-# SOURCE_GPG=kay.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE_URL=http://people.freedesktop.org/~kay/udev/$SOURCE
+ SOURCE2_URL=$SOURCE_URL.asc
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG=kay.gpg:$SOURCE2:UPSTREAM_KEY

WEB_SITE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
ENTERED=20030725
DOCS="ChangeLog COPYING FAQ README docs/* RELEASE-NOTES"
diff --git a/disk/udev/FINAL b/disk/udev/FINAL
index 9869e28..b812714 100755
--- a/disk/udev/FINAL
+++ b/disk/udev/FINAL
@@ -27,15 +27,3 @@ message "\n${PROBLEM_COLOR}About persistent net interfaces
naming:" \
"of\nthe interface by changing the NAME key. Udev will" \
"not erase it.\nThe old configuration stuff with the" \
"DEVICE_MAC field in netconf is now\nobsolete.$DEFAULT_COLOR"
-# udev-174 changes
-message "\n${PROBLEM_COLOR}Udev-174 changes:" \
- "$DEFAULT_COLOR$MESSAGE_COLOR" \
- "The udev daemon moved to /lib/udev/udevd"
-# udev-177 changes
-message "\n${PROBLEM_COLOR}Udev-177 changes:" \
- "$DEFAULT_COLOR$MESSAGE_COLOR" \
- "udevadm is now in /usr/bin"
- "'udevadm control --reload-rules' option has been renamed to
'--reload'" \
-# final warning
-message "\n${PROBLEM_COLOR}Check any local scripts and udev rules !!!" \
- "$DEFAULT_COLOR$MESSAGE_COLOR Read the NEWS file"
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index b0f5992..3e69ecc 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,18 +1,5 @@
-2012-01-13 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 177
- revert to KERNEL_URL
- only the uncompressed tar is signed
- add SOURCEHASH instead
- * DEPENDS: add kmod
- * BUILD: remove libexecdir and sbindir options
- * FINAL: add lots of warnings
- * INSTALL, FINAL, init.d/coldplug: udevadm has moved
- * init.d/udevd: udevd in now in /usr/libexec/udev
- * init.d/devices:
- * init.d/coldplug: udevadm has moved
-
2011-12-20 David Kowis <dkowis AT shlrm.org>
- * BUILD: included logic to handle when systemd is installed
+* BUILD: included logic to handle when systemd is installed

2011-12-20 Vlad Glagolev <stealth AT sourcemage.org>
* kay.gpg: minimized
diff --git a/disk/udev/INSTALL b/disk/udev/INSTALL
index e918182..5b1360f 100755
--- a/disk/udev/INSTALL
+++ b/disk/udev/INSTALL
@@ -26,4 +26,4 @@ make_single &&
default_install &&
make_normal &&

-ln -sf "$TRACK_ROOT/usr/bin/udevadm" "$INSTALL_ROOT/usr/bin/udevinfo"
+ln -sf "$TRACK_ROOT/sbin/udevadm" "$INSTALL_ROOT/usr/bin/udevinfo"
diff --git a/disk/udev/PRE_BUILD b/disk/udev/PRE_BUILD
index 6a9d5da..04b876f 100755
--- a/disk/udev/PRE_BUILD
+++ b/disk/udev/PRE_BUILD
@@ -18,8 +18,8 @@ local VER2=$(echo $KVER | cut -d. -f2) &&
local VER3=$(echo $KVER | cut -d. -f3) &&
VER3=${VER3%%[^0-9]*} &&

-if [[ VER2 < 6 || VER2 == 6 && VER3 < 32 ]]; then
- message "${PROBLEM_COLOR}You have a kernel < 2.6.32, it is too" \
+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" &&
diff --git a/disk/udev/init.d/coldplug b/disk/udev/init.d/coldplug
index 092ac87..0f38ba6 100755
--- a/disk/udev/init.d/coldplug
+++ b/disk/udev/init.d/coldplug
@@ -13,10 +13,10 @@ start()
{
if [[ $DEVICES = udev ]]; then
echo "Triggering kernel device uevents..."
- /usr/bin/udevadm trigger
+ /sbin/udevadm trigger
evaluate_retval
echo "Waiting for all events to be handled..."
- /usr/bin/udevadm settle --timeout=60
+ /sbin/udevadm settle --timeout=60
fi
evaluate_retval
}
diff --git a/disk/udev/init.d/udevd b/disk/udev/init.d/udevd
index 61a8e7a..d6b3024 100755
--- a/disk/udev/init.d/udevd
+++ b/disk/udev/init.d/udevd
@@ -1,6 +1,6 @@
#!/bin/bash

-PROGRAM=/usr/libexec/udev/udevd
+PROGRAM=/lib/udev/udevd
ARGS="--daemon"
RUNLEVEL=DEV
ESSENTIAL=yes



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (e113eecb6592bfa3031641af926e5b960006e3fc), Vlad Glagolev, 01/13/2012

Archive powered by MHonArc 2.6.24.

Top of Page