systemd: update to 183. udev pkgs are now subpkgs of systemd.

common/shlibs

@@ -199,6 +199,7 @@ libgirepository-gimarshallingtests-1.0.so libgirepository-1.30
 libgirepository-everything-1.0.so libgirepository-1.30
 libgirepository-1.0.so.1 libgirepository-1.30
 libudev.so.0 libudev-149
+libudev.so.1 libudev-183
 libgudev-1.0.so.0 libgudev-149
 libext2fs.so.2 e2fsprogs-libs-1.41.5_1
 libcom_err.so.2 e2fsprogs-libs-1.41.5_1

srcpkgs/libgudev

@@ -0,0 +1 @@
+systemd

srcpkgs/libgudev-devel

@@ -1 +1 @@
-libgudev
+systemd

srcpkgs/libgudev/libgudev-devel.template

@@ -1,16 +0,0 @@
-# Template file for 'libgudev-devel'.
-#
-depends="libudev-devel glib-devel libgudev"
-short_desc="${short_desc} - development files"
-long_desc="${long_desc}
-
- This package contains the libgudev development files (static libs, headers,
- etc), a library to interact with udev through the GLib bindings."
-
-
-do_install()
-{
-	vmove usr/include usr
-	vmove usr/share usr
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/libgudev/template

@@ -1,33 +0,0 @@
-# Template file for 'libudev'
-pkgname=libgudev
-version=182
-wrksrc=udev-${version}
-distfiles="${KERNEL_SITE}/utils/kernel/hotplug/udev-${version}.tar.xz"
-build_style=gnu-configure
-configure_args="--without-selinux --disable-rule-generator
---enable-introspection --enable-gudev --disable-static
---disable-keymap --disable-mtd_probe"
-makedepends="pkg-config gperf glib-devel gobject-introspection libblkid-devel libkmod-devel usbutils pciutils"
-short_desc="GObject-based wrapper library for libudev"
-maintainer="Juan RP <xtraeme@gmail.com>"
-homepage="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
-license="GPL-2"
-checksum=adb8892f3b8e4b7163703ed4a545774721a3d55a1062de001f08c477c03d97ab
-long_desc="
- This library makes it much simpler to use libudev from programs already using
- GObject. It also makes it possible to easily use libudev from other
- programming languages, such as Javascript, because of GObject introspection
- support."
-
-subpackages="${pkgname}-devel"
-
-
-post_install() {
-	# remove stuff in udev pkg.
-	for f in etc sbin usr/sbin lib usr/libexec usr/share/man \
-		usr/share/pkgconfig usr/share/gtk-doc/html/libudev \
-		usr/bin; do
-		rm -rf ${DESTDIR}/${f}
-	done
-	find ${DESTDIR} -name libudev\* -delete
-}

srcpkgs/libudev

@@ -1 +1 @@
-udev
+systemd

srcpkgs/libudev-devel

@@ -1 +1 @@
-udev
+systemd

srcpkgs/systemd/files/udev.initramfs-hook

@@ -21,8 +21,8 @@ esac
 . /usr/share/initramfs-tools/hook-functions
 
 # Copy across the udev binaries
-copy_exec /sbin/udevd /sbin
+copy_exec /lib/systemd/systemd-udevd /sbin
-copy_exec /sbin/udevadm /sbin
+copy_exec /usr/bin/udevadm /sbin
 
 # Copy udev configuration
 mkdir -p ${DESTDIR}/etc/udev

srcpkgs/systemd/files/udev.initramfs-inittop

@@ -18,7 +18,7 @@ esac
 
 
 # Start the udev daemon to process events
-udevd --daemon --resolve-names=never
+systemd-udevd --daemon --resolve-names=never
 
 # Iterate sysfs and fire off everything; if we include a rule for it then
 # it'll get handled; otherwise it'll get handled later when we do this again

srcpkgs/systemd/libgudev-devel.template

@@ -0,0 +1,14 @@
+# Template file for 'libgudev-devel'.
+#
+depends="glib-devel libudev-devel>=$version libgudev>=$version"
+short_desc="GObject-based wrapper library for libudev - development files"
+long_desc="
+ This package contains the libgudev development files (static libs, headers,
+ etc), a library to interact with udev through the GLib bindings."
+
+do_install() {
+	vmove usr/include/gudev-1.0 usr/include
+	vmove "usr/lib/pkgconfig/gudev*" usr/lib/pkgconfig
+	vmove "usr/lib/libgudev*.a" usr/lib
+	vmove usr/lib/girepository-1.0 usr/lib
+}

srcpkgs/systemd/libgudev.rshlibs

@@ -1,7 +1,6 @@
-libudev.so.0
+libudev.so.1
 libgobject-2.0.so.0
-libgthread-2.0.so.0
 libglib-2.0.so.0
+libdl.so.2
 librt.so.1
-libpthread.so.0
 libc.so.6

srcpkgs/systemd/libgudev.template

@@ -0,0 +1,12 @@
+# Template file for 'libgudev'.
+#
+short_desc="GObject-based wrapper library for libudev"
+long_desc="
+ This library makes it much simpler to use libudev from programs already using
+ GObject. It also makes it possible to easily use libudev from other
+ programming languages, such as Javascript, because of GObject introspection
+ support."
+
+do_install() {
+	vmove "usr/lib/libgudev*.so*" usr/lib
+}

srcpkgs/systemd/libudev-devel.template

@@ -1,15 +1,13 @@
 # Template file for 'libudev-devel'.
 #
-depends="glibc-devel libudev>=$version"
+depends="libudev>=$version"
-short_desc="libudev development files"
+short_desc="udev shared library -- development files"
-long_desc="${long_desc}
+long_desc="
-
  This package contains the files needed for developing applications
  that use libudev."
 
 do_install() {
-	vmove usr/include usr
+	vmove usr/include/libudev.h usr/include
-	vmove usr/share/gtk-doc usr/share
 	vmove usr/lib/pkgconfig/libudev.pc usr/lib/pkgconfig
-	vmove usr/share/pkgconfig usr/share
+	vmove "usr/lib/libudev*.a" usr/lib
 }

srcpkgs/systemd/libudev.rshlibs

@@ -0,0 +1,4 @@
+libdl.so.2
+librt.so.1
+libc.so.6
+ld-linux-x86-64.so.2

srcpkgs/systemd/libudev.template

@@ -0,0 +1,12 @@
+# Template file for 'libudev'.
+#
+short_desc="udev shared library"
+long_desc="
+ udev is a daemon which dynamically creates and removes device nodes from
+ /dev/, handles hotplug events and loads drivers at boot time.
+
+ This library provides access to udev device information."
+
+do_install() {
+	vmove "usr/lib/libudev.so*" usr/lib
+}

srcpkgs/systemd/systemd-admin.rshlibs

@@ -1,8 +0,0 @@
-libgtk-x11-2.0.so.0
-libgio-2.0.so.0
-libgobject-2.0.so.0
-libglib-2.0.so.0
-libpthread.so.0
-libc.so.6
-libpango-1.0.so.0
-libgee.so.2

srcpkgs/systemd/systemd-admin.template

@@ -1,14 +0,0 @@
-# Template file for 'systemd-admin'.
-#
-depends="systemd"
-short_desc="${sourcepkg} - system administration GUI"
-long_desc="${long_desc}
-
- This package contains systemadm, a GTK+2 application to administer systemd."
-
-
-do_install()
-{
-	vmove usr/bin/systemadm usr/bin
-	vmove "usr/share/man/man1/systemadm*" usr/share/man/man1
-}

srcpkgs/systemd/systemd-gnome-passwd-agent.rshlibs

@@ -1,8 +0,0 @@
-libnotify.so.4
-libgtk-x11-2.0.so.0
-libgio-2.0.so.0
-libgobject-2.0.so.0
-libglib-2.0.so.0
-librt.so.1
-libpthread.so.0
-libc.so.6

srcpkgs/systemd/systemd-gnome-passwd-agent.template

@@ -1,15 +0,0 @@
-# Template file for 'systemd-gnome-passwd-aggent'.
-#
-depends="systemd"
-short_desc="${sourcepkg} - GNOME password agent helper"
-long_desc="${long_desc}
-
- This package contains systemd-gnome-ask-password-agent, a GNOME
- helper to assist in password changes with systemd."
-
-
-do_install()
-{
-	vmove "usr/bin/systemd-gnome*" usr/bin
-	vmove "usr/share/man/man1/systemd-ask-*" usr/share/man/man1
-}

srcpkgs/systemd/systemd-libs.rshlibs

@@ -1,7 +1,6 @@
 libdl.so.2
 librt.so.1
 libc.so.6
-libcap.so.2
 ld-linux.so.2
 ld-linux-x86-64.so.2
 liblzma.so.5

srcpkgs/systemd/systemd.rshlibs

@@ -5,7 +5,6 @@ ld-linux.so.2
 libdl.so.2
 libdbus-1.so.3
 libpthread.so.0
-libudev.so.0
 libpam.so.0
 libacl.so.1
 libpam_misc.so.0
@@ -17,3 +16,4 @@ libsystemd-journal.so.0
 libsystemd-login.so.0
 libsystemd-id128.so.0
 libcryptsetup.so.4
+libudev.so.1

srcpkgs/systemd/template

@@ -1,18 +1,21 @@
 # Template file for 'systemd'
 pkgname=systemd
-version=44
+version=183
 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz"
 build_style=gnu-configure
-configure_args="--with-distro=other --with-rootprefix=
+configure_args="--with-distro=other --with-rootprefix= --enable-plymouth
 --with-pamlibdir=/lib/security --disable-selinux --disable-tcpwrap
---with-sysvinit-path= --with-sysvrcd-path= --disable-audit"
+--with-sysvinit-path= --with-sysvrcd-path= --disable-audit --libexecdir=/lib
-depends="dbus run-parts kbd>=1.15.3_5"
+--with-usb-ids-path=/usr/share/hwdata/usb.ids
-makedepends="pkg-config intltool gperf libxslt docbook-xsl acl-devel libudev-devel pam-devel dbus-devel libcap-devel gtk+-devel libgee-devel libnotify-devel vala-devel libkmod-devel liblzma-devel cryptsetup-devel"
+--with-pci-ids-path=/usr/share/hwdata/pci.ids"
+depends="dbus run-parts kbd>=1.15.3_5 systemd-libs>=$version udev>=$version"
+makedepends="pkg-config intltool gperf libxslt docbook-xsl acl-devel pam-devel dbus-devel libcap-devel libkmod-devel liblzma-devel cryptsetup-devel libblkid-devel glib-devel gobject-introspection"
+subpackages="udev libudev libudev-devel libgudev libgudev-devel systemd-analyze systemd-devel systemd-libs"
 short_desc="A system and service manager for Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/systemd"
-license="GPL-2"
+license="LGPL-2.1, GPL-2, MIT"
-checksum=7a5aac4b4b8b3a82bf59292f10e43d8f2c2d7039f34e95714f81d8edcb42233c
+checksum=1fdd35c1cd4b2d473808973c3ed3a41bd64d13513194c748ee09b36e51fc9bd7
 long_desc="
  systemd is a system and service manager for Linux, compatible with SysV and LSB
  init scripts. systemd provides aggressive parallelization capabilities, uses 
@@ -22,27 +25,20 @@ long_desc="
  implements an elaborate transactional dependency-based service control logic. 
  It can work as a drop-in replacement for sysvinit."
 
-subpackages="systemd-admin systemd-analyze systemd-gnome-passwd-agent"
-subpackages="${subpackages} systemd-devel systemd-libs"
-
-system_groups="lock"
-
 conf_files="
 /etc/hostname
 /etc/vconsole.conf
 /etc/locale.conf
 /etc/systemd/system.conf
 /etc/systemd/user.conf
-/etc/systemd/systemd-journald.conf
+/etc/systemd/journald.conf
-/etc/systemd/systemd-logind.conf"
+/etc/systemd/logind.conf"
 
-# Required by systemd-loginctl enable-linger.
+# Required by loginctl enable-linger.
 make_dirs="
 /etc/local.d 0755 root root
 /var/lib/systemd 0755 root root"
 
-
-
 pre_configure() {
 	sed -i -e "s|/bin/loadkeys|/usr/bin/loadkeys|g" Makefile.in
 	sed -i -e "s|/bin/setfont|/usr/bin/setfont|g" Makefile.in
@@ -54,7 +50,8 @@ post_install() {
 		etc/systemd/system/sysinit.target.wants \
 		lib/systemd/system-shutdown \
 		lib/systemd/system/graphical.target.wants \
-		usr/libexec/systemd/user-generators \
+		lib/systemd/user-generators \
+		lib/systemd/system-sleep \
 		usr/lib/binfmt.d usr/lib/sysctl.d usr/lib/modules-load.d; do
 		vmkdir ${f}
 		touch ${DESTDIR}/${f}/.owned

srcpkgs/systemd/udev.rshlibs

@@ -1,5 +1,8 @@
-librt.so.1
-libc.so.6
-libm.so.6
 libblkid.so.1
 libkmod.so.2
+libacl.so.1
+librt.so.1
+libc.so.6
+ld-linux-x86-64.so.2
+libudev.so.1
+libm.so.6

srcpkgs/systemd/udev.template

@@ -0,0 +1,31 @@
+# Template file for 'libudev'.
+#
+triggers="initramfs-tools"
+conf_files="/etc/udev/udev.conf"
+short_desc="udev daemon"
+long_desc="
+ udev is a daemon which dynamically creates and removes device nodes from
+ /dev/, handles hotplug events and loads drivers at boot time."
+
+do_install() {
+	vmove etc/udev etc
+	vmove usr/bin/udevadm usr/bin
+	vmove lib/udev lib
+	vmove usr/share/man/man7/udev.7 usr/share/man/man7
+	for f in udevadm systemd-udevd; do
+		vmove usr/share/man/man8/${f}.8 usr/share/man/man8
+	done
+	vmove usr/share/pkgconfig/udev.pc usr/share/pkgconfig
+	vmove lib/systemd/systemd-udevd lib/systemd
+	for f in udev.service udev-control.socket udev-kernel.socket \
+		udev-trigger.service udev-settle.service; do
+		vmove lib/systemd/system/systemd-${f} lib/systemd/system
+	done
+	# initramfs-tools support.
+	vinstall ${FILESDIR}/udev.initramfs-hook 755 \
+		usr/share/initramfs-tools/hooks udev
+	vinstall ${FILESDIR}/udev.initramfs-bottom 755 \
+		usr/share/initramfs-tools/scripts/init-bottom udev
+	vinstall ${FILESDIR}/udev.initramfs-inittop 755 \
+		usr/share/initramfs-tools/scripts/init-top udev
+}

srcpkgs/udev

@@ -0,0 +1 @@
+systemd

srcpkgs/udev/libudev.rshlibs

@@ -1,2 +0,0 @@
-librt.so.1
-libc.so.6

srcpkgs/udev/libudev.template

@@ -1,11 +0,0 @@
-# Template file for 'libudev'.
-#
-short_desc="libudev shared library"
-long_desc="${long_desc}
-
- This library provides access to udev device information."
-
-do_install() {
-	vmove "lib/libudev.so*" lib
-	vmove "usr/lib/libudev.so" usr/lib
-}

srcpkgs/udev/template

@@ -1,42 +0,0 @@
-# Template file for 'udev'
-pkgname=udev
-version=182
-revision=1
-distfiles="${KERNEL_SITE}/utils/kernel/hotplug/udev-${version}.tar.xz"
-build_style=gnu-configure
-configure_args="--sbindir=/sbin --without-selinux --libexecdir=/lib
---with-rootlibdir=/lib --disable-introspection --enable-floppy
---with-systemdsystemunitdir=/lib/systemd/system --disable-gudev
---disable-static --disable-rule-generator
---with-firmware-path=/lib/firmware/updates:/lib/firmware
---with-pci-ids-path=/usr/share/hwdata/pci.ids
---with-usb-ids-path=/usr/share/hwdata/usb.ids"
-makedepends="pkg-config gperf libxslt libblkid-devel libkmod-devel"
-fulldepends="hwids"
-systemd_services="udev.service on"
-conf_files="/etc/udev/udev.conf"
-subpackages="libudev libudev-devel"
-short_desc="/dev/ and hotplug management daemon"
-maintainer="Juan RP <xtraeme@gmail.com>"
-homepage="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
-license="GPL-2"
-checksum=adb8892f3b8e4b7163703ed4a545774721a3d55a1062de001f08c477c03d97ab
-long_desc="
- udev is a daemon which dynamically creates and removes device nodes from
- /dev/, handles hotplug events and loads drivers at boot time."
-
-post_install() {
-        # Install the initramfs-tools hook/scripts.
-	vinstall ${FILESDIR}/udev.initramfs-hook 755 \
-		usr/share/initramfs-tools/hooks udev
-	vinstall ${FILESDIR}/udev.initramfs-inittop 755 \
-		usr/share/initramfs-tools/scripts/init-top udev
-	vinstall ${FILESDIR}/udev.initramfs-bottom 755 \
-		usr/share/initramfs-tools/scripts/init-bottom udev
-
-	# udevd has been moved to /lib/udev, make a symlink.
-	vmkdir sbin
-	cd ${DESTDIR}/sbin && ln -sf ../lib/udev/udevd .
-	# compat symlink to udevadm.
-	cd ${DESTDIR}/sbin && ln -sf ../usr/bin/udevadm .
-}