[arch-commits] Commit in kmod/trunk (2 files)

[Dave Reisner]

    Date: Sunday, November 16, 2014 @ 16:08:04
  Author: dreisner
Revision: 226315

upgpkg: kmod 19-1

- enable xz support (FS#42684)

Modified:
  kmod/trunk/PKGBUILD
Deleted:
  kmod/trunk/0001-static-nodes-indicate-that-creation-of-static-nodes-.patch

-----------------------------------------------------------------+
 0001-static-nodes-indicate-that-creation-of-static-nodes-.patch |   36 ----------
 PKGBUILD                                                        |   21 +----
 2 files changed, 7 insertions(+), 50 deletions(-)

Deleted: 0001-static-nodes-indicate-that-creation-of-static-nodes-.patch
===================================================================
--- 0001-static-nodes-indicate-that-creation-of-static-nodes-.patch	2014-11-16 13:29:05 UTC (rev 226314)
+++ 0001-static-nodes-indicate-that-creation-of-static-nodes-.patch	2014-11-16 15:08:04 UTC (rev 226315)
@@ -1,36 +0,0 @@
-From 27eceb2e4ecbf2e31940b67cee682a6935f61e6c Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg at jklm.no>
-Date: Mon, 27 Oct 2014 17:55:03 +0100
-Subject: [PATCH] static-nodes: indicate that creation of static nodes should
- only happen at boot
-
-udev will only manage static nodes that exist at the time udev is started, so
-creating static nodes later on will likely not behave as expected. In
-particular, recreating the static nodes at run-time will reset any permissions
-udev may have applied to the nodes at boot.
-
-See <https://bugzilla.redhat.com/show_bug.cgi?id=1147248> and the discussion
-following <http://permalink.gmane.org/gmane.comp.sysutils.systemd.devel/23795>.
-
-Note that this requires (the yet to be released) systemd v217 or a backport
-of systemd patch 8c94052ee543c3598a3c7b0c46688150aa2c6168.
----
- tools/static-nodes.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/static-nodes.c b/tools/static-nodes.c
-index d1e3b6e..8d2356d 100644
---- a/tools/static-nodes.c
-+++ b/tools/static-nodes.c
-@@ -96,7 +96,7 @@ static int write_tmpfiles(FILE *out, char modname[], char devname[], char type,
- 			return EXIT_FAILURE;
- 	}
- 
--	ret = fprintf(out, "%c /dev/%s 0600 - - - %u:%u\n",
-+	ret = fprintf(out, "%c! /dev/%s 0600 - - - %u:%u\n",
- 		      type, devname, maj, min);
- 	if (ret < 0)
- 		return EXIT_FAILURE;
--- 
-2.1.2
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-16 13:29:05 UTC (rev 226314)
+++ PKGBUILD	2014-11-16 15:08:04 UTC (rev 226315)
@@ -2,13 +2,13 @@
 # Maintainer: Dave Reisner <dreisner at archlinux.org>
 
 pkgname=kmod
-pkgver=18
-pkgrel=2
+pkgver=19
+pkgrel=1
 pkgdesc="Linux kernel module handling"
 arch=('i686' 'x86_64')
 url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
 license=('GPL2')
-depends=('glibc' 'zlib')
+depends=('glibc' 'zlib' 'xz')
 makedepends=('gtk-doc')
 options=('strip' 'debug')
 provides=('module-init-tools=3.16' 'libkmod.so')
@@ -15,19 +15,11 @@
 conflicts=('module-init-tools')
 replaces=('module-init-tools')
 source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
-        "depmod-search.conf"
-        0001-static-nodes-indicate-that-creation-of-static-nodes-.patch)
-md5sums=('82835c7f01983634e06ca72b4ee30cc6'
-         'dd62cbf62bd8f212f51ef8c43bec9a77'
-         'e9ffb25ec5759523875f0eb13c525bab')
+"depmod-search.conf")
+md5sums=('a08643f814aa4efc12211c6e5909f4d9'
+         'dd62cbf62bd8f212f51ef8c43bec9a77')
 
 
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np1 <../0001-static-nodes-indicate-that-creation-of-static-nodes-.patch
-}
-
 build() {
   cd "$pkgname-$pkgver"
 
@@ -34,6 +26,7 @@
   ./configure \
     --sysconfdir=/etc \
     --enable-gtk-doc \
+    --with-xz \
     --with-zlib
 
   make