[arch-commits] Commit in btrfs-progs/repos/testing-x86_64 (14 files)

Sébastien Luttringer seblu at archlinux.org
Wed Jan 23 14:29:00 UTC 2019


    Date: Wednesday, January 23, 2019 @ 14:28:59
  Author: seblu
Revision: 344622

archrelease: copy trunk to testing-x86_64

Added:
  btrfs-progs/repos/testing-x86_64/FS#58237.patch
    (from rev 344621, btrfs-progs/trunk/FS#58237.patch)
  btrfs-progs/repos/testing-x86_64/PKGBUILD
    (from rev 344621, btrfs-progs/trunk/PKGBUILD)
  btrfs-progs/repos/testing-x86_64/btrfs-progs.install
    (from rev 344621, btrfs-progs/trunk/btrfs-progs.install)
  btrfs-progs/repos/testing-x86_64/btrfs-scrub at .service
    (from rev 344621, btrfs-progs/trunk/btrfs-scrub at .service)
  btrfs-progs/repos/testing-x86_64/btrfs-scrub at .timer
    (from rev 344621, btrfs-progs/trunk/btrfs-scrub at .timer)
  btrfs-progs/repos/testing-x86_64/initcpio-hook-btrfs
    (from rev 344621, btrfs-progs/trunk/initcpio-hook-btrfs)
  btrfs-progs/repos/testing-x86_64/initcpio-install-btrfs
    (from rev 344621, btrfs-progs/trunk/initcpio-install-btrfs)
Deleted:
  btrfs-progs/repos/testing-x86_64/FS#58237.patch
  btrfs-progs/repos/testing-x86_64/PKGBUILD
  btrfs-progs/repos/testing-x86_64/btrfs-progs.install
  btrfs-progs/repos/testing-x86_64/btrfs-scrub at .service
  btrfs-progs/repos/testing-x86_64/btrfs-scrub at .timer
  btrfs-progs/repos/testing-x86_64/initcpio-hook-btrfs
  btrfs-progs/repos/testing-x86_64/initcpio-install-btrfs

------------------------+
 FS#58237.patch         |   32 ++++++------
 PKGBUILD               |  122 +++++++++++++++++++++++------------------------
 btrfs-progs.install    |   30 +++++------
 btrfs-scrub at .service   |   16 +++---
 btrfs-scrub at .timer     |   20 +++----
 initcpio-hook-btrfs    |   14 ++---
 initcpio-install-btrfs |   34 ++++++-------
 7 files changed, 134 insertions(+), 134 deletions(-)

Deleted: FS#58237.patch
===================================================================
--- FS#58237.patch	2019-01-23 14:28:43 UTC (rev 344621)
+++ FS#58237.patch	2019-01-23 14:28:59 UTC (rev 344622)
@@ -1,16 +0,0 @@
-diff --git a/utils.c b/utils.c
-index e9cb3a82f..f867e5a7f 100644
---- a/utils.c
-+++ b/utils.c
-@@ -2484,11 +2484,6 @@ const char *subvol_strip_mountpoint(const char *mnt, const char *full_path)
- 	if (!len)
- 		return full_path;
- 
--	if ((strncmp(mnt, full_path, len) != 0) || (full_path[len] != '/')) {
--		error("not on mount point: %s", mnt);
--		exit(1);
--	}
--
- 	if (mnt[len - 1] != '/')
- 		len += 1;
- 

Copied: btrfs-progs/repos/testing-x86_64/FS#58237.patch (from rev 344621, btrfs-progs/trunk/FS#58237.patch)
===================================================================
--- FS#58237.patch	                        (rev 0)
+++ FS#58237.patch	2019-01-23 14:28:59 UTC (rev 344622)
@@ -0,0 +1,16 @@
+diff --git a/utils.c b/utils.c
+index e9cb3a82f..f867e5a7f 100644
+--- a/utils.c
++++ b/utils.c
+@@ -2484,11 +2484,6 @@ const char *subvol_strip_mountpoint(const char *mnt, const char *full_path)
+ 	if (!len)
+ 		return full_path;
+ 
+-	if ((strncmp(mnt, full_path, len) != 0) || (full_path[len] != '/')) {
+-		error("not on mount point: %s", mnt);
+-		exit(1);
+-	}
+-
+ 	if (mnt[len - 1] != '/')
+ 		len += 1;
+ 

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-23 14:28:43 UTC (rev 344621)
+++ PKGBUILD	2019-01-23 14:28:59 UTC (rev 344622)
@@ -1,61 +0,0 @@
-# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
-# Contributor: Tom Gundersen <teg at jklm.no>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=btrfs-progs
-pkgver=4.20
-pkgrel=1
-pkgdesc='Btrfs filesystem utilities'
-arch=('x86_64')
-makedepends=('git' 'asciidoc' 'xmlto' 'systemd' 'python' 'python-setuptools')
-depends=('glibc' 'libutil-linux' 'e2fsprogs' 'lzo' 'zlib' 'zstd')
-optdepends=('python: libbtrfsutil python bindings')
-url='https://btrfs.wiki.kernel.org'
-replaces=('btrfs-progs-unstable')
-conflicts=('btrfs-progs-unstable')
-provides=('btrfs-progs-unstable')
-license=('GPL2')
-validpgpkeys=('F2B41200C54EFB30380C1756C565D5F9D76D583B')
-source=("https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar."{sign,xz}
-        'initcpio-install-btrfs'
-        'initcpio-hook-btrfs'
-        'btrfs-scrub at .service'
-        'btrfs-scrub at .timer')
-install=btrfs-progs.install
-options=(!staticlibs)
-md5sums=('SKIP'
-         '1aaf4f4a306358a0d8c9afd238933589'
-         '7241ba3a4286d08da0d50b7176941112'
-         'b09688a915a0ec8f40e2f5aacbabc9ad'
-         '917b31f4eb90448d6791e17ea0f386c7'
-         '502221c1b47a3bb2c06703d4fb90a0c2')
-
-build() {
-  cd $pkgname-v$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd $pkgname-v$pkgver
- ./btrfs filesystem show
-}
-
-package() {
-  cd $pkgname-v$pkgver
-  make DESTDIR="$pkgdir" install install_python
-
-  # install bash completion (FS#44618)
-  install -Dm644 btrfs-completion "$pkgdir/usr/share/bash-completion/completions/btrfs"
-
-  # install mkinitcpio hooks
-  cd "$srcdir"
-  install -Dm644 initcpio-install-btrfs "$pkgdir/usr/lib/initcpio/install/btrfs"
-  install -Dm644 initcpio-hook-btrfs "$pkgdir/usr/lib/initcpio/hooks/btrfs"
-
-  # install scrub service/timer
-  install -Dm644 btrfs-scrub at .service "$pkgdir/usr/lib/systemd/system/btrfs-scrub at .service"
-  install -Dm644 btrfs-scrub at .timer "$pkgdir/usr/lib/systemd/system/btrfs-scrub at .timer"
-}
-
-# vim:set ts=2 sw=2 ft=sh et:

Copied: btrfs-progs/repos/testing-x86_64/PKGBUILD (from rev 344621, btrfs-progs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-01-23 14:28:59 UTC (rev 344622)
@@ -0,0 +1,61 @@
+# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+# Contributor: Tom Gundersen <teg at jklm.no>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=btrfs-progs
+pkgver=4.20.1
+pkgrel=1
+pkgdesc='Btrfs filesystem utilities'
+arch=('x86_64')
+makedepends=('git' 'asciidoc' 'xmlto' 'systemd' 'python' 'python-setuptools')
+depends=('glibc' 'libutil-linux' 'e2fsprogs' 'lzo' 'zlib' 'zstd')
+optdepends=('python: libbtrfsutil python bindings')
+url='https://btrfs.wiki.kernel.org'
+replaces=('btrfs-progs-unstable')
+conflicts=('btrfs-progs-unstable')
+provides=('btrfs-progs-unstable')
+license=('GPL2')
+validpgpkeys=('F2B41200C54EFB30380C1756C565D5F9D76D583B')
+source=("https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$pkgver.tar."{sign,xz}
+        'initcpio-install-btrfs'
+        'initcpio-hook-btrfs'
+        'btrfs-scrub at .service'
+        'btrfs-scrub at .timer')
+install=btrfs-progs.install
+options=(!staticlibs)
+md5sums=('SKIP'
+         '9aa0a16236c7087ded08425c7256044f'
+         '7241ba3a4286d08da0d50b7176941112'
+         'b09688a915a0ec8f40e2f5aacbabc9ad'
+         '917b31f4eb90448d6791e17ea0f386c7'
+         '502221c1b47a3bb2c06703d4fb90a0c2')
+
+build() {
+  cd $pkgname-v$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd $pkgname-v$pkgver
+ ./btrfs filesystem show
+}
+
+package() {
+  cd $pkgname-v$pkgver
+  make DESTDIR="$pkgdir" install install_python
+
+  # install bash completion (FS#44618)
+  install -Dm644 btrfs-completion "$pkgdir/usr/share/bash-completion/completions/btrfs"
+
+  # install mkinitcpio hooks
+  cd "$srcdir"
+  install -Dm644 initcpio-install-btrfs "$pkgdir/usr/lib/initcpio/install/btrfs"
+  install -Dm644 initcpio-hook-btrfs "$pkgdir/usr/lib/initcpio/hooks/btrfs"
+
+  # install scrub service/timer
+  install -Dm644 btrfs-scrub at .service "$pkgdir/usr/lib/systemd/system/btrfs-scrub at .service"
+  install -Dm644 btrfs-scrub at .timer "$pkgdir/usr/lib/systemd/system/btrfs-scrub at .timer"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

Deleted: btrfs-progs.install
===================================================================
--- btrfs-progs.install	2019-01-23 14:28:43 UTC (rev 344621)
+++ btrfs-progs.install	2019-01-23 14:28:59 UTC (rev 344622)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  if (( "$(vercmp "$2" 0.19.20121005)" < 0 )); then
-    echo 'btrfs multi-device support now relies on linux 3.6 or later'
-  elif (( "$(vercmp "$2" 4.3.1-2)" < 0 )); then
-    echo 'btrfs-scrub at .timer instance names must not be prefix by dash anymore'
-    echo 'use btrfs-scrub at -.timer to scrub / monthly'
-    echo '    btrfs-scrub at home.timer to scrub /home monthly.'
-  fi
-}
-
-# vim:set ts=2 sw=2 et:

Copied: btrfs-progs/repos/testing-x86_64/btrfs-progs.install (from rev 344621, btrfs-progs/trunk/btrfs-progs.install)
===================================================================
--- btrfs-progs.install	                        (rev 0)
+++ btrfs-progs.install	2019-01-23 14:28:59 UTC (rev 344622)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  if (( "$(vercmp "$2" 0.19.20121005)" < 0 )); then
+    echo 'btrfs multi-device support now relies on linux 3.6 or later'
+  elif (( "$(vercmp "$2" 4.3.1-2)" < 0 )); then
+    echo 'btrfs-scrub at .timer instance names must not be prefix by dash anymore'
+    echo 'use btrfs-scrub at -.timer to scrub / monthly'
+    echo '    btrfs-scrub at home.timer to scrub /home monthly.'
+  fi
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: btrfs-scrub at .service
===================================================================
--- btrfs-scrub at .service	2019-01-23 14:28:43 UTC (rev 344621)
+++ btrfs-scrub at .service	2019-01-23 14:28:59 UTC (rev 344622)
@@ -1,8 +0,0 @@
-[Unit]
-Description=Btrfs scrub on %f
-
-[Service]
-Nice=19
-IOSchedulingClass=idle
-KillSignal=SIGINT
-ExecStart=/usr/bin/btrfs scrub start -B %f

Copied: btrfs-progs/repos/testing-x86_64/btrfs-scrub at .service (from rev 344621, btrfs-progs/trunk/btrfs-scrub at .service)
===================================================================
--- btrfs-scrub at .service	                        (rev 0)
+++ btrfs-scrub at .service	2019-01-23 14:28:59 UTC (rev 344622)
@@ -0,0 +1,8 @@
+[Unit]
+Description=Btrfs scrub on %f
+
+[Service]
+Nice=19
+IOSchedulingClass=idle
+KillSignal=SIGINT
+ExecStart=/usr/bin/btrfs scrub start -B %f

Deleted: btrfs-scrub at .timer
===================================================================
--- btrfs-scrub at .timer	2019-01-23 14:28:43 UTC (rev 344621)
+++ btrfs-scrub at .timer	2019-01-23 14:28:59 UTC (rev 344622)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Monthly Btrfs scrub on %f
-
-[Timer]
-OnCalendar=monthly
-AccuracySec=1d
-Persistent=true
-
-[Install]
-WantedBy=multi-user.target

Copied: btrfs-progs/repos/testing-x86_64/btrfs-scrub at .timer (from rev 344621, btrfs-progs/trunk/btrfs-scrub at .timer)
===================================================================
--- btrfs-scrub at .timer	                        (rev 0)
+++ btrfs-scrub at .timer	2019-01-23 14:28:59 UTC (rev 344622)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Monthly Btrfs scrub on %f
+
+[Timer]
+OnCalendar=monthly
+AccuracySec=1d
+Persistent=true
+
+[Install]
+WantedBy=multi-user.target

Deleted: initcpio-hook-btrfs
===================================================================
--- initcpio-hook-btrfs	2019-01-23 14:28:43 UTC (rev 344621)
+++ initcpio-hook-btrfs	2019-01-23 14:28:59 UTC (rev 344622)
@@ -1,7 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
-    btrfs device scan
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

Copied: btrfs-progs/repos/testing-x86_64/initcpio-hook-btrfs (from rev 344621, btrfs-progs/trunk/initcpio-hook-btrfs)
===================================================================
--- initcpio-hook-btrfs	                        (rev 0)
+++ initcpio-hook-btrfs	2019-01-23 14:28:59 UTC (rev 344622)
@@ -0,0 +1,7 @@
+#!/usr/bin/ash
+
+run_hook() {
+    btrfs device scan
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Deleted: initcpio-install-btrfs
===================================================================
--- initcpio-install-btrfs	2019-01-23 14:28:43 UTC (rev 344621)
+++ initcpio-install-btrfs	2019-01-23 14:28:59 UTC (rev 344622)
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module btrfs
-    add_binary btrfs
-    add_binary btrfsck
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook provides support for multi-device btrfs volumes. This hook
-is only needed for initramfs images which do not use udev.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

Copied: btrfs-progs/repos/testing-x86_64/initcpio-install-btrfs (from rev 344621, btrfs-progs/trunk/initcpio-install-btrfs)
===================================================================
--- initcpio-install-btrfs	                        (rev 0)
+++ initcpio-install-btrfs	2019-01-23 14:28:59 UTC (rev 344622)
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+build() {
+    add_module btrfs
+    add_binary btrfs
+    add_binary btrfsck
+    add_runscript
+}
+
+help() {
+    cat <<HELPEOF
+This hook provides support for multi-device btrfs volumes. This hook
+is only needed for initramfs images which do not use udev.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:



More information about the arch-commits mailing list