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

[Bartłomiej Piotrowski]

    Date: Friday, March 29, 2013 @ 18:31:45
  Author: bpiotrowski
Revision: 181007

upgpkg: systemd 200-1

Modified:
  systemd/trunk/PKGBUILD
Deleted:
  systemd/trunk/0001-build-sys-fix-HAVE-ENABLE_FIRMWARE.patch

-----------------------------------------------+
 0001-build-sys-fix-HAVE-ENABLE_FIRMWARE.patch |  102 ------------------------
 PKGBUILD                                      |   11 --
 2 files changed, 3 insertions(+), 110 deletions(-)

Deleted: 0001-build-sys-fix-HAVE-ENABLE_FIRMWARE.patch
===================================================================
--- 0001-build-sys-fix-HAVE-ENABLE_FIRMWARE.patch	2013-03-29 15:52:14 UTC (rev 181006)
+++ 0001-build-sys-fix-HAVE-ENABLE_FIRMWARE.patch	2013-03-29 17:31:45 UTC (rev 181007)
@@ -1,102 +0,0 @@
-From d8d4bee76cf3b40ea923bc57d44aa0815ca9b5ff Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay at vrfy.org>
-Date: Thu, 28 Mar 2013 15:28:10 +0100
-Subject: [PATCH] build-sys: fix HAVE/ENABLE_FIRMWARE
-
-https://bugs.freedesktop.org/show_bug.cgi?id=62864
----
- configure.ac            | 2 +-
- src/udev/udev-builtin.c | 2 +-
- src/udev/udev.h         | 4 ++--
- src/udev/udevd.c        | 6 +++---
- 4 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5b88bcf..e73cd5c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -728,6 +728,7 @@ for i in $with_firmware_path; do
- done
- IFS=$OLD_IFS
- AC_SUBST(FIRMWARE_PATH)
-+AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is available]) ])
- AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"])
- 
- # ------------------------------------------------------------------------------
-@@ -736,7 +737,6 @@ AC_ARG_ENABLE([gudev],
-        [], [enable_gudev=yes])
- AS_IF([test "x$enable_gudev" = "xyes"], [ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 gio-2.0]) ])
- AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"])
--
- AS_IF([test "x$enable_gudev" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ])
- 
- # ------------------------------------------------------------------------------
-diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
-index 13922d3..c7d4319 100644
---- a/src/udev/udev-builtin.c
-+++ b/src/udev/udev-builtin.c
-@@ -34,7 +34,7 @@ static const struct udev_builtin *builtins[] = {
-         [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
- #endif
-         [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
--#ifdef ENABLE_FIRMWARE
-+#ifdef HAVE_FIRMWARE
-         [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
- #endif
-         [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
-diff --git a/src/udev/udev.h b/src/udev/udev.h
-index aa2edbe..906dfba 100644
---- a/src/udev/udev.h
-+++ b/src/udev/udev.h
-@@ -140,7 +140,7 @@ enum udev_builtin_cmd {
-         UDEV_BUILTIN_BLKID,
- #endif
-         UDEV_BUILTIN_BTRFS,
--#ifdef ENABLE_FIRMWARE
-+#ifdef HAVE_FIRMWARE
-         UDEV_BUILTIN_FIRMWARE,
- #endif
-         UDEV_BUILTIN_HWDB,
-@@ -169,7 +169,7 @@ struct udev_builtin {
- extern const struct udev_builtin udev_builtin_blkid;
- #endif
- extern const struct udev_builtin udev_builtin_btrfs;
--#ifdef ENABLE_FIRMWARE
-+#ifdef HAVE_FIRMWARE
- extern const struct udev_builtin udev_builtin_firmware;
- #endif
- extern const struct udev_builtin udev_builtin_hwdb;
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index b30bedf..2ad7388 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -98,7 +98,7 @@ struct event {
-         dev_t devnum;
-         int ifindex;
-         bool is_block;
--#ifdef ENABLE_FIRMWARE
-+#ifdef HAVE_FIRMWARE
-         bool nodelay;
- #endif
- };
-@@ -444,7 +444,7 @@ static int event_queue_insert(struct udev_device *dev)
-         event->devnum = udev_device_get_devnum(dev);
-         event->is_block = streq("block", udev_device_get_subsystem(dev));
-         event->ifindex = udev_device_get_ifindex(dev);
--#ifdef ENABLE_FIRMWARE
-+#ifdef HAVE_FIRMWARE
-         if (streq(udev_device_get_subsystem(dev), "firmware"))
-                 event->nodelay = true;
- #endif
-@@ -527,7 +527,7 @@ static bool is_devpath_busy(struct event *event)
-                         return true;
-                 }
- 
--#ifdef ENABLE_FIRMWARE
-+#ifdef HAVE_FIRMWARE
-                 /* allow to bypass the dependency tracking */
-                 if (event->nodelay)
-                         continue;
--- 
-1.8.2
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-29 15:52:14 UTC (rev 181006)
+++ PKGBUILD	2013-03-29 17:31:45 UTC (rev 181007)
@@ -3,8 +3,8 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=199
-pkgrel=2
+pkgver=200
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -16,13 +16,11 @@
         'initcpio-hook-udev'
         'initcpio-install-udev'
         'initcpio-install-timestamp'
-        '0001-build-sys-fix-HAVE-ENABLE_FIRMWARE.patch'
         'use-split-usr-path.patch')
-md5sums=('4bb13f84ce211e93f0141774a90a2322'
+md5sums=('5584b96e55c46217dab4c1768d10a472'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          'fb37e34ea006c79be1c54cbb0f803414'
          'df69615503ad293c9ddf9d8b7755282d'
-         'dea26041451c8963d9cb1e1bf6dd4985'
          '76bf83fe34c5b40533abc5dc940576a6')
 
 build() {
@@ -31,9 +29,6 @@
   # hang onto this until we do the /{,s}bin merge
   patch -Np1 <"$srcdir/use-split-usr-path.patch"
 
-  # upstream commit d8d4bee76cf3b40ea923bc57d44aa0815ca9b5ff
-  patch -Np1 <"$srcdir/0001-build-sys-fix-HAVE-ENABLE_FIRMWARE.patch"
-
   ./configure \
       --enable-static \
       --libexecdir=/usr/lib \