summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorJoshua Ismael Haase Hernández <hahj87@gmail.com>2012-02-15 21:04:51 -0600
committerJoshua Ismael Haase Hernández <hahj87@gmail.com>2012-02-15 21:04:51 -0600
commitb3ff1c22a93664f083589a10e30e1f96ca2a15af (patch)
tree5c693c0c80a9a5f06f7af0a2330f0bae74179698 /core
parentd562099d4844c7dbd49830bce70524e8eabad0fc (diff)
parentecec4d4d3ca64d7929f1f63857e82268798e066b (diff)
Merge branch 'master' of gitpar:abslibre-mips64el
Diffstat (limited to 'core')
-rw-r--r--core/btrfs-progs/PKGBUILD2
-rw-r--r--core/dhcpcd/PKGBUILD11
-rw-r--r--core/gcc/PKGBUILD6
-rw-r--r--core/gcc/gcc-libs.install4
-rw-r--r--core/glib2/PKGBUILD4
-rw-r--r--core/glibc/PKGBUILD17
-rw-r--r--core/glibc/glibc-2.15-strcmp-disable-avx.patch48
-rw-r--r--core/gnupg/PKGBUILD2
-rw-r--r--core/gpgme/PKGBUILD2
-rw-r--r--core/grep/PKGBUILD6
-rw-r--r--core/iw/PKGBUILD8
-rw-r--r--core/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch28
-rw-r--r--core/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch34
-rw-r--r--core/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch196
-rw-r--r--core/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch34
-rw-r--r--core/kmod/0004-modprobe-remove-0-refcnt-deps.patch52
-rw-r--r--core/kmod/PKGBUILD38
-rw-r--r--core/less/PKGBUILD6
-rw-r--r--core/libassuan/PKGBUILD2
-rw-r--r--core/libksba/PKGBUILD17
-rw-r--r--core/libtool/PKGBUILD4
-rw-r--r--core/ncurses/PKGBUILD34
-rw-r--r--core/pcre/PKGBUILD15
-rw-r--r--core/pinentry/PKGBUILD4
-rw-r--r--core/procinfo-ng/PKGBUILD2
-rw-r--r--core/udev/PKGBUILD85
-rw-r--r--core/udev/initcpio-hooks-udev9
-rw-r--r--core/udev/initcpio-install-udev26
-rw-r--r--core/udev/udev.install14
29 files changed, 177 insertions, 533 deletions
diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD
index 343cb55c3..ab848570a 100644
--- a/core/btrfs-progs/PKGBUILD
+++ b/core/btrfs-progs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=btrfs-progs
pkgver=0.19.20120110
pkgrel=2
pkgdesc="btrfs filesystem utilities"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
depends=('glibc' 'e2fsprogs')
source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz)
url="http://btrfs.wiki.kernel.org/"
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index 75477bfeb..817f7c7d7 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 142553 2011-11-12 07:19:26Z allan $
+# $Id: PKGBUILD 150154 2012-02-13 15:50:03Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Tom Killian <tom.archlinux.org>
# Contributor: Judd Vinet <jvinet.zeroflux.org>
pkgname=dhcpcd
-pkgver=5.2.12
-pkgrel=4
+pkgver=5.5.4
+pkgrel=1
pkgdesc="RFC2131 compliant DHCP client daemon"
url="http://roy.marples.name/dhcpcd/"
arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
'dhcpcd.conf.d' '0001-Set-hostname-via-proc-if-file-is-available.patch' \
'0001-set-MTU-via-sysfs-if-file-is-available.patch')
-sha1sums=('27378a251705c7888332e6d60eea7805d1f8aeb5'
+sha1sums=('8aa42abd28d49cce5b179998490c36f6c490e338'
'b67b9ce6a2faaca75fea356966a16be2283b7db0'
'ee85adac972a8172a9d9b3a1bdd46e0430301582'
'afbed18dc5544f7d0b81e2266b322ca12becf9a4')
@@ -30,7 +30,8 @@ build() {
patch -Np1 -i ${srcdir}/0001-set-MTU-via-sysfs-if-file-is-available.patch
# configure variables
- ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd
+ ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \
+ --rundir=/run
# Build
make
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index f1bf35876..5ea4f6637 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -31,6 +31,12 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
gcc_mips64el_lib.patch
gcc-hash-style-both.patch
gcc-4.6.2-cloog-0.17.patch)
+md5sums=('f7ca5d9f7a07216577f81318b7cf56ef'
+ '450772ce32daed97d7383199f8797f33'
+ '4030ee1c08dd1e843c0225b772360e76'
+ '67e337993d821d72fccacbed52d48c34'
+ '4df25b623799b148a0703eaeec8fdf3f'
+ '6d9939a2e667376031679ac9f9c49263')
if [ -n "${_snapshot}" ]; then
_basedir="${srcdir}/gcc-${_snapshot}"
diff --git a/core/gcc/gcc-libs.install b/core/gcc/gcc-libs.install
index a880434ae..a6ac198f2 100644
--- a/core/gcc/gcc-libs.install
+++ b/core/gcc/gcc-libs.install
@@ -4,13 +4,13 @@ filelist=(libgomp.info libquadmath.info)
post_upgrade() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
- [ -f $infodir/$file.gz ] && install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ [ -f $infodir/$file.gz ] && install-info $infodir/$file.gz $infodir/dir 2> /dev/null || true
done
}
pre_remove() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist[@]}; do
- [ -f $infodir/$file.gz ] && install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ [ -f $infodir/$file.gz ] && install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null || true
done
}
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 075b45073..01c980695 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142720 2011-11-13 20:52:32Z ibiru $
+# $Id: PKGBUILD 149930 2012-02-11 23:29:30Z allan $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=glib2
pkgver=2.30.2
-pkgrel=1
+pkgrel=2
pkgdesc="Common C routines used by GTK+ and other libs"
url="http://www.gtk.org/"
arch=(i686 x86_64 'mips64el')
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 5e4442ba0..020907346 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -65,7 +65,6 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf')
-
mksource() {
git clone http://sourceware.org/git/glibc.git
pushd glibc
@@ -267,19 +266,3 @@ package() {
lib/{libmemusage,libpcprofile,libSegFault}.so \
usr/lib/{pt_chown,{audit,gconv}/*.so}
}
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
- 'a006504b83553d0b554cf8badff005b6'
- '4dadb9203b69a3210d53514bb46f41c3'
- '0c5540efc51c0b93996c51b57a8540ae'
- '40cd342e21f71f5e49e32622b25acc52'
- 'b042647ea7d6f22ad319e12e796bd13e'
- '6970bcfeb3bf88913436d5112d16f588'
- '7da8c554a3b591c7401d7023b1928afc'
- 'c5de2a946215d647c8af5432ec4b0da0'
- '55febbb72139ac7b65757df085024b83'
- '3c219ddfb619b6df903cac4cc42c611d'
- '7ae3e426251ae33e73dbad71f9c91378'
- 'dc7550e659ddd685bd78a930d15a01f2'
- 'b587ee3a70c9b3713099295609afde49'
- '07ac979b6ab5eeb778d55f041529d623'
- '476e9113489f93b348b21e144b6a8fcf')
diff --git a/core/glibc/glibc-2.15-strcmp-disable-avx.patch b/core/glibc/glibc-2.15-strcmp-disable-avx.patch
deleted file mode 100644
index 7f1f5b8f2..000000000
--- a/core/glibc/glibc-2.15-strcmp-disable-avx.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S
-index f93c83d..d8aa889 100644
---- a/sysdeps/x86_64/multiarch/strcmp.S
-+++ b/sysdeps/x86_64/multiarch/strcmp.S
-@@ -105,11 +105,6 @@ ENTRY(__strcasecmp)
- jne 1f
- call __init_cpu_features
- 1:
--# ifdef HAVE_AVX_SUPPORT
-- leaq __strcasecmp_avx(%rip), %rax
-- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
-- jnz 2f
--# endif
- leaq __strcasecmp_sse42(%rip), %rax
- testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
- jnz 2f
-@@ -128,11 +123,6 @@ ENTRY(__strncasecmp)
- jne 1f
- call __init_cpu_features
- 1:
--# ifdef HAVE_AVX_SUPPORT
-- leaq __strncasecmp_avx(%rip), %rax
-- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
-- jnz 2f
--# endif
- leaq __strncasecmp_sse42(%rip), %rax
- testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
- jnz 2f
-@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp)
- # include "strcmp-sse42.S"
-
-
--# ifdef HAVE_AVX_SUPPORT
--# if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L
--# define LABEL(l) .L##l##_avx
--# define GLABEL(l) l##_avx
--# define USE_AVX 1
--# undef STRCMP_SSE42
--# define STRCMP_SSE42 STRCMP_AVX
--# define SECTION avx
--# include "strcmp-sse42.S"
--# endif
--# endif
--
--
- # undef ENTRY
- # define ENTRY(name) \
- .type STRCMP_SSE2, @function; \
diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD
index b6419c832..d3c490d20 100644
--- a/core/gnupg/PKGBUILD
+++ b/core/gnupg/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnupg
pkgver=1.4.12
pkgrel=1
pkgdesc="GNU Privacy Guard - a PGP replacement tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
depends=('zlib' 'bzip2' 'libldap>=2.4.18' 'libusb-compat' 'curl>=7.16.2' 'readline>=6.0.00')
source=(ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg/$pkgname-$pkgver.tar.bz2)
diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD
index 830d06cc3..76e2dc8a8 100644
--- a/core/gpgme/PKGBUILD
+++ b/core/gpgme/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gpgme
pkgver=1.3.1
pkgrel=2
pkgdesc="A C wrapper library for GnuPG"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnupg.org/related_software/gpgme/"
license=('GPL')
depends=('libgpg-error' 'pth' 'gnupg' 'gnupg2')
diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD
index 5cd2533f6..0a727b140 100644
--- a/core/grep/PKGBUILD
+++ b/core/grep/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143252 2011-11-24 01:36:25Z allan $
+# $Id: PKGBUILD 149932 2012-02-11 23:29:33Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=grep
pkgver=2.10
-pkgrel=1
+pkgrel=2
pkgdesc="A string search utility"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
@@ -19,7 +19,7 @@ md5sums=('709915434d09f5db655e5ebd7fd6bb7f'
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --bindir=/bin --without-included-regex
+ ./configure --prefix=/usr --without-included-regex
make
}
diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD
index 260ec0c2e..dd1cc2b0a 100644
--- a/core/iw/PKGBUILD
+++ b/core/iw/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 135527 2011-08-14 20:37:21Z thomas $
+# $Id: PKGBUILD 149926 2012-02-11 23:08:41Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=iw
-pkgver=3.0
-pkgrel=1.1
+pkgver=3.3
+pkgrel=1
pkgdesc="nl80211 based CLI configuration utility for wireless devices"
arch=("i686" "x86_64" 'mips64el')
url="http://wireless.kernel.org/en/users/Documentation/iw"
@@ -11,7 +11,7 @@ license=("GPL")
depends=("libnl")
makedepends=("linux-api-headers" "pkg-config")
source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('a0ccbf1ce71ae4bdb05495ca18ab00a87c06dce2c3bf8b8358c615e60c4632fb')
+sha256sums=('567f0d389dd7c9919832101aaa8e3863a463cb505545534eb46b4ddab4400e60')
build() {
cd "$srcdir"/$pkgname-$pkgver
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 <lucas.demarchi@profusion.mobi>
+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/0001-partially-fix-parsing-of-alias-with-dots.patch b/core/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch
deleted file mode 100644
index b69d095d3..000000000
--- a/core/kmod/0001-partially-fix-parsing-of-alias-with-dots.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From cdaf4b2f3ef60365c6b8006a63410368a7b38f39 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Tue, 31 Jan 2012 00:12:32 -0500
-Subject: [PATCH 1/4] partially fix parsing of alias with dots
-
----
- libkmod/libkmod-util.c | 4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c
-index 7c2611b..6a9f697 100644
---- a/libkmod/libkmod-util.c
-+++ b/libkmod/libkmod-util.c
-@@ -134,8 +134,7 @@ inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len)
- case ']':
- return -EINVAL;
- case '[':
-- while (alias[s] != ']' &&
-- alias[s] != '.' && alias[s] != '\0')
-+ while (alias[s] != ']' && alias[s] != '\0')
- s++;
-
- if (alias[s] != ']')
-@@ -144,7 +143,6 @@ inline int alias_normalize(const char *alias, char buf[PATH_MAX], size_t *len)
- s++;
- break;
- case '\0':
-- case '.':
- goto finish;
- default:
- buf[s] = c;
---
-1.7.9
-
diff --git a/core/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch b/core/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch
deleted file mode 100644
index 76cc35049..000000000
--- a/core/kmod/0002-libkmod-module-used-shared-code-in-module-creation.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 1d2f64689b2456ade81d6d489c4f5bfb5fdb92fd Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Tue, 31 Jan 2012 00:13:43 -0500
-Subject: [PATCH 2/4] libkmod-module: used shared code in module creation
-
----
- libkmod/libkmod-module.c | 135 ++++++++++++++++++++++++++-------------------
- 1 files changed, 78 insertions(+), 57 deletions(-)
-
-diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
-index 47b1709..48e4aa1 100644
---- a/libkmod/libkmod-module.c
-+++ b/libkmod/libkmod-module.c
-@@ -162,6 +162,76 @@ fail:
- return err;
- }
-
-+/*
-+ * Memory layout with alias:
-+ *
-+ * struct kmod_module {
-+ * hashkey -----.
-+ * alias -----. |
-+ * name ----. | |
-+ * } | | |
-+ * name <----------' | |
-+ * alias <-----------' |
-+ * name\alias <--------'
-+ *
-+ * Memory layout without alias:
-+ *
-+ * struct kmod_module {
-+ * hashkey ---.
-+ * alias -----|----> NULL
-+ * name ----. |
-+ * } | |
-+ * name <----------'-'
-+ *
-+ * @key is "name\alias" or "name" (in which case alias == NULL)
-+ */
-+static int kmod_module_new(struct kmod_ctx *ctx, const char *key,
-+ const char *name, size_t namelen,
-+ const char *alias, size_t aliaslen,
-+ struct kmod_module **mod)
-+{
-+ struct kmod_module *m;
-+ size_t keylen;
-+
-+ m = kmod_pool_get_module(ctx, key);
-+ if (m != NULL) {
-+ *mod = kmod_module_ref(m);
-+ return 0;
-+ }
-+
-+ if (alias == NULL)
-+ keylen = namelen;
-+ else
-+ keylen = namelen + aliaslen + 1;
-+
-+ m = malloc(sizeof(*m) + (alias == NULL ? 1 : 2) * (keylen + 1));
-+ if (m == NULL) {
-+ free(m);
-+ return -ENOMEM;
-+ }
-+
-+ memset(m, 0, sizeof(*m));
-+
-+ m->ctx = kmod_ref(ctx);
-+ m->name = (char *)m + sizeof(*m);
-+ memcpy(m->name, key, keylen + 1);
-+ if (alias == NULL) {
-+ m->hashkey = m->name;
-+ m->alias = NULL;
-+ } else {
-+ m->name[namelen] = '\0';
-+ m->alias = m->name + namelen + 1;
-+ m->hashkey = m->name + keylen + 1;
-+ memcpy(m->hashkey, key, keylen + 1);
-+ }
-+
-+ m->refcount = 1;
-+ kmod_pool_add_module(ctx, m, m->hashkey);
-+ *mod = m;
-+
-+ return 0;
-+}
-+
- /**
- * kmod_module_new_from_name:
- * @ctx: kmod library context
-@@ -188,54 +258,15 @@ KMOD_EXPORT int kmod_module_new_from_name(struct kmod_ctx *ctx,
- const char *name,
- struct kmod_module **mod)
- {
-- struct kmod_module *m;
- size_t namelen;
- char name_norm[PATH_MAX];
-- char *namesep;
-
- if (ctx == NULL || name == NULL || mod == NULL)
- return -ENOENT;
-
-- if (alias_normalize(name, name_norm, &namelen) < 0) {
-- DBG(ctx, "invalid alias: %s\n", name);
-- return -EINVAL;
-- }
-+ modname_normalize(name, name_norm, &namelen);
-
-- m = kmod_pool_get_module(ctx, name_norm);
-- if (m != NULL) {
-- *mod = kmod_module_ref(m);
-- return 0;
-- }
--
-- namesep = strchr(name_norm, '/');
-- m = malloc(sizeof(*m) + (namesep == NULL ? 1 : 2) * namelen + 2);
-- if (m == NULL) {
-- free(m);
-- return -ENOMEM;
-- }
--
-- memset(m, 0, sizeof(*m));
--
-- m->ctx = kmod_ref(ctx);
-- m->name = (char *)m + sizeof(*m);
-- memcpy(m->name, name_norm, namelen + 1);
--
-- if (namesep) {
-- size_t len = namesep - name_norm;
--
-- m->name[len] = '\0';
-- m->alias = m->name + len + 1;
-- m->hashkey = m->name + namelen + 1;
-- memcpy(m->hashkey, name_norm, namelen + 1);
-- } else {
-- m->hashkey = m->name;
-- }
--
-- m->refcount = 1;
-- kmod_pool_add_module(ctx, m, m->hashkey);
-- *mod = m;
--
-- return 0;
-+ return kmod_module_new(ctx, name_norm, name_norm, namelen, NULL, 0, mod);
- }
-
- int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias,
-@@ -251,9 +282,9 @@ int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias,
-
- memcpy(key, name, namelen);
- memcpy(key + namelen + 1, alias, aliaslen + 1);
-- key[namelen] = '/';
-+ key[namelen] = '\\';
-
-- err = kmod_module_new_from_name(ctx, key, mod);
-+ err = kmod_module_new(ctx, key, name, namelen, alias, aliaslen, mod);
- if (err < 0)
- return err;
-
-@@ -323,7 +354,7 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx,
- free(abspath);
- else {
- ERR(ctx, "kmod_module '%s' already exists with different path: new-path='%s' old-path='%s'\n",
-- name, abspath, m->path);
-+ name, abspath, m->path);
- free(abspath);
- return -EEXIST;
- }
-@@ -332,21 +363,11 @@ KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx,
- return 0;
- }
-
-- m = malloc(sizeof(*m) + namelen + 1);
-- if (m == NULL)
-- return -errno;
--
-- memset(m, 0, sizeof(*m));
-+ err = kmod_module_new(ctx, name, name, namelen, NULL, 0, &m);
-+ if (err < 0)
-+ return err;
-
-- m->ctx = kmod_ref(ctx);
-- m->name = (char *)m + sizeof(*m);
-- memcpy(m->name, name, namelen + 1);
- m->path = abspath;
-- m->hashkey = m->name;
-- m->refcount = 1;
--
-- kmod_pool_add_module(ctx, m, m->hashkey);
--
- *mod = m;
-
- return 0;
---
-1.7.9
-
diff --git a/core/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch b/core/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch
deleted file mode 100644
index 5bbc93a90..000000000
--- a/core/kmod/0003-modprobe-handle-all-error-returns-from-init_module.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From fdf78d80d298353c29e1fe8c00602669dd9662bb Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Mon, 30 Jan 2012 23:05:26 -0500
-Subject: [PATCH 3/4] modprobe: handle all error returns from init_module
-
----
- tools/kmod-modprobe.c | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index 3e51506..c882856 100644
---- a/tools/kmod-modprobe.c
-+++ b/tools/kmod-modprobe.c
-@@ -551,6 +551,8 @@ static int insmod_do_insert_module(struct kmod_module *mod, const char *opts)
-
- err = kmod_module_insert_module(mod, flags, opts);
- switch (err) {
-+ case 0:
-+ break;
- case -EEXIST:
- /*
- * We checked for EEXIST with an earlier call to
-@@ -564,7 +566,7 @@ static int insmod_do_insert_module(struct kmod_module *mod, const char *opts)
- ERR("Module %s already in kernel.\n",
- kmod_module_get_name(mod));
- break;
-- case -EPERM:
-+ default:
- ERR("could not insert '%s': %s\n", kmod_module_get_name(mod),
- strerror(-err));
- break;
---
-1.7.9
-
diff --git a/core/kmod/0004-modprobe-remove-0-refcnt-deps.patch b/core/kmod/0004-modprobe-remove-0-refcnt-deps.patch
deleted file mode 100644
index 80cc73130..000000000
--- a/core/kmod/0004-modprobe-remove-0-refcnt-deps.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 4e3dd21aff55b5bbaa08b037fc2a5625bfffc0a5 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Mon, 30 Jan 2012 23:39:30 -0500
-Subject: [PATCH 4/4] modprobe: remove 0 refcnt deps
-
----
- tools/kmod-modprobe.c | 15 +++++++++++++--
- 1 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index c882856..bd991a5 100644
---- a/tools/kmod-modprobe.c
-+++ b/tools/kmod-modprobe.c
-@@ -381,7 +381,7 @@ static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors)
- static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies)
- {
- const char *modname = kmod_module_get_name(mod);
-- struct kmod_list *pre = NULL, *post = NULL;
-+ struct kmod_list *pre = NULL, *post = NULL, *deps, *itr;
- const char *cmd = NULL;
- int err;
-
-@@ -422,7 +422,7 @@ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies)
- rmmod_do_deps_list(post, false);
-
- if (do_dependencies && remove_dependencies) {
-- struct kmod_list *deps = kmod_module_get_dependencies(mod);
-+ deps = kmod_module_get_dependencies(mod);
-
- err = rmmod_do_deps_list(deps, true);
- if (err < 0)
-@@ -451,6 +451,17 @@ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies)
-
- rmmod_do_deps_list(pre, false);
-
-+ deps = kmod_module_get_dependencies(mod);
-+ if (deps != NULL) {
-+ kmod_list_foreach_reverse(itr, deps) {
-+ struct kmod_module *dep = kmod_module_get_module(itr);
-+ if (kmod_module_get_refcnt(dep) == 0)
-+ rmmod_do_remove_module(dep);
-+ kmod_module_unref(dep);
-+ }
-+ kmod_module_unref_list(deps);
-+ }
-+
- error:
- kmod_module_unref_list(pre);
- kmod_module_unref_list(post);
---
-1.7.9
-
diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD
index 06275f062..85d74af1f 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 <dreisner@archlinux.org>
pkgname=kmod
-pkgver=4
+pkgver=5
pkgrel=2
pkgdesc="Linux kernel module handling"
arch=('i686' 'x86_64' 'mips64el')
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/less/PKGBUILD b/core/less/PKGBUILD
index 5edb5273f..884fd549e 100644
--- a/core/less/PKGBUILD
+++ b/core/less/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142066 2011-11-04 23:35:58Z allan $
+# $Id: PKGBUILD 149934 2012-02-11 23:29:36Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=less
pkgver=444
-pkgrel=2.1
+pkgrel=3.1
pkgdesc="A terminal based program for viewing text files"
license=('GPL3')
arch=('i686' 'x86_64' 'mips64el')
@@ -26,6 +26,4 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make prefix="${pkgdir}"/usr install
- install -dm755 "${pkgdir}"/bin
- mv "${pkgdir}"/usr/bin/${pkgname} "${pkgdir}"/bin
}
diff --git a/core/libassuan/PKGBUILD b/core/libassuan/PKGBUILD
index 12e79ce0e..2ba5063e8 100644
--- a/core/libassuan/PKGBUILD
+++ b/core/libassuan/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libassuan
pkgver=2.0.3
pkgrel=1
pkgdesc="A IPC library used by some GnuPG related software"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://www.gnupg.org/related_software/libassuan"
depends=('libgpg-error')
diff --git a/core/libksba/PKGBUILD b/core/libksba/PKGBUILD
index ccc897c8b..505a60633 100644
--- a/core/libksba/PKGBUILD
+++ b/core/libksba/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146743 2012-01-16 22:52:50Z dreisner $
+# $Id: PKGBUILD 149815 2012-02-11 07:14:25Z tpowa $
# Maintainer: damir <damir@archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
pkgname=libksba
pkgver=1.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="A CMS and X.509 access library"
arch=(i686 x86_64)
license=('GPL')
@@ -15,9 +15,18 @@ options=(!libtool)
install=libksba.install
build() {
- cd $startdir/src/$pkgname-$pkgver
+ cd $srcdir/$pkgname-$pkgver
./configure --prefix=/usr
make
- make DESTDIR=$startdir/pkg install
+}
+
+check() {
+ cd $srcdir/$pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
}
md5sums=('e797f370b69b4dc776499d6a071ae137')
diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD
index dd52c6771..65dc24970 100644
--- a/core/libtool/PKGBUILD
+++ b/core/libtool/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 141370 2011-10-30 06:46:45Z allan $
+# $Id: PKGBUILD 149936 2012-02-11 23:29:39Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
@@ -6,7 +6,7 @@
pkgname=('libtool' 'libltdl')
pkgver=2.4.2
-pkgrel=2
+pkgrel=4
pkgdesc="A generic library support script"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/libtool"
diff --git a/core/ncurses/PKGBUILD b/core/ncurses/PKGBUILD
index 4c816ce0b..866b1f3fd 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 <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=ncurses
pkgver=5.9
-pkgrel=2.1
+pkgrel=3
pkgdesc="System V Release 4.0 curses emulation library"
arch=('i686' 'x86_64' 'mips64el')
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/pcre/PKGBUILD b/core/pcre/PKGBUILD
index d828db0a9..3d97ae554 100644
--- a/core/pcre/PKGBUILD
+++ b/core/pcre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145006 2011-12-13 23:40:35Z allan $
+# $Id: PKGBUILD 149938 2012-02-11 23:29:42Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: John Proctor <jproctor@prium.net>
pkgname=pcre
-pkgver=8.21
+pkgver=8.30
pkgrel=1
pkgdesc="A library that implements Perl 5-style regular expressions"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,14 +13,14 @@ license=('BSD')
depends=('gcc-libs')
options=('!libtool')
source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('0a7b592bea64b7aa7f4011fc7171a730'
- '4768871445dff956e620a9e902b4db55')
+md5sums=('98e8928cccc945d04279581e778fbdff'
+ '01eee0333fa71687e0b6756db77f94ad')
build() {
cd "${srcdir}"/${pkgname}-${pkgver}
[ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
- ./configure --prefix=/usr --enable-jit \
+ ./configure --prefix=/usr --enable-pcre16 --enable-jit \
--enable-utf8 --enable-unicode-properties
make
}
@@ -34,10 +34,5 @@ package() {
cd "${srcdir}"/${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
- # grep uses pcre, so we need the libs in /lib
- install -dm755 "${pkgdir}"/lib
- mv "${pkgdir}"/usr/lib/libpcre.so.* "${pkgdir}"/lib/
- ln -sf /lib/libpcre.so.0 "${pkgdir}"/usr/lib/libpcre.so
-
install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
}
diff --git a/core/pinentry/PKGBUILD b/core/pinentry/PKGBUILD
index c94625d29..ca098263f 100644
--- a/core/pinentry/PKGBUILD
+++ b/core/pinentry/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=pinentry
pkgver=0.8.1
pkgrel=3
pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://www.gnupg.org/aegypten2"
depends=('ncurses' 'libcap>=2.16')
@@ -16,7 +16,7 @@ source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz
install=pinentry.install
build() {
- cd $startdir/src/$pkgname-$pkgver
+ cd $srcdir/$pkgname-$pkgver
for file in qt4/*.moc; do
/usr/bin/moc ${file/.moc/.h} > ${file}
done
diff --git a/core/procinfo-ng/PKGBUILD b/core/procinfo-ng/PKGBUILD
index 45fa85e68..8444232b0 100644
--- a/core/procinfo-ng/PKGBUILD
+++ b/core/procinfo-ng/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=procinfo-ng
pkgver=2.0.304
-pkgrel=3
+pkgrel=3.1
pkgdesc="Displays useful information from /proc"
arch=('i686' 'x86_64' 'mips64el')
url="http://procinfo-ng.sourceforge.net/"
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD
index efe9f4fa4..80bd4b804 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 <teg@jklm.no>
# Contributor: Aaron Griffin <aaron@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Thomas Bächler <thomas@archlinux.org>
-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 mips64el)
-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 <<HELPEOF
+This hook will use udev to create your root device node and detect the needed
+modules for your root device. It is also required for firmware loading in
+initramfs. It is recommended to use this hook.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/udev/udev.install b/core/udev/udev.install
index c49c5006f..7c866c2a3 100644
--- a/core/udev/udev.install
+++ b/core/udev/udev.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
post_upgrade() {
- if [ "$(vercmp $2 175)" -lt 0 ]; then
+ if [ "$(vercmp $2 181)" -lt 0 ]; then
echo "ATTENTION UDEV:"
echo "----------"
if [ "$(vercmp $2 168)" -lt 0 ]; then
@@ -58,8 +58,16 @@ post_upgrade() {
echo "where devtmpfs is not mounted by the kernel, this only affects fresh installs."
echo " --"
fi
- echo "devtmpfs support is now a hard requirement. Users of the official Arch kernels"
- echo "have this enabled."
+ if [ "$(vercmp $2 175)" -lt 0 ]; then
+ echo "devtmpfs support is now a hard requirement. Users of the official Arch kernels"
+ echo "have this enabled."
+ echo " --"
+ fi
+ echo "udev-compat has been removed, and should be uninstalled."
+ echo " --"
+ echo "Framebuffers are no longer blacklisted by default."
+ echo " --"
+ echo "binaries moved from /sbin to /usr/bin"
echo "---------------"
fi
}