*: /usr merge
Some checks failed
/ deploy-v3.19 (pull_request) Has been cancelled
/ build-v3.19 (pull_request) Has been cancelled
/ deploy-v3.20 (pull_request) Has been cancelled
/ build-v3.20 (pull_request) Has been cancelled
/ deploy-edge (pull_request) Has been cancelled
/ build-edge (pull_request) Has been cancelled
/ lint (pull_request) Successful in 24s
Some checks failed
/ deploy-v3.19 (pull_request) Has been cancelled
/ build-v3.19 (pull_request) Has been cancelled
/ deploy-v3.20 (pull_request) Has been cancelled
/ build-v3.20 (pull_request) Has been cancelled
/ deploy-edge (pull_request) Has been cancelled
/ build-edge (pull_request) Has been cancelled
/ lint (pull_request) Successful in 24s
This commit is contained in:
parent
d23bf80510
commit
65ab48938e
8 changed files with 23 additions and 23 deletions
|
@ -3,7 +3,7 @@
|
|||
pkgname=qubes-db-vm
|
||||
subpackages="$pkgname-openrc"
|
||||
pkgver=4.2.6
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
_gittag="v$pkgver"
|
||||
pkgdesc="QubesDB libs and daemon service."
|
||||
arch="x86_64"
|
||||
|
@ -39,12 +39,12 @@ build() {
|
|||
|
||||
package() {
|
||||
# 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
|
||||
}
|
||||
sha512sums="
|
||||
182ae7edb7235a21c45334d8d7aa20a7a9f63056d411fe66fe20d67ea0de7cf63d2a79886016561f69c5f444704f3728ee7b1aa6343f5ce15667ba458c08c9c7 qubes-db-vm-v4.2.6.tar.gz
|
||||
af86268c264c843b94f9cefb735b9d078dc58819c890fc0a31dd79fa2761d3c2fa87aed73752bca1db07948ba86ecfe16a745b19672ccc10dfb9461df24aa207 0001-musl-build.patch
|
||||
892eb29b9bab4d9e662678d13a5607df04cdb024c2f28332f40fa4b7c644476a4b26a9fc038dfcdac1e0b8d328165d21d50d894d2c1e27f792287dd57449e7eb 0001-create_pidfile.patch
|
||||
3d87f82d3637cf10bf1a3058ebbd2590ab17f65d1b49058f62d892f126635497abd5045f6797bc8069e5de08bb6e08fc6146deb6422090ad02122764cc6d72f0 qubes-db.openrc
|
||||
6f48b4bee6a3517bdbb884bd6f7e21916e8438c5e8b8d9d1b1cfffe970c4549d941056f9022998ed7f9edb799d9b123564f01e69cdca7da241d0fb6a8e9a1c5e qubes-db.openrc
|
||||
"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
name=$RC_SVCNAME
|
||||
cfgfile="/etc/qubes/$RC_SVCNAME.conf"
|
||||
command="/sbin/qubesdb-daemon"
|
||||
command="/usr/sbin/qubesdb-daemon"
|
||||
command_args="0"
|
||||
command_user="root"
|
||||
pidfile="/run/qubes/$RC_SVCNAME.pid"
|
||||
|
|
|
@ -9,7 +9,7 @@ subpackages="
|
|||
$pkgname-pyc
|
||||
"
|
||||
pkgver=4.2.37
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
_gittag="v$pkgver"
|
||||
pkgdesc="The Qubes core files for installation inside a Qubes VM."
|
||||
arch="x86_64"
|
||||
|
@ -107,9 +107,9 @@ build() {
|
|||
# * core systemd services and drop-ins
|
||||
# * basic network functionality (setting IP address, DNS, default gateway)
|
||||
package() {
|
||||
make install-corevm DESTDIR="$pkgdir" SBINDIR=/sbin LIBDIR=/usr/lib SYSLIBDIR=/lib
|
||||
make -C app-menu install DESTDIR="$pkgdir" install LIBDIR=/usr/lib SYSLIBDIR=/lib
|
||||
make -C misc install DESTDIR="$pkgdir" install 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 DESTDIR="$pkgdir" LIBDIR=/usr/lib SYSLIBDIR=/usr/lib install
|
||||
make -C misc DESTDIR="$pkgdir" LIBDIR=/usr/lib SYSLIBDIR=/usr/lib install
|
||||
make -C qubes-rpc DESTDIR="$pkgdir" install
|
||||
make -C qubes-rpc/kde DESTDIR="$pkgdir" install
|
||||
make -C qubes-rpc/nautilus DESTDIR="$pkgdir" install
|
||||
|
@ -156,22 +156,22 @@ networking() {
|
|||
tinyproxy
|
||||
"
|
||||
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/.
|
||||
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() {
|
||||
cd "$builddir"
|
||||
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="
|
||||
d141083238aa01975741c0b11f167f2fdc4c07301d9896b5ffb146e8414de5eda64662cf5c70cd7789423836c9af6be66dad6ee6ccf350cedd98fe354ddbb90e qubes-vm-core-v4.2.37.tar.gz
|
||||
95c080a593ca1cd457ffafc0cdd6ee28999c72f67191a3955b6081a4a7d287cae4cd0c626139562e5e1eb55516c25402a174e3599daf7d4cb259d6b4bbdff155 qubes-core-early.openrc
|
||||
61529413a16b7fa0df691c24adc41b90477c01ea70d572921ecec89df23932e5a2e60c4e73b9a84181dc30424e2e6af4ad1c7dcf6c42689c3cc346a9923d6e07 qubes-core-netvm.openrc
|
||||
da8e293520f5fce29ce76d7586e8ce1a4164798a1214079fb554c690264da1d774fdad3f45825aac52c2c3a0b0cfd39df73eb33394dedd7c043fe0f2344b90ca qubes-core.openrc
|
||||
8f1ea1b6bfb4d3089a51cc3e325861ee7b644f743b2652bf61789933adedefdbc743a61567ad980d2a6077647eb61570b68a056125abaab2a67166d249a961b0 qubes-firewall.openrc
|
||||
164159a80d00c160e74a0ebf4695c047ca7720821e4a9c395405cd96f680b6765e9c4cf426aea94fcb26e08274ec2b42adf45ecc12d26cf683ab3bd0c01afed9 qubes-firewall.openrc
|
||||
437a3dc443c5b0311c5dc8f792739eef89e38b2e854b9a5bb248211dd0eb0f26c1d79588ca2b4b63236b8bed0d735be6b2265d8328885730a8aa5f854301d61f qubes-iptables.openrc
|
||||
e9096560e4ee4cad836b686e18eb6dbac729227683eda2f0c8b3541c909f64de3489dbb66e3752014deab69cbfae7885bc15b9bb7e3942c02e40328337b9ef30 qubes-sysinit.openrc
|
||||
99ec0afc167866727072606aa183f0c7a539e68e0d8b9a57f6b9c129d3722c9135e1487eef438807d7138af0e669fb14608cbc1f1d5620ee9e995f294a8929f8 qubes-updates-proxy-forwarder.openrc
|
||||
|
|
|
@ -16,7 +16,7 @@ depend() {
|
|||
}
|
||||
|
||||
start_pre() {
|
||||
/sbin/ethtool -K "$(get_qubes_managed_iface)" sg off
|
||||
/usr/sbin/ethtool -K "$(get_qubes_managed_iface)" sg off
|
||||
checkpath --directory --owner $command_user:qubes --mode 0775 \
|
||||
/run/$RC_SVCNAME /var/log/qubes
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@ subpackages="
|
|||
qubes-vm-pipewire
|
||||
$pkgname-openrc"
|
||||
pkgver=4.2.18
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
_gittag="v$pkgver"
|
||||
pkgdesc="The Qubes GUI Agent for AppVMs"
|
||||
arch="x86_64"
|
||||
|
@ -79,7 +79,7 @@ build() {
|
|||
}
|
||||
|
||||
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
|
||||
|
||||
# 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 "-")
|
||||
|
||||
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() {
|
||||
|
|
|
@ -4,7 +4,7 @@ pkgname=qubes-vm-qrexec
|
|||
subpackages="$pkgname-openrc $pkgname-doc $pkgname-pyc"
|
||||
pkgver=4.2.22
|
||||
_gittag="v$pkgver"
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
pkgdesc="The Qubes qrexec files (qube side)"
|
||||
arch="x86_64"
|
||||
url="https://github.com/QubesOS/qubes-core-qrexec"
|
||||
|
@ -47,8 +47,8 @@ build() {
|
|||
}
|
||||
|
||||
package() {
|
||||
make install-base DESTDIR="$pkgdir" SBINDIR=/sbin LIBDIR=/usr/lib SYSLIBDIR=/lib
|
||||
make install-vm 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=/usr/sbin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib
|
||||
install -Dm 755 "$srcdir"/qubes-qrexec-agent.openrc "$pkgdir"/etc/init.d/qubes-qrexec-agent
|
||||
}
|
||||
sha512sums="
|
||||
|
|
|
@ -7,7 +7,7 @@ subpackages="
|
|||
$pkgname-pyc
|
||||
"
|
||||
pkgver=4.2.17
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
_gittag="v$pkgver"
|
||||
pkgdesc="Common Linux files for Qubes VM."
|
||||
arch="x86_64"
|
||||
|
@ -40,7 +40,7 @@ build() {
|
|||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
|
@ -60,5 +60,5 @@ support() {
|
|||
}
|
||||
sha512sums="
|
||||
3a3ddd46d94b0fae608dc7436a1a43437968b65830de2c65a5735d3264063df493ce12514071b0214ae3c906c364b420e09fcf569c0395629292b1f34f90dd83 qubes-vm-utils-v4.2.17.tar.gz
|
||||
aebc606faa95948be77766f164fc40e4be66e4398e7f56ad52ba9de4c8f7de4ec0c4b48b23a3a6dd083d6f19ae1a591f3ae0caf2c696fd061cd8fea4bdf7d4f3 qubes-meminfo-writer.openrc
|
||||
c29bac0c6b9a0c81ee42e88541d9216549276448a02c3005ea20d85c7eda483cee28bbc159098bd42badc7ed80058734311931ee4ef13e170e49f83cf3f5a9ae qubes-meminfo-writer.openrc
|
||||
"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
name=$RC_SVCNAME
|
||||
cfgfile="/etc/qubes/$RC_SVCNAME.conf"
|
||||
pidfile="/var/run/meminfo-writer.pid"
|
||||
command="/sbin/meminfo-writer"
|
||||
command="/usr/sbin/meminfo-writer"
|
||||
command_args="30000 100000 $pidfile"
|
||||
command_user="root"
|
||||
start_stop_daemon_args=""
|
||||
|
|
Loading…
Reference in a new issue