upg libvirt udisks2

This commit is contained in:
joborun linux 2024-03-02 11:15:05 +02:00
parent df962e8989
commit 7f3f7010fb
7 changed files with 260 additions and 60 deletions

View File

@ -7,8 +7,8 @@
pkgname=(libvirt) # (libvirt-storage-gluster libvirt-storage-iscsi-direct libvirt-storage-rbd)
epoch=1
pkgver=10.0.0
pkgrel=03
pkgver=10.1.0
pkgrel=01
pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc) w/o zstd iscsi systemd"
url="https://libvirt.org/"
depends=('libpciaccess' 'yajl' 'fuse3' 'gnutls' 'parted' 'libssh' 'libxml2' 'numactl' 'polkit' 'libnbd' 'libnl')
@ -93,7 +93,6 @@ prepare() {
sed -i 's|/usr/libexec/qemu-bridge-helper|/usr/lib/qemu/qemu-bridge-helper|g' \
src/qemu/qemu.conf.in \
src/qemu/test_libvirtd_qemu.aug.in
}
build() {
@ -102,8 +101,8 @@ build() {
arch-meson build \
--libexecdir=lib/libvirt \
-Drunstatedir=/run \
-Dqemu_group=libvirt-qemu \
-Dqemu_user=libvirt-qemu \
-Dqemu_group=libvirt-qemu \
-Dnetcf=disabled \
-Dopenwsman=disabled \
-Dapparmor=disabled \
@ -136,12 +135,11 @@ build() {
}
# -Dparallels_sdk=disabled \ # this option is invalid
# Many tests fail
#check() {
# cd "$pkgname-$pkgver"
#
# ninja -C build test
#}
check() {
cd "$pkgname-$pkgver"
meson test -C build --print-errorlogs
}
#package_libvirt() {
package() {
@ -149,16 +147,17 @@ package() {
cd "$pkgname-$pkgver"
# DESTDIR="$pkgdir" ninja -C build install
meson install -C build --destdir "$pkgdir"
mkdir "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d
echo 'g libvirt - -' > "$pkgdir/usr/lib/sysusers.d/libvirt.conf"
mkdir -p "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d
echo 'g libvirt - -' > "$pkgdir/usr/lib/sysusers.d/libvirt-qemu.conf"
echo 'u libvirt-qemu /var/lib/libvirt "Libvirt QEMU user"' >> "$pkgdir/usr/lib/sysusers.d/libvirt.conf"
echo 'm libvirt-qemu kvm' >> "$pkgdir/usr/lib/sysusers.d/libvirt.conf"
echo 'z /var/lib/libvirt/qemu 0751' > "$pkgdir/usr/lib/tmpfiles.d/libvirt.conf"
## systemd-sysusers
## sysusers
install -D -m0644 "$srcdir/libvirt.sysusers" "$pkgdir/usr/lib/sysusers.d/libvirt.conf"
## systemd-tmpfiles
## tmpfiles
install -D -m0644 "$srcdir/libvirt.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/libvirt.conf"
# chown 0:102 "$pkgdir/usr/share/polkit-1/rules.d"
@ -176,7 +175,7 @@ package() {
rm -f "$pkgdir/etc/libvirt/qemu/networks/autostart/default.xml"
# move split modules
# mv "$pkgdir"/usr/lib/libvirt/storage-backend/libvirt_storage_backend_{rbd,gluster}.so "$pkgdir/../"
# mv "$pkgdir"/usr/lib/libvirt/storage-backend/libvirt_storage_backend_gluster.so "$pkgdir/../"
# mv "$pkgdir/usr/lib/libvirt/storage-backend/libvirt_storage_backend_iscsi-direct.so" "$pkgdir/../"
# mv "$pkgdir/usr/lib/libvirt/storage-file/libvirt_storage_file_gluster.so" "$pkgdir/../"
}
@ -217,10 +216,10 @@ license=('LGPL-2.1-or-later' 'GPL-3.0-or-later') # libvirt_parthelper links to l
validpgpkeys=('453B65310595562855471199CA68BE8010084C9C') # Jiří Denemark <jdenemar@redhat.com>
sha256sums=(8ba2e72ec8bdd2418554a1474c42c35704c30174b7611eaf9a16544b71bcf00a # libvirt-10.0.0.tar.xz
4cdedadd6c9827d1efc7697c3ac2c2a992f161931acf107df98204e18d01bf8f # libvirt-10.0.0.tar.xz.asc
sha256sums=(36d9077e2b0ef6b0c6df3b42e42a67411b6ce3b1564b427b55e65019dde60eed # libvirt-10.1.0.tar.xz
024da80baf95aec52241f53474ee9b86ef9fee9ac103f5a714a5e336547f9704 # libvirt-10.1.0.tar.xz.asc
6dc7907d6d4d883ac5ea15c195af673c97cff13f4c0493d23196e94bc87f04db # libvirt.sysusers
465a3e535cdc5549beaf82b41f53b27d5352aab1313277fd0c2f33004d0d59ba) # libvirt.tmpfiles
## bfc4ecae5198c821d303e9d8676e1b15035cc580ef616b1ef24c3907aac4677f libvirt-1_10.0.0-03-x86_64.pkg.tar.lz
## b348c4ae469d8a2a2d16a6fb3fd34531cf5dba0b6ecf2787b5623d122fb01418 libvirt-1_10.1.0-01-x86_64.pkg.tar.lz

View File

@ -6,8 +6,8 @@
pkgname=(libvirt libvirt-storage-gluster libvirt-storage-iscsi-direct)
epoch=1
pkgver=10.0.0
pkgrel=3
pkgver=10.1.0
pkgrel=1
pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
arch=('x86_64')
url="https://libvirt.org/"
@ -85,7 +85,7 @@ backup=(
source=(
"https://libvirt.org/sources/$pkgname-$pkgver.tar.xz"{,.asc}
)
sha256sums=('8ba2e72ec8bdd2418554a1474c42c35704c30174b7611eaf9a16544b71bcf00a'
sha256sums=('36d9077e2b0ef6b0c6df3b42e42a67411b6ce3b1564b427b55e65019dde60eed'
'SKIP')
validpgpkeys=('453B65310595562855471199CA68BE8010084C9C') # Jiří Denemark <jdenemar@redhat.com>
@ -144,8 +144,8 @@ package_libvirt() {
cd "$pkgname-$pkgver"
meson install -C build --destdir "$pkgdir"
mkdir "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d
echo 'g libvirt - -' > "$pkgdir/usr/lib/sysusers.d/libvirt.conf"
mkdir -p "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d
echo 'g libvirt - -' > "$pkgdir/usr/lib/sysusers.d/libvirt-qemu.conf"
echo 'u libvirt-qemu /var/lib/libvirt "Libvirt QEMU user"' >> "$pkgdir/usr/lib/sysusers.d/libvirt.conf"
echo 'm libvirt-qemu kvm' >> "$pkgdir/usr/lib/sysusers.d/libvirt.conf"
echo 'z /var/lib/libvirt/qemu 0751' > "$pkgdir/usr/lib/tmpfiles.d/libvirt.conf"

View File

@ -17,4 +17,3 @@ libnbd
dbus

View File

@ -5,31 +5,39 @@
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=udisks2
pkgbase=udisks2
pkgname=(udisks2 udisks2-{btrfs,lvm2})
pkgver=2.10.1
pkgrel=03 ## eudev rebuild
pkgrel=04 ## eudev rebuild
pkgdesc="Disk Management Service, version 2 w/o systemd zram systemd-swap"
# piece of junk software coming from none other than the source of trouble
# they have added systemd-swap functionality to disk management just to exclude
# its use from non-systemd systems, zram is the victim
# since we are based on Arch we must issue junky solutions for junky software
url="https://www.freedesktop.org/wiki/Software/udisks/"
depends=('acl' 'polkit' 'glib2' 'gcc-libs' 'glibc' 'libatasmart' 'libgudev' 'libblockdev' 'util-linux-libs')
makedepends=('gobject-introspection' 'gtk-doc')
optdepends=('dosfstools: FAT filesystem support'
'ntfs-3g: NTFS filesystem management support'
'exfatprogs: exFAT filesystem support'
'udftools: UDF filesystem support'
'xfsprogs: XFS filesystem support')
provides=("udisks2=${pkgver}")
conflicts=('udisks2-nosystemd' 'udisks2-eudev')
replaces=('udisks2-nosystemd' 'udisks2-eudev')
options=(!libtool)
backup=('etc/udisks2/udisks2.conf')
makedepends=('acl' 'gcc-libs' 'glib2' 'glibc' 'gobject-introspection' 'gtk-doc'
'libatasmart' 'libblockdev' 'libblockdev-btrfs' 'libblockdev-crypto' 'libblockdev-fs'
'libblockdev-mdraid' 'libblockdev-loop' 'libblockdev-lvm' 'libblockdev-nvme'
'libblockdev-part' 'libblockdev-swap' 'libgudev' 'lvm2' 'polkit' 'util-linux-libs')
#provides=("udisks2=${pkgver}")
#conflicts=('udisks2-nosystemd' 'udisks2-eudev')
#replaces=('udisks2-nosystemd' 'udisks2-eudev')
#options=(!libtool)
#backup=('etc/udisks2/udisks2.conf')
source=("https://github.com/storaged-project/udisks/releases/download/udisks-$pkgver/udisks-$pkgver.tar.bz2"
disable_logind_support.patch)
# remove_check.patch
_pick() {
local p="$1" f d; shift
for f; do
d="$srcdir/$p/${f#$pkgdir/}"
mkdir -p "$(dirname "$d")"
mv "$f" "$d"
rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
done
}
prepare() {
cd "udisks-$pkgver"
@ -61,6 +69,7 @@ build() {
--enable-gtk-doc
#enable_available_modules=yes
# prevent libtool from overlinking everything
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
}
@ -70,12 +79,95 @@ check() {
make check
}
package() {
package_udisks2() {
depends=(
acl libacl.so
dbus # a running dbus is required for default operation
gcc-libs
glib2 libgio-2.0.so libglib-2.0.so libgmodule-2.0.so libgobject-2.0.so
glibc
libatasmart
libblockdev libbd_utils.so libblockdev.so
libblockdev-crypto # dynamically loaded by libblockdev.so, required for default operation
libblockdev-fs # dynamically loaded by libblockdev.so, required for default operation
libblockdev-mdraid # dynamically loaded by libblockdev.so, required for default operation
libblockdev-loop # dynamically loaded by libblockdev.so, required for default operation
libblockdev-nvme # dynamically loaded by libblockdev.so, required for default operation
libblockdev-part # dynamically loaded by libblockdev.so, required for default operation
libblockdev-swap # dynamically loaded by libblockdev.so, required for default operation
libgudev libgudev-1.0.so
polkit libpolkit-agent-1.so libpolkit-gobject-1.so
util-linux-libs libblkid.so libmount.so libuuid.so
)
optdepends=(
'udisks2-btrfs: for BTRFS module'
'udisks2-lvm2: for LVM2 module'
'btrfs-progs: for BTRFS support in libblockdev-fs'
'dosfstools: for FAT support in libblockdev-fs'
'exfatprogs: for exFAT support in libblockdev-fs'
'e2fsprogs: for Ext2/3/4 support in libblockdev-fs'
'f2fs-tools: for F2FS support in libblockdev-fs'
'nilfs-utils: for NILFS support in libblockdev-fs'
'udftools: for UDF support in libblockdev-fs'
'xfsprogs: for XFS support in libblockdev-fs'
)
provides=(libudisks2.so)
backup=('etc/udisks2/udisks2.conf')
cd udisks-$pkgver
make DESTDIR="$pkgdir" install
# interface declaration
install -vDm 644 data/org.freedesktop.UDisks2.xml -t "$pkgdir/usr/share/dbus-1/interfaces/"
cd "$pkgdir"
_pick $pkgbase-btrfs usr/lib/$pkgbase/modules/lib${pkgbase}_btrfs.so
_pick $pkgbase-btrfs usr/lib/pkgconfig/$pkgbase-btrfs.pc
_pick $pkgbase-btrfs usr/share/polkit-1/actions/org.freedesktop.UDisks2.btrfs.policy
_pick $pkgbase-lvm2 usr/lib/$pkgbase/modules/lib${pkgbase}_lvm2.so
_pick $pkgbase-lvm2 usr/lib/pkgconfig/$pkgbase-lvm2.pc
_pick $pkgbase-lvm2 usr/share/polkit-1/actions/org.freedesktop.UDisks2.lvm2.policy
}
package_udisks2-btrfs() {
pkgdesc+=" - BTRFS module"
depends=(
acl libacl.so
btrfs-progs
gcc-libs
glib2 libgio-2.0.so libglib-2.0.so libgmodule-2.0.so libgobject-2.0.so
glibc
libatasmart
libblockdev libbd_utils.so libblockdev.so
libblockdev-btrfs # dynamically loaded by libblockdev.so
libgudev libgudev-1.0.so
polkit libpolkit-gobject-1.so
udisks2 libudisks2.so
util-linux-libs libblkid.so libmount.so libuuid.so
)
mv -v $pkgname/* "$pkgdir/"
}
package_udisks2-lvm2() {
pkgdesc+=" - LVM2 module"
depends=(
acl libacl.so
gcc-libs
glib2 libgio-2.0.so libglib-2.0.so libgmodule-2.0.so libgobject-2.0.so
glibc
libatasmart
libblockdev libbd_utils.so libblockdev.so
libblockdev-lvm # dynamically loaded by libblockdev.so
libgudev libgudev-1.0.so
lvm2
polkit libpolkit-gobject-1.so
udisks2 libudisks2.so
util-linux-libs libblkid.so libmount.so libuuid.so
)
mv -v $pkgname/* "$pkgdir/"
}
#---- arch license gpg-key & sha256sums ----
@ -88,4 +180,7 @@ license=(GPL-2.0-or-later
sha256sums=(b75734ccf602540dedb4068bec206adcb508a4c003725e117ae8f994d92d8ece # udisks-2.10.1.tar.bz2
53eb9e7f350d76cee03b1e4ad406eaf8bbf239b8d27be696a07d39fd121916ba) # disable_logind_support.patch
## b2fc0c71639d2d6e0bd12e4da8287f9e8544f6cb5d38ff1cd5178928536f73a7 udisks2-2.10.1-03-x86_64.pkg.tar.lz
## ef97571ab39944bba1d558beb7a20c4b9ffc02a3ad9309805caea1359bbfa7c5 udisks2-2.10.1-04-x86_64.pkg.tar.lz
## 5db3c21640db96e516f513951ffb49fcde70fd68462e1e6ca9ebd68d7e70a00a udisks2-btrfs-2.10.1-04-x86_64.pkg.tar.lz
## 85230f7dfb1f8ba4a00d3601170def8757a46e5ad7cc05d8884ab3adddf3cab4 udisks2-lvm2-2.10.1-04-x86_64.pkg.tar.lz

View File

@ -1,9 +1,10 @@
# Maintainer: Felix Yan <felixonmars@archlinux.org>
# Contributor: Ionut Biru <ibiru@archlinux.org>
pkgname=udisks2
pkgbase=udisks2
pkgname=(udisks2 udisks2-{btrfs,lvm2})
pkgver=2.10.1
pkgrel=2
pkgrel=4
pkgdesc="Daemon, tools and libraries to access and manipulate disks, storage devices and technologies"
arch=('x86_64')
url="https://www.freedesktop.org/wiki/Software/udisks/"
@ -11,41 +12,50 @@ license=(
GPL-2.0-or-later
LGPL-2.0-or-later
)
depends=(
makedepends=(
'acl'
'btrfs-progs'
'gcc-libs'
'glib2'
'glibc'
'gobject-introspection'
'gtk-doc'
'libatasmart'
'libblockdev'
'libblockdev-btrfs'
'libblockdev-crypto'
'libblockdev-fs'
'libblockdev-mdraid'
'libblockdev-loop'
'libblockdev-lvm'
'libblockdev-nvme'
'libblockdev-part'
'libblockdev-swap'
'libgudev'
'lvm2'
'polkit'
'systemd-libs'
'util-linux-libs'
)
makedepends=(
'gobject-introspection'
'gtk-doc'
)
optdepends=(
'dosfstools: FAT filesystem support'
'exfatprogs: exFAT filesystem support'
'e2fsprogs: Ext2/3/4 filesystem suport'
'udftools: UDF filesystem support'
'xfsprogs: XFS filesystem support'
)
backup=('etc/udisks2/udisks2.conf')
source=("https://github.com/storaged-project/udisks/releases/download/udisks-$pkgver/udisks-$pkgver.tar.bz2")
sha512sums=('9cdaeca4306a970c85f88d406dbe5d2dad23d72f47d9ab1c021b8c2888d4c790f680eb94388d86f9255024283b4a36e98b8aee4408d193a7d4aad1e74463356a')
b2sums=('41282e4dbbd93e6bda2a10a6ff2f2fb82bfc83b3ccbed9450cca7888c634cde9300fcd0b7d055e0d8e4c8fc0b431a75d5612a24132ea9b2677d194529732178d')
_pick() {
local p="$1" f d; shift
for f; do
d="$srcdir/$p/${f#$pkgdir/}"
mkdir -p "$(dirname "$d")"
mv "$f" "$d"
rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
done
}
build() {
local configure_options=(
--disable-static
--enable-btrfs
--enable-gtk-doc
# --enable-iscsi # relies on heavily patched open-iscsi only packaged by Fedora: https://github.com/storaged-project/udisks/issues/388
--enable-lvm2
--libexecdir=/usr/lib
--localstatedir=/var
@ -67,10 +77,96 @@ check() {
make check
}
package() {
package_udisks2() {
depends=(
acl libacl.so
dbus # a running dbus is required for default operation
gcc-libs
glib2 libgio-2.0.so libglib-2.0.so libgmodule-2.0.so libgobject-2.0.so
glibc
libatasmart
libblockdev libbd_utils.so libblockdev.so
libblockdev-crypto # dynamically loaded by libblockdev.so, required for default operation
libblockdev-fs # dynamically loaded by libblockdev.so, required for default operation
libblockdev-mdraid # dynamically loaded by libblockdev.so, required for default operation
libblockdev-loop # dynamically loaded by libblockdev.so, required for default operation
libblockdev-nvme # dynamically loaded by libblockdev.so, required for default operation
libblockdev-part # dynamically loaded by libblockdev.so, required for default operation
libblockdev-swap # dynamically loaded by libblockdev.so, required for default operation
libgudev libgudev-1.0.so
polkit libpolkit-agent-1.so libpolkit-gobject-1.so
systemd-libs libsystemd.so
util-linux-libs libblkid.so libmount.so libuuid.so
)
optdepends=(
'udisks2-btrfs: for BTRFS module'
'udisks2-lvm2: for LVM2 module'
'btrfs-progs: for BTRFS support in libblockdev-fs'
'dosfstools: for FAT support in libblockdev-fs'
'exfatprogs: for exFAT support in libblockdev-fs'
'e2fsprogs: for Ext2/3/4 support in libblockdev-fs'
'f2fs-tools: for F2FS support in libblockdev-fs'
'nilfs-utils: for NILFS support in libblockdev-fs'
'udftools: for UDF support in libblockdev-fs'
'xfsprogs: for XFS support in libblockdev-fs'
)
provides=(libudisks2.so)
backup=('etc/udisks2/udisks2.conf')
cd udisks-$pkgver
make DESTDIR="$pkgdir" install
# interface declaration
install -vDm 644 data/org.freedesktop.UDisks2.xml -t "$pkgdir/usr/share/dbus-1/interfaces/"
cd "$pkgdir"
_pick $pkgbase-btrfs usr/lib/$pkgbase/modules/lib${pkgbase}_btrfs.so
_pick $pkgbase-btrfs usr/lib/pkgconfig/$pkgbase-btrfs.pc
_pick $pkgbase-btrfs usr/share/polkit-1/actions/org.freedesktop.UDisks2.btrfs.policy
_pick $pkgbase-lvm2 usr/lib/$pkgbase/modules/lib${pkgbase}_lvm2.so
_pick $pkgbase-lvm2 usr/lib/pkgconfig/$pkgbase-lvm2.pc
_pick $pkgbase-lvm2 usr/share/polkit-1/actions/org.freedesktop.UDisks2.lvm2.policy
}
package_udisks2-btrfs() {
pkgdesc+=" - BTRFS module"
depends=(
acl libacl.so
btrfs-progs
gcc-libs
glib2 libgio-2.0.so libglib-2.0.so libgmodule-2.0.so libgobject-2.0.so
glibc
libatasmart
libblockdev libbd_utils.so libblockdev.so
libblockdev-btrfs # dynamically loaded by libblockdev.so
libgudev libgudev-1.0.so
polkit libpolkit-gobject-1.so
systemd-libs libsystemd.so
udisks2 libudisks2.so
util-linux-libs libblkid.so libmount.so libuuid.so
)
mv -v $pkgname/* "$pkgdir/"
}
package_udisks2-lvm2() {
pkgdesc+=" - LVM2 module"
depends=(
acl libacl.so
gcc-libs
glib2 libgio-2.0.so libglib-2.0.so libgmodule-2.0.so libgobject-2.0.so
glibc
libatasmart
libblockdev libbd_utils.so libblockdev.so
libblockdev-lvm # dynamically loaded by libblockdev.so
libgudev libgudev-1.0.so
lvm2
polkit libpolkit-gobject-1.so
systemd-libs libsystemd.so
udisks2 libudisks2.so
util-linux-libs libblkid.so libmount.so libuuid.so
)
mv -v $pkgname/* "$pkgdir/"
}

View File

@ -9,3 +9,14 @@ gobject-introspection
gtk-doc
libblockdev-btrfs
libblockdev-crypto
libblockdev-fs
libblockdev-mdraid
libblockdev-loop
libblockdev-lvm
libblockdev-nvme
libblockdev-part
libblockdev-swap
lvm2

View File

@ -1,6 +1,6 @@
real 4m46.487s
user 4m40.276s
sys 0m7.135s
real 4m43.681s
user 5m37.804s
sys 0m9.095s