From 0e10d859eadd7643a12b184cc0a7176ef0d4b56b Mon Sep 17 00:00:00 2001 From: root Date: Sat, 14 Apr 2012 00:01:25 +0000 Subject: Sat Apr 14 00:01:25 UTC 2012 --- core/btrfs-progs/PKGBUILD | 24 +++++++++++++++------ core/btrfs-progs/initcpio-hook-btrfs | 7 ++++++ core/btrfs-progs/initcpio-install-btrfs | 15 +++++++++++++ ...sr-always-read-config-files-from-lib-udev.patch | 25 +++++++++++----------- core/udev/0002-reinstate-TIMEOUT-handling.patch | 16 +++++++------- core/udev/PKGBUILD | 18 +++++++++------- 6 files changed, 69 insertions(+), 36 deletions(-) create mode 100644 core/btrfs-progs/initcpio-hook-btrfs create mode 100644 core/btrfs-progs/initcpio-install-btrfs (limited to 'core') diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD index 343cb55c3..4161b1d43 100644 --- a/core/btrfs-progs/PKGBUILD +++ b/core/btrfs-progs/PKGBUILD @@ -1,31 +1,41 @@ -# $Id: PKGBUILD 147160 2012-01-23 15:27:41Z ibiru $ +# $Id: PKGBUILD 156058 2012-04-12 15:42:01Z dreisner $ # Maintainer: Tom Gundersen # Contributor: Tobias Powalowski pkgname=btrfs-progs -pkgver=0.19.20120110 +pkgver=0.19.20120328 pkgrel=2 pkgdesc="btrfs filesystem utilities" arch=(i686 x86_64) depends=('glibc' 'e2fsprogs') -source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz) url="http://btrfs.wiki.kernel.org/" replaces=('btrfs-progs-unstable') conflicts=('btrfs-progs-unstable') provides=('btrfs-progs-unstable') license=('GPL2') +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz + initcpio-install-btrfs + initcpio-hook-btrfs) +md5sums=('f4504e73cf9254779b78d5b2318ac570' + 'bdaaf6bd339220c63260acec809864d2' + 'b09688a915a0ec8f40e2f5aacbabc9ad') build() { - cd $srcdir/$pkgname - make CFLAGS="$CFLAGS" all convert + cd $srcdir/$pkgname-$pkgver + make CFLAGS="$CFLAGS" } package() { - cd $srcdir/$pkgname + cd $srcdir/$pkgname-$pkgver make prefix=$pkgdir/usr install # fix manpage mkdir -p $pkgdir/usr/share/ mv $pkgdir/usr/man $pkgdir/usr/share/man mkdir -p ${pkgdir}/sbin ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs + + # install mkinitcpio hooks + install -Dm644 "$srcdir/initcpio-install-btrfs" \ + "$pkgdir/usr/lib/initcpio/install/btrfs" + install -Dm644 "$srcdir/initcpio-hook-btrfs" \ + "$pkgdir/usr/lib/initcpio/hooks/btrfs" } -md5sums=('a3f6fbeb166f8e6b5c06833888d4ecf2') diff --git a/core/btrfs-progs/initcpio-hook-btrfs b/core/btrfs-progs/initcpio-hook-btrfs new file mode 100644 index 000000000..7965d0a8a --- /dev/null +++ b/core/btrfs-progs/initcpio-hook-btrfs @@ -0,0 +1,7 @@ +#!/usr/bin/ash + +run_hook() { + btrfs device scan +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/btrfs-progs/initcpio-install-btrfs b/core/btrfs-progs/initcpio-install-btrfs new file mode 100644 index 000000000..dbeb47ee8 --- /dev/null +++ b/core/btrfs-progs/initcpio-install-btrfs @@ -0,0 +1,15 @@ +#!/bin/bash + +build() { + MODULES=$(all_modules btrfs) + BINARIES=btrfs + SCRIPT=btrfs +} + +help() { + cat < Date: Sat, 3 Mar 2012 12:28:15 +0100 Subject: [PATCH 1/2] split /usr: always read config files from /lib/udev @@ -6,11 +6,11 @@ Subject: [PATCH 1/2] split /usr: always read config files from /lib/udev This means we don't need a flagday in order to move udev to use /usr/lib/udev/rules.d --- - src/libudev.c | 25 ++++++++++++++++--------- - 1 file changed, 16 insertions(+), 9 deletions(-) + src/libudev.c | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/libudev.c b/src/libudev.c -index be24329..754d713 100644 +index d954dae..4da6309 100644 --- a/src/libudev.c +++ b/src/libudev.c @@ -43,8 +43,8 @@ struct udev { @@ -24,7 +24,7 @@ index be24329..754d713 100644 int rules_path_count; char *run_path; struct udev_list properties_list; -@@ -255,21 +255,26 @@ UDEV_EXPORT struct udev *udev_new(void) +@@ -255,9 +255,14 @@ UDEV_EXPORT struct udev *udev_new(void) goto err; if (udev->rules_path[0] == NULL) { @@ -40,16 +40,15 @@ index be24329..754d713 100644 + if (!udev->rules_path[1]) goto err; + /* /run/udev -- runtime rules */ +@@ -265,11 +270,11 @@ UDEV_EXPORT struct udev *udev_new(void) + goto err; + /* /etc/udev -- local administration rules */ - udev->rules_path[1] = strdup(SYSCONFDIR "/udev/rules.d"); - if (!udev->rules_path[1]) -+ udev->rules_path[2] = strdup(SYSCONFDIR "/udev/rules.d"); -+ if (!udev->rules_path[2]) - goto err; - - /* /run/udev -- runtime rules */ -- if (asprintf(&udev->rules_path[2], "%s/rules.d", udev->run_path) < 0) -+ if (asprintf(&udev->rules_path[3], "%s/rules.d", udev->run_path) < 0) ++ udev->rules_path[3] = strdup(SYSCONFDIR "/udev/rules.d"); ++ if (!udev->rules_path[3]) goto err; - udev->rules_path_count = 3; @@ -76,5 +75,5 @@ index be24329..754d713 100644 dbg(udev, "context %p released\n", udev); free(udev); -- -1.7.9.5 +1.7.10 diff --git a/core/udev/0002-reinstate-TIMEOUT-handling.patch b/core/udev/0002-reinstate-TIMEOUT-handling.patch index 9d1d36fb6..edbbf1d32 100644 --- a/core/udev/0002-reinstate-TIMEOUT-handling.patch +++ b/core/udev/0002-reinstate-TIMEOUT-handling.patch @@ -1,4 +1,4 @@ -From 0a581062ee3e31e0c2aedc5eb64c60f52868b17f Mon Sep 17 00:00:00 2001 +From 629d840316280cffcc724fac41047374a7685490 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 15 Mar 2012 02:12:43 +0100 Subject: [PATCH 2/2] reinstate TIMEOUT= handling @@ -21,18 +21,18 @@ This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/TODO b/TODO -index 36e8440..c2e59b6 100644 +index 8b8b9c8..3d26e89 100644 --- a/TODO +++ b/TODO -@@ -1,6 +1,8 @@ - - find a way to tell udev to not cancel firmware - requests in initramfs +@@ -7,6 +7,8 @@ + + - move /usr/lib/udev/devices/ to tmpfiles + - remove TIMEOUT= handling + - - move /lib/udev/devices/ to tmpfiles - - trigger --subsystem-match=usb/usb_device + + - kill rules_generator diff --git a/src/libudev-device.c b/src/libudev-device.c index 10f28b8..639c367 100644 --- a/src/libudev-device.c @@ -142,5 +142,5 @@ index 1702217..88e9272 100644 } -- -1.7.9.5 +1.7.10 diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index 082ed6213..586aee998 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 155730 2012-04-06 00:04:05Z tomegun $ +# $Id: PKGBUILD 156062 2012-04-12 15:54:20Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Aaron Griffin # Contributor: Tobias Powalowski # Contributor: Thomas Bächler pkgname=udev -pkgver=181 -pkgrel=9 +pkgver=182 +pkgrel=1 pkgdesc="The userspace dev tools (udev)" depends=('util-linux' 'glib2' 'kmod' 'pciutils' 'usbutils' 'bash' 'acl') install=udev.install @@ -33,8 +33,7 @@ build() { --sysconfdir=/etc \ --libexecdir=/usr/lib \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \ - --enable-udev_acl + --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware make } @@ -61,6 +60,9 @@ package() { install -d ${pkgdir}/sbin ln -s ../usr/bin/udevadm ${pkgdir}/sbin/udevadm + # fix wrong path to /bin/sh + sed -i -e 's#/usr/bin/sh#/bin/sh#g' $pkgdir/usr/lib/udev/keyboard-force-release.sh + # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group for i in $pkgdir/usr/lib/udev/rules.d/*.rules; do sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; @@ -68,8 +70,8 @@ package() { s#GROUP="cdrom"#GROUP="optical"#g' $i done } -md5sums=('0d7af750702620a871b9f9b98d8ad859' - '02a0dbbdcba6c1eae3ef65b6b06bde1f' - 'a9fae85491a08d7759388c605389a8c5' +md5sums=('023877e6cc0d907994b8c648beab542b' + '0fa3eac115ad0140af1582d941b15f2c' + '94b816896bf23275c0598fc8e07270c3' 'a4dd853050bf2e0ae6b2e3d2c75499c2' 'd2b16edc6d806b5dafdbbad43ae5a3de') -- cgit v1.2.3-54-g00ecf