Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 77339 by Flavien Bridault 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 77339 by Flavien Bridault for review
  • Date: Thu, 6 Apr 2006 12:10:01 +0100 (BST)

Change 77339 by flavien_bridault@flavien-Gargamel on 2006/04/06 12:06:53

integrate Juuso update and changes for a larger testing, integrated
bugfix #10858

Affected files ...

... //sgl/grimoires/test/disk/udev/50-default.rules#1 branch
... //sgl/grimoires/test/disk/udev/50-default.rules-hotplug#1 branch
... //sgl/grimoires/test/disk/udev/CONFIGURE#9 integrate
... //sgl/grimoires/test/disk/udev/DEPENDS#9 integrate
... //sgl/grimoires/test/disk/udev/DETAILS#40 integrate
... //sgl/grimoires/test/disk/udev/HISTORY#60 integrate
... //sgl/grimoires/test/disk/udev/INSTALL#20 integrate
... //sgl/grimoires/test/disk/udev/PRE_BUILD#5 integrate
... //sgl/grimoires/test/disk/udev/TRIGGERS#1 branch
... //sgl/grimoires/test/disk/udev/WIP#1 branch
... //sgl/grimoires/test/disk/udev/init.d/coldplug#6 integrate
... //sgl/grimoires/test/disk/udev/rules/50-default.rules#14 delete

Differences ...

==== //sgl/grimoires/test/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/test/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/test/disk/udev/DETAILS#40 (xtext) ====

@@ -1,5 +1,5 @@
SPELL=udev
- VERSION=086
+ VERSION=089
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=${SOURCE}.sign
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
@@ -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/test/disk/udev/HISTORY#60 (text) ====

@@ -1,3 +1,35 @@
+2006-04-06 Flavien Bridault <vlaaad AT sourcemage.org>
+ * 50-default.rules-hotplug, 50-default.rules: added a rule for svgalib
+ devices (bug #10858)
+
+2006-04-04 Flavien Bridault <vlaaad AT sourcemage.org>
+ * 50-default.rules-hotplug, 50-default.rules: corrected path to
cdrom_id
+
+2006-04-04 Juuso Alasuutari <iuso AT sourcemage.org>
+ * INSTALL: made loop vars local
+
+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
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS


==== //sgl/grimoires/test/disk/udev/INSTALL#20 (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 file 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,19 +28,18 @@
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 &&

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
done &&

==== //sgl/grimoires/test/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

==== //sgl/grimoires/test/disk/udev/init.d/coldplug#6 (text) ====

@@ -1,6 +1,6 @@
#!/bin/bash

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

-
-start() {
-echo "starting coldplug"
- list=$(builtin echo /sys/bus/*/devices/*/uevent)
- list="$list $(builtin echo /sys/class/*/*/uevent)"
- list="$list $(builtin echo /sys/block/*/uevent
/sys/block/*/*/uevent)"
- for i in $list; do
- case "$i" in
- */device/uevent|*\**)
- continue
- ;;
- */class/mem/*|*/class/tty/*)
- first="$first $i"
- ;;
- */block/md*)
- last="$last $i"
- ;;
- */*)
- default="$default $i"
- ;;
- esac
- done
-
- # trigger the sorted events
- for i in $first $default $last; do
- builtin echo "add" > "$i"
- done
-echo "coldplug complete"
-}
-
stop() { exit 0; }
restart() { exit 3; }
reload() { exit 3; }



  • [SM-Commit] PERFORCE change 77339 by Flavien Bridault for review, Perforce Review Daemon, 04/06/2006

Archive powered by MHonArc 2.6.24.

Top of Page