diff options
Diffstat (limited to 'abs/core/klibc-module-init-tools')
| -rw-r--r-- | abs/core/klibc-module-init-tools/PKGBUILD | 31 | ||||
| -rw-r--r-- | abs/core/klibc-module-init-tools/fix-modprobe-ignore-path.patch | 14 | ||||
| -rw-r--r-- | abs/core/klibc-module-init-tools/makefile.patch | 54 |
3 files changed, 99 insertions, 0 deletions
diff --git a/abs/core/klibc-module-init-tools/PKGBUILD b/abs/core/klibc-module-init-tools/PKGBUILD new file mode 100644 index 0000000..80a1ede --- /dev/null +++ b/abs/core/klibc-module-init-tools/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 5989 2008-07-22 12:58:46Z thomas $ +# Maintainer: Thomas Baechler <thomas@archlinux.org> + +pkgname=klibc-module-init-tools +pkgver=3.4 +pkgrel=10 +pkgdesc="Utilities for inserting and removing modules from the Linux kernel" +arch=(i686 x86_64) +url="http://www.kernel.org" +license=('GPL') +groups=('base') +depends=('klibc' $(basename /lib/klibc-*.so .so)) +source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-$pkgver.tar.bz2 \ + makefile.patch + fix-modprobe-ignore-path.patch) +md5sums=('db6ac059e80e8dd4389dbe81ee61f3c6' + 'c48553c2b61fd8d9784aa86e559b9d7b' + '335c3f8317f257ddd70b09271b4360bd') + +build() { + cd $startdir/src/module-init-tools-$pkgver + patch -p1 -i ../makefile.patch || return 1 + autoreconf || return 1 + patch -p0 -i ../fix-modprobe-ignore-path.patch || return 1 + sed -i 's|/usr/bin/install|/bin/install|g' install-with-care + CFLAGS="${CFLAGS} -DCONFIG_NO_BACKWARDS_COMPAT" CC=klcc LD=klcc ./configure --prefix=/usr/lib/klibc + make || return 1 + INSTALL=/bin/install make DESTDIR=$startdir/pkg install || return 1 + rm -f $startdir/pkg/usr/lib/klibc/sbin/{generate-modprobe.conf,insmod.static} + rm -rf $startdir/pkg/usr/lib/klibc/{share,man} +} diff --git a/abs/core/klibc-module-init-tools/fix-modprobe-ignore-path.patch b/abs/core/klibc-module-init-tools/fix-modprobe-ignore-path.patch new file mode 100644 index 0000000..c562b3f --- /dev/null +++ b/abs/core/klibc-module-init-tools/fix-modprobe-ignore-path.patch @@ -0,0 +1,14 @@ +--- modprobe.c~ 2005-12-02 00:42:09.000000000 +0100 ++++ modprobe.c 2008-03-12 09:39:14.000000000 +0100 +@@ -1236,9 +1236,8 @@ + + /* Try defaults. */ + for (i = 0; i < ARRAY_SIZE(default_configs); i++) { +- if (read_config(default_configs[i], name, dump_only, removing, +- options, commands, aliases, blacklist)) +- return; ++ read_config(default_configs[i], name, dump_only, removing, ++ options, commands, aliases, blacklist); + } + } + diff --git a/abs/core/klibc-module-init-tools/makefile.patch b/abs/core/klibc-module-init-tools/makefile.patch new file mode 100644 index 0000000..df0836f --- /dev/null +++ b/abs/core/klibc-module-init-tools/makefile.patch @@ -0,0 +1,54 @@ +diff -Nur module-init-tools-3.4.orig/Makefile.am module-init-tools-3.4/Makefile.am +--- module-init-tools-3.4.orig/Makefile.am 2007-10-07 23:51:46.000000000 +0200 ++++ module-init-tools-3.4/Makefile.am 2008-07-22 14:49:09.000000000 +0200 +@@ -18,16 +18,9 @@ + EXTRA_depmod_SOURCES = moduleops_core.c + EXTRA_modinfo_SOURCES = backwards_compat.c + +-MAN5 = modprobe.conf.5 modules.dep.5 depmod.conf.5 +-MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8 +-SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml)) +-man_MANS = $(MAN5) $(MAN8) +-# If they haven't overridden mandir, fix it (never /man!) +-mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi) +- + TESTSUITE := $(shell find tests -type f ! -name '*~') tests/vg-suppressions + +-EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE) ++EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(TESTSUITE) + + sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static + bin_PROGRAMS = lsmod +@@ -38,32 +31,6 @@ + + DIST_DIR := /home/rusty/devel/kernel/www/modules/ + +-MAINTAINERCLEANFILES := $(man_MANS) +- +-# According to Warren Togami, RH has docbook2man in the docbook-utils rpm. +-DOCBOOKTOMAN := $(shell if command -v docbook-to-man >/dev/null 2>&1; then echo docbook-to-man; else echo docbook2man; fi) +- +-# docbook2man writes file itself, doesn't do stdout. +-%.8: doc/%.sgml +- if [ "$(DOCBOOKTOMAN)" = "docbook2man" ]; then \ +- $(DOCBOOKTOMAN) $< > /dev/null 2>&1; \ +- else \ +- $(DOCBOOKTOMAN) $< 2>&1 > $@ | sed 's/^[^:]*://'; \ +- fi +- +-%.5: doc/%.sgml +- if [ "$(DOCBOOKTOMAN)" = "docbook2man" ]; then \ +- $(DOCBOOKTOMAN) $< > /dev/null 2>&1; \ +- else \ +- $(DOCBOOKTOMAN) $< 2>&1 > $@ | sed 's/^[^:]*://'; \ +- fi +- +-# docbook2man creates extra crap files which need cleaning. +-distclean: killbuildmanpages +- +-killbuildmanpages: +- rm -f doc/*.tmp manpage.refs manpage.links +- + tarball: $(DIST_DIR)/module-init-tools-$(VERSION).tar.gz + + $(DIST_DIR)/module-init-tools-$(VERSION).tar.gz: dist |