diff --git a/main/postmarketos-duranium/APKBUILD b/main/postmarketos-duranium/APKBUILD index c503fab91..e11976cfb 100644 --- a/main/postmarketos-duranium/APKBUILD +++ b/main/postmarketos-duranium/APKBUILD @@ -1,6 +1,6 @@ maintainer="Clayton Craft " pkgname=postmarketos-duranium -pkgver=10 +pkgver=11 pkgrel=0 pkgdesc="Configuration for building and booting immutable postmarketOS images" url="https://wiki.postmarketos.org/wiki/Duranium_(Immutable_postmarketOS)" @@ -29,6 +29,7 @@ license="GPL-3.0-or-later" subpackages=" $pkgname-initramfs $pkgname-sysext-dev-tools:sysext_dev_tools + $pkgname-sysext-waydroid:sysext_waydroid " _source644=" @@ -58,8 +59,11 @@ _source644=" usr/lib/sysupdate.d/11-usr.transfer usr/lib/sysupdate.d/20-uki.transfer usr/lib/sysupdate.d/50-dev-tools-sysext.transfer + usr/lib/sysupdate.d/50-waydroid-sysext.transfer usr/lib/sysupdate.d/51-dev-tools-confext.transfer + usr/lib/sysupdate.d/51-waydroid-confext.transfer usr/lib/sysupdate.d/dev-tools.feature + usr/lib/sysupdate.d/waydroid.feature usr/lib/sysusers.d/10-pmos-user.conf usr/lib/tmpfiles.d/duranium.conf usr/lib/udev/rules.d/90-udisks-ignore-verity-hack.rules @@ -210,6 +214,19 @@ sysext_dev_tools() { amove usr/local/sbin/apk } +sysext_waydroid() { + description="meta package for Duranium waydroid system extension" + depends=" + waydroid + waydroid-nftrules + " + + mkdir -p "$subpkgdir"/etc/nftables.d + # "manually" enable the rule for now, see: + # https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7791 + ln -s /usr/share/nftables.avail/51_waydroid.nft "$subpkgdir"/etc/nftables.d/ +} + sha512sums=" ac441c8a690b89a92c2d7db37145e54d918bb9838a45cf76d20de82d46848a80477a8035d9cbaa39fb6ea4747c2762789f71736aa11a78e3adcca0c339dc5677 rootfs-etc-crypttab ce3f39aa5ed95065306a42bbab6b405bcb90446e206c25509bda64ed2866d80d5168ac225baeb2a50a66e17cbb9b32f26b4a5ec1e042b5f0bf40f6907f4e4d82 rootfs-usr-lib-modprobe.d-no-firmware.conf @@ -237,8 +254,11 @@ b1aa826b83fbb5d606b5dc37a4db67a7233519e0ac953325395dd7f3b7e303d206f6297e51a749d0 177d975fb333f5703627cf389f32c6168903098734bf66feecf3b9b03a1cbb13239f3807d7a6cea5b26f0ee36c50a422b933732e3b9a6a4cac7def6bed57be59 rootfs-usr-lib-sysupdate.d-11-usr.transfer 4ffb2be01cb033c1282b6661052250937e1ac457cec3900b075d0dcdf59de7dcb2eb927c39db0e96468a90b03fed0a4e6db0d99f62d714c31a29d4684e79751f rootfs-usr-lib-sysupdate.d-20-uki.transfer 4699b75e545ccf3b539f9fb418841106f69879e5bcc9faef6918296d0c89b2fec5e3f85c7742acf4b6b5b6eb91006d38375041b78263913fd41bebab4746dee3 rootfs-usr-lib-sysupdate.d-50-dev-tools-sysext.transfer +6d3a24bfe7df2026b2bdab55eca2acd3342875fa574f3b1fc546d47b0cd5ad882641371549c70146d39d2b8fd2eae0af9326c50ec53dab7566fd7322cd6d3274 rootfs-usr-lib-sysupdate.d-50-waydroid-sysext.transfer fe0a3a0be13d4b4a8d632859cc54f95d69021f1f100debe5565beb55d909fff8bbf2f0bd561e27c67540356fb7f16bc41eab68830ab6a72fcd6d39e6c01afebb rootfs-usr-lib-sysupdate.d-51-dev-tools-confext.transfer +17119d215669bbaf5c12b30d03bb1beed9b154c087dcb4fc02fc2e74c981d0f6a5cf8cac586b9e133ee5097e66faaa0c2c5708054c7b8b2392c10c230ae2236b rootfs-usr-lib-sysupdate.d-51-waydroid-confext.transfer 89a7bddc6ebe2fd4a41355bbdc7418382e96f10d4e9e9748405f534a549bc64280f543fae16c4aa60f30830f3679d94a87357c941dff83f5134eb5ac4b654706 rootfs-usr-lib-sysupdate.d-dev-tools.feature +e7626be41123e8be466a0377fb84c857cd9cd0725094498c6148208c1862d17499b7a4e3e7279689c24ad4abd1e868fbf1216f75867425b3f3a607e622ca2beb rootfs-usr-lib-sysupdate.d-waydroid.feature fa1c3dd727fd20d16d18695d58dd10ec335d64ece00152346c84ae750ed5ade8faf5ba11747135d79972dd1a3f4f1ab496ae9425ebcf7232a4203ca9396fa7e0 rootfs-usr-lib-sysusers.d-10-pmos-user.conf fc4bf2b78e25b3f04add2ef7fbcfe70f24f8a865526ea817252a6bc4585755d40873909c4a1eb37acc86f93424f7de0bc2add29265eb2e5df69764ae0018fd76 rootfs-usr-lib-tmpfiles.d-duranium.conf a51fa1cf454169183ff086c70a777eb3d23f2f70c8e75ec27f96d06fd964c354621736901b8a53e42dcf3e5e891ced8c0ea06b793d910fbdff8c5c3bea8dc7b9 rootfs-usr-lib-udev-rules.d-90-udisks-ignore-verity-hack.rules diff --git a/main/postmarketos-duranium/rootfs-usr-lib-sysupdate.d-50-waydroid-sysext.transfer b/main/postmarketos-duranium/rootfs-usr-lib-sysupdate.d-50-waydroid-sysext.transfer new file mode 100644 index 000000000..84cefecec --- /dev/null +++ b/main/postmarketos-duranium/rootfs-usr-lib-sysupdate.d-50-waydroid-sysext.transfer @@ -0,0 +1,15 @@ +[Transfer] +Features=waydroid +ProtectVersion=%A + +[Source] +Type=url-file +Path=https://duranium.postmarketos.org/images/%M_%W_%w/ +MatchPattern=%M_%W_%w_@v.waydroid-sysext-%a.raw.zst + +[Target] +Type=regular-file +Path=/var/lib/extensions +MatchPattern=%M_%W_%w_@v.waydroid-sysext-%a.raw +Mode=0444 +InstancesMax=2 diff --git a/main/postmarketos-duranium/rootfs-usr-lib-sysupdate.d-51-waydroid-confext.transfer b/main/postmarketos-duranium/rootfs-usr-lib-sysupdate.d-51-waydroid-confext.transfer new file mode 100644 index 000000000..b01039e64 --- /dev/null +++ b/main/postmarketos-duranium/rootfs-usr-lib-sysupdate.d-51-waydroid-confext.transfer @@ -0,0 +1,15 @@ +[Transfer] +Features=waydroid +ProtectVersion=%A + +[Source] +Type=url-file +Path=https://duranium.postmarketos.org/images/%M_%W_%w/ +MatchPattern=%M_%W_%w_@v.waydroid-confext-%a.raw.zst + +[Target] +Type=regular-file +Path=/var/lib/confexts +MatchPattern=%M_%W_%w_@v.waydroid-confext-%a.raw +Mode=0444 +InstancesMax=2 diff --git a/main/postmarketos-duranium/rootfs-usr-lib-sysupdate.d-waydroid.feature b/main/postmarketos-duranium/rootfs-usr-lib-sysupdate.d-waydroid.feature new file mode 100644 index 000000000..f8565924a --- /dev/null +++ b/main/postmarketos-duranium/rootfs-usr-lib-sysupdate.d-waydroid.feature @@ -0,0 +1,3 @@ +[Feature] +Description=Waydroid +Enabled=false