upg btrfs-progs
This commit is contained in:
parent
4d0541ef97
commit
ee1b4353e8
3 changed files with 75 additions and 41 deletions
|
|
@ -6,14 +6,15 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=btrfs-progs
|
||||
pkgver=6.10.1
|
||||
pkgrel=02
|
||||
pkgver=6.11
|
||||
pkgrel=01
|
||||
pkgdesc='Btrfs filesystem utilities w/o systemd'
|
||||
makedepends=('asciidoc' 'xmlto' 'python' 'python-setuptools' 'e2fsprogs'
|
||||
'python-sphinx' 'python-sphinx_rtd_theme' 'automake' 'autoconf')
|
||||
depends=('glibc' 'util-linux-libs' 'lzo' 'zlib' 'zstd' 'libgcrypt')
|
||||
checkdepends=(libaio liburing ripgrep)
|
||||
optdepends=('python: libbtrfsutil python bindings'
|
||||
'e2fsprogs: btrfs-convert')
|
||||
'e2fsprogs: btrfs-convert')
|
||||
#url='https://btrfs.wiki.kernel.org'
|
||||
url='https://btrfs.readthedocs.io'
|
||||
replaces=('btrfs-progs-unstable')
|
||||
|
|
@ -49,7 +50,11 @@ build() {
|
|||
|
||||
check() {
|
||||
cd $pkgname
|
||||
./btrfs filesystem show
|
||||
# ./btrfs filesystem show
|
||||
# remove all tests, which requires real root
|
||||
rm -r $(dirname $(rg -t sh -l -e SUDO_HELPER -e mount -e prepare_test) | rg 'tests/')
|
||||
# -j1 for running tests chronological
|
||||
make -j1 -C tests test
|
||||
}
|
||||
|
||||
package() {
|
||||
|
|
@ -73,16 +78,13 @@ license=('GPL-2.0-only')
|
|||
|
||||
validpgpkeys=('F2B41200C54EFB30380C1756C565D5F9D76D583B')
|
||||
|
||||
b2sums=('2704650efc795e8e01670306959781cf10d9837da227ffb15ffcd81d09751c8070e01edd834287c65fcb25dd0889a5060c36fc033affd32160b37c27270e137c'
|
||||
b2sums=('d4088c8d55f642cae584b7c83e9c6e5d7358795844c2ccb66f7453c5fd93bd43812f4c80e3cbd0851080685a9dcff3c35f8a42c63aa1903042cd56f9d6aaba9c'
|
||||
'75659665a24f92bba1175a2fcae942d9851495c9cff88570b88a98dced4eb98fcc9879de044bfc7d560dbe1c71a20d7ae51ca4b7c2649f90d646b414e0864b6e'
|
||||
'0d3c25d0cb6fdb8e8777723b5e199835fac25573bc8f7fcb248ccfeea7268752b7100dd2c8284529812f0b1d3943eceb5785f119959f89bffedcf30472a915db')
|
||||
# '4408d0f81634c99f874a2dde8fc289f61d9e00d5c2d2efd465bcc90db69112604ec987a46858f48c0c2ce1cb4499de1355ad4baf847a74b40c148f8d7a516d22'
|
||||
# '9601b31936e1c4b69e6be517f545c6520302fa946eb3203e2d50bd85e918c87a9512e3b40d4e8cee6b9ae4a3fe9fbde26052305beec10fa2c49732a08d1f6753')
|
||||
|
||||
sha256sums=(710915b0cbcfdc4fc09daf5f135a867ee932324f450d47e427fe738da69e67e4 # btrfs-progs
|
||||
# 8af0811fffe01e21a987747990348d4efacef27e35a8fdbb09fac17fb017e1e3 # btrfs-progs-v6.10.1.tar.sign
|
||||
sha256sums=(6b2599c12500f9c61c0b94f0147e5260bba774176b22596d8f859c85a78c43b3 # btrfs-progs
|
||||
bbe60b35d1b1e2efc1308a8f54f1fdc6808240a81c5f5b4d75321b7ee86e41f4 # initcpio-install-btrfs
|
||||
35efeee8590d6d60c711ae9cdc918e4841ab61d10cb02359e65e36ebff95ffc5) # initcpio-hook-btrfs
|
||||
|
||||
##
|
||||
##
|
||||
## ca3ab2e978fd5ac00e472bf9b9ebf5313b57199be371784e765e77dd9f8920b8 btrfs-progs-6.11-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -3,73 +3,101 @@
|
|||
# Contributor: Tom Gundersen <teg@jklm.no>
|
||||
|
||||
pkgname=btrfs-progs
|
||||
pkgver=6.10.1
|
||||
pkgrel=2
|
||||
pkgver=6.11
|
||||
pkgrel=1
|
||||
pkgdesc='Btrfs filesystem utilities'
|
||||
arch=('x86_64')
|
||||
makedepends=('git' 'asciidoc' 'xmlto' 'systemd' 'python' 'python-setuptools' 'e2fsprogs'
|
||||
'python-sphinx' 'python-sphinx_rtd_theme')
|
||||
depends=('glibc' 'util-linux-libs' 'lzo' 'zlib' 'zstd' 'libgcrypt' 'systemd-libs')
|
||||
optdepends=('python: libbtrfsutil python bindings'
|
||||
'e2fsprogs: btrfs-convert')
|
||||
makedepends=(
|
||||
asciidoc
|
||||
e2fsprogs
|
||||
git
|
||||
python
|
||||
python-setuptools
|
||||
python-sphinx
|
||||
python-sphinx_rtd_theme
|
||||
systemd
|
||||
xmlto
|
||||
)
|
||||
depends=(
|
||||
glibc
|
||||
libgcrypt
|
||||
lzo
|
||||
systemd-libs
|
||||
util-linux-libs
|
||||
zlib
|
||||
zstd
|
||||
)
|
||||
checkdepends=(
|
||||
libaio
|
||||
liburing
|
||||
ripgrep
|
||||
)
|
||||
optdepends=(
|
||||
'python: libbtrfsutil python bindings'
|
||||
'e2fsprogs: btrfs-convert'
|
||||
)
|
||||
url='https://btrfs.readthedocs.io'
|
||||
replaces=('btrfs-progs-unstable')
|
||||
conflicts=('btrfs-progs-unstable')
|
||||
provides=('btrfs-progs-unstable')
|
||||
license=('GPL-2.0-only')
|
||||
validpgpkeys=('F2B41200C54EFB30380C1756C565D5F9D76D583B')
|
||||
source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git?signed#tag=v${pkgver}"
|
||||
'initcpio-install-btrfs'
|
||||
'initcpio-hook-btrfs'
|
||||
'btrfs-scrub@.service'
|
||||
'btrfs-scrub@.timer'
|
||||
)
|
||||
validpgpkeys=('F2B41200C54EFB30380C1756C565D5F9D76D583B') # David Sterba <kdave@kernel.org>
|
||||
source=(
|
||||
git+https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git?signed#tag=v${pkgver}
|
||||
initcpio-install-btrfs
|
||||
initcpio-hook-btrfs
|
||||
btrfs-scrub@.service
|
||||
btrfs-scrub@.timer
|
||||
)
|
||||
install=btrfs-progs.install
|
||||
b2sums=('2704650efc795e8e01670306959781cf10d9837da227ffb15ffcd81d09751c8070e01edd834287c65fcb25dd0889a5060c36fc033affd32160b37c27270e137c'
|
||||
b2sums=('d4088c8d55f642cae584b7c83e9c6e5d7358795844c2ccb66f7453c5fd93bd43812f4c80e3cbd0851080685a9dcff3c35f8a42c63aa1903042cd56f9d6aaba9c'
|
||||
'75659665a24f92bba1175a2fcae942d9851495c9cff88570b88a98dced4eb98fcc9879de044bfc7d560dbe1c71a20d7ae51ca4b7c2649f90d646b414e0864b6e'
|
||||
'0d3c25d0cb6fdb8e8777723b5e199835fac25573bc8f7fcb248ccfeea7268752b7100dd2c8284529812f0b1d3943eceb5785f119959f89bffedcf30472a915db'
|
||||
'4408d0f81634c99f874a2dde8fc289f61d9e00d5c2d2efd465bcc90db69112604ec987a46858f48c0c2ce1cb4499de1355ad4baf847a74b40c148f8d7a516d22'
|
||||
'9601b31936e1c4b69e6be517f545c6520302fa946eb3203e2d50bd85e918c87a9512e3b40d4e8cee6b9ae4a3fe9fbde26052305beec10fa2c49732a08d1f6753')
|
||||
|
||||
prepare() {
|
||||
cd $pkgname
|
||||
cd "${pkgname}"
|
||||
# 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
|
||||
echo "Applying patch $src..."
|
||||
patch -Np1 < "../$src"
|
||||
echo "Applying patch ${src}..."
|
||||
patch -Np1 < "../${src}"
|
||||
done
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $pkgname
|
||||
cd "${pkgname}"
|
||||
./autogen.sh
|
||||
./configure --prefix=/usr --with-crypto=libgcrypt
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd $pkgname
|
||||
./btrfs filesystem show
|
||||
cd "${pkgname}"
|
||||
# remove all tests, which requires real root
|
||||
rm -r $(dirname $(rg -t sh -l -e SUDO_HELPER -e mount -e prepare_test) | rg 'tests/')
|
||||
# -j1 for running tests chronological
|
||||
make -j1 -C tests test
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $pkgname
|
||||
cd "${pkgname}"
|
||||
make DESTDIR="$pkgdir" install install_python
|
||||
|
||||
# install bash completion (FS#44618)
|
||||
install -Dm644 btrfs-completion "$pkgdir/usr/share/bash-completion/completions/btrfs"
|
||||
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"
|
||||
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"
|
||||
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"
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,12 @@ asciidoc
|
|||
python-sphinx
|
||||
python-typing_extensions
|
||||
python-sphinx_rtd_theme
|
||||
|
||||
|
||||
git
|
||||
automake
|
||||
autoconf
|
||||
|
||||
|
||||
libaio
|
||||
liburing
|
||||
ripgrep
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue