*: /usr merge
All checks were successful
/ lint (pull_request) Successful in 35s
/ deploy-v3.20 (pull_request) Successful in 1m26s
/ build-v3.20 (pull_request) Successful in 3m19s
/ deploy-edge (pull_request) Successful in 1m33s
/ build-edge (pull_request) Successful in 3m51s
/ deploy-v3.19 (pull_request) Successful in 2m7s
/ build-v3.19 (pull_request) Successful in 3m27s
All checks were successful
/ lint (pull_request) Successful in 35s
/ deploy-v3.20 (pull_request) Successful in 1m26s
/ build-v3.20 (pull_request) Successful in 3m19s
/ deploy-edge (pull_request) Successful in 1m33s
/ build-edge (pull_request) Successful in 3m51s
/ deploy-v3.19 (pull_request) Successful in 2m7s
/ build-v3.19 (pull_request) Successful in 3m27s
This commit is contained in:
parent
d23bf80510
commit
b5ad097e45
5 changed files with 17 additions and 17 deletions
|
@ -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="
|
||||||
|
|
|
@ -9,7 +9,7 @@ subpackages="
|
||||||
$pkgname-pyc
|
$pkgname-pyc
|
||||||
"
|
"
|
||||||
pkgver=4.2.37
|
pkgver=4.2.37
|
||||||
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="
|
||||||
d141083238aa01975741c0b11f167f2fdc4c07301d9896b5ffb146e8414de5eda64662cf5c70cd7789423836c9af6be66dad6ee6ccf350cedd98fe354ddbb90e qubes-vm-core-v4.2.37.tar.gz
|
d141083238aa01975741c0b11f167f2fdc4c07301d9896b5ffb146e8414de5eda64662cf5c70cd7789423836c9af6be66dad6ee6ccf350cedd98fe354ddbb90e qubes-vm-core-v4.2.37.tar.gz
|
||||||
|
|
|
@ -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() {
|
||||||
|
|
|
@ -4,7 +4,7 @@ pkgname=qubes-vm-qrexec
|
||||||
subpackages="$pkgname-openrc $pkgname-doc $pkgname-pyc"
|
subpackages="$pkgname-openrc $pkgname-doc $pkgname-pyc"
|
||||||
pkgver=4.2.22
|
pkgver=4.2.22
|
||||||
_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="
|
||||||
|
|
|
@ -7,7 +7,7 @@ subpackages="
|
||||||
$pkgname-pyc
|
$pkgname-pyc
|
||||||
"
|
"
|
||||||
pkgver=4.2.17
|
pkgver=4.2.17
|
||||||
pkgrel=3
|
pkgrel=4
|
||||||
_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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue