diff options
| author | Tim Biermann <tbier@posteo.de> | 2022-04-28 21:38:24 +0200 |
|---|---|---|
| committer | Tim Biermann <tbier@posteo.de> | 2022-04-28 21:38:24 +0200 |
| commit | fc7f351ee57967cc29dc08d580d2feccc38348fe (patch) | |
| tree | 65396f9fdbc4f72628b57e757ebed044d4466e42 /btrfs-progs | |
| parent | 4b963aa43c973c1325208caadd97c8dbe75f74a6 (diff) | |
| parent | ccd90ee82cad57e515ad782ed17c8b8914653f09 (diff) | |
| download | opt-fc7f351ee57967cc29dc08d580d2feccc38348fe.tar.gz opt-fc7f351ee57967cc29dc08d580d2feccc38348fe.tar.xz | |
Merge remote-tracking branch 'origin/3.6' into 3.7
Diffstat (limited to 'btrfs-progs')
| -rw-r--r-- | btrfs-progs/.footprint | 25 | ||||
| -rw-r--r-- | btrfs-progs/.signature | 8 | ||||
| -rw-r--r-- | btrfs-progs/Pkgfile | 9 |
3 files changed, 9 insertions, 33 deletions
diff --git a/btrfs-progs/.footprint b/btrfs-progs/.footprint index 592fbff15..d06a91b18 100644 --- a/btrfs-progs/.footprint +++ b/btrfs-progs/.footprint @@ -41,30 +41,5 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libbtrfsutil.pc drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man5/ --rw-r--r-- root/root usr/share/man/man5/btrfs.5.gz 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-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 --rw-r--r-- root/root usr/share/man/man8/btrfs-image.8.gz --rw-r--r-- root/root usr/share/man/man8/btrfs-inspect-internal.8.gz --rw-r--r-- root/root usr/share/man/man8/btrfs-map-logical.8.gz --rw-r--r-- root/root usr/share/man/man8/btrfs-property.8.gz --rw-r--r-- root/root usr/share/man/man8/btrfs-qgroup.8.gz --rw-r--r-- root/root usr/share/man/man8/btrfs-quota.8.gz --rw-r--r-- root/root usr/share/man/man8/btrfs-receive.8.gz --rw-r--r-- root/root usr/share/man/man8/btrfs-replace.8.gz --rw-r--r-- root/root usr/share/man/man8/btrfs-rescue.8.gz --rw-r--r-- root/root usr/share/man/man8/btrfs-restore.8.gz --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-subvolume.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 --rw-r--r-- root/root usr/share/man/man8/fsck.btrfs.8.gz --rw-r--r-- root/root usr/share/man/man8/mkfs.btrfs.8.gz diff --git a/btrfs-progs/.signature b/btrfs-progs/.signature index ada8afa78..f0a73f210 100644 --- a/btrfs-progs/.signature +++ b/btrfs-progs/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/a0g0gItKejME5mMChmkgfU9fOnyUSPuT534M02yCYdDbWvSxJ2nMXSDUuA4WjoGV2lRJx/IYD2S6HrmR71ygAE= -SHA256 (Pkgfile) = 7a8c05f13d41e290323d387e67e931fa8e3bb9ab4584adb1d7a3c5283d96706d -SHA256 (.footprint) = 817033e6611f65c6f70a7e4dfe1941714415034ec77e090cb3a9f81b2b951248 -SHA256 (btrfs-progs-v5.16.2.tar.xz) = 9e9b303a1d0fd9ceaaf204ee74c1c8fa1fd55794e223d9fe2bc62875ecbd53d2 +RWSE3ohX2g5d/bxV+cRS22I4t36nUklABGEnLWSl2HtDP2QE5z3FMbRPTzkureanJDtxVfPux/RQVdQRReC6fMGCfV4FkB1pfwY= +SHA256 (Pkgfile) = 7301c11f9b9187eaf4e2bd56addb284110d36f076d8b27ca6968eeede35c2453 +SHA256 (.footprint) = 7be20095f5380ee0b377f1bad05ae60e598bb425e107624ee774df419caa7aea +SHA256 (btrfs-progs-v5.17.tar.xz) = 63b778fe4c2bad18e371dce58ed35488e08f583921367454fdd88507a3d0d89e diff --git a/btrfs-progs/Pkgfile b/btrfs-progs/Pkgfile index a5eaa6738..d7427eacc 100644 --- a/btrfs-progs/Pkgfile +++ b/btrfs-progs/Pkgfile @@ -4,7 +4,7 @@ # Depends on: lzo util-linux zstd name=btrfs-progs -version=5.16.2 +version=5.17 release=1 source=(https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$version.tar.xz) @@ -21,10 +21,11 @@ build() { make make DESTDIR=$PKG install - install -d $PKG/usr/share/man/{man5,man8} - install -m644 Documentation/*.5 $PKG/usr/share/man/man5/ + #install -d $PKG/usr/share/man/{man5,man8} + #install -m644 Documentation/*.5 $PKG/usr/share/man/man5/ + install -d $PKG/usr/share/man/man8 install -m644 Documentation/*.8 $PKG/usr/share/man/man8/ #btrfs-convert disabled - rm $PKG/usr/share/man/man8/btrfs-convert.8 + #rm $PKG/usr/share/man/man8/btrfs-convert.8 } |