Skip to Content.
Sympa Menu

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

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 (c634508140fff508ba030d6e55ded1b1295c70da)
  • Date: Sun, 12 Jun 2011 07:05:36 -0500

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

ChangeLog | 3 +++
disk/udev/CONFIGURE | 7 -------
disk/udev/DEPENDS | 12 ++++++------
disk/udev/DETAILS | 1 +
disk/udev/FINAL | 1 +
disk/udev/HISTORY | 8 ++++++++
disk/udev/SUB_DEPENDS | 12 +++---------
disk/udev/rules/40-alsa.rules | 1 -
groups | 1 +
9 files changed, 23 insertions(+), 23 deletions(-)

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

udev: added fixes for #15994 and serveral corrections for alsa and groups
usage

commit a52c394d250fa64ab60db7c0f22f7489ed73795e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

added 'tape' group

diff --git a/ChangeLog b/ChangeLog
index 5eef170..25a174e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-06-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * groups: added 'tape' group (required at least for udev)
+
2011-06-07 Arjan Bouter <abouter AT sourcemage.org>
* windowmanagers/i3: new spell, tiling windowmanager
* wm-addons: i3lock: new spell, improved screen locker
diff --git a/disk/udev/CONFIGURE b/disk/udev/CONFIGURE
index 84f4673..eee38ca 100755
--- a/disk/udev/CONFIGURE
+++ b/disk/udev/CONFIGURE
@@ -9,20 +9,13 @@ config_query_option UDEV_OPTS \
#
if list_find "$UDEV_OPTS" '--enable-extras'; then
list_remove UDEV_OPTS '--enable-extras' &&
- list_add UDEV_OPTS '--enable-udev_acl'
elif list_find "$UDEV_OPTS" '--disable-extras'; then
list_remove UDEV_OPTS '--disable-extras' &&
- list_add UDEV_OPTS '--disable-udev_acl'
fi &&
#
# End Bug #15994
#

-config_query_option UDEV_OPTS \
- "Compile access control lists" n \
- "--enable-udev_acl" \
- "--disable-udev_acl" &&
-
if spell_ok hotplug; then
message "You seem to have hotplug installed. Hotplug has been" \
"officially\ndeprecated in favor of udev, and it is" \
diff --git a/disk/udev/DEPENDS b/disk/udev/DEPENDS
index 3ebeebe..666e274 100755
--- a/disk/udev/DEPENDS
+++ b/disk/udev/DEPENDS
@@ -4,12 +4,6 @@ depends gperf &&
depends usbutils &&
depends PCIIDS &&

-if list_find "$UDEV_OPTS" "--enable-udev_acl"; then
- depends pkgconfig &&
- depends libusb &&
- optional_depends consolekit '' '' 'seesion/seat support'
-fi &&
-
if [[ "$(get_spell_provider ${SPELL} PCIIDS)" = 'pciutils' ]]; then
depends -sub NO_ZLIB pciutils
fi &&
@@ -19,6 +13,12 @@ optional_depends acl \
"--disable-udev_acl" \
"for local user acl permissions support" &&

+if is_depends_enabled $SPELL acl; then
+ depends pkgconfig &&
+ depends libusb &&
+ optional_depends consolekit '' '' 'seesion/seat support'
+fi &&
+
optional_depends glib2 \
'--enable-gudev' \
'--disable-gudev' \
diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index 94a72be..04e25a8 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,5 +1,6 @@
SPELL=udev
VERSION=171
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/udev/FINAL b/disk/udev/FINAL
index 5341338..b812714 100755
--- a/disk/udev/FINAL
+++ b/disk/udev/FINAL
@@ -8,6 +8,7 @@ create_group audio
create_group uucp
create_group dialout
create_group firewire
+create_group tape

# dispel hotplug
if [[ $UDEV_DISPEL_HOTPLUG == y ]]; then
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index f0f7cff..c726278 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,11 @@
+2011-06-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * CONFIGURE: removed acl selection (it exists in DEPENDS as acl dep
now)
+ * SUB_DEPENDS: corrected flags and dependencies
+ * FINAL: add 'tape' group creation
+ * init.d/40-alsa.rules: removed useless lines to restore settings
+ (it's managed by alsa-state init script from alsa-utils spell)
+
2011-06-08 Eric Sandall <sandalle AT sourcemage.org>
* Fix Bug #15994
* CONFIGURE: extras split to glib2 (gudev) and --enable-udev_acl
diff --git a/disk/udev/SUB_DEPENDS b/disk/udev/SUB_DEPENDS
index e6ae426..be4a453 100755
--- a/disk/udev/SUB_DEPENDS
+++ b/disk/udev/SUB_DEPENDS
@@ -2,16 +2,10 @@ case "$THIS_SUB_DEPENDS" in
VOLUME_ID) true;;
EXTRAS) message "${MESSAGE_COLOR}Forcing building of hash function" \
"generator and access control lists${DEFAULT_COLOR}" &&
- list_add UDEV_OPTS --enable-extras
- list_remove UDEV_OPTS --disable-extras
- depends acl &&
- depends gperf &&
+ depends acl '--enable-udev_acl' &&
+ depends glib2 '--enable-gudev' &&
depends pkgconfig &&
- depends glib2 &&
- depends libusb &&
- depends usbutils &&
- depends USBIDS &&
- depends PCIIDS ;;
+ depends libusb ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
return 1;;
esac
diff --git a/disk/udev/rules/40-alsa.rules b/disk/udev/rules/40-alsa.rules
index 0d0f4c2..c0c94cc 100644
--- a/disk/udev/rules/40-alsa.rules
+++ b/disk/udev/rules/40-alsa.rules
@@ -11,5 +11,4 @@ SUBSYSTEM=="usb", ACTION=="add",
ENV{PRODUCT}=="1604/8004/*", RUN+="/sbin/fxload
SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="1604/8006/*",
RUN+="/sbin/fxload -s /usr/share/alsa/firmware/usx2yloader/tascam_loader.ihx
-I /usr/share/alsa/firmware/usx2yloader/us122fw.ihx"
SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="1604/8001/*",
RUN+="/sbin/startproc /usr/bin/us428control"
SUBSYSTEM=="usb", ACTION=="add", ENV{PRODUCT}=="1604/8005/*",
RUN+="/sbin/startproc /usr/bin/us428control"
-SUBSYSTEM=="sound", KERNEL=="controlC?", RUN+="/usr/sbin/alsactl -F restore
%n"
SUBSYSTEM=="sound", KERNEL=="hwC?D2", DRIVERS=="EMU10K1_Audigy",
RUN+="/etc/alsa.d/udev-soundfont"
diff --git a/groups b/groups
index 0be45e0..4c37b66 100755
--- a/groups
+++ b/groups
@@ -15,6 +15,7 @@ kmem:15:
ppp:20:
cdrom:24:
floppy:25:
+tape:26:
audio:29:
www-data:33:
backup:34:



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (c634508140fff508ba030d6e55ded1b1295c70da), Vlad Glagolev, 06/12/2011

Archive powered by MHonArc 2.6.24.

Top of Page