[arch-commits] Commit in lib32-systemd/trunk (PKGBUILD use-split-usr-path.patch)

[Laurent Carlier]

Date: Monday, July 29, 2013 @ 18:02:34
  Author: lcarlier
Revision: 94720

upgpkg: lib32-systemd 206-1

Sync with testing

Modified:
  lib32-systemd/trunk/PKGBUILD
Deleted:
  lib32-systemd/trunk/use-split-usr-path.patch

--+
 PKGBUILD |   16 +++-
 use-split-usr-path.patch |   14 --
 2 files changed, 3 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-29 13:10:04 UTC (rev 94719)
+++ PKGBUILD2013-07-29 16:02:34 UTC (rev 94720)
@@ -4,7 +4,7 @@
 
 pkgname=lib32-systemd
 _pkgbasename=systemd
-pkgver=204
+pkgver=206
 pkgrel=1
 pkgdesc=system and service manager (32-bit)
 arch=('x86_64')
@@ -13,18 +13,9 @@
 makedepends=('lib32-gcc-libs' 'gcc-multilib' 'lib32-dbus-core' 'lib32-libcap' 
'lib32-acl' 
  'lib32-libgcrypt' 'lib32-glib2' 'lib32-xz' 'intltool' 'gperf')
 options=('!libtool')
-source=(http://www.freedesktop.org/software/$_pkgbasename/$_pkgbasename-$pkgver.tar.xz;
-use-split-usr-path.patch)
-md5sums=('a07619bb19f48164fbf0761d12fd39a8'
- '76bf83fe34c5b40533abc5dc940576a6')
+source=(http://www.freedesktop.org/software/$_pkgbasename/$_pkgbasename-$pkgver.tar.xz;)
+md5sums=('89e36f2d3ba963020b72738549954cbc')
 
-prepare() {
-  cd ${srcdir}/systemd-${pkgver}
-
-  # hang onto this until we do the /{,s}bin merge
-  patch -Np1 $srcdir/use-split-usr-path.patch
-}
-
 build() {
   export CC=gcc -m32
   export CXX=g++ -m32
@@ -33,7 +24,6 @@
   cd ${srcdir}/systemd-${pkgver}
 
   ./configure \
---enable-static \
 --libexecdir=/usr/lib32 \
 --libdir=/usr/lib32 \
 --localstatedir=/var \

Deleted: use-split-usr-path.patch
===
--- use-split-usr-path.patch2013-07-29 13:10:04 UTC (rev 94719)
+++ use-split-usr-path.patch2013-07-29 16:02:34 UTC (rev 94720)
@@ -1,14 +0,0 @@
 a/src/core/main.c  2012-09-20 23:02:54.0 -0400
-+++ b/src/core/main.c  2012-09-20 23:03:13.0 -0400
-@@ -1487,11 +1487,7 @@ int main(int argc, char *argv[]) {
- 
- /* Set up PATH unless it is already set */
- setenv(PATH,
--#ifdef HAVE_SPLIT_USR
-/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin,
--#else
--   /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin,
--#endif
-arg_running_as == SYSTEMD_SYSTEM);
- 
- if (arg_running_as == SYSTEMD_SYSTEM) {

[arch-commits] Commit in lib32-systemd/trunk (PKGBUILD use-split-usr-path.patch)

[Laurent Carlier]

Date: Thursday, March 28, 2013 @ 17:10:53
  Author: lcarlier
Revision: 87211

upgpkg: lib32-systemd 199-1

Sync with testing

Added:
  lib32-systemd/trunk/use-split-usr-path.patch
Modified:
  lib32-systemd/trunk/PKGBUILD

--+
 PKGBUILD |   64 -
 use-split-usr-path.patch |   14 +
 2 files changed, 49 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-28 16:08:29 UTC (rev 87210)
+++ PKGBUILD2013-03-28 16:10:53 UTC (rev 87211)
@@ -4,7 +4,7 @@
 
 pkgname=lib32-systemd
 _pkgbasename=systemd
-pkgver=198
+pkgver=199
 pkgrel=1
 pkgdesc=system and service manager (32-bit)
 arch=('x86_64')
@@ -13,42 +13,48 @@
 makedepends=('lib32-gcc-libs' 'gcc-multilib' 'lib32-dbus-core' 'lib32-libcap' 
'lib32-acl' 
  'lib32-libgcrypt' 'lib32-glib2' 'lib32-xz' 'intltool' 'gperf')
 options=('!libtool')
-source=(http://www.freedesktop.org/software/$_pkgbasename/$_pkgbasename-$pkgver.tar.xz;)
-md5sums=('26a75e2a310f8c1c1ea9ec26ddb171c5')
+source=(http://www.freedesktop.org/software/$_pkgbasename/$_pkgbasename-$pkgver.tar.xz;
+use-split-usr-path.patch)
+md5sums=('4bb13f84ce211e93f0141774a90a2322')
 
 build() {
-export CC=gcc -m32
-export CXX=g++ -m32
-export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
+  export CC=gcc -m32
+  export CXX=g++ -m32
+  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
 
-cd ${srcdir}/systemd-${pkgver}
+  cd ${srcdir}/systemd-${pkgver}
 
-./configure \
-  --enable-static \
-  --libexecdir=/usr/lib32 \
-  --libdir=/usr/lib32 \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --disable-audit \
-  --disable-ima \
-  --disable-pam \
-  --disable-kmod \
-  --disable-blkid \
-  --without-python \
-  --disable-libcryptsetup \
-  --with-sysvinit-path= \
-  --with-sysvrcnd-path=
+  # hang onto this until we do the /{,s}bin merge
+  patch -Np1 $srcdir/use-split-usr-path.patch
 
-make
+  ./configure \
+--enable-static \
+--libexecdir=/usr/lib32 \
+--libdir=/usr/lib32 \
+--localstatedir=/var \
+--sysconfdir=/etc \
+--disable-audit \
+--disable-ima \
+--disable-pam \
+--disable-kmod \
+--disable-blkid \
+--without-python \
+--disable-libcryptsetup \
+--with-sysvinit-path= \
+--with-sysvrcnd-path=
+
+  make
 }
 
 package() {
-depends=('lib32-glib2' 'lib32-libgcrypt' 'lib32-xz' 'systemd')
-cd ${srcdir}/systemd-${pkgver}
+  depends=('lib32-glib2' 'lib32-libgcrypt' 'lib32-xz' 'systemd')
+  cd ${srcdir}/systemd-${pkgver}
 
-make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir install
 
-rm -rf ${pkgdir}/{etc,var}
-rm -rf ${pkgdir}/usr/{bin,include,lib,share}
-rm -rf ${pkgdir}/usr/lib32/libnss*
+  rm -rf ${pkgdir}/{etc,var}
+  rm -rf ${pkgdir}/usr/{bin,include,lib,share}
+  rm -rf ${pkgdir}/usr/lib32/libnss*
 }
+md5sums=('4bb13f84ce211e93f0141774a90a2322'
+ '76bf83fe34c5b40533abc5dc940576a6')

Added: use-split-usr-path.patch
===
--- use-split-usr-path.patch(rev 0)
+++ use-split-usr-path.patch2013-03-28 16:10:53 UTC (rev 87211)
@@ -0,0 +1,14 @@
+--- a/src/core/main.c  2012-09-20 23:02:54.0 -0400
 b/src/core/main.c  2012-09-20 23:03:13.0 -0400
+@@ -1487,11 +1487,7 @@ int main(int argc, char *argv[]) {
+ 
+ /* Set up PATH unless it is already set */
+ setenv(PATH,
+-#ifdef HAVE_SPLIT_USR
+/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin,
+-#else
+-   /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin,
+-#endif
+arg_running_as == SYSTEMD_SYSTEM);
+ 
+ if (arg_running_as == SYSTEMD_SYSTEM) {