Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 77188 by Juuso Alasuutari for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andraž " ruskie " Levstik" <ruskie AT mages.ath.cx>, "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "Arwed von Merkatz" <v.merkatz AT gmx.net>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Flavien Bridault" <f.bridault AT fra.net>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "George J. Sherwood" <george AT beernabeer.com>, "Jason Flatt" <jflatt AT sourcemage.org>, "Jeremy Blosser" <jblosser AT sourcemage.org>, "Juuso Alasuutari" <iuso AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 77188 by Juuso Alasuutari for review
  • Date: Tue, 4 Apr 2006 00:35:00 +0100 (BST)

Change 77188 by juuso_alasuutari@juuso_alasuutari-kamayuq on 2006/04/04
00:34:17

major: succesfully autoload all modules on hotplug-free systems,
remain compatible with both (=install diff rulesets depending on spell_ok
hotplug). minor: bugfixing, tweaking, sanitization.

Affected files ...

... //sgl/grimoires/devel/disk/udev/50-default.rules#1 add
... //sgl/grimoires/devel/disk/udev/50-default.rules-hotplug#1 add
... //sgl/grimoires/devel/disk/udev/CONFIGURE#9 edit
... //sgl/grimoires/devel/disk/udev/DEPENDS#9 edit
... //sgl/grimoires/devel/disk/udev/DETAILS#45 edit
... //sgl/grimoires/devel/disk/udev/HISTORY#74 edit
... //sgl/grimoires/devel/disk/udev/INSTALL#25 edit
... //sgl/grimoires/devel/disk/udev/PRE_BUILD#5 edit
... //sgl/grimoires/devel/disk/udev/TRIGGERS#1 add
... //sgl/grimoires/devel/disk/udev/rules/50-default.rules#16 delete

Differences ...

==== //sgl/grimoires/devel/disk/udev/CONFIGURE#9 (xtext) ====

@@ -4,7 +4,7 @@
if [[ "$UDEV_STATIC" == 'y' ]]; then
if [[ -z "$UDEV_STATIC_TARGET" ]]; then
# add more UDEV utilities here as necessary, space-separated
- UDEV_STATIC_TARGET="udevstart"
+ local UDEV_STATIC_TARGET="udevstart"
fi &&
persistent_add UDEV_STATIC_TARGET &&
message "${MESSAGE_COLOR}Static utilities (with suffix .static):
$UDEV_STATIC_TARGET${DEFAULT_COLOR}"

==== //sgl/grimoires/devel/disk/udev/DEPENDS#9 (xtext) ====

@@ -1,7 +1,7 @@
depends gnupg &&
depends smgl-fhs &&

-KVER=`installed_version linux |cut -c-6` &&
+local KVER=`installed_version linux |cut -c-6` &&

if [[ "$KVER" < "2.6.13" ]]; then
depends hotplug

==== //sgl/grimoires/devel/disk/udev/DETAILS#45 (xtext) ====

@@ -10,7 +10,7 @@

WEB_SITE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
ENTERED=20030725
UPDATED=20060107
- PATCHLEVEL=7
+ PATCHLEVEL=8
DOCS="ChangeLog COPYING FAQ README docs/* RELEASE-NOTES"
LICENSE[0]=GPL
KEYWORDS="disk"

==== //sgl/grimoires/devel/disk/udev/HISTORY#74 (text) ====

@@ -1,3 +1,21 @@
+2006-04-04 Juuso Alasuutari <iuso AT sourcemage.org>
+ * INSTALL: edited to install different default rules for hotplug
+ and non-hotplug systems because rulesets are incompatible.
+ removed one unused var, made another var local, and did some
+ minor and not so minor fixes.
+ * rules/50-default.rules: deleted
+ * 50-default.rules-hotplug: added (same file as above, moved &
+ renamed)
+ * 50-default.rules: added (new udev-only module autoload rules
+ file)
+ * TRIGGERS: hotplug cast/dispel now triggers udev cast to keep
+ rules up to date
+ * DETAILS: PATCHLEVEL up
+ * DEPENDS: made 1 var local
+ * CONFIGURE: made 1 var local
+ * PRE_BUILD: removed a sedit that fixes something already fixed
+ upstream
+
2006-04-03 David Brown <dmlb2000 AT gmail.com>
* DETAILS: updated 089
* init.d/coldplug: all you need is the udevtrigger instead of big
script

==== //sgl/grimoires/devel/disk/udev/INSTALL#25 (xtext) ====

@@ -1,20 +1,23 @@
-install -d ${INSTALL_ROOT}/sys &&
-UDEV_CFG=${INSTALL_ROOT}/etc/udev &&
-DEV_DDIR=/etc/dev.d &&
-mkdir -p ${UDEV_CFG}/rules.d &&
+install -d ${INSTALL_ROOT}/sys &&
+local UDEV_CFG=${INSTALL_ROOT}/etc/udev &&
+mkdir -p ${UDEV_CFG}/rules.d &&

-for file in $SCRIPT_DIRECTORY/udev.{conf,missing} ; do
- install_config_file $file ${UDEV_CFG}/$(basename $file)
-done &&
+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)
+ install_config_file $file ${UDEV_CFG}/rules.d/$(basename $file)
done &&

-# install some of the suse rules
-for file in etc/udev/suse/40-alsa.rules ; do
- install_config_file $file ${UDEV_CFG}/rules.d/$(basename $file)
-done &&
+# install diff default rules on hotplug and non-hotplug systems
+if spell_ok hotplug; then
+ install_config_file $SCRIPT_DIRECTORY/50-default.rules-hotplug
${UDEV_CFG}/rules.d/50-default.rules
+else
+ install_config_file $SCRIPT_DIRECTORY/50-default.rules
${UDEV_CFG}/rules.d/50-default.rules
+fi
+
+# 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 &&
@@ -25,13 +28,11 @@
V=true ${OPTS} install &&
if [[ "$UDEV_EXTRAS" == 'y' ]]; then
make EXTRAS="extras/ata_id extras/dasd_id extras/edd_id extras/floppy
extras/scsi_id extras/usb_id extras/volume_id" prefix=${INSTALL_ROOT}/
exec_prefix=${INSTALL_ROOT}/ ${OPTS} V=true install &&
- install extras/path_id ${INSTALL_ROOT}/sbin &&
+ install extras/path_id/path_id ${INSTALL_ROOT}/sbin &&

if [[ "$UDEV_PERSIST" == 'y' ]];then
- for file in etc/udev/persistent-disk.rules ; do
- install_config_file $file ${UDEV_CFG}/rules.d/60-$(basename $file)
- done
- fi
+ install_config_file etc/udev/60-persistent-storage.rules
${UDEV_CFG}/rules.d/60-persistent-storage.rules
+ fi

fi &&


==== //sgl/grimoires/devel/disk/udev/PRE_BUILD#5 (xtext) ====

@@ -5,7 +5,5 @@
if [[ "$UDEV_STATIC" == 'y' ]]; then
message "${MESSAGE_COLOR}Setting up static build
directory...${DEFAULT_COLOR}" &&
mkdir __static__ &&
- cp -aRv Makefile *.{c,h} ./__static__/ &&
- # fix file so static build actually works
- sedit '29i#include <errno.h>' __static__/udev_libc_wrapper.c
+ cp -aRv Makefile *.{c,h} ./__static__/
fi



  • [SM-Commit] PERFORCE change 77188 by Juuso Alasuutari for review, Perforce Review Daemon, 04/03/2006

Archive powered by MHonArc 2.6.24.

Top of Page