From 94324a053b386948238d1e0e5cb7cf6aeb3f52ff Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 28 May 2012 20:22:30 +0200 Subject: [PATCH] udev: replace with systemd Signed-off-by: Stephan Raue --- .../3rdparty/multimedia/vdr-dynamite/meta | 4 +- packages/audio/pulseaudio/meta | 4 +- packages/devel/libcec/meta | 4 +- packages/graphics/libdrm/meta | 4 +- packages/network/connman/meta | 4 +- packages/security/polkit/meta | 4 +- packages/sysutils/libatasmart/meta | 4 +- packages/sysutils/remote/eventlircd/meta | 4 +- packages/sysutils/remote/xwiimote/meta | 4 +- packages/sysutils/{udev => systemd}/build | 63 ++++++++++++------- .../config/udev.rules.d.sample/README | 0 .../{udev => systemd}/init.d/11_udevd | 2 +- .../{udev => systemd}/init.d/12_udev-monitor | 0 .../{udev => systemd}/init.d/13_udev-trigger | 0 packages/sysutils/{udev => systemd}/install | 32 +++++----- packages/sysutils/{udev => systemd}/meta | 18 +++--- .../patches/systemd-183-udev_path.patch | 9 +++ .../{udev => systemd}/udev.d/80-clock.rules | 0 .../udev-181-002-rules_generator_path.patch | 30 --------- packages/sysutils/udisks/meta | 4 +- packages/sysutils/upower/meta | 4 +- packages/x11/driver/xf86-video-intel/meta | 4 +- packages/x11/driver/xf86-video-nouveau/meta | 4 +- packages/x11/xserver/xorg-server/meta | 4 +- 24 files changed, 104 insertions(+), 106 deletions(-) rename packages/sysutils/{udev => systemd}/build (62%) rename packages/sysutils/{udev => systemd}/config/udev.rules.d.sample/README (100%) rename packages/sysutils/{udev => systemd}/init.d/11_udevd (97%) rename packages/sysutils/{udev => systemd}/init.d/12_udev-monitor (100%) rename packages/sysutils/{udev => systemd}/init.d/13_udev-trigger (100%) rename packages/sysutils/{udev => systemd}/install (72%) rename packages/sysutils/{udev => systemd}/meta (54%) create mode 100644 packages/sysutils/systemd/patches/systemd-183-udev_path.patch rename packages/sysutils/{udev => systemd}/udev.d/80-clock.rules (100%) delete mode 100644 packages/sysutils/udev/patches/udev-181-002-rules_generator_path.patch diff --git a/packages/3rdparty/multimedia/vdr-dynamite/meta b/packages/3rdparty/multimedia/vdr-dynamite/meta index c457290be5..25b0bc22e4 100644 --- a/packages/3rdparty/multimedia/vdr-dynamite/meta +++ b/packages/3rdparty/multimedia/vdr-dynamite/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://projects.vdr-developer.org/projects/plg-dynamite" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="vdr udev" -PKG_BUILD_DEPENDS="toolchain vdr udev" +PKG_DEPENDS="vdr systemd" +PKG_BUILD_DEPENDS="toolchain vdr systemd" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="vdr-dynamite turns the dvbdevices into hotpluggable devices. They can be dynamically attached and detached while vdr is running." diff --git a/packages/audio/pulseaudio/meta b/packages/audio/pulseaudio/meta index 1f0533eaf8..0b9c4c6d23 100644 --- a/packages/audio/pulseaudio/meta +++ b/packages/audio/pulseaudio/meta @@ -26,8 +26,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://pulseaudio.org/" PKG_URL="http://freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="libtool json-c alsa-lib libsndfile libsamplerate speex dbus udev openssl libcap" -PKG_BUILD_DEPENDS="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus udev openssl libcap" +PKG_DEPENDS="libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd openssl libcap" +PKG_BUILD_DEPENDS="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd openssl libcap" PKG_PRIORITY="optional" PKG_SECTION="audio" PKG_SHORTDESC="pulseaudio: Yet another sound server for Unix" diff --git a/packages/devel/libcec/meta b/packages/devel/libcec/meta index af345c89aa..fde8ad05fa 100644 --- a/packages/devel/libcec/meta +++ b/packages/devel/libcec/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://libcec.pulse-eight.com/" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="udev lockdev" -PKG_BUILD_DEPENDS="toolchain udev lockdev" +PKG_DEPENDS="systemd lockdev" +PKG_BUILD_DEPENDS="toolchain systemd lockdev" PKG_PRIORITY="optional" PKG_SECTION="system" PKG_SHORTDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor" diff --git a/packages/graphics/libdrm/meta b/packages/graphics/libdrm/meta index b67ab36dd7..63d35ee25c 100644 --- a/packages/graphics/libdrm/meta +++ b/packages/graphics/libdrm/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://dri.freedesktop.org" PKG_URL="http://dri.freedesktop.org/libdrm/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="udev libpciaccess" -PKG_BUILD_DEPENDS="toolchain libpthread-stubs udev libpciaccess" +PKG_DEPENDS="systemd libpciaccess" +PKG_BUILD_DEPENDS="toolchain libpthread-stubs systemd libpciaccess" PKG_PRIORITY="optional" PKG_SECTION="graphics" PKG_SHORTDESC="libdrm: Userspace interface to kernel DRM services" diff --git a/packages/network/connman/meta b/packages/network/connman/meta index 027ca2e614..5f4cdc275e 100644 --- a/packages/network/connman/meta +++ b/packages/network/connman/meta @@ -28,8 +28,8 @@ PKG_SITE="http://www.connman.net" PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2" #PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/network/connman//$PKG_NAME-$PKG_VERSION.tar.bz2" #PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="glib dbus udev iptables wpa_supplicant ntp" -PKG_BUILD_DEPENDS="toolchain glib dbus udev iptables" +PKG_DEPENDS="glib dbus systemd iptables wpa_supplicant ntp" +PKG_BUILD_DEPENDS="toolchain glib dbus systemd iptables" PKG_PRIORITY="optional" PKG_SECTION="network" PKG_SHORTDESC="connman: Network manager daemon" diff --git a/packages/security/polkit/meta b/packages/security/polkit/meta index 31b385de1a..762d2b5e16 100644 --- a/packages/security/polkit/meta +++ b/packages/security/polkit/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="http://gitweb.freedesktop.org/?p=PolicyKit.git;a=summary" PKG_URL="http://hal.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="zlib sg3_utils glib udev eggdbus expat" -PKG_BUILD_DEPENDS="toolchain zlib sg3_utils glib udev eggdbus expat gobject-introspection" +PKG_DEPENDS="zlib sg3_utils glib systemd eggdbus expat" +PKG_BUILD_DEPENDS="toolchain zlib sg3_utils glib systemd eggdbus expat gobject-introspection" PKG_PRIORITY="optional" PKG_SECTION="security" PKG_SHORTDESC="polkit: Authorization Toolkit" diff --git a/packages/sysutils/libatasmart/meta b/packages/sysutils/libatasmart/meta index d74fbe6f44..4d724abfb0 100644 --- a/packages/sysutils/libatasmart/meta +++ b/packages/sysutils/libatasmart/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://0pointer.de/blog/projects/being-smart.html" PKG_URL="http://0pointer.de/public/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="udev" -PKG_BUILD_DEPENDS="toolchain udev" +PKG_DEPENDS="systemd" +PKG_BUILD_DEPENDS="toolchain systemd" PKG_PRIORITY="optional" PKG_SECTION="system" PKG_SHORTDESC="libatasmart: a lean, small and clean implementation of an ATA S.M.A.R.T. reading and parsing library" diff --git a/packages/sysutils/remote/eventlircd/meta b/packages/sysutils/remote/eventlircd/meta index 6f3a18ea1d..79b9f2fac7 100644 --- a/packages/sysutils/remote/eventlircd/meta +++ b/packages/sysutils/remote/eventlircd/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://code.google.com/p/eventlircd" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="udev lirc" -PKG_BUILD_DEPENDS="toolchain udev" +PKG_DEPENDS="systemd lirc" +PKG_BUILD_DEPENDS="toolchain systemd" PKG_PRIORITY="optional" PKG_SECTION="system/remote" PKG_SHORTDESC="eventlircd:The eventlircd daemon provides various functions for LIRC devices" diff --git a/packages/sysutils/remote/xwiimote/meta b/packages/sysutils/remote/xwiimote/meta index e888a3da0e..0b92764cea 100644 --- a/packages/sysutils/remote/xwiimote/meta +++ b/packages/sysutils/remote/xwiimote/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/dvdhrm/xwiimote" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="dbus-glib udev bluez" -PKG_BUILD_DEPENDS="toolchain dbus-glib udev bluez" +PKG_DEPENDS="dbus-glib systemd bluez" +PKG_BUILD_DEPENDS="toolchain dbus-glib systemd bluez" PKG_PRIORITY="optional" PKG_SECTION="sysutils/remote" PKG_SHORTDESC="xwiimote: Nintendo Wii Remote Linux Device Driver Tools" diff --git a/packages/sysutils/udev/build b/packages/sysutils/systemd/build similarity index 62% rename from packages/sysutils/udev/build rename to packages/sysutils/systemd/build index 880ae9c90b..6a84a91537 100755 --- a/packages/sysutils/udev/build +++ b/packages/sysutils/systemd/build @@ -1,5 +1,4 @@ -#!/bin/sh - +#!/bin/sh ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) @@ -22,39 +21,59 @@ . config/options $1 +# systemd fails to build with LTO support + strip_lto + strip_linker_plugin + +# dont build parallel + MAKEFLAGS=-j1 + cd $PKG_BUILD -ac_cv_file__usr_share_pci_ids="yes" \ -ac_cv_file__usr_share_hwdata_pci_ids="no" \ -ac_cv_file__usr_share_misc_pci_ids="no" \ -LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ --sysconfdir=/etc \ - --bindir=/usr/bin \ - --sbindir=/usr/bin \ --libexecdir=/lib \ --localstatedir=/var \ - --disable-silent-rules \ --disable-static \ --enable-shared \ - --disable-manpages \ + --disable-nls \ --disable-gtk-doc \ --disable-gtk-doc-html \ --disable-gtk-doc-pdf \ - --disable-debug \ - --disable-logging \ - --disable-rule_generator \ + --disable-ima \ + --disable-selinux \ + --disable-xz \ + --disable-tcpwrap \ + --disable-pam \ + --disable-acl \ + --disable-audit \ + --disable-libcryptsetup \ + --disable-binfmt \ + --disable-vconsole \ + --disable-readahead \ + --disable-quotacheck \ + --disable-randomseed \ + --enable-logind \ + --disable-hostnamed \ + --disable-timedated \ + --disable-localed \ + --disable-coredump \ --enable-gudev \ - --disable-introspection \ --disable-keymap \ - --disable-floppy \ - --without-selinux \ - --without-systemdsystemunitdir \ - --with-firmware-path="/storage/.config/firmware:/lib/firmware" \ - --with-pci-ids-path=/usr/share/pci.ids \ + --disable-manpages \ + --disable-plymouth \ + --enable-split-usr \ --with-usb-ids-path=/usr/share/usb.ids \ - --with-gnu-ld \ + --with-pci-ids-path=/usr/share/pci.ids \ + --with-firmware-path="/storage/.config/firmware:/lib/firmware" \ + --with-distro=other \ + --with-sysvinit-path="" \ + --with-sysvrcd-path="" \ + --with-tty-gid="5" \ + --with-rootprefix="/" \ + --with-rootlibdir="/lib" -make -$MAKEINSTALL +make V=1 + +$MAKEINSTALL \ No newline at end of file diff --git a/packages/sysutils/udev/config/udev.rules.d.sample/README b/packages/sysutils/systemd/config/udev.rules.d.sample/README similarity index 100% rename from packages/sysutils/udev/config/udev.rules.d.sample/README rename to packages/sysutils/systemd/config/udev.rules.d.sample/README diff --git a/packages/sysutils/udev/init.d/11_udevd b/packages/sysutils/systemd/init.d/11_udevd similarity index 97% rename from packages/sysutils/udev/init.d/11_udevd rename to packages/sysutils/systemd/init.d/11_udevd index 9d05584300..a438cd2ac9 100644 --- a/packages/sysutils/udev/init.d/11_udevd +++ b/packages/sysutils/systemd/init.d/11_udevd @@ -30,4 +30,4 @@ progress "starting udev daemon" else mkdir -p /dev/rules.d fi - /lib/udev/udevd --daemon + /lib/udev/systemd-udevd --daemon diff --git a/packages/sysutils/udev/init.d/12_udev-monitor b/packages/sysutils/systemd/init.d/12_udev-monitor similarity index 100% rename from packages/sysutils/udev/init.d/12_udev-monitor rename to packages/sysutils/systemd/init.d/12_udev-monitor diff --git a/packages/sysutils/udev/init.d/13_udev-trigger b/packages/sysutils/systemd/init.d/13_udev-trigger similarity index 100% rename from packages/sysutils/udev/init.d/13_udev-trigger rename to packages/sysutils/systemd/init.d/13_udev-trigger diff --git a/packages/sysutils/udev/install b/packages/sysutils/systemd/install similarity index 72% rename from packages/sysutils/udev/install rename to packages/sysutils/systemd/install index 4462ae052d..1668d19bdb 100755 --- a/packages/sysutils/udev/install +++ b/packages/sysutils/systemd/install @@ -1,5 +1,4 @@ -#!/bin/sh - +#!/bin/sh ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) @@ -32,6 +31,8 @@ add_group tape 33 add_group tty 5 add_group video 39 +# install udev + mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/udevadm $INSTALL/usr/bin @@ -41,31 +42,28 @@ mkdir -p $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libgudev*.*T mkdir -p $INSTALL/lib/udev - for i in accelerometer ata_id cdrom_id collect mtd_probe scsi_id v4l_id; do + cp $PKG_BUILD/systemd-udevd $INSTALL/lib/udev + + cp $PKG_BUILD/.libs/accelerometer $INSTALL/lib/udev + cp $PKG_BUILD/.libs/cdrom_id $INSTALL/lib/udev + cp $PKG_BUILD/.libs/v4l_id $INSTALL/lib/udev + for i in ata_id collect mtd_probe scsi_id; do cp $PKG_BUILD/$i $INSTALL/lib/udev done - cp $PKG_BUILD/udevd $INSTALL/lib/udev -# cp $PKG_BUILD/src/rule_generator/rule_generator.functions $INSTALL/lib/udev -# cp $PKG_BUILD/src/rule_generator/write_cd_rules $INSTALL/lib/udev -# cp $PKG_BUILD/src/rule_generator/write_net_rules $INSTALL/lib/udev -# chmod +x $INSTALL/lib/udev/write_cd_rules -# chmod +x $INSTALL/lib/udev/write_net_rules mkdir -p $INSTALL/lib/udev/rules.d cp $PKG_BUILD/rules/50-udev-default.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/src/cdrom_id/60-cdrom_id.rules $INSTALL/lib/udev/rules.d + cp $PKG_BUILD/rules/60-cdrom_id.rules $INSTALL/lib/udev/rules.d cp $PKG_BUILD/rules/60-persistent-alsa.rules $INSTALL/lib/udev/rules.d cp $PKG_BUILD/rules/60-persistent-input.rules $INSTALL/lib/udev/rules.d cp $PKG_BUILD/rules/60-persistent-serial.rules $INSTALL/lib/udev/rules.d cp $PKG_BUILD/rules/60-persistent-storage-tape.rules $INSTALL/lib/udev/rules.d cp $PKG_BUILD/rules/60-persistent-storage.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/src/v4l_id/60-persistent-v4l.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/src/accelerometer/61-accelerometer.rules $INSTALL/lib/udev/rules.d -# cp $PKG_BUILD/src/rule_generator/75-cd-aliases-generator.rules $INSTALL/lib/udev/rules.d -# cp $PKG_BUILD/src/rule_generator/75-persistent-net-generator.rules $INSTALL/lib/udev/rules.d + cp $PKG_BUILD/rules/60-persistent-v4l.rules $INSTALL/lib/udev/rules.d + cp $PKG_BUILD/rules/61-accelerometer.rules $INSTALL/lib/udev/rules.d cp $PKG_BUILD/rules/75-net-description.rules $INSTALL/lib/udev/rules.d + cp $PKG_BUILD/rules/75-probe_mtd.rules $INSTALL/lib/udev/rules.d cp $PKG_BUILD/rules/75-tty-description.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/src/mtd_probe/75-probe_mtd.rules $INSTALL/lib/udev/rules.d cp $PKG_BUILD/rules/78-sound-card.rules $INSTALL/lib/udev/rules.d cp $PKG_BUILD/rules/80-drivers.rules $INSTALL/lib/udev/rules.d cp $PKG_BUILD/rules/95-udev-late.rules $INSTALL/lib/udev/rules.d @@ -73,8 +71,10 @@ mkdir -p $INSTALL/lib/udev/rules.d mkdir -p $INSTALL/lib/udev/devices mkdir -p $INSTALL/etc/udev - cp $PKG_BUILD/src/udev.conf $INSTALL/etc/udev + cp $PKG_BUILD/src/udev/udev.conf $INSTALL/etc/udev ln -sf /dev/rules.d $INSTALL/etc/udev/rules.d mkdir -p $INSTALL/usr/config cp -R $PKG_DIR/config/*.sample $INSTALL/usr/config + +# reserved for installing systemd diff --git a/packages/sysutils/udev/meta b/packages/sysutils/systemd/meta similarity index 54% rename from packages/sysutils/udev/meta rename to packages/sysutils/systemd/meta index 5549dab0c8..3f2baabf27 100644 --- a/packages/sysutils/udev/meta +++ b/packages/sysutils/systemd/meta @@ -18,19 +18,19 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -PKG_NAME="udev" -PKG_VERSION="182" +PKG_NAME="systemd" +PKG_VERSION="183" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" -PKG_SITE="http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" -PKG_URL="http://www.kernel.org/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="glib pciutils usbutils libusb-compat util-linux kmod" -PKG_BUILD_DEPENDS="toolchain glib pciutils usbutils libusb-compat util-linux kmod" -PKG_PRIORITY="optional" +PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd" +PKG_URL="http://www.freedesktop.org/software/systemd/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_DEPENDS=" libcap dbus kmod util-linux usbutils pciutils glib" +PKG_BUILD_DEPENDS="toolchain libcap dbus kmod util-linux usbutils pciutils glib" +PKG_PRIORITY="required" PKG_SECTION="system" -PKG_SHORTDESC="udev: A Userspace Implementation for dynamic /dev nodes" -PKG_LONGDESC="U/dev is a program that replaces the functionality of DevFS (only providing /dev entries for devices that are in the system at any point in time). It is an attempt to move all naming policy out of the kernel." +PKG_SHORTDESC="systemd: a system and session manager" +PKG_LONGDESC="systemd is a system and session manager for Linux, compatible with SysV and LSB init scripts. systemd provides aggressive parallelization capabilities, uses socket and D-Bus activation for starting services, offers on-demand starting of daemons, keeps track of processes using Linux cgroups, supports snapshotting and restoring of the system state, maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit." PKG_IS_ADDON="no" PKG_AUTORECONF="yes" diff --git a/packages/sysutils/systemd/patches/systemd-183-udev_path.patch b/packages/sysutils/systemd/patches/systemd-183-udev_path.patch new file mode 100644 index 0000000000..cdd8750113 --- /dev/null +++ b/packages/sysutils/systemd/patches/systemd-183-udev_path.patch @@ -0,0 +1,9 @@ +diff -Naur systemd-183/src/udev/udev.pc.in systemd-183.patch/src/udev/udev.pc.in +--- systemd-183/src/udev/udev.pc.in 2012-04-05 17:49:14.000000000 +0200 ++++ systemd-183.patch/src/udev/udev.pc.in 2012-05-27 20:48:44.119357342 +0200 +@@ -2,4 +2,4 @@ + Description: udev + Version: @VERSION@ + +-udevdir=@pkglibexecdir@ ++udevdir=@udevlibexecdir@ diff --git a/packages/sysutils/udev/udev.d/80-clock.rules b/packages/sysutils/systemd/udev.d/80-clock.rules similarity index 100% rename from packages/sysutils/udev/udev.d/80-clock.rules rename to packages/sysutils/systemd/udev.d/80-clock.rules diff --git a/packages/sysutils/udev/patches/udev-181-002-rules_generator_path.patch b/packages/sysutils/udev/patches/udev-181-002-rules_generator_path.patch deleted file mode 100644 index b2cfa73745..0000000000 --- a/packages/sysutils/udev/patches/udev-181-002-rules_generator_path.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur udev-175/extras/rule_generator/write_cd_rules udev-175.patch/extras/rule_generator/write_cd_rules ---- udev-175/src/extras/rule_generator/write_cd_rules 2010-06-25 11:37:36.000000000 +0200 -+++ udev-175.patch/src/extras/rule_generator/write_cd_rules 2011-12-04 17:11:04.704237462 +0100 -@@ -27,9 +27,9 @@ - fi - fi - --RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules" -+RULES_FILE="/run/udev/70-persistent-cd.rules" - --. /lib/udev/rule_generator.functions -+. /lib/udev/rule_generator.functions - - find_next_available() { - raw_find_next_available "$(find_all_rules 'SYMLINK\+=' "$1")" -diff -Naur udev-175/extras/rule_generator/write_net_rules udev-175.patch/extras/rule_generator/write_net_rules ---- udev-175/src/extras/rule_generator/write_net_rules 2010-08-11 10:30:57.000000000 +0200 -+++ udev-175.patch/src/extras/rule_generator/write_net_rules 2011-12-04 17:11:22.696592805 +0100 -@@ -38,9 +38,9 @@ - fi - fi - --RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' -+RULES_FILE='/run/udev/70-persistent-net.rules' - --. /lib/udev/rule_generator.functions -+. /lib/udev/rule_generator.functions - - interface_name_taken() { - local value="$(find_all_rules 'NAME=' $INTERFACE)" diff --git a/packages/sysutils/udisks/meta b/packages/sysutils/udisks/meta index 0450a17c0b..b1aff0f268 100644 --- a/packages/sysutils/udisks/meta +++ b/packages/sysutils/udisks/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/udisks" PKG_URL="http://hal.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="sg3_utils udev glib dbus dbus-glib parted LVM2 polkit libatasmart" -PKG_BUILD_DEPENDS="toolchain sg3_utils udev glib dbus dbus-glib parted LVM2 polkit libatasmart" +PKG_DEPENDS="sg3_utils systemd glib dbus dbus-glib parted LVM2 polkit libatasmart" +PKG_BUILD_DEPENDS="toolchain sg3_utils systemd glib dbus dbus-glib parted LVM2 polkit libatasmart" PKG_PRIORITY="optional" PKG_SECTION="system" PKG_SHORTDESC="udisks: a modular hardware abstraction layer designed for use in Linux systems that is designed to simplify device management." diff --git a/packages/sysutils/upower/meta b/packages/sysutils/upower/meta index 4949f6e2f3..c7cb1e3f61 100644 --- a/packages/sysutils/upower/meta +++ b/packages/sysutils/upower/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://upower.freedesktop.org/" PKG_URL="http://upower.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="udev glib dbus dbus-glib polkit pm-utils" -PKG_BUILD_DEPENDS="toolchain udev glib dbus dbus-glib gobject-introspection polkit" +PKG_DEPENDS="systemd glib dbus dbus-glib polkit pm-utils" +PKG_BUILD_DEPENDS="toolchain systemd glib dbus dbus-glib gobject-introspection polkit" PKG_PRIORITY="optional" PKG_SECTION="system" PKG_SHORTDESC="upower: a modular hardware abstraction layer designed for use in Linux systems that is designed to simplify device management." diff --git a/packages/x11/driver/xf86-video-intel/meta b/packages/x11/driver/xf86-video-intel/meta index d50b75cba1..0aeb352164 100644 --- a/packages/x11/driver/xf86-video-intel/meta +++ b/packages/x11/driver/xf86-video-intel/meta @@ -25,8 +25,8 @@ PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" PKG_SITE="http://intellinuxgraphics.org/" PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="udev" -PKG_BUILD_DEPENDS="toolchain util-macros fontsproto udev xorg-server" +PKG_DEPENDS="systemd" +PKG_BUILD_DEPENDS="toolchain util-macros fontsproto systemd xorg-server" PKG_PRIORITY="optional" PKG_SECTION="x11/driver" PKG_SHORTDESC="xf86-video-intel: The Xorg driver for Intel video chips" diff --git a/packages/x11/driver/xf86-video-nouveau/meta b/packages/x11/driver/xf86-video-nouveau/meta index b44016f417..a6c7ddbc66 100644 --- a/packages/x11/driver/xf86-video-nouveau/meta +++ b/packages/x11/driver/xf86-video-nouveau/meta @@ -25,8 +25,8 @@ PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" PKG_SITE="http://www.x.org/" PKG_URL="http://cgit.freedesktop.org/nouveau/xf86-video-nouveau/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libXrandr libXrender libdrm libXext libpciaccess udev Mesa" -PKG_BUILD_DEPENDS="toolchain util-macros libXrandr libXrender libdrm libXext libpciaccess udev Mesa xorg-server" +PKG_DEPENDS="libXrandr libXrender libdrm libXext libpciaccess systemd Mesa" +PKG_BUILD_DEPENDS="toolchain util-macros libXrandr libXrender libdrm libXext libpciaccess systemd Mesa xorg-server" PKG_PRIORITY="optional" PKG_SECTION="x11/driver" PKG_SHORTDESC="xf86-video-nouveau: Nouveau display driver (experimental)" diff --git a/packages/x11/xserver/xorg-server/meta b/packages/x11/xserver/xorg-server/meta index ef9522457f..f6438cc1e2 100644 --- a/packages/x11/xserver/xorg-server/meta +++ b/packages/x11/xserver/xorg-server/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libpciaccess libX11 libXfont libdrm Mesa openssl pixman udev" -PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto recordproto renderproto scrnsaverproto videoproto inputproto xf86dgaproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm Mesa openssl freetype pixman fontsproto udev" +PKG_DEPENDS="libpciaccess libX11 libXfont libdrm Mesa openssl pixman systemd" +PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto recordproto renderproto scrnsaverproto videoproto inputproto xf86dgaproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm Mesa openssl freetype pixman fontsproto systemd" PKG_PRIORITY="optional" PKG_SECTION="x11/xserver" PKG_SHORTDESC="xorg-server: The Xorg X server"