[arch-commits] Commit in devtools/repos (4 files)

[Bartłomiej Piotrowski]

    Date: Tuesday, July 4, 2017 @ 10:14:14
  Author: bpiotrowski
Revision: 299661

archrelease: copy trunk to staging-any

Added:
  devtools/repos/staging-any/
  devtools/repos/staging-any/0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch
    (from rev 299660, devtools/trunk/0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch)
  devtools/repos/staging-any/0002-Sync-makepkg.conf-files-with-pacman-5.0.2-2.patch
    (from rev 299660, devtools/trunk/0002-Sync-makepkg.conf-files-with-pacman-5.0.2-2.patch)
  devtools/repos/staging-any/PKGBUILD
    (from rev 299660, devtools/trunk/PKGBUILD)

-----------------------------------------------------------------+
 0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch |   27 +++++
 0002-Sync-makepkg.conf-files-with-pacman-5.0.2-2.patch          |   47 ++++++++++
 PKGBUILD                                                        |   39 ++++++++
 3 files changed, 113 insertions(+)

Copied: devtools/repos/staging-any/0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch (from rev 299660, devtools/trunk/0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch)
===================================================================
--- staging-any/0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch	                        (rev 0)
+++ staging-any/0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch	2017-07-04 10:14:14 UTC (rev 299661)
@@ -0,0 +1,27 @@
+From a1f8ac9c70494009554c08c1036351cb2b374828 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sun, 9 Apr 2017 02:36:01 +0200
+Subject: [PATCH] makechrootpkg: Delete chroot subvols recursively when using
+ -T
+
+I overlooked this one. Fixes FS#53513.
+---
+ makechrootpkg.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/makechrootpkg.in b/makechrootpkg.in
+index f6764cb..20a1f50 100644
+--- a/makechrootpkg.in
++++ b/makechrootpkg.in
+@@ -143,7 +143,7 @@ delete_chroot() {
+ 
+ 	stat_busy "Removing chroot copy [%s]" "$copy"
+ 	if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then
+-		btrfs subvolume delete "$copydir" >/dev/null ||
++		subvolume_delete_recursive "$copydir" ||
+ 			die "Unable to delete subvolume %s" "$copydir"
+ 	else
+ 		# avoid change of filesystem in case of an umount failure
+-- 
+2.12.2
+

Copied: devtools/repos/staging-any/0002-Sync-makepkg.conf-files-with-pacman-5.0.2-2.patch (from rev 299660, devtools/trunk/0002-Sync-makepkg.conf-files-with-pacman-5.0.2-2.patch)
===================================================================
--- staging-any/0002-Sync-makepkg.conf-files-with-pacman-5.0.2-2.patch	                        (rev 0)
+++ staging-any/0002-Sync-makepkg.conf-files-with-pacman-5.0.2-2.patch	2017-07-04 10:14:14 UTC (rev 299661)
@@ -0,0 +1,47 @@
+From c9b1fc08b5f63c9f6bb1a992431c661129ab2db1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b at bpiotrowski.pl>
+Date: Tue, 4 Jul 2017 12:04:51 +0200
+Subject: [PATCH] Sync makepkg.conf files with pacman 5.0.2-2
+
+---
+ makepkg-i686.conf   | 6 +++---
+ makepkg-x86_64.conf | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/makepkg-i686.conf b/makepkg-i686.conf
+index c565795..e57988f 100644
+--- a/makepkg-i686.conf
++++ b/makepkg-i686.conf
+@@ -37,9 +37,9 @@ CHOST="i686-pc-linux-gnu"
+ # -march (or -mcpu) builds exclusively for an architecture
+ # -mtune optimizes for an architecture, but builds for whole processor family
+ CPPFLAGS="-D_FORTIFY_SOURCE=2"
+-CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"
+-CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"
+-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
++CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
++CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
++LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
+ #-- Make Flags: change this for DistCC/SMP systems
+ #MAKEFLAGS="-j2"
+ #-- Debugging flags
+diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf
+index 058da9b..7aa192e 100644
+--- a/makepkg-x86_64.conf
++++ b/makepkg-x86_64.conf
+@@ -37,9 +37,9 @@ CHOST="x86_64-pc-linux-gnu"
+ # -march (or -mcpu) builds exclusively for an architecture
+ # -mtune optimizes for an architecture, but builds for whole processor family
+ CPPFLAGS="-D_FORTIFY_SOURCE=2"
+-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"
+-CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"
+-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
++CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
++CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
++LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
+ #-- Make Flags: change this for DistCC/SMP systems
+ #MAKEFLAGS="-j2"
+ #-- Debugging flags
+-- 
+2.13.2
+

Copied: devtools/repos/staging-any/PKGBUILD (from rev 299660, devtools/trunk/PKGBUILD)
===================================================================
--- staging-any/PKGBUILD	                        (rev 0)
+++ staging-any/PKGBUILD	2017-07-04 10:14:14 UTC (rev 299661)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=devtools
+pkgver=20170320
+pkgrel=3
+pkgdesc='Tools for Arch Linux package maintainers'
+arch=('any')
+license=('GPL')
+url='http://projects.archlinux.org/devtools.git/'
+depends=('namcap' 'openssh' 'subversion' 'rsync' 'arch-install-scripts')
+source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+        '0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch'
+        '0002-Sync-makepkg.conf-files-with-pacman-5.0.2-2.patch')
+validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'
+              '4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC'
+              '86CFFCA918CF3AF47147588051E8B148A9999C34'
+              '8FC15A064950A99DD1BD14DD39E4B877E62EB915'
+              '8218F88849AAC522E94CF470A5E9288C4FA415FA')
+md5sums=('e401f4e3d1074b80060390b9812766f1'
+         'SKIP'
+         '678ec14b148dbe88cbac92a1cefa57d5'
+         'a5b4e14d9870cfcf0f841b438ee0d8cc')
+
+prepare() {
+	cd "${pkgname}-${pkgver}"
+	patch -Np1 -i ../0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch
+	patch -Np1 -i ../0002-Sync-makepkg.conf-files-with-pacman-5.0.2-2.patch
+}
+
+build() {
+	cd "${pkgname}-${pkgver}"
+	make PREFIX=/usr
+}
+
+package() {
+	cd "${pkgname}-${pkgver}"
+	make PREFIX=/usr DESTDIR=${pkgdir} install
+}