[arch-commits] Commit in devtools/trunk (2 files)
Evangelos Foutras
foutrelis at archlinux.org
Thu Apr 27 04:35:55 UTC 2017
Date: Thursday, April 27, 2017 @ 04:35:54
Author: foutrelis
Revision: 294877
upgpkg: devtools 20170320-2
Unbreak 'makechrootpkg -T' (FS#53513).
Added:
devtools/trunk/0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch
Modified:
devtools/trunk/PKGBUILD
-----------------------------------------------------------------+
0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch | 27 ++++++++++
PKGBUILD | 13 +++-
2 files changed, 37 insertions(+), 3 deletions(-)
Added: 0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch
===================================================================
--- 0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch (rev 0)
+++ 0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch 2017-04-27 04:35:54 UTC (rev 294877)
@@ -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
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-04-27 04:25:58 UTC (rev 294876)
+++ PKGBUILD 2017-04-27 04:35:54 UTC (rev 294877)
@@ -3,13 +3,14 @@
pkgname=devtools
pkgver=20170320
-pkgrel=1
+pkgrel=2
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})
+source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+ '0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch')
validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'
'4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC'
'86CFFCA918CF3AF47147588051E8B148A9999C34'
@@ -16,8 +17,14 @@
'8FC15A064950A99DD1BD14DD39E4B877E62EB915'
'8218F88849AAC522E94CF470A5E9288C4FA415FA')
md5sums=('e401f4e3d1074b80060390b9812766f1'
- 'SKIP')
+ 'SKIP'
+ '678ec14b148dbe88cbac92a1cefa57d5')
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ patch -Np1 -i ../0001-makechrootpkg-Delete-chroot-subvols-recursively-when.patch
+}
+
build() {
cd "${pkgname}-${pkgver}"
make PREFIX=/usr
More information about the arch-commits
mailing list