[arch-commits] Commit in rsync/trunk (PKGBUILD)

[Christian Hesse]

    Date: Wednesday, January 15, 2020 @ 20:04:39
  Author: eworm
Revision: 373527

fix build on btrfs

Modified:
  rsync/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-15 18:32:18 UTC (rev 373526)
+++ PKGBUILD	2020-01-15 20:04:39 UTC (rev 373527)
@@ -11,6 +11,7 @@
 install=rsync.install
 validpgpkeys=('0048C8B026D4C96F0E589C2F6C859FB14B96A8C5') # Wayne Davison <wayned at users.sourceforge.net>
 source=("https://rsync.samba.org/ftp/rsync/src/$pkgname-$pkgver.tar.gz"{,.asc}
+        '0001-avoid-a-failed-test-if-dirs-report-1-hlink.patch'
         'rsyncd.conf'
         'rsync.xinetd'
         'rsyncd.service'
@@ -18,6 +19,7 @@
         'rsyncd at .service')
 sha256sums=('55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0'
             'SKIP'
+            'efd0a969820ed23167dd3cd39114a5135b19eaaf1c0efc87b46a53d097a82405'
             '733ccb571721433c3a6262c58b658253ca6553bec79c2bdd0011810bb4f2156b'
             'da0ec9ce07bf2edafbc8e44020da29a58038b00c3048a22de57017c56318a767'
             '6ad010a1f85f5637bdd0972403c032ca30d71608a36943c71c34ba1c5b463cd6'
@@ -24,6 +26,12 @@
             '551f17407de0e539c8419fc2cd48dd0124eb0253a186690b165b51703ffad1a5'
             '21983037aa116943b89ec982bc88e02c12376763e46f5ab25944cc1da29235ae')
 
+prepare() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	patch -Np1 < ../0001-avoid-a-failed-test-if-dirs-report-1-hlink.patch
+}
+
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
@@ -38,12 +46,6 @@
 check() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	# rsync fails with xattr on btrfs...
-	if [ "$(stat --file-system --printf=%T .)" = "btrfs" ]; then
-		echo "Test is known to fail on btrfs..." >&2
-		exit 1
-	fi
-
 	make test
 }