From 16e845de1bbf76ab48a02bfaa21730f45e6afaaa Mon Sep 17 00:00:00 2001 From: root Date: Mon, 13 Feb 2012 23:15:14 +0000 Subject: Mon Feb 13 23:15:14 UTC 2012 --- ...ule-probe-Fix-ignore-loaded-flag-not-bein.patch | 28 +++++++ core/kmod/PKGBUILD | 38 ++++------ core/ncurses/PKGBUILD | 34 ++++----- core/udev/PKGBUILD | 85 ++++++---------------- core/udev/initcpio-hooks-udev | 9 +++ core/udev/initcpio-install-udev | 26 +++++++ core/udev/udev.install | 14 +++- 7 files changed, 125 insertions(+), 109 deletions(-) create mode 100644 core/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch create mode 100644 core/udev/initcpio-hooks-udev create mode 100644 core/udev/initcpio-install-udev (limited to 'core') diff --git a/core/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch b/core/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch new file mode 100644 index 000000000..4ffc3e53b --- /dev/null +++ b/core/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch @@ -0,0 +1,28 @@ +From 269de2e0bf5011072da2f40f4f2d4023fad696b9 Mon Sep 17 00:00:00 2001 +From: Lucas De Marchi +Date: Tue, 7 Feb 2012 09:48:59 -0200 +Subject: [PATCH] libkmod-module: probe: Fix ignore-loaded flag not being + applied + +--- + TODO | 3 +++ + libkmod/libkmod-module.c | 3 ++- + 2 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c +index 0af3e2e..b5eb7c9 100644 +--- a/libkmod/libkmod-module.c ++++ b/libkmod/libkmod-module.c +@@ -1132,7 +1132,8 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct kmod_module *mod, + if (mod == NULL) + return -ENOENT; + +- if (module_is_inkernel(mod)) { ++ if (!(flags & KMOD_PROBE_IGNORE_LOADED) ++ && module_is_inkernel(mod)) { + if (flags & KMOD_PROBE_FAIL_ON_LOADED) + return -EEXIST; + else +-- +1.7.9 + diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index ac327eac1..a219e2d8f 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,41 +1,32 @@ -# $Id: PKGBUILD 148463 2012-02-01 13:16:33Z dreisner $ +# $Id: PKGBUILD 150108 2012-02-12 15:37:16Z dreisner $ # Maintainer: Dave Reisner pkgname=kmod -pkgver=4 +pkgver=5 pkgrel=2 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64') url="http://git.profusion.mobi/cgit.cgi/kmod.git" license=('GPL2') depends=('glibc' 'zlib') -makedepends=('docbook2x') options=('!libtool') provides=('module-init-tools=3.16') conflicts=('module-init-tools') replaces=('module-init-tools') source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz" - 0001-partially-fix-parsing-of-alias-with-dots.patch - 0002-libkmod-module-used-shared-code-in-module-creation.patch - 0003-modprobe-handle-all-error-returns-from-init_module.patch - 0004-modprobe-remove-0-refcnt-deps.patch + '0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch' "depmod-search.conf") -md5sums=('e14450a066a48accd0af1995b3c0232d' - '5f497ab3466ee1a616b6e6c97b330706' - '23a9257a152862753ce4c4ee7287761a' - '3a57671b0f37b1203b207f35a4442ae3' - '1fe88eee9302104b179124ce6bfc55d2' +md5sums=('b271c2ec54aba1c67bda63c8579d8c15' + '81545a1509b43008f85c03fb980f0e86' '4b8cbcbc54b9029c99fd730e257d4436') build() { cd "$pkgname-$pkgver" - patch -Np1 <"$srcdir/0001-partially-fix-parsing-of-alias-with-dots.patch" - patch -Np1 <"$srcdir/0002-libkmod-module-used-shared-code-in-module-creation.patch" - patch -Np1 <"$srcdir/0003-modprobe-handle-all-error-returns-from-init_module.patch" - patch -Np1 <"$srcdir/0004-modprobe-remove-0-refcnt-deps.patch" + # fix modprobe --show-depends failures on loaded modules + patch -Np1 <"$srcdir/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch" - ./configure \ + CFLAGS+=' -g -O0' ./configure \ --sysconfdir=/etc \ --with-rootprefix= \ --with-zlib @@ -50,16 +41,13 @@ check() { package() { make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - # binary directories - install -dm755 "$pkgdir"/{,s}bin - - # configuration directories - install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d + # extra directories + install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d "$pkgdir/sbin" # add symlinks to kmod - ln -s /usr/bin/kmod "$pkgdir/bin/lsmod" - for tool in {ins,rm,dep}mod mod{info,probe}; do - ln -s ../usr/bin/kmod "$pkgdir/sbin/$tool" + ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe" + for tool in {dep,ins,ls,rm}mod modinfo; do + ln -s kmod "$pkgdir/usr/bin/$tool" done # install depmod.d file for search/ dir diff --git a/core/ncurses/PKGBUILD b/core/ncurses/PKGBUILD index fdf6a0343..b55c21040 100644 --- a/core/ncurses/PKGBUILD +++ b/core/ncurses/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142072 2011-11-04 23:36:06Z allan $ +# $Id: PKGBUILD 150103 2012-02-12 13:47:59Z allan $ # Maintainer: Allan McRae # Contributor: judd pkgname=ncurses pkgver=5.9 -pkgrel=2 +pkgrel=3 pkgdesc="System V Release 4.0 curses emulation library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/ncurses/" @@ -21,7 +21,8 @@ build() { cd ${srcdir}/ncursesw-build ../${pkgname}-${pkgver}/configure --prefix=/usr --mandir=/usr/share/man \ --with-shared --with-normal --without-debug --without-ada \ - --with-install-prefix=${pkgdir} --enable-widec + --with-install-prefix=${pkgdir} --enable-widec \ + --enable-pc-files # add --enable-ext-colors with next soname bump make @@ -38,34 +39,27 @@ package() { cd ${srcdir}/ncursesw-build make install - # move libraries needed for boot to /lib (we call tput in initscripts) - install -dm755 ${pkgdir}/lib - mv ${pkgdir}/usr/lib/libncursesw.so.5* ${pkgdir}/lib - ln -sf ../../lib/libncursesw.so.5 ${pkgdir}/usr/lib/libncursesw.so - # Fool packages looking to link to non-wide-character ncurses libraries - for lib in curses ncurses form panel menu; do - rm -f ${pkgdir}/usr/lib/lib${lib}.so + for lib in ncurses form panel menu; do echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib/lib${lib}.so - ln -sf lib${lib}w.a ${pkgdir}/usr/lib/lib${lib}.a + ln -s lib${lib}w.a ${pkgdir}/usr/lib/lib${lib}.a done - ln -sf libncurses++w.a ${pkgdir}/usr/lib/libncurses++.a + ln -s libncurses++w.a ${pkgdir}/usr/lib/libncurses++.a - # install tput to /bin - install -dm755 ${pkgdir}/bin/ - mv ${pkgdir}/usr/bin/tput ${pkgdir}/bin/tput + for lib in ncurses ncurses++ form panel menu; do + ln -s ${lib}w.pc ${pkgdir}/usr/lib/pkgconfig/${lib}.pc + done # Some packages look for -lcurses during build - rm -f ${pkgdir}/usr/lib/libcursesw.so echo "INPUT(-lncursesw)" >${pkgdir}/usr/lib/libcursesw.so - ln -sf libncurses.so ${pkgdir}/usr/lib/libcurses.so - ln -sf libncursesw.a ${pkgdir}/usr/lib/libcursesw.a - ln -sf libncurses.a ${pkgdir}/usr/lib/libcurses.a + ln -s libncurses.so ${pkgdir}/usr/lib/libcurses.so + ln -s libncursesw.a ${pkgdir}/usr/lib/libcursesw.a + ln -s libncurses.a ${pkgdir}/usr/lib/libcurses.a # non-widec compatibility library cd ${srcdir}/ncurses-build install -Dm755 lib/libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.${pkgver} - ln -sf libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.5 + ln -s libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.5 # install license, rip it from the readme cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index 7b3d060c2..8e4448343 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,30 +1,33 @@ -# $Id: PKGBUILD 148430 2012-01-31 19:55:52Z tomegun $ +# $Id: PKGBUILD 150105 2012-02-12 15:37:11Z dreisner $ # Maintainer: Tom Gundersen # Contributor: Aaron Griffin # Contributor: Tobias Powalowski # Contributor: Thomas Bächler -pkgbase="udev" -pkgname=('udev' 'udev-compat') -pkgver=180 -pkgrel=1 +pkgname=udev +pkgver=181 +pkgrel=2 +pkgdesc="The userspace dev tools (udev)" +depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils') +install=udev.install arch=(i686 x86_64) -url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" license=('GPL') +makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod') +source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz + initcpio-hooks-udev + initcpio-install-udev) +url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" +backup=(etc/udev/udev.conf) groups=('base') options=(!makeflags !libtool) -makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod') -source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.xz) build() { - cd $srcdir/$pkgbase-$pkgver + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr \ --with-rootprefix= \ --sysconfdir=/etc \ - --bindir=/sbin \ --libdir=/usr/lib \ - --with-rootlibdir=/lib \ --libexecdir=/lib \ --with-systemdsystemunitdir=/lib/systemd/system \ --enable-udev_acl @@ -32,30 +35,19 @@ build() { make } -package_udev() { - pkgdesc="The userspace dev tools (udev)" - depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils') - install=udev.install - backup=(etc/udev/udev.conf) - - cd $srcdir/$pkgbase-$pkgver +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=${pkgdir} install - # create framebuffer blacklist - install -d -m755 ${pkgdir}/lib/modprobe.d/ - for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz' -exec basename {} .ko.gz \;); do - echo "blacklist $mod" - done | sort -u > $pkgdir/lib/modprobe.d/framebuffer_blacklist.conf - # /dev/loop0 is created for convenience, to autoload the module if necessary # this is no longer needed when util-linux-2.21 is released as /dev/loop-control - # will be used instead. In that case move this to udev-compat + # will be used instead. Support for this will go away in a future version of udev install -d -m755 ${pkgdir}/lib/udev/devices/ mknod ${pkgdir}/lib/udev/devices/loop0 b 7 0 chgrp disk ${pkgdir}/lib/udev/devices/loop0 # udevd moved, symlink to make life easy for restarting udevd manually - ln -s /lib/udev/udevd ${pkgdir}/sbin/udevd + ln -s /lib/udev/udevd ${pkgdir}/usr/bin/udevd # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group for i in $pkgdir/lib/udev/rules.d/*.rules; do @@ -63,40 +55,11 @@ package_udev() { s#GROUP="tape"#GROUP="storage"#g; s#GROUP="cdrom"#GROUP="optical"#g' $i done -} - -package_udev-compat() { - pkgdesc="The userspace dev tools (udev) - additional rules for older kernels" - depends=('udev') - groups=('') - install -d -m755 ${pkgdir}/lib/udev/rules.d - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules - - # create static nodes to be compatible with on-demand module - # loading in the most recent kernel - # - # the list of nodes is generated from /lib/modules/`most recent kernel`/modprobe.devname - # excluding any devices not included in the LTS kernel and any entries in the - # modprobe.devname file of the LTS kernel (if it exists). - install -d -m755 ${pkgdir}/lib/udev/devices - cd ${pkgdir}/lib/udev/devices - - install -d -m755 net - mknod net/tun c 10 200 - mknod ppp c 108 0 -# mknod loop-control c 10 237 -- does not exist in old kernels - mknod uinput c 10 223 - install -d -m755 mapper - mknod mapper/control c 10 236 - install -d -m755 snd - mknod snd/timer c 116 33 - mknod snd/seq c 116 1 - mknod btrfs-control c 10 234 - mknod autofs c 10 235 - mknod fuse c 10 229 - install -d -m755 cpu - mknod cpu/microcode c 10 184 - + # install the mkinitpcio hook + install -D -m644 ../initcpio-hooks-udev ${pkgdir}/lib/initcpio/hooks/udev + install -D -m644 ../initcpio-install-udev ${pkgdir}/lib/initcpio/install/udev } -md5sums=('1cf124ab5a124ea35d4748ea414926ec') +md5sums=('0d7af750702620a871b9f9b98d8ad859' + 'a4dd853050bf2e0ae6b2e3d2c75499c2' + 'ee0bfe91a20fff12cc25ab1d1e024853') diff --git a/core/udev/initcpio-hooks-udev b/core/udev/initcpio-hooks-udev new file mode 100644 index 000000000..87aa7960f --- /dev/null +++ b/core/udev/initcpio-hooks-udev @@ -0,0 +1,9 @@ +# vim: set ft=sh: +run_hook () +{ + msg -n ":: Triggering uevents..." + udevadm trigger --action=add --type=subsystems + udevadm trigger --action=add --type=devices + udevadm settle + msg "done." +} diff --git a/core/udev/initcpio-install-udev b/core/udev/initcpio-install-udev new file mode 100644 index 000000000..e7e2c0f60 --- /dev/null +++ b/core/udev/initcpio-install-udev @@ -0,0 +1,26 @@ +#!/bin/bash + +build() { + FILES="/etc/udev/udev.conf" + SCRIPT="udev" + + add_binary /lib/udev/udevd + add_binary /usr/bin/udevadm + + for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do + add_file "/lib/udev/rules.d/$rules" + done + for tool in ata_id scsi_id; do + add_file "/lib/udev/$tool" + done +} + +help() { + cat <