[arch-commits] Commit in btrfs-progs/trunk (3 files)
Date: Tuesday, November 24, 2015 @ 14:21:39
Author: seblu
Revision: 251938
upgpkg: btrfs-progs 4.3.1-2
Modified:
btrfs-progs/trunk/PKGBUILD
btrfs-progs/trunk/btrfs-progs.install
btrfs-progs/trunk/btrfs-scrub@.service
--+
PKGBUILD |4 ++--
btrfs-progs.install | 10 --
btrfs-scrub@.service |4 ++--
3 files changed, 12 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-11-24 12:47:39 UTC (rev 251937)
+++ PKGBUILD2015-11-24 13:21:39 UTC (rev 251938)
@@ -5,7 +5,7 @@
pkgname=btrfs-progs
pkgver=4.3.1
-pkgrel=1
+pkgrel=2
pkgdesc='Btrfs filesystem utilities'
arch=('i686' 'x86_64')
depends=('glibc' 'libutil-linux' 'e2fsprogs' 'lzo' 'zlib')
@@ -25,7 +25,7 @@
md5sums=('SKIP'
'7241ba3a4286d08da0d50b7176941112'
'b09688a915a0ec8f40e2f5aacbabc9ad'
- '6988ee82cc06d8639faf16fd2d9e0bc2'
+ '794b867e09451284c545bae112aa0cfd'
'a290e0ab88b7b4675cd20f5a2befc8cb')
build() {
Modified: btrfs-progs.install
===
--- btrfs-progs.install 2015-11-24 12:47:39 UTC (rev 251937)
+++ btrfs-progs.install 2015-11-24 13:21:39 UTC (rev 251938)
@@ -1,8 +1,14 @@
#!/bin/sh
+## arg 1: the new package version
+## arg 2: the old package version
post_upgrade() {
- if [ "$(vercmp 0.19.20121005 "$2")" -eq 1 ]; then
-echo "btrfs multi-device support now relies on linux 3.6 or later"
+ 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
}
Modified: btrfs-scrub@.service
===
--- btrfs-scrub@.service2015-11-24 12:47:39 UTC (rev 251937)
+++ btrfs-scrub@.service2015-11-24 13:21:39 UTC (rev 251938)
@@ -1,7 +1,7 @@
[Unit]
-Description=Btrfs scrub on %I
+Description=Btrfs scrub on %f
[Service]
Nice=19
IOSchedulingClass=idle
-ExecStart=/usr/bin/btrfs scrub start -B %I
+ExecStart=/usr/bin/btrfs scrub start -B %f
[arch-commits] Commit in btrfs-progs/trunk (3 files)
Date: Monday, October 26, 2015 @ 22:26:38
Author: seblu
Revision: 249773
upgpkg: btrfs-progs 4.2.3-2
- add service/timer for scrubing
Added:
btrfs-progs/trunk/btrfs-scrub@.service
btrfs-progs/trunk/btrfs-scrub@.timer
Modified:
btrfs-progs/trunk/PKGBUILD
--+
PKGBUILD | 14 +++---
btrfs-scrub@.service |7 +++
btrfs-scrub@.timer | 10 ++
3 files changed, 28 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-10-26 19:56:40 UTC (rev 249772)
+++ PKGBUILD2015-10-26 21:26:38 UTC (rev 249773)
@@ -5,7 +5,7 @@
pkgname=btrfs-progs
pkgver=4.2.3
-pkgrel=1
+pkgrel=2
pkgdesc='Btrfs filesystem utilities'
arch=('i686' 'x86_64')
depends=('glibc' 'libutil-linux' 'e2fsprogs' 'lzo' 'zlib')
@@ -17,12 +17,16 @@
license=('GPL2')
source=("git://git.kernel.org/pub/scm/linux/kernel/git/kdave/$pkgname.git#tag=v$pkgver"
'initcpio-install-btrfs'
-'initcpio-hook-btrfs')
+'initcpio-hook-btrfs'
+'btrfs-scrub@.service'
+'btrfs-scrub@.timer')
install=btrfs-progs.install
options=(!staticlibs)
md5sums=('SKIP'
'7241ba3a4286d08da0d50b7176941112'
- 'b09688a915a0ec8f40e2f5aacbabc9ad')
+ 'b09688a915a0ec8f40e2f5aacbabc9ad'
+ '6988ee82cc06d8639faf16fd2d9e0bc2'
+ 'a290e0ab88b7b4675cd20f5a2befc8cb')
build() {
cd $pkgname
@@ -47,6 +51,10 @@
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:
Added: btrfs-scrub@.service
===
--- btrfs-scrub@.service(rev 0)
+++ btrfs-scrub@.service2015-10-26 21:26:38 UTC (rev 249773)
@@ -0,0 +1,7 @@
+[Unit]
+Description=Btrfs scrub on %I
+
+[Service]
+Nice=19
+IOSchedulingClass=idle
+ExecStart=/usr/bin/btrfs scrub start -B %I
Added: btrfs-scrub@.timer
===
--- btrfs-scrub@.timer (rev 0)
+++ btrfs-scrub@.timer 2015-10-26 21:26:38 UTC (rev 249773)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Monthly Btrfs scrub on %I
+
+[Timer]
+OnCalendar=monthly
+AccuracySec=1d
+Persistent=true
+
+[Install]
+WantedBy=multi-user.target
[arch-commits] Commit in btrfs-progs/trunk (3 files)
Date: Sunday, October 21, 2012 @ 15:56:31
Author: dreisner
Revision: 169470
upgpkg: btrfs-progs 0.19.20121005-2
- remove add_file() call referring to nonexistant udev rule
- update hook help to denote hook is only needed for non-udev scenarios
Modified:
btrfs-progs/trunk/PKGBUILD
btrfs-progs/trunk/initcpio-hook-btrfs
btrfs-progs/trunk/initcpio-install-btrfs
+
PKGBUILD |8
initcpio-hook-btrfs|5 +
initcpio-install-btrfs |5 ++---
3 files changed, 7 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-21 18:59:02 UTC (rev 169469)
+++ PKGBUILD2012-10-21 19:56:31 UTC (rev 169470)
@@ -4,7 +4,7 @@
pkgname=btrfs-progs
pkgver=0.19.20121005
-pkgrel=1
+pkgrel=2
pkgdesc="btrfs filesystem utilities"
arch=(i686 x86_64)
depends=('glibc' 'e2fsprogs')
@@ -17,6 +17,9 @@
initcpio-install-btrfs
initcpio-hook-btrfs)
install=btrfs-progs.install
+md5sums=('7fb014324954ee073b039dc0066de960'
+ 'd7ad825b0b25f2be73289a20e7afcdb7'
+ 'b09688a915a0ec8f40e2f5aacbabc9ad')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -38,6 +41,3 @@
mkdir -p ${pkgdir}/sbin
ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
}
-md5sums=('7fb014324954ee073b039dc0066de960'
- 'e5186ec3fe8a809b7473470128d1c4ab'
- '9fb35142755b477a96cb7292f3d64839')
Modified: initcpio-hook-btrfs
===
--- initcpio-hook-btrfs 2012-10-21 18:59:02 UTC (rev 169469)
+++ initcpio-hook-btrfs 2012-10-21 19:56:31 UTC (rev 169470)
@@ -1,10 +1,7 @@
#!/usr/bin/ash
run_hook() {
-# if udevd is running, this is done async by add/change events
-if [ "$udevd_running" -ne 1 ]; then
-btrfs device scan
-fi
+btrfs device scan
}
# vim: set ft=sh ts=4 sw=4 et:
Modified: initcpio-install-btrfs
===
--- initcpio-install-btrfs 2012-10-21 18:59:02 UTC (rev 169469)
+++ initcpio-install-btrfs 2012-10-21 19:56:31 UTC (rev 169470)
@@ -4,13 +4,12 @@
add_module btrfs
add_binary btrfs
add_runscript
-
-add_file /usr/lib/udev/rules.d/70-btrfs.rules
}
help() {
cat <
[arch-commits] Commit in btrfs-progs/trunk (3 files)
Date: Sunday, October 21, 2012 @ 12:04:56
Author: tomegun
Revision: 169463
upgpkg: btrfs-progs 0.19.20121005-1
update snapshot
Modified:
btrfs-progs/trunk/PKGBUILD
btrfs-progs/trunk/btrfs-progs.install
Deleted:
btrfs-progs/trunk/70-btrfs.rules
-+
70-btrfs.rules |1 -
PKGBUILD| 16 ++--
btrfs-progs.install |2 +-
3 files changed, 7 insertions(+), 12 deletions(-)
Deleted: 70-btrfs.rules
===
--- 70-btrfs.rules 2012-10-21 15:00:52 UTC (rev 169462)
+++ 70-btrfs.rules 2012-10-21 16:04:56 UTC (rev 169463)
@@ -1 +0,0 @@
-ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="btrfs",
RUN+="/usr/bin/btrfs device scan /dev/%k"
Modified: PKGBUILD
===
--- PKGBUILD2012-10-21 15:00:52 UTC (rev 169462)
+++ PKGBUILD2012-10-21 16:04:56 UTC (rev 169463)
@@ -3,8 +3,8 @@
# Contributor: Tobias Powalowski
pkgname=btrfs-progs
-pkgver=0.19.20120904
-pkgrel=7
+pkgver=0.19.20121005
+pkgrel=1
pkgdesc="btrfs filesystem utilities"
arch=(i686 x86_64)
depends=('glibc' 'e2fsprogs')
@@ -15,9 +15,8 @@
license=('GPL2')
source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
initcpio-install-btrfs
- initcpio-hook-btrfs
- 70-btrfs.rules)
-#install=btrfs-progs.install
+ initcpio-hook-btrfs)
+install=btrfs-progs.install
build() {
cd $srcdir/$pkgname-$pkgver
@@ -28,8 +27,6 @@
"$pkgdir/usr/lib/initcpio/install/btrfs"
install -Dm644 "$srcdir/initcpio-hook-btrfs" \
"$pkgdir/usr/lib/initcpio/hooks/btrfs"
- install -Dm644 "$srcdir/70-btrfs.rules" \
- "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules"
}
package() {
@@ -41,7 +38,6 @@
mkdir -p ${pkgdir}/sbin
ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
}
-md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2'
+md5sums=('7fb014324954ee073b039dc0066de960'
'e5186ec3fe8a809b7473470128d1c4ab'
- '9fb35142755b477a96cb7292f3d64839'
- '345c62c8b267082361729ca5b647518f')
+ '9fb35142755b477a96cb7292f3d64839')
Modified: btrfs-progs.install
===
--- btrfs-progs.install 2012-10-21 15:00:52 UTC (rev 169462)
+++ btrfs-progs.install 2012-10-21 16:04:56 UTC (rev 169463)
@@ -1,7 +1,7 @@
#!/bin/sh
post_upgrade() {
- if [ "$(vercmp 0.19.20120904-6 "$2")" -eq 1 ]; then
+ if [ "$(vercmp 0.19.20121005 "$2")" -eq 1 ]; then
echo "btrfs multi-device support now relies on linux 3.6 or later"
fi
}
[arch-commits] Commit in btrfs-progs/trunk (3 files)
Date: Friday, October 5, 2012 @ 09:14:13
Author: tomegun
Revision: 168027
upgpkg: btrfs-progs 0.19.20120904-7
reinstate udev rule
Added:
btrfs-progs/trunk/btrfs-progs.install
(from rev 168025, btrfs-progs/trunk/btrfs.install)
Modified:
btrfs-progs/trunk/PKGBUILD
Deleted:
btrfs-progs/trunk/btrfs.install
-+
PKGBUILD|2 +-
btrfs-progs.install |9 +
btrfs.install |9 -
3 files changed, 10 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-05 13:06:44 UTC (rev 168026)
+++ PKGBUILD2012-10-05 13:14:13 UTC (rev 168027)
@@ -17,7 +17,7 @@
initcpio-install-btrfs
initcpio-hook-btrfs
70-btrfs.rules)
-install=btrfs.install
+#install=btrfs-progs.install
build() {
cd $srcdir/$pkgname-$pkgver
Copied: btrfs-progs/trunk/btrfs-progs.install (from rev 168025,
btrfs-progs/trunk/btrfs.install)
===
--- btrfs-progs.install (rev 0)
+++ btrfs-progs.install 2012-10-05 13:14:13 UTC (rev 168027)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+post_upgrade() {
+ if [ "$(vercmp 0.19.20120904-6 "$2")" -eq 1 ]; then
+echo "btrfs multi-device support now relies on linux 3.6 or later"
+ fi
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: btrfs.install
===
--- btrfs.install 2012-10-05 13:06:44 UTC (rev 168026)
+++ btrfs.install 2012-10-05 13:14:13 UTC (rev 168027)
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-post_upgrade() {
-# if [ "$(vercmp 0.19.20120904-6 "$2")" -eq 1 ]; then
-#echo "btrfs multi-device support now relies on linux 3.6 or later"
-# fi
-}
-
-# vim:set ts=2 sw=2 et:
[arch-commits] Commit in btrfs-progs/trunk (3 files)
Date: Tuesday, October 2, 2012 @ 19:22:35
Author: tomegun
Revision: 167681
initcpio: remove btrfs initcpio hooks, the functionality is now provided by udev
Modified:
btrfs-progs/trunk/PKGBUILD
Deleted:
btrfs-progs/trunk/initcpio-hook-btrfs
btrfs-progs/trunk/initcpio-install-btrfs
+
PKGBUILD | 14 ++
initcpio-hook-btrfs| 10 --
initcpio-install-btrfs | 17 -
3 files changed, 2 insertions(+), 39 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-02 22:57:36 UTC (rev 167680)
+++ PKGBUILD2012-10-02 23:22:35 UTC (rev 167681)
@@ -13,9 +13,7 @@
conflicts=('btrfs-progs-unstable')
provides=('btrfs-progs-unstable')
license=('GPL2')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
-initcpio-install-btrfs
-initcpio-hook-btrfs)
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz)
build() {
cd $srcdir/$pkgname-$pkgver
@@ -30,13 +28,5 @@
mv $pkgdir/usr/man $pkgdir/usr/share/man
mkdir -p ${pkgdir}/sbin
ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
-
- # install mkinitcpio hooks
- install -Dm644 "$srcdir/initcpio-install-btrfs" \
- "$pkgdir/usr/lib/initcpio/install/btrfs"
- install -Dm644 "$srcdir/initcpio-hook-btrfs" \
- "$pkgdir/usr/lib/initcpio/hooks/btrfs"
}
-md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2'
- 'e5186ec3fe8a809b7473470128d1c4ab'
- '9fb35142755b477a96cb7292f3d64839')
+md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2')
Deleted: initcpio-hook-btrfs
===
--- initcpio-hook-btrfs 2012-10-02 22:57:36 UTC (rev 167680)
+++ initcpio-hook-btrfs 2012-10-02 23:22:35 UTC (rev 167681)
@@ -1,10 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
-# if udevd is running, this is done async by add/change events
-if [ "$udevd_running" -ne 1 ]; then
-btrfs device scan
-fi
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Deleted: initcpio-install-btrfs
===
--- initcpio-install-btrfs 2012-10-02 22:57:36 UTC (rev 167680)
+++ initcpio-install-btrfs 2012-10-02 23:22:35 UTC (rev 167681)
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-build() {
-add_module btrfs
-add_binary btrfs
-add_runscript
-
-add_file /usr/lib/udev/rules.d/70-btrfs.rules
-}
-
-help() {
-cat <
[arch-commits] Commit in btrfs-progs/trunk (3 files)
Date: Sunday, April 8, 2012 @ 22:05:41
Author: dreisner
Revision: 155910
upgpkg: btrfs-progs 0.19.20120328-2
- adopt initcpio hooks
Added:
btrfs-progs/trunk/initcpio-hook-btrfs
btrfs-progs/trunk/initcpio-install-btrfs
Modified:
btrfs-progs/trunk/PKGBUILD
+
PKGBUILD | 16 +---
initcpio-hook-btrfs|7 +++
initcpio-install-btrfs | 15 +++
3 files changed, 35 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-09 02:05:22 UTC (rev 155909)
+++ PKGBUILD2012-04-09 02:05:41 UTC (rev 155910)
@@ -3,16 +3,21 @@
# Contributor: Tobias Powalowski
pkgname=btrfs-progs
pkgver=0.19.20120328
-pkgrel=1
+pkgrel=2
pkgdesc="btrfs filesystem utilities"
arch=(i686 x86_64)
depends=('glibc' 'e2fsprogs')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz)
url="http://btrfs.wiki.kernel.org/";
replaces=('btrfs-progs-unstable')
conflicts=('btrfs-progs-unstable')
provides=('btrfs-progs-unstable')
license=('GPL2')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
+initcpio-install-btrfs
+initcpio-hook-btrfs)
+md5sums=('f4504e73cf9254779b78d5b2318ac570'
+ 'bdaaf6bd339220c63260acec809864d2'
+ 'b09688a915a0ec8f40e2f5aacbabc9ad')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -27,5 +32,10 @@
mv $pkgdir/usr/man $pkgdir/usr/share/man
mkdir -p ${pkgdir}/sbin
ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
+
+ # install mkinitcpio hooks
+ install -Dm644 "$srcdir/initcpio-install-btrfs" \
+ "$pkgdir/usr/lib/initcpio/install/btrfs"
+ install -Dm644 "$srcdir/initcpio-hook-btrfs" \
+ "$pkgdir/usr/lib/initcpio/hooks/btrfs"
}
-md5sums=('f4504e73cf9254779b78d5b2318ac570')
Added: initcpio-hook-btrfs
===
--- initcpio-hook-btrfs (rev 0)
+++ initcpio-hook-btrfs 2012-04-09 02:05:41 UTC (rev 155910)
@@ -0,0 +1,7 @@
+#!/usr/bin/ash
+
+run_hook() {
+btrfs device scan
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
Added: initcpio-install-btrfs
===
--- initcpio-install-btrfs (rev 0)
+++ initcpio-install-btrfs 2012-04-09 02:05:41 UTC (rev 155910)
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+build() {
+MODULES=$(all_modules btrfs)
+BINARIES=btrfs
+SCRIPT=btrfs
+}
+
+help() {
+cat <
