Date: Friday, November 1, 2019 @ 13:37:10 Author: foutrelis Revision: 366362
archrelease: copy trunk to staging-x86_64 Added: btrfs-progs/repos/staging-x86_64/PKGBUILD (from rev 366361, btrfs-progs/trunk/PKGBUILD) btrfs-progs/repos/staging-x86_64/btrfs-progs.install (from rev 366361, btrfs-progs/trunk/btrfs-progs.install) btrfs-progs/repos/staging-x86_64/btrfs-scrub@.service (from rev 366361, btrfs-progs/trunk/btrfs-scrub@.service) btrfs-progs/repos/staging-x86_64/btrfs-scrub@.timer (from rev 366361, btrfs-progs/trunk/btrfs-scrub@.timer) btrfs-progs/repos/staging-x86_64/initcpio-hook-btrfs (from rev 366361, btrfs-progs/trunk/initcpio-hook-btrfs) btrfs-progs/repos/staging-x86_64/initcpio-install-btrfs (from rev 366361, btrfs-progs/trunk/initcpio-install-btrfs) Deleted: btrfs-progs/repos/staging-x86_64/PKGBUILD btrfs-progs/repos/staging-x86_64/btrfs-progs.install btrfs-progs/repos/staging-x86_64/btrfs-scrub@.service btrfs-progs/repos/staging-x86_64/btrfs-scrub@.timer btrfs-progs/repos/staging-x86_64/initcpio-hook-btrfs btrfs-progs/repos/staging-x86_64/initcpio-install-btrfs ------------------------+ PKGBUILD | 148 +++++++++++++++++++++++------------------------ btrfs-progs.install | 30 ++++----- btrfs-scrub@.service | 16 ++--- btrfs-scrub@.timer | 22 +++--- initcpio-hook-btrfs | 14 ++-- initcpio-install-btrfs | 34 +++++----- 6 files changed, 132 insertions(+), 132 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-11-01 13:37:02 UTC (rev 366361) +++ PKGBUILD 2019-11-01 13:37:10 UTC (rev 366362) @@ -1,74 +0,0 @@ -# Maintainer: Sébastien "Seblu" Luttringer <se...@archlinux.org> -# Contributor: Tom Gundersen <t...@jklm.no> -# Contributor: Tobias Powalowski <tp...@archlinux.org> - -pkgname=btrfs-progs -pkgver=5.3.1 -pkgrel=2 -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) -sha224sums=('SKIP' - '8deb6a6cc4bc7239ecc92d109be8e571fa3b13bbccb427360c1decc6' - '9a20f841f572d97eaecaa25f5641eee143bc4c5ded79198b15d6691d' - '650621f98192cc9c8cc4ecfdcf560db88011dbc07c5df1d7bdae0ae2' - 'c1477fc473324a7f3057f3e5e258b6462d596d1447fad8651ccb872c' - '1425cb4ded552dc69048f46147ecf5d3b8879e65ec0893d0dca149a2') - -prepare() { - cd $pkgname-v$pkgver - # apply patch from the source array (should be a pacman feature) - local src - for src in "${source[@]}"; do - src="${src%%::*}" - src="${src##*/}" - [[ $src = *.patch ]] || continue - msg2 "Applying patch $src..." - patch -Np1 < "../$src" - done -} - -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/staging-x86_64/PKGBUILD (from rev 366361, btrfs-progs/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-11-01 13:37:10 UTC (rev 366362) @@ -0,0 +1,74 @@ +# Maintainer: Sébastien "Seblu" Luttringer <se...@archlinux.org> +# Contributor: Tom Gundersen <t...@jklm.no> +# Contributor: Tobias Powalowski <tp...@archlinux.org> + +pkgname=btrfs-progs +pkgver=5.3.1 +pkgrel=3 +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) +sha224sums=('SKIP' + '8deb6a6cc4bc7239ecc92d109be8e571fa3b13bbccb427360c1decc6' + '9a20f841f572d97eaecaa25f5641eee143bc4c5ded79198b15d6691d' + '650621f98192cc9c8cc4ecfdcf560db88011dbc07c5df1d7bdae0ae2' + 'c1477fc473324a7f3057f3e5e258b6462d596d1447fad8651ccb872c' + '1425cb4ded552dc69048f46147ecf5d3b8879e65ec0893d0dca149a2') + +prepare() { + cd $pkgname-v$pkgver + # apply patch from the source array (should be a pacman feature) + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + [[ $src = *.patch ]] || continue + msg2 "Applying patch $src..." + patch -Np1 < "../$src" + done +} + +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: Deleted: btrfs-progs.install =================================================================== --- btrfs-progs.install 2019-11-01 13:37:02 UTC (rev 366361) +++ btrfs-progs.install 2019-11-01 13:37:10 UTC (rev 366362) @@ -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@.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/staging-x86_64/btrfs-progs.install (from rev 366361, btrfs-progs/trunk/btrfs-progs.install) =================================================================== --- btrfs-progs.install (rev 0) +++ btrfs-progs.install 2019-11-01 13:37:10 UTC (rev 366362) @@ -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: Deleted: btrfs-scrub@.service =================================================================== --- btrfs-scrub@.service 2019-11-01 13:37:02 UTC (rev 366361) +++ btrfs-scrub@.service 2019-11-01 13:37:10 UTC (rev 366362) @@ -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/staging-x86_64/btrfs-scrub@.service (from rev 366361, btrfs-progs/trunk/btrfs-scrub@.service) =================================================================== --- btrfs-scrub@.service (rev 0) +++ btrfs-scrub@.service 2019-11-01 13:37:10 UTC (rev 366362) @@ -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@.timer =================================================================== --- btrfs-scrub@.timer 2019-11-01 13:37:02 UTC (rev 366361) +++ btrfs-scrub@.timer 2019-11-01 13:37:10 UTC (rev 366362) @@ -1,11 +0,0 @@ -[Unit] -Description=Monthly Btrfs scrub on %f - -[Timer] -OnCalendar=monthly -AccuracySec=1d -RandomizedDelaySec=1w -Persistent=true - -[Install] -WantedBy=multi-user.target Copied: btrfs-progs/repos/staging-x86_64/btrfs-scrub@.timer (from rev 366361, btrfs-progs/trunk/btrfs-scrub@.timer) =================================================================== --- btrfs-scrub@.timer (rev 0) +++ btrfs-scrub@.timer 2019-11-01 13:37:10 UTC (rev 366362) @@ -0,0 +1,11 @@ +[Unit] +Description=Monthly Btrfs scrub on %f + +[Timer] +OnCalendar=monthly +AccuracySec=1d +RandomizedDelaySec=1w +Persistent=true + +[Install] +WantedBy=multi-user.target Deleted: initcpio-hook-btrfs =================================================================== --- initcpio-hook-btrfs 2019-11-01 13:37:02 UTC (rev 366361) +++ initcpio-hook-btrfs 2019-11-01 13:37:10 UTC (rev 366362) @@ -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/staging-x86_64/initcpio-hook-btrfs (from rev 366361, btrfs-progs/trunk/initcpio-hook-btrfs) =================================================================== --- initcpio-hook-btrfs (rev 0) +++ initcpio-hook-btrfs 2019-11-01 13:37:10 UTC (rev 366362) @@ -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-11-01 13:37:02 UTC (rev 366361) +++ initcpio-install-btrfs 2019-11-01 13:37:10 UTC (rev 366362) @@ -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/staging-x86_64/initcpio-install-btrfs (from rev 366361, btrfs-progs/trunk/initcpio-install-btrfs) =================================================================== --- initcpio-install-btrfs (rev 0) +++ initcpio-install-btrfs 2019-11-01 13:37:10 UTC (rev 366362) @@ -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: