Merge branch '3.3' into 3.4

This commit is contained in:
Fredrik Rinnestam 2018-04-24 22:09:10 +02:00
commit 8ba92f4bd1
4 changed files with 6 additions and 11 deletions

View File

@ -4,12 +4,10 @@ drwxr-xr-x root/root lib/udev/rules.d/
-rw-r--r-- root/root lib/udev/rules.d/64-btrfs-dm.rules
drwxr-xr-x root/root sbin/
-rwxr-xr-x root/root sbin/btrfs
-rwxr-xr-x root/root sbin/btrfs-debug-tree
-rwxr-xr-x root/root sbin/btrfs-find-root
-rwxr-xr-x root/root sbin/btrfs-image
-rwxr-xr-x root/root sbin/btrfs-map-logical
-rwxr-xr-x root/root sbin/btrfs-select-super
-rwxr-xr-x root/root sbin/btrfs-zero-log
lrwxrwxrwx root/root sbin/btrfsck -> btrfs
-rwxr-xr-x root/root sbin/btrfstune
-rwxr-xr-x root/root sbin/fsck.btrfs
@ -51,7 +49,6 @@ drwxr-xr-x root/root usr/share/man/man5/
drwxr-xr-x root/root usr/share/man/man8/
-rw-r--r-- root/root usr/share/man/man8/btrfs-balance.8.gz
-rw-r--r-- root/root usr/share/man/man8/btrfs-check.8.gz
-rw-r--r-- root/root usr/share/man/man8/btrfs-debug-tree.8.gz
-rw-r--r-- root/root usr/share/man/man8/btrfs-device.8.gz
-rw-r--r-- root/root usr/share/man/man8/btrfs-filesystem.8.gz
-rw-r--r-- root/root usr/share/man/man8/btrfs-find-root.8.gz
@ -68,9 +65,7 @@ drwxr-xr-x root/root usr/share/man/man8/
-rw-r--r-- root/root usr/share/man/man8/btrfs-scrub.8.gz
-rw-r--r-- root/root usr/share/man/man8/btrfs-select-super.8.gz
-rw-r--r-- root/root usr/share/man/man8/btrfs-send.8.gz
-rw-r--r-- root/root usr/share/man/man8/btrfs-show-super.8.gz
-rw-r--r-- root/root usr/share/man/man8/btrfs-subvolume.8.gz
-rw-r--r-- root/root usr/share/man/man8/btrfs-zero-log.8.gz
-rw-r--r-- root/root usr/share/man/man8/btrfs.8.gz
-rw-r--r-- root/root usr/share/man/man8/btrfsck.8.gz
-rw-r--r-- root/root usr/share/man/man8/btrfstune.8.gz

View File

@ -1 +1 @@
830e173b9fcef4135b0e5a2e0399344e btrfs-progs-v4.16.tar.xz
d7a4598d58fc91d49ee8e7c342b3b919 btrfs-progs-v4.16.1.tar.xz

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/SuscCvSAAUakgcM5/c+V+Lgm+SM/2dTmFyC73iQ5vt0SWWo6JMBJaekDW7DYlEZKQmmNe6TqOdbpwKlmEpwxAM=
SHA256 (Pkgfile) = 08a1b9f9ff9e7996a5c9782cbefa247c337dcfc7b4b3e81ccdc8e5fe16ed7db2
SHA256 (.footprint) = d00e3c49eaa5d26465f2e38d818f1a67125218bbb54121ee96b94de89514bf33
SHA256 (btrfs-progs-v4.16.tar.xz) = f3e0ec4864b7b89db1a6a36fa48bf8a9217117714a04b13c84d0fea1eac154b2
RWSE3ohX2g5d/aM2f8rc8p5o2KoXQjftPyL3GqqTb+DQqf96Rf4ClF3n08F73vktH2IgwLMbRxCgyfnjPJ0ddZH/esrUDBePhwo=
SHA256 (Pkgfile) = 9182310985906fd0cd8268f16560a5ad60b8905eb7c61e0728cfa35a2d2b19ed
SHA256 (.footprint) = b66bd51b8ceb223976c676b8e301be31090713e0d17d31831a65581e3d423106
SHA256 (btrfs-progs-v4.16.1.tar.xz) = 013403fb67b17975b21408fa9eb7523b0ecf94f84f8a4397cf972e8e254d2246

View File

@ -4,7 +4,7 @@
# Depends on: lzo zstd
name=btrfs-progs
version=4.16
version=4.16.1
release=1
source=(https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$version.tar.xz)