Date: Friday, August 10, 2018 @ 08:42:27
  Author: seblu
Revision: 331326

archrelease: copy trunk to testing-x86_64

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

------------------------+
 FS#58237.patch         |   16 ++++++++++++
 PKGBUILD               |   62 +++++++++++++++++++++++++++++++++++++++++++++++
 btrfs-progs.install    |   15 +++++++++++
 btrfs-scrub@.service   |    8 ++++++
 btrfs-scrub@.timer     |   10 +++++++
 initcpio-hook-btrfs    |    7 +++++
 initcpio-install-btrfs |   17 ++++++++++++
 7 files changed, 135 insertions(+)

Copied: btrfs-progs/repos/testing-x86_64/FS#58237.patch (from rev 331325, 
btrfs-progs/trunk/FS#58237.patch)
===================================================================
--- testing-x86_64/FS#58237.patch                               (rev 0)
+++ testing-x86_64/FS#58237.patch       2018-08-10 08:42:27 UTC (rev 331326)
@@ -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;
+ 

Copied: btrfs-progs/repos/testing-x86_64/PKGBUILD (from rev 331325, 
btrfs-progs/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD                             (rev 0)
+++ testing-x86_64/PKGBUILD     2018-08-10 08:42:27 UTC (rev 331326)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer <se...@archlinux.org>
+# Contributor: Tom Gundersen <t...@jklm.no>
+# Contributor: Tobias Powalowski <tp...@archlinux.org>
+
+pkgname=btrfs-progs
+pkgver=4.17.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@.service'
+        'btrfs-scrub@.timer')
+install=btrfs-progs.install
+options=(!staticlibs)
+md5sums=('SKIP'
+         '130be469ced99b01948af64b6a6312f6'
+         '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@.service 
"$pkgdir/usr/lib/systemd/system/btrfs-scrub@.service"
+  install -Dm644 btrfs-scrub@.timer 
"$pkgdir/usr/lib/systemd/system/btrfs-scrub@.timer"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

Copied: btrfs-progs/repos/testing-x86_64/btrfs-progs.install (from rev 331325, 
btrfs-progs/trunk/btrfs-progs.install)
===================================================================
--- testing-x86_64/btrfs-progs.install                          (rev 0)
+++ testing-x86_64/btrfs-progs.install  2018-08-10 08:42:27 UTC (rev 331326)
@@ -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@.timer instance names must not be prefix by dash anymore'
+    echo 'use btrfs-scrub@-.timer to scrub / monthly'
+    echo '    btrfs-scrub@home.timer to scrub /home monthly.'
+  fi
+}
+
+# vim:set ts=2 sw=2 et:

Copied: btrfs-progs/repos/testing-x86_64/btrfs-scrub@.service (from rev 331325, 
btrfs-progs/trunk/btrfs-scrub@.service)
===================================================================
--- testing-x86_64/btrfs-scrub@.service                         (rev 0)
+++ testing-x86_64/btrfs-scrub@.service 2018-08-10 08:42:27 UTC (rev 331326)
@@ -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

Copied: btrfs-progs/repos/testing-x86_64/btrfs-scrub@.timer (from rev 331325, 
btrfs-progs/trunk/btrfs-scrub@.timer)
===================================================================
--- testing-x86_64/btrfs-scrub@.timer                           (rev 0)
+++ testing-x86_64/btrfs-scrub@.timer   2018-08-10 08:42:27 UTC (rev 331326)
@@ -0,0 +1,10 @@
+[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/initcpio-hook-btrfs (from rev 331325, 
btrfs-progs/trunk/initcpio-hook-btrfs)
===================================================================
--- testing-x86_64/initcpio-hook-btrfs                          (rev 0)
+++ testing-x86_64/initcpio-hook-btrfs  2018-08-10 08:42:27 UTC (rev 331326)
@@ -0,0 +1,7 @@
+#!/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-install-btrfs (from rev 
331325, btrfs-progs/trunk/initcpio-install-btrfs)
===================================================================
--- testing-x86_64/initcpio-install-btrfs                               (rev 0)
+++ testing-x86_64/initcpio-install-btrfs       2018-08-10 08:42:27 UTC (rev 
331326)
@@ -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:

Reply via email to