*: /usr merge
All checks were successful
/ lint (pull_request) Successful in 35s
/ deploy-edge (pull_request) Successful in 1m12s
/ build-edge (pull_request) Successful in 4m14s
/ deploy-v3.19 (pull_request) Successful in 1m5s
/ build-v3.19 (pull_request) Successful in 3m42s
/ deploy-v3.20 (pull_request) Successful in 1m1s
/ build-v3.20 (pull_request) Successful in 3m58s

This commit is contained in:
Antoine Martin 2024-10-16 19:36:49 -04:00
parent 8109344b8e
commit bad5de4e9a
Signed by: forge
GPG key ID: D62A472A4AA7D541
5 changed files with 17 additions and 17 deletions

View file

@ -3,7 +3,7 @@
pkgname=qubes-db-vm pkgname=qubes-db-vm
subpackages="$pkgname-openrc" subpackages="$pkgname-openrc"
pkgver=4.2.6 pkgver=4.2.6
pkgrel=0 pkgrel=1
_gittag="v$pkgver" _gittag="v$pkgver"
pkgdesc="QubesDB libs and daemon service." pkgdesc="QubesDB libs and daemon service."
arch="x86_64" arch="x86_64"
@ -39,7 +39,7 @@ build() {
package() { package() {
# Install all with python bindings # Install all with python bindings
make install DESTDIR=$pkgdir LIBDIR=/usr/lib BINDIR=/usr/bin SBINDIR=/sbin make install DESTDIR=$pkgdir LIBDIR=/usr/lib BINDIR=/usr/bin SBINDIR=/usr/sbin
install -Dm 755 "$srcdir"/qubes-db.openrc "$pkgdir"/etc/init.d/qubes-db install -Dm 755 "$srcdir"/qubes-db.openrc "$pkgdir"/etc/init.d/qubes-db
} }
sha512sums=" sha512sums="

View file

@ -9,7 +9,7 @@ subpackages="
$pkgname-pyc $pkgname-pyc
" "
pkgver=4.3.7 pkgver=4.3.7
pkgrel=0 pkgrel=1
_gittag="v$pkgver" _gittag="v$pkgver"
pkgdesc="The Qubes core files for installation inside a Qubes VM." pkgdesc="The Qubes core files for installation inside a Qubes VM."
arch="x86_64" arch="x86_64"
@ -107,9 +107,9 @@ build() {
# * core systemd services and drop-ins # * core systemd services and drop-ins
# * basic network functionality (setting IP address, DNS, default gateway) # * basic network functionality (setting IP address, DNS, default gateway)
package() { package() {
make install-corevm DESTDIR="$pkgdir" SBINDIR=/sbin LIBDIR=/usr/lib SYSLIBDIR=/lib make DESTDIR="$pkgdir" SYSTEM_DROPIN_DIR=/usr/lib/systemd SBINDIR=/usr/sbin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib install-corevm
make -C app-menu install DESTDIR="$pkgdir" install LIBDIR=/usr/lib SYSLIBDIR=/lib make -C app-menu DESTDIR="$pkgdir" LIBDIR=/usr/lib SYSLIBDIR=/usr/lib install
make -C misc install DESTDIR="$pkgdir" install LIBDIR=/usr/lib SYSLIBDIR=/lib make -C misc DESTDIR="$pkgdir" LIBDIR=/usr/lib SYSLIBDIR=/usr/lib install
make -C qubes-rpc DESTDIR="$pkgdir" install make -C qubes-rpc DESTDIR="$pkgdir" install
make -C qubes-rpc/kde DESTDIR="$pkgdir" install make -C qubes-rpc/kde DESTDIR="$pkgdir" install
make -C qubes-rpc/nautilus DESTDIR="$pkgdir" install make -C qubes-rpc/nautilus DESTDIR="$pkgdir" install
@ -156,15 +156,15 @@ networking() {
tinyproxy tinyproxy
" "
cd "$builddir" cd "$builddir"
install -dm 755 "$subpkgdir"/usr/bin install -dm 755 "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib/systemd/system
mv "$pkgdir"/usr/bin/qubes-firewall "$subpkgdir"/usr/bin/. mv "$pkgdir"/usr/bin/qubes-firewall "$subpkgdir"/usr/bin/.
make install-netvm DESTDIR="$subpkgdir" SBINDIR=/sbin LIBDIR=/usr/lib SYSLIBDIR=/lib make install-netvm DESTDIR="$subpkgdir" SYSTEM_DROPIN_DIR=/usr/lib/systemd SBINDIR=/usr/sbin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib
} }
root() { root() {
cd "$builddir" cd "$builddir"
pkgdesc="Qubes OS Passwordless root access from normal user" pkgdesc="Qubes OS Passwordless root access from normal user"
make -C passwordless-root install DESTDIR="$subpkgdir" SBINDIR=/sbin LIBDIR=/usr/lib SYSLIBDIR=/lib make -C passwordless-root install DESTDIR="$subpkgdir" SBINDIR=/usr/sbin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib
} }
sha512sums=" sha512sums="
4fd7d72a7500a4b97db194a272bf27aa87a475e65b14e8509e651e70da01509fa0dc946d34e5d6c49187e9bb7df79e4f5fbdc76ce4d23b5d172cc489c7fc1c41 qubes-vm-core-v4.3.7.tar.gz 4fd7d72a7500a4b97db194a272bf27aa87a475e65b14e8509e651e70da01509fa0dc946d34e5d6c49187e9bb7df79e4f5fbdc76ce4d23b5d172cc489c7fc1c41 qubes-vm-core-v4.3.7.tar.gz

View file

@ -6,7 +6,7 @@ subpackages="
qubes-vm-pipewire qubes-vm-pipewire
$pkgname-openrc" $pkgname-openrc"
pkgver=4.2.18 pkgver=4.2.18
pkgrel=0 pkgrel=1
_gittag="v$pkgver" _gittag="v$pkgver"
pkgdesc="The Qubes GUI Agent for AppVMs" pkgdesc="The Qubes GUI Agent for AppVMs"
arch="x86_64" arch="x86_64"
@ -79,7 +79,7 @@ build() {
} }
package() { package() {
make install-rh-agent DESTDIR="$pkgdir" LIBDIR=/usr/lib USRLIBDIR=/usr/lib SYSLIBDIR=/lib make install-rh-agent DESTDIR="$pkgdir" LIBDIR=/usr/lib USRLIBDIR=/usr/lib SYSLIBDIR=/usr/lib
install -Dm 755 "$srcdir"/qubes-gui-agent.openrc "$pkgdir"/etc/init.d/qubes-gui-agent install -Dm 755 "$srcdir"/qubes-gui-agent.openrc "$pkgdir"/etc/init.d/qubes-gui-agent
# Starts qubes-session after X11 start # Starts qubes-session after X11 start
@ -100,7 +100,7 @@ pulseaudio() {
local pa_ver=$(pkg-config --modversion libpulse 2>/dev/null | cut -f 1 -d "-") local pa_ver=$(pkg-config --modversion libpulse 2>/dev/null | cut -f 1 -d "-")
cd "$builddir" cd "$builddir"
make install-pulseaudio DESTDIR=$subpkgdir PA_VER=$pa_ver LIBDIR=/usr/lib USRLIBDIR=/usr/lib SYSLIBDIR=/lib make install-pulseaudio DESTDIR=$subpkgdir PA_VER=$pa_ver LIBDIR=/usr/lib USRLIBDIR=/usr/lib SYSLIBDIR=/usr/lib
} }
pipewire() { pipewire() {

View file

@ -4,7 +4,7 @@ pkgname=qubes-vm-qrexec
subpackages="$pkgname-openrc $pkgname-doc $pkgname-pyc" subpackages="$pkgname-openrc $pkgname-doc $pkgname-pyc"
pkgver=4.3.0 pkgver=4.3.0
_gittag="v$pkgver" _gittag="v$pkgver"
pkgrel=0 pkgrel=1
pkgdesc="The Qubes qrexec files (qube side)" pkgdesc="The Qubes qrexec files (qube side)"
arch="x86_64" arch="x86_64"
url="https://github.com/QubesOS/qubes-core-qrexec" url="https://github.com/QubesOS/qubes-core-qrexec"
@ -47,8 +47,8 @@ build() {
} }
package() { package() {
make install-base DESTDIR="$pkgdir" SBINDIR=/sbin LIBDIR=/usr/lib SYSLIBDIR=/lib make install-base DESTDIR="$pkgdir" SBINDIR=/usr/sbin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib
make install-vm DESTDIR="$pkgdir" SBINDIR=/sbin LIBDIR=/usr/lib SYSLIBDIR=/lib make install-vm DESTDIR="$pkgdir" SBINDIR=/usr/sbin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib
install -Dm 755 "$srcdir"/qubes-qrexec-agent.openrc "$pkgdir"/etc/init.d/qubes-qrexec-agent install -Dm 755 "$srcdir"/qubes-qrexec-agent.openrc "$pkgdir"/etc/init.d/qubes-qrexec-agent
} }
sha512sums=" sha512sums="

View file

@ -7,7 +7,7 @@ subpackages="
$pkgname-pyc $pkgname-pyc
" "
pkgver=4.3.4 pkgver=4.3.4
pkgrel=0 pkgrel=1
_gittag="v$pkgver" _gittag="v$pkgver"
pkgdesc="Common Linux files for Qubes VM." pkgdesc="Common Linux files for Qubes VM."
arch="x86_64" arch="x86_64"
@ -40,7 +40,7 @@ build() {
} }
package() { package() {
make install DESTDIR="$pkgdir" LIBDIR=/usr/lib SYSLIBDIR=/lib SBINDIR=/sbin make install DESTDIR="$pkgdir" LIBDIR=/usr/lib SYSLIBDIR=/usr/lib SBINDIR=/usr/sbin
install -Dm 755 "$srcdir"/qubes-meminfo-writer.openrc "$pkgdir"/etc/init.d/qubes-meminfo-writer install -Dm 755 "$srcdir"/qubes-meminfo-writer.openrc "$pkgdir"/etc/init.d/qubes-meminfo-writer
} }