main/postmarketos-config-nftables: systemd support

Apparently nftables-openrc doesn't get pulled in automatically? But we can't just depend on it now. Add our own -openrc subpackage with the correct install_if property to pull in nftables-openrc. The upstream nftables-openrc subpackage should be fixed (if it's broken). Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
main/postmarketos-bootsplash: systemd support
2024-03-21 22:43:20 +00:00 · 2024-03-21 22:43:20 +00:00 · 2024-03-21 22:43:20 +00:00 · 2024-03-21 22:43:20 +00:00 · 2024-03-21 22:43:20 +00:00 · 2024-03-21 22:43:12 +00:00
55 changed files with 366 additions and 262 deletions
@@ -3,7 +3,7 @@
 pkgname=device-xiaomi-daisy
 pkgdesc="Xiaomi Mi A2 Lite"
 pkgver=9
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -45,6 +45,6 @@ nonfree_firmware() {
 }

 sha512sums="
-0982ea07d3a048da27a10dd41efacf638d08be35768b587c31874d21654c4e5ba99096729c0f14d18e6f4447ce277dd1cf986162462654eb01c916cc458503e7  deviceinfo
+8c5980c1da9e5bc91f11bb8056ac9a225cb84a90a42a964dc0dc2966220c105683081055fdcb1caa8c198019d8373d8c5fe27155429c17814d34075d5f961aa4  deviceinfo
 7202f0a55dfe43348940412fc38e59c855594b070db8742419feadb2299086d5810107201a228b7137b7cc7a97c94afac95d81c0cd65c52f31dbcb619b0a4279  modules-initfs
 "
@@ -20,8 +20,6 @@ deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="2280"
 deviceinfo_swap_size_recommended="1024"
-deviceinfo_dev_touchscreen="/dev/input/event1"
-deviceinfo_dev_touchscreen_calibration="4.00 0.00 0.00 0.00 1.80 0.00"

 # Bootloader related
 deviceinfo_flash_method="fastboot"
@@ -2,7 +2,7 @@
 # Co-Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=soc-qcom-msm8916
 pkgdesc="Common package for Qualcomm MSM8916 devices"
-pkgver=21
+pkgver=20
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -10,7 +10,6 @@ arch="aarch64 armv7"
 options="!check !archcheck !tracedeps pmb:cross-native"
 depends="$pkgname-ucm swclock-offset"
 subpackages="
-	$pkgname-gpu
 	$pkgname-ucm
 	$pkgname-rproc-none:rproc_none
 	$pkgname-rproc-no-modem:rproc_no_modem
@@ -23,7 +22,6 @@ source="$pkgname-$_ucm_commit.tar.gz::https://github.com/msm8916-mainline/alsa-u
 	q6voiced.conf
 	77-modem-samsung-msm8916.rules
 	90-feedbackd-pm8916.rules
-	adreno-a306-quirks.sh
 	"

 package() {
@@ -86,18 +84,9 @@ samsung_modem_workaround() {
 		"$subpkgdir"/lib/udev/rules.d/77-modem-samsung-msm8916.rules
 }

-gpu() {
-	pkgdesc="Various GPU workaround for Adreno a306"
-	install_if="$pkgname=$pkgver-r$pkgrel mesa-dri-gallium"
-
-	install -Dm755 "$srcdir"/adreno-a306-quirks.sh \
-		"$subpkgdir"/etc/profile.d/adreno-a306-quirks.sh
-}
-
 sha512sums="
 eee73ae7895fb6772b35a190956d17642d08af47a0fa5dfd022052c5b30c99cf9649215aef161ddcc21fac236f2a1435ab906462c7458b4e99e405b6cb6ef5f8  soc-qcom-msm8916-3deea2860ab680c3e790442dbdf578fef152e639.tar.gz
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
 bcebc36ec62140f4620d462be2b95858adae380e5d74f6b9c9b956fb76a6541f39749f4dcec6ac3c39b868dbfed6fac7a34ba357510532a3df2d39f7ea818d55  77-modem-samsung-msm8916.rules
 90fca4a3291a2c84c0b20e41308c4698374ba896e9365ca80dbfd0c0c4f7dc08317f3dd865a3c7f6707c81b02f5bb24136d1172253d2e4fdd50039bbbf02a178  90-feedbackd-pm8916.rules
-ff143f0f8654bba26087439e206b62c9f8e25f945fa299ba1b7504316f7398a0622404f2415e915ce1c96809ed9a5e93fc16ddcb2bafe410f35466510dc2d51d  adreno-a306-quirks.sh
 "
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# New GTK renderer crashes a306.
-export GSK_RENDERER=gl
@@ -1 +0,0 @@
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}="2c7c/125/318", RUN+="/sbin/rc-service eg25-manager restart"
@@ -2,8 +2,8 @@
 # Maintainer: Arnav Singh <me@arnavion.dev>
 # Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
 pkgname=device-pine64-pinephone
-pkgver=1
-pkgrel=0
+pkgver=0.47
+pkgrel=3
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
@@ -14,7 +14,6 @@ subpackages="
 	$pkgname-gnome
 	$pkgname-kirigami:kirigami
 	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-openrc
 	$pkgname-plasma-mobile:plasma_mobile
 	$pkgname-sensorfw
 	$pkgname-shelli
@@ -48,7 +47,6 @@ source="
 	60-flashlight.rules
 	70-wifi-pm.rules
 	90-modem-eg25.rules
-	90-modem-eg25-openrc.rules
 	UPower.conf
 	deviceinfo
 	modules-initfs
@@ -174,13 +172,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }

-openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel eg25-manager-openrc"
-	depends="eg25-manager-openrc"
-	install -Dm644 "$srcdir"/90-modem-eg25-openrc.rules -t \
-		"$subpkgdir"/usr/lib/udev/rules.d/
-}
-
 camera() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-default-camera"
 	depends="megapixels"
@@ -255,7 +246,6 @@ bac664c504d9a3adc6e3d25f24ac63cf7c449a82374544a5b56c259dc25af580897b9dc992865ac8
 9170da7ac869254644f2fc8d914102f2c16e917dbeb53e33b96c76936711d0540f55fa5c2526d73d5fe244500bc2728bc9d629e2524cf52c573d11e833aee666  60-flashlight.rules
 8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5  70-wifi-pm.rules
 7dc2b7c20b4a2b15f597a6417bd01797643dad84a3683b0dee648e030fb6326e9d020307643fdcdf1bb43fc44af9975697e417003bd359610bae2d8ce614fc00  90-modem-eg25.rules
-c6d9b65100072687df11ed2231edf3a007a6a54941e321fc5416131e881291eaf5853a4f6f7819510c460adcc487fce59bfd4eeb001363ddc87cae7ef85e3e98  90-modem-eg25-openrc.rules
 ed0e03f7e1c0348c06be9a7922414469245604ce813bbf0c8910ef211cb993bbb0d0d4615c9c961d50712415f85d6b73e0cf02780ac784666aac56e4889341e4  UPower.conf
 87751806329118272bc887691a0d5b588fa7a601fb048594785032a661b7e48a86c9d97f8bfa99edf247051a81799f2e628e5bf7c129cf2919c2abf0c146e031  deviceinfo
 218d1361622418a0f79bd661a601baf586aec3995cf32304399b47664caf92bac006466ae1e59afa90f6ab4b9ed6acd16147a696fffd0dcab2492e2428ecc0b0  modules-initfs
@@ -3,19 +3,19 @@
 # Co-Maintainer: Jethrob <jeybee@hotmail.com>
 pkgname=device-microsoft-surface-rt
 pkgdesc="Microsoft Surface RT"
-pkgver=8
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
-options="!check !archcheck"
+# pmb:strict: avoid grub-related install error during build with pmbootstrap
+options="!check !archcheck pmb:strict"
 depends="
 	alsa-ucm-conf
 	linux-postmarketos-grate
 	postmarketos-base
-	systemd-boot
 "
-makedepends="devicepkg-dev"
+makedepends="devicepkg-dev grub grub-efi"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-x11
@@ -24,10 +24,28 @@ source="deviceinfo modules-initfs"

 build() {
 	devicepkg_build $startdir $pkgname
+
+	grub-mkimage \
+		--prefix="/grub" \
+		--output="bootarm.efi" \
+		--format="arm-efi" \
+		--compression="xz" \
+		\
+		disk \
+		fat \
+		gzio \
+		iso9660 \
+		linux \
+		normal \
+		part_gpt \
+		part_msdos
 }

 package() {
 	devicepkg_package $startdir $pkgname
+
+	install -D "$srcdir"/bootarm.efi \
+		"$pkgdir"/boot/EFI/Boot/bootarm.efi
 }

 nonfree_firmware() {
@@ -43,6 +61,6 @@ x11() {
 }

 sha512sums="
-9e480a8b0958e7f481aa0297b01639ab7b9ddee9043fc8af44ecd175fa44a4ee4344249f71a20fa3bbdd55258ce380c0002be11f038e91737aaaee4209cd9299  deviceinfo
+4585b96c10b86012d2ce33c623adf4f64a77219372a17e79ff3617bed1b18617f0965a4d9ea859dc7ecc6892970cbc9327936ce9413787e991d77ad57ec94ba6  deviceinfo
 67ff4306270b7e6e292ddb48ac5fcb1472840d8eaa412f9cd989442fb20139ee3c844fd1ca5c5b923c7980403d945999a77fc6617127059e56e22bdc8dca2bf8  modules-initfs
 "
@@ -18,6 +18,6 @@ deviceinfo_external_storage="true"
 deviceinfo_flash_method="none"
 deviceinfo_dtb="tegra30-microsoft-surface-rt-efi"
 deviceinfo_kernel_cmdline="cpuidle.off=1 console=ttyS0,115200 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE"
-deviceinfo_generate_systemd_boot="true"
+deviceinfo_generate_grub_config="true"
 deviceinfo_generate_bootimg="false"
 deviceinfo_boot_filesystem="fat32"
@@ -1,5 +0,0 @@
-# bluetooth firmware
-/lib/firmware/rtl_bt/rtl8821cs_fw.bin
-# former is a symlink to latter
-/lib/firmware/rtl_bt/rtl8821cs_config.bin
-/lib/firmware/rtl_bt/rtl8761b_config.bin
@@ -2,7 +2,7 @@
 # Maintainer: Vitaliy Ognev <vitaliy.ognev@gmail.com>
 pkgname=device-powkiddy-x55
 pkgdesc="Powkiddy X55"
-pkgver=2
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -17,13 +17,11 @@ depends="
 "
 makedepends="devicepkg-dev"
 source="
-	00-bt-firmware.files
-	cage-ui-powkiddy-x55-rotate.sh
 	deviceinfo
 	rtw88.conf
+	cage-ui-powkiddy-x55-rotate.sh
 "
 subpackages="$pkgname-cage-ui-addons:cage_ui_addons:noarch"
-_pmb_recommends="powkiddy-x55-mapper"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -33,11 +31,6 @@ package() {
 	devicepkg_package $startdir $pkgname

 	install -Dm644 "$srcdir"/rtw88.conf -t "$pkgdir"/etc/modprobe.d/
-	# See https://lore.kernel.org/lkml/CA+fyA4SqT4jgpWeq_ipp7i3ZM7s=gQkSdtsPw6x+zeJdGcXvqw@mail.gmail.com/.
-	# When both BT(UART)/WiFi(SDIO) drivers modprobed simultaneously, seems there's a kind of misbehaviour,
-	# probably related to the fact that both BT/WiFi provided by same chip but accessed via different interfaces.
-	# Making btrtl compiled into kernel and providing firmware in initramfs seems to work around the problem.
-	install -Dm644 "$srcdir"/00-bt-firmware.files -t "$pkgdir"/etc/mkinitfs/files/
 }

 cage_ui_addons() {
@@ -48,8 +41,7 @@ cage_ui_addons() {
 }

 sha512sums="
-6ef832211ba030b0e4c94699bb0b1594166ef26cc8efc3434ff962b28451dbf9e5717e887f4b6cff07cbff32f4c7b4e282bb70a72f2460a564d22b64c3702aa4  00-bt-firmware.files
-a22986cab90dd8641956e19f8139e1cb7f24a349cb2907cadb0001b0f5ff9be67b7fa717502f3b078ea8db62eb0fdb8de20e35495b4e4db69c0940dcac04996d  cage-ui-powkiddy-x55-rotate.sh
 71efac86cba6e1982b0557636b08c050da9adcc98ecfa8d91ad96843994434d0e09a0af8094f103c88314a07a20962cad58f05c38109b887399b84b324cb05f1  deviceinfo
 3765ba8da5c22965dbcbe199665d78af42187873b3dd0314b78f0e389e5703f40277f8b784566badbe21241a06074e3769a263ba5eb6099c01d6cda0bf024a75  rtw88.conf
+a22986cab90dd8641956e19f8139e1cb7f24a349cb2907cadb0001b0f5ff9be67b7fa717502f3b078ea8db62eb0fdb8de20e35495b4e4db69c0940dcac04996d  cage-ui-powkiddy-x55-rotate.sh
 "
@@ -4,7 +4,7 @@
 _flavor="postmarketos-stericsson"
 _config="config-$_flavor.armv7"
 pkgname=linux-$_flavor
-pkgver=6.8.1
+pkgver=6.7.0
 pkgrel=0
 pkgdesc="Mainline kernel for ST-Ericsson NovaThor devices"
 arch="armv7"
@@ -65,6 +65,6 @@ package() {
 }

 sha512sums="
-255921dd12f1043a4db38b5435b34773267c592f6712815c0851f1e0add71131fb00fd00746200eabdad29ba5b6e38a768da9c048da47fb5aa59d8eaef7d236e  linux-6.8.1.tar.xz
-b5da01ede887ddce973898d16ddc087f9a6cee92f10866892ad37ecbf9be92b7c524065a6593e0fb42abed23dc87d11812b803d9a1ee719a5cef4f8865e10208  config-postmarketos-stericsson.armv7
+de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad  linux-6.7.tar.xz
+2f71e984835fe838031d07ea084a6179674c09ba1a9688c84d4eff0d1c19686475cd92bb2519e033f557f781aea056efcddbe2bb2d6092eb3cf39d577c96ea89  config-postmarketos-stericsson.armv7
 "
@@ -1,19 +1,18 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.8.1 Kernel Configuration
+# Linux/arm 6.7.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
+CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24200
+CONFIG_AS_VERSION=24100
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24200
+CONFIG_LD_VERSION=24100
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
-CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -147,10 +146,8 @@ CONFIG_GENERIC_SCHED_CLOCK=y
 # end of Scheduler features

 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
-CONFIG_GCC10_NO_ARRAY_BOUNDS=y
+CONFIG_GCC11_NO_ARRAY_BOUNDS=y
 CONFIG_CC_NO_ARRAY_BOUNDS=y
-CONFIG_GCC_NO_STRINGOP_OVERFLOW=y
-CONFIG_CC_NO_STRINGOP_OVERFLOW=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
@@ -222,14 +219,14 @@ CONFIG_AIO=y
 CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
-CONFIG_KCMP=y
-CONFIG_RSEQ=y
-CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_SELFTEST is not set
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
+CONFIG_RSEQ=y
+CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_USE_VMALLOC=y

@@ -287,9 +284,6 @@ CONFIG_ARCH_MULTI_V6_V7=y

 # CONFIG_ARCH_VIRT is not set
 # CONFIG_ARCH_AIROHA is not set
-# CONFIG_ARCH_RDA is not set
-# CONFIG_ARCH_SUNPLUS is not set
-# CONFIG_ARCH_UNIPHIER is not set
 # CONFIG_ARCH_ACTIONS is not set
 # CONFIG_ARCH_ALPINE is not set
 # CONFIG_ARCH_ARTPEC is not set
@@ -325,6 +319,7 @@ CONFIG_ARCH_MULTI_V6_V7=y
 # end of TI OMAP/AM/DM/DRA Family

 # CONFIG_ARCH_QCOM is not set
+# CONFIG_ARCH_RDA is not set
 # CONFIG_ARCH_REALTEK is not set
 # CONFIG_ARCH_ROCKCHIP is not set
 # CONFIG_ARCH_S5PV210 is not set
@@ -333,8 +328,10 @@ CONFIG_ARCH_MULTI_V6_V7=y
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_STI is not set
 # CONFIG_ARCH_STM32 is not set
+# CONFIG_ARCH_SUNPLUS is not set
 # CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_TEGRA is not set
+# CONFIG_ARCH_UNIPHIER is not set
 CONFIG_ARCH_U8500=y
 CONFIG_UX500_SOC_DB8500=y
 CONFIG_UX500_DEBUG_UART=2
@@ -693,7 +690,6 @@ CONFIG_BLOCK_LEGACY_AUTOLOAD=y
 CONFIG_BLK_CGROUP_RWSTAT=y
 # CONFIG_BLK_DEV_BSGLIB is not set
 # CONFIG_BLK_DEV_INTEGRITY is not set
-CONFIG_BLK_DEV_WRITE_MOUNTED=y
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
@@ -780,8 +776,9 @@ CONFIG_ZSMALLOC_STAT=y
 CONFIG_ZSMALLOC_CHAIN_SIZE=8

 #
-# Slab allocator options
+# SLAB allocator options
 #
+# CONFIG_SLAB_DEPRECATED is not set
 CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
@@ -789,7 +786,7 @@ CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
-# end of Slab allocator options
+# end of SLAB allocator options

 # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
 CONFIG_COMPAT_BRK=y
@@ -830,8 +827,6 @@ CONFIG_MEMFD_CREATE=y
 CONFIG_LRU_GEN=y
 CONFIG_LRU_GEN_ENABLED=y
 # CONFIG_LRU_GEN_STATS is not set
-CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
-CONFIG_PER_VMA_LOCK=y
 CONFIG_LOCK_MM_AND_FIND_VMA=y

 #
@@ -970,7 +965,7 @@ CONFIG_NFT_NAT=m
 # CONFIG_NFT_QUOTA is not set
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_REJECT_INET=m
-CONFIG_NFT_COMPAT=m
+# CONFIG_NFT_COMPAT is not set
 # CONFIG_NFT_HASH is not set
 # CONFIG_NFT_SOCKET is not set
 # CONFIG_NFT_OSF is not set
@@ -1178,6 +1173,7 @@ CONFIG_NF_DEFRAG_IPV6=m
 # CONFIG_NF_TABLES_BRIDGE is not set
 # CONFIG_NF_CONNTRACK_BRIDGE is not set
 # CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_BPFILTER is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -1513,7 +1509,6 @@ CONFIG_ZRAM_DEF_COMP_ZSTD=y
 # CONFIG_ZRAM_DEF_COMP_842 is not set
 CONFIG_ZRAM_DEF_COMP="zstd"
 # CONFIG_ZRAM_WRITEBACK is not set
-CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y
 CONFIG_ZRAM_MEMORY_TRACKING=y
 # CONFIG_ZRAM_MULTI_COMP is not set
 CONFIG_BLK_DEV_LOOP=m
@@ -1741,6 +1736,7 @@ CONFIG_NET_VENDOR_WIZNET=y
 # CONFIG_WIZNET_W5300 is not set
 CONFIG_NET_VENDOR_XILINX=y
 # CONFIG_XILINX_EMACLITE is not set
+# CONFIG_XILINX_AXI_EMAC is not set
 # CONFIG_XILINX_LL_TEMAC is not set
 CONFIG_PHYLIB=y
 CONFIG_SWPHY=y
@@ -1799,7 +1795,6 @@ CONFIG_SMSC_PHY=y
 # CONFIG_DP83867_PHY is not set
 # CONFIG_DP83869_PHY is not set
 # CONFIG_DP83TD510_PHY is not set
-# CONFIG_DP83TG720_PHY is not set
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_XILINX_GMII2RGMII is not set
 # CONFIG_MICREL_KS8995MA is not set
@@ -1842,7 +1837,6 @@ CONFIG_WLAN_VENDOR_ATH=y
 # CONFIG_ATH6KL is not set
 # CONFIG_ATH10K is not set
 # CONFIG_WCN36XX is not set
-# CONFIG_ATH11K is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
 CONFIG_WLAN_VENDOR_BROADCOM=y
 # CONFIG_B43 is not set
@@ -1854,8 +1848,10 @@ CONFIG_BRCMFMAC_PROTO_BCDC=y
 CONFIG_BRCMFMAC_SDIO=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
 CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_WLAN_VENDOR_INTERSIL=y
+# CONFIG_HOSTAP is not set
 # CONFIG_P54_COMMON is not set
 CONFIG_WLAN_VENDOR_MARVELL=y
 # CONFIG_LIBERTAS is not set
@@ -2245,6 +2241,7 @@ CONFIG_SPI_PL022=y
 # CONFIG_SPI_MXIC is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
 # CONFIG_SPI_AMD is not set

 #
@@ -2577,7 +2574,6 @@ CONFIG_SENSORS_INA238=m
 CONFIG_THERMAL=y
 # CONFIG_THERMAL_NETLINK is not set
 # CONFIG_THERMAL_STATISTICS is not set
-# CONFIG_THERMAL_DEBUGFS is not set
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
@@ -2712,6 +2708,7 @@ CONFIG_STMPE_I2C=y
 # end of STMicroelectronics STMPE Interface Drivers

 CONFIG_MFD_SYSCON=y
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP3943 is not set
 # CONFIG_MFD_LP8788 is not set
 # CONFIG_MFD_TI_LMU is not set
@@ -2764,7 +2761,6 @@ CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
-# CONFIG_REGULATOR_NETLINK_EVENTS is not set
 # CONFIG_REGULATOR_88PG86X is not set
 # CONFIG_REGULATOR_ACT8865 is not set
 # CONFIG_REGULATOR_AD5398 is not set
@@ -2899,10 +2895,7 @@ CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y
 # Media ancillary drivers
 #
 CONFIG_VIDEO_CAMERA_SENSOR=y
-# CONFIG_VIDEO_ALVIUM_CSI2 is not set
 # CONFIG_VIDEO_AR0521 is not set
-# CONFIG_VIDEO_GC0308 is not set
-# CONFIG_VIDEO_GC2145 is not set
 # CONFIG_VIDEO_HI556 is not set
 # CONFIG_VIDEO_HI846 is not set
 # CONFIG_VIDEO_HI847 is not set
@@ -2947,7 +2940,6 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_OV5675 is not set
 # CONFIG_VIDEO_OV5693 is not set
 # CONFIG_VIDEO_OV5695 is not set
-# CONFIG_VIDEO_OV64A40 is not set
 # CONFIG_VIDEO_OV6650 is not set
 # CONFIG_VIDEO_OV7251 is not set
 # CONFIG_VIDEO_OV7640 is not set
@@ -2970,12 +2962,6 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_ET8EK8 is not set

-#
-# Camera ISPs
-#
-# CONFIG_VIDEO_THP7312 is not set
-# end of Camera ISPs
-
 #
 # Lens drivers
 #
@@ -3086,7 +3072,6 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
@@ -3144,7 +3129,6 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E63M0_DSI=y
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
-# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
 # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
@@ -3227,12 +3211,14 @@ CONFIG_DRM_LIMA=y
 CONFIG_DRM_MCDE=y
 # CONFIG_DRM_TIDSS is not set
 # CONFIG_DRM_SSD130X is not set
+# CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y

 #
 # Frame buffer Devices
 #
 CONFIG_FB=y
+# CONFIG_FB_ARMCLCD is not set
 # CONFIG_FB_OPENCORES is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_IBM_GXT4500 is not set
@@ -3248,9 +3234,10 @@ CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYSMEM_FOPS=y
+CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_DMAMEM_HELPERS=y
+CONFIG_FB_IOMEM_FOPS=y
 CONFIG_FB_SYSMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
 # CONFIG_FB_MODE_HELPERS is not set
@@ -3947,7 +3934,6 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_HYM8563 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
-# CONFIG_RTC_DRV_MAX31335 is not set
 # CONFIG_RTC_DRV_NCT3018Y is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
 # CONFIG_RTC_DRV_ISL1208 is not set
@@ -4397,7 +4383,6 @@ CONFIG_IIO_ST_ACCEL_SPI_3AXIS=y
 CONFIG_AB8500_GPADC=y
 # CONFIG_AD4130 is not set
 # CONFIG_AD7091R5 is not set
-# CONFIG_AD7091R8 is not set
 # CONFIG_AD7124 is not set
 # CONFIG_AD7192 is not set
 # CONFIG_AD7266 is not set
@@ -4435,7 +4420,6 @@ CONFIG_AB8500_GPADC=y
 # CONFIG_MAX11410 is not set
 # CONFIG_MAX1241 is not set
 # CONFIG_MAX1363 is not set
-# CONFIG_MAX34408 is not set
 # CONFIG_MAX9611 is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
@@ -4498,7 +4482,6 @@ CONFIG_IIO_RESCALE=y
 #
 # Chemical Sensors
 #
-# CONFIG_AOSONG_AGS02MA is not set
 # CONFIG_ATLAS_PH_SENSOR is not set
 # CONFIG_ATLAS_EZO_SENSOR is not set
 # CONFIG_BME680 is not set
@@ -4574,7 +4557,6 @@ CONFIG_IIO_ST_SENSORS_CORE=y
 # CONFIG_MAX5821 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_MCP4728 is not set
-# CONFIG_MCP4821 is not set
 # CONFIG_MCP4922 is not set
 # CONFIG_TI_DAC082S085 is not set
 # CONFIG_TI_DAC5571 is not set
@@ -4655,7 +4637,6 @@ CONFIG_IIO_ST_GYRO_SPI_3AXIS=y
 # CONFIG_DHT11 is not set
 # CONFIG_HDC100X is not set
 # CONFIG_HDC2010 is not set
-# CONFIG_HDC3020 is not set
 # CONFIG_HTS221 is not set
 # CONFIG_HTU21 is not set
 # CONFIG_SI7005 is not set
@@ -4671,8 +4652,6 @@ CONFIG_IIO_ST_GYRO_SPI_3AXIS=y
 # CONFIG_ADIS16480 is not set
 # CONFIG_BMI160_I2C is not set
 # CONFIG_BMI160_SPI is not set
-# CONFIG_BMI323_I2C is not set
-# CONFIG_BMI323_SPI is not set
 # CONFIG_BOSCH_BNO055_SERIAL is not set
 # CONFIG_BOSCH_BNO055_I2C is not set
 # CONFIG_FXOS8700_I2C is not set
@@ -4709,12 +4688,10 @@ CONFIG_GP2AP002=y
 # CONFIG_SENSORS_ISL29018 is not set
 # CONFIG_SENSORS_ISL29028 is not set
 # CONFIG_ISL29125 is not set
-# CONFIG_ISL76682 is not set
 # CONFIG_JSA1212 is not set
 # CONFIG_ROHM_BU27008 is not set
 # CONFIG_ROHM_BU27034 is not set
 # CONFIG_RPR0521 is not set
-# CONFIG_LTR390 is not set
 # CONFIG_LTR501 is not set
 # CONFIG_LTRF216A is not set
 # CONFIG_LV0104CS is not set
@@ -4740,7 +4717,6 @@ CONFIG_TSL2772=y
 # CONFIG_VCNL4035 is not set
 # CONFIG_VEML6030 is not set
 # CONFIG_VEML6070 is not set
-# CONFIG_VEML6075 is not set
 # CONFIG_VL6180 is not set
 # CONFIG_ZOPT2201 is not set
 # end of Light sensors
@@ -4823,7 +4799,6 @@ CONFIG_IIO_HRTIMER_TRIGGER=y
 # CONFIG_DLHL60D is not set
 # CONFIG_DPS310 is not set
 # CONFIG_HP03 is not set
-# CONFIG_HSC030PA is not set
 # CONFIG_ICP10100 is not set
 # CONFIG_MPL115_I2C is not set
 # CONFIG_MPL115_SPI is not set
@@ -4879,7 +4854,6 @@ CONFIG_IIO_ST_PRESS_SPI=y
 # CONFIG_MAXIM_THERMOCOUPLE is not set
 # CONFIG_MLX90614 is not set
 # CONFIG_MLX90632 is not set
-# CONFIG_MLX90635 is not set
 # CONFIG_TMP006 is not set
 # CONFIG_TMP007 is not set
 # CONFIG_TMP117 is not set
@@ -4888,7 +4862,6 @@ CONFIG_IIO_ST_PRESS_SPI=y
 # CONFIG_MAX30208 is not set
 # CONFIG_MAX31856 is not set
 # CONFIG_MAX31865 is not set
-# CONFIG_MCP9600 is not set
 # end of Temperature sensors

 # CONFIG_PWM is not set
@@ -4959,7 +4932,6 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 # CONFIG_DAX is not set
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
-CONFIG_NVMEM_LAYOUTS=y

 #
 # Layout Types
@@ -4996,7 +4968,6 @@ CONFIG_PM_OPP=y
 CONFIG_DCACHE_WORD_ACCESS=y
 # CONFIG_VALIDATE_FS_PARSER is not set
 CONFIG_FS_IOMAP=y
-CONFIG_FS_STACK=y
 CONFIG_BUFFER_HEAD=y
 CONFIG_LEGACY_DIRECT_IO=y
 CONFIG_EXT2_FS=y
@@ -5047,6 +5018,7 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 # Caches
 #
+# CONFIG_FSCACHE is not set
 # end of Caches

 #
@@ -5333,12 +5305,14 @@ CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_ARC4 is not set
 # CONFIG_CRYPTO_CHACHA20 is not set
 CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CFB is not set
 CONFIG_CRYPTO_CTR=y
 # CONFIG_CRYPTO_CTS is not set
 CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_HCTR2 is not set
 # CONFIG_CRYPTO_KEYWRAP is not set
 # CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_OFB is not set
 # CONFIG_CRYPTO_PCBC is not set
 CONFIG_CRYPTO_XTS=y
 # end of Length-preserving ciphers and modes
@@ -5593,7 +5567,6 @@ CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 CONFIG_ARCH_STACKWALK=y
 CONFIG_STACKDEPOT=y
-CONFIG_STACKDEPOT_MAX_FRAMES=64
 CONFIG_SBITMAP=y
 # CONFIG_LWQ_TEST is not set
 # end of Library routines
@@ -5627,7 +5600,7 @@ CONFIG_DEBUG_MISC=y
 # Compile-time checks and compiler options
 #
 CONFIG_DEBUG_INFO=y
-CONFIG_AS_HAS_NON_CONST_ULEB128=y
+CONFIG_AS_HAS_NON_CONST_LEB128=y
 # CONFIG_DEBUG_INFO_NONE is not set
 CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 # CONFIG_DEBUG_INFO_DWARF4 is not set
@@ -5687,7 +5660,6 @@ CONFIG_SLUB_DEBUG=y
 # CONFIG_DEBUG_WX is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_PER_VMA_LOCK_STATS is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SHRINKER_DEBUG is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
@@ -1,6 +1,6 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=linux-valve-jupiter
-pkgver=6.8
+pkgver=6.8_rc7
 pkgrel=0
 pkgdesc="Valve Steam Deck kernel fork"
 arch="x86_64"
@@ -85,8 +85,8 @@ package() {
 }

 sha512sums="
-17991b3e0cd69e910416e8b11ba48919a4ee179bf1bb8a66516897218f1bafb297754777ebee77e75f6f844a6ec79a748b10371e33ae5374a4f4accab6c6b8f7  linux-6.8.tar.gz
-cee50091682acbaf1461672ab221a6f629ab03dde7c3fbba448349e1b396e507d776e3a2047998b2fc1775cb81f10545f0053ebb4d9da84b83aa4554aeebdc96  config-valve-jupiter.x86_64
+14dfe21da64bd625548f3439a878b46010c7c9c0569ca320dacc2219c297e2c1a8e3cb95c7c497b1177d3e4f6f6ea94b2a622cf75db86fd4a8edeccdfdeed42a  linux-6.8-rc7.tar.gz
+23e8144e337e1ec25ffdd90458e0f55760913ff3489bd4e019df9c5e39fdc80c87c23ee192aef52d3f7301b759a77b383e09fce75cf281149512fc8370fb6faf  config-valve-jupiter.x86_64
 fe6d4f0b8b86134b62a1f040ef7e8090702b1933b909a095217180160b4dd87d1d2cd7da41b1578f4577dd423e6dbca40d74f8f2d21c274074b19f612de3f343  0001-ACPICA-Limit-error-message-flood-caused-by-firmware-.patch
 ff6e833025d8df063d5de4db08376bc70892a5a07f98cfcec665e75e85862b4a583ad3685b056af9e623cd45458921d102c8fe94d2cad58385129e1f01308da1  0002-drivers-video-backlight-Disable-backlight-notificati.patch
 35fed97f0bae352f2cfb53fe301c24e893c5d04120fdcd8b1390582c489517f8f11d01f98cacbe3f4a51ee7156e8eab6197a1cdd96be3d70d5ad40d5e0992494  0003-iio-light-ltrf216a-Return-floating-point-values.patch
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 6.8.0 Kernel Configuration
+# Linux/x86 6.8.0-rc7 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="x86_64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
+CONFIG_CC_VERSION_TEXT="x86_64-alpine-linux-musl-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
@@ -193,7 +193,7 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CC_HAS_INT128=y
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
-CONFIG_GCC10_NO_ARRAY_BOUNDS=y
+CONFIG_GCC11_NO_ARRAY_BOUNDS=y
 CONFIG_CC_NO_ARRAY_BOUNDS=y
 CONFIG_GCC_NO_STRINGOP_OVERFLOW=y
 CONFIG_CC_NO_STRINGOP_OVERFLOW=y
@@ -2104,7 +2104,7 @@ CONFIG_SCSI_PROC_FS=y
 #
 # SCSI support type (disk, tape, CD-ROM)
 #
-CONFIG_BLK_DEV_SD=y
+# CONFIG_BLK_DEV_SD is not set
 # CONFIG_CHR_DEV_ST is not set
 # CONFIG_BLK_DEV_SR is not set
 # CONFIG_CHR_DEV_SG is not set
@@ -5786,19 +5786,19 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_REALTEK=m
 CONFIG_REALTEK_AUTOPM=y
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
+# CONFIG_USB_UAS is not set

 #
 # USB Imaging devices
@@ -1,25 +0,0 @@
-pkgname=powkiddy-x55-mapper
-pkgver=1.0.0
-pkgrel=0
-pkgdesc="Powkiddy X55 gamepad joiner/mapper"
-url="https://github.com/vognev/x55-mapper"
-arch="aarch64"
-license="MIT"
-options="!check"
-makedepends="cargo"
-source="powkiddy-x55-mapper-$pkgver.tar.gz::https://github.com/vognev/x55-mapper/archive/refs/tags/v$pkgver.tar.gz"
-install="$pkgname.post-install $pkgname.pre-deinstall"
-builddir="$srcdir/x55-mapper-$pkgver"
-
-build() {
-	cargo build --release --locked
-}
-
-package() {
-	install -Dm755 contrib/postmarketos/powkiddy-x55-mapper.initd "$pkgdir"/etc/init.d/powkiddy-x55-mapper
-	install -Dm755 target/release/x55-mapper -t "$pkgdir"/usr/bin/
-}
-
-sha512sums="
-03d8f637d2c3249ee63ce0a63df1571c1a3261afe0ec4fd4505fe4a8cba29880c5a055bf1789da3ba9a6bf6d93fe157fb11c1cf497d80cfada4f649352580f58  powkiddy-x55-mapper-1.0.0.tar.gz
-"
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rc-update add powkiddy-x55-mapper default
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rc-update del powkiddy-x55-mapper
@@ -1,6 +1,6 @@
 pkgname=devicepkg-dev
 pkgver=0.18.0
-pkgrel=1
+pkgrel=0
 pkgdesc="Provides default device package functions"
 url="https://postmarketos.org"
 arch="noarch"
@@ -76,7 +76,7 @@ package() {
 }
 sha512sums="
 d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c  compiler-gcc.h
-a483a970f6cf3e1f2724d8ec1039c2a935cc3e75efd016b3f134cef8a6e53820428bff0f1cb2bcfbd8ccda33c69fdb250be1cf061b2dc53c6063d2ab49023f97  devicepkg_build.sh
+faba89519197a9bccba3049a031f11b22f5c8b1b87b5278cb4daaa9d73f5946394643f9a59f76eb120618e6fe8df08b80879eca12b76a24ce03b1c9c7db65528  devicepkg_build.sh
 5b83255dabd2019ea07a589d185bee5dad6760e28ab02de3480a0adfd1cf20d0c2e0b4a978e56757899ef683819091cee99d168a48e24a3f604b725e1ba26849  devicepkg_package.sh
 3b997a00e76be7d4540290275585026c5b83832c0b9a7214346763f03ec196b3f1bea9f50a9928a5cab0bc22dc557af136ffe146bd45d3666b5c05589891047d  devicepkg_pmtest_post_install.sh
 f81e74e45ae8e55686ae459f550e229e7398daeafa72bd023c2d8c3a0d50e60bf53d5bbdfec931e9fbabe1cd71de57b2192805aaef091ab90bc7203cbaf66ba6  downstreamkernel_prepare.sh
@@ -50,14 +50,14 @@ echo_libinput_calibration()
 	# As the "dc" command from "bc" is incompatible to the one provided by busybox,
 	# this calls busybox explicitly.
 	# shellcheck disable=SC2154
-	x_offset=$(busybox dc -e "$3 $deviceinfo_screen_width / p")
+	x_offset=$(busybox dc "$3" "$deviceinfo_screen_width" / p)
 	# shellcheck disable=SC2154
-	y_offset=$(busybox dc -e "$6 $deviceinfo_screen_height / p")
+	y_offset=$(busybox dc "$6" "$deviceinfo_screen_height" / p)
 	# Check if we have got results from dc. If there was an error, dc should have
 	# printed an error message that hopefully gives the user a hint why it failed.
 	if [ -z "$x_offset" ] || [ -z "$y_offset" ]; then
 		echo "WARNING: Calculating the offsets for the calibration matrix for x11/libinput failed." >&2
-		echo "WARNING: No calibration matrix for x11/libinput will be generated." >&2
+		echo "No calibration matrix for x11/libinput will be generated." >&2
 		return
 	fi

@@ -1,21 +1,17 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-base-ui-gnome
-pkgver=3
-pkgrel=2
+pkgver=4
+pkgrel=0
 pkgdesc="Meta package for shared configuration for GNOME-based UIs"
 url="https://postmarketos.org"
 arch="noarch"
 license="GPL-3.0-or-later"
 depends="
-	apk-polkit-rs-openrc
 	dnsmasq
 	elogind
-	elogind-openrc
 	gnome-bluetooth
 	iio-sensor-proxy
-	iio-sensor-proxy-openrc
 	modemmanager
-	modemmanager-openrc
 	polkit-elogind
 	postmarketos-base-ui
 	postmarketos-base-ui-networkmanager
@@ -32,7 +28,10 @@ source="
 	10_pmOS-wallpaper.gschema.override
 	"
 options="!check"
-subpackages="$pkgname-wallpaper-pmos:wallpaper_pmos"
+subpackages="
+	$pkgname-wallpaper-pmos:wallpaper_pmos
+	$pkgname-openrc:openrc
+"

 _pmb_recommends="
 	evince
@@ -60,6 +59,18 @@ package() {
 		"$srcdir"/*.override
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	depends="
+		apk-polkit-rs-openrc
+		iio-sensor-proxy-openrc
+		modemmanager-openrc
+		elogind-openrc
+	"
+
+	mkdir "$subpkgdir"
+}
+
 # GNOME and Phosh depend on this package to set the pmOS wallpaper. GNOME
 # Mobile has a custom wallpaper because it directly draws icons and text on it
 # and it would be hard to read with the default wallpaper.
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-base-ui-plasma
 pkgver=2
-pkgrel=0
+pkgrel=1
 pkgdesc="Meta package for shared configuration for Plasma-based UIs"
 url="https://postmarketos.org"
 arch="noarch !armhf" # armhf is not supported
@@ -12,15 +12,11 @@ depends="
 	bluez-openrc
 	breeze
 	dnsmasq
-	elogind
-	elogind-openrc
 	iio-sensor-proxy
-	iio-sensor-proxy-openrc
 	kscreen
 	kwallet-pam
 	kwayland-integration
 	modemmanager
-	modemmanager-openrc
 	pipewire
 	polkit-kde-agent-1
 	postmarketos-base-ui
@@ -28,13 +24,10 @@ depends="
 	powerdevil
 	pulseaudio
 	urfkill
-	urfkill-openrc
 	xdg-desktop-portal-kde
 	"
 # Required to launch
 depends="$depends
-	tinydm
-	tinydm-openrc
 	xorg-server
 	"
 _pmb_recommends="
@@ -51,7 +44,7 @@ _pmb_recommends="
 	postmarketos-artwork-wallpapers
 	xdg-user-dirs
 	"
-install="$pkgname.post-install $pkgname.post-upgrade"
+subpackages="$pkgname-openrc $pkgname-systemd"
 source="
 	gtk-app-wayland.sh
 	kdewallet.kwl
@@ -76,6 +69,26 @@ package() {
 		"$srcdir"/kdewallet.salt
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="
+		elogind
+		elogind-openrc
+		iio-sensor-proxy-openrc
+		urfkill-openrc
+		"
+
+	mkdir -p "$subpkgdir"
+}
+
+systemd() {
+	install_if="$pkgname=$pkgver-r$pkgrel systemd"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="systemd-services"
+
+	mkdir -p "$subpkgdir"
+}

 sha512sums="
 57793bb079c76ba3bdcfca7880aa887de11fe80e7a05557b78435e57feabab70fbaeedc42da3aec6f914c35bba8e8ee9918367516eb45ee247f63f694624f179  gtk-app-wayland.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+rc-update add bluetooth default
+rc-update add elogind default
+rc-update add hfd-service default
+rc-update add iio-sensor-proxy default
+rc-update add networkmanager default
+rc-update add urfkill default
@@ -0,0 +1 @@
+postmarketos-base-ui-plasma-openrc.post-install
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+systemctl enable bluetooth
+#systemctl enable hfd-service
+systemctl enable iio-sensor-proxy
+#systemctl enable networkmanager
+#systemctl enable urfkill
@@ -0,0 +1 @@
+postmarketos-base-ui-plasma-systemd.post-install
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-rc-update add bluetooth default
-rc-update add elogind default
-rc-update add hfd-service default
-rc-update add iio-sensor-proxy default
-rc-update add networkmanager default
-rc-update add modemmanager default
-rc-update add tinydm default
-rc-update add urfkill default
-
-
-# Migrate from the old ofono setup
-if rc-update del ofono default; then
-	rc-update del ofono-auto-enable default
-	rc-service stop ofono
-	rc-service stop ofono-auto-enable
-
-	rc-service start modemmanager
-fi
-
-glib-compile-schemas /usr/share/glib-2.0/schemas
@@ -1 +0,0 @@
-postmarketos-base-ui-plasma.post-install
@@ -1,6 +1,6 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-base-ui
-pkgver=20
+pkgver=99920
 pkgrel=0
 pkgdesc="Meta package for minimal postmarketOS UI base"
 url="https://postmarketos.org"
@@ -119,7 +119,7 @@ bluez() {

 elogind() {
 	install_if="$pkgname=$pkgver-r$pkgrel elogind"
-	depends="sleep-inhibitor"
+	depends="sleep-inhibitor !systemd-logind"
 	install="$subpkgname.pre-upgrade $subpkgname.post-install"
 	replaces="
 		elogind
@@ -177,7 +177,6 @@ networkmanager() {
 		gojq
 		networkmanager
 		networkmanager-cli
-		networkmanager-openrc
 		networkmanager-tui
 		networkmanager-wifi
 		networkmanager-wwan
@@ -1,6 +1,6 @@
 # Maintainer: Caleb Connolly <caleb@connolly.tech>
 pkgname=postmarketos-bootsplash
-pkgver=0.2.1
+pkgver=0.2.2
 pkgrel=0
 pkgdesc="pmOS integration components for pbsplash"
 url="https://postmarketos.org"
@@ -8,9 +8,11 @@ arch="all"
 license="CC-BY-SA-3.0"
 depends="devicepkg-utils pbsplash"
 options="!check" # no testsuite
-subpackages="$pkgname-openrc"
+subpackages="$pkgname-openrc $pkgname-service"
 source="
 	kill-pbsplash
+	kill-pbsplash.service
+	kill-pbsplash-override.conf
 	99-shutdown-pbsplash.stop
 	OpenSans-Regular.svg
 	pmos-logo.svg
@@ -21,6 +23,8 @@ source="

 package() {
 	install -Dm755 "$srcdir/kill-pbsplash" -t "$pkgdir"/etc/init.d/
+	install -Dm644 "$srcdir/kill-pbsplash.service" -t "$pkgdir"/usr/lib/systemd/system/
+	install -Dm644 "$srcdir/kill-pbsplash-override.conf" -t "$pkgdir"/usr/lib/systemd/system/display-manager.service.d/
 	install -Dm755 "$srcdir/99-shutdown-pbsplash.stop" -t "$pkgdir"/etc/local.d/
 	install -Dm644 "$srcdir"/OpenSans-Regular.svg -t "$pkgdir"/usr/share/pbsplash/
 	install -Dm644 "$srcdir"/pmos-logo.svg -t "$pkgdir"/usr/share/pbsplash/
@@ -28,6 +32,7 @@ package() {
 	install -Dm644 "$srcdir"/pmos-logo-text-epaper.svg -t "$pkgdir"/usr/share/pbsplash/
 	install -Dm644 "$srcdir"/postmarketos-bootsplash.files \
 		"$pkgdir"/usr/share/mkinitfs/files/30-postmarketos-bootsplash.files
+
 }

 openrc() {
@@ -35,8 +40,15 @@ openrc() {
 	default_openrc
 }

+service() {
+	install="$subpkgname.post-install"
+	default_service
+}
+
 sha512sums="
 7e5416f0f9de3605dcbc5ddd4b93d244fd6d4fd1bc2d5a15a034263f8517fc51e73509f29f2a13397d059913917990ada89b36ac7b00a0d21c0283fade755c1c  kill-pbsplash
+47b1266c5d859213e5a759a79c666b7cedf2f7b8b404bef37624b951a905022effc4df6434659e88d4c84966a0000dca63387d4c9ac80b817c2b265abfe4f5c4  kill-pbsplash.service
+c413607e21c805fff3d9948963aebf1048cdb2e68ed2f4316723d21f861a32aede7d1bf3851c8ba7562b07302471ca6d8f7be1e0487d83dd4cdea9bbb506e792  kill-pbsplash-override.conf
 3b862e2282c79d6ffc7aa8dc3992562c11fea5633c98e3ff9c6205a907f5d995e9fcf098adcf294e0648436df97746a3943b9b761ddf72339cc5589fb8904a8d  99-shutdown-pbsplash.stop
 2387c64d84f0ba3ee76925f55c87ce025140aa3cd462107a851c34ffd89bd52f606e0d1f9f371d4f642d96545d5cc1bc0fcfb23ca7629a9149055f068da6bffd  OpenSans-Regular.svg
 98984fd67b99400d2b08422c4d314da558d3c94ee67dbc895e7bbfd6fdf22d4b2c9d35f48f4b73b383a054f535d4089fb705c5532f034cb2ee54eab2184e8e86  pmos-logo.svg
@@ -0,0 +1,3 @@
+[Unit]
+# Trigger killing pbsplash when the display manager starts
+OnFailure=kill-pbsplash.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Kill pbsplash!
+After=graphical.target
+Requisite=graphical.target
+
+[Service]
+ExecStart=-/usr/bin/killall pbsplash
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=graphical.target
@@ -0,0 +1 @@
+postmarketos-bootsplash-openrc.post-install
@@ -1,12 +1,12 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-config-nftables
-pkgver=0.16
+pkgver=0.17
 pkgrel=0
 pkgdesc="nftables firewall configuration for postmarketOS"
 url="https://gitlab.com/postmarketos"
 arch="noarch"
 license="MIT"
-depends="nftables-openrc"
+depends=""
 subpackages="
 	$pkgname-openusb:openusb
 	$pkgname-log:log
@@ -19,6 +19,7 @@ subpackages="
 	$pkgname-vlc-chromecast:vlc_chromecast
 	$pkgname-vncserver:vncserver
 	$pkgname-wifi-display:wifi_display
+	$pkgname-openrc:openrc
 "
 source="
 	rules/00_log_all.nft
@@ -55,6 +56,13 @@ openusb() {
 	amove etc/nftables.d/60_usb.nft
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	depends="nftables-openrc"
+
+	mkdir "$subpkgdir"
+}
+
 log() {
 	depends="$pkgname"
 	description="Enables logging of nftable events"
@@ -48,7 +48,7 @@ source="
 	20_pmOS-wallpaper-gnome-mobile.gschema.override
 	firefox-wayland.sh
 	"
-options="!check"
+options="!check pmb:systemd"

 package() {
 	install -Dm755 \
@@ -2,7 +2,7 @@
 # Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=postmarketos-ui-phosh
 pkgver=22.3
-pkgrel=4
+pkgrel=5
 pkgdesc="(Wayland) Mobile UI initially developed for the Librem 5"
 url="https://phosh.mobi"
 arch="noarch !armhf"
@@ -21,8 +21,6 @@ depends="
 	postmarketos-base-ui-gnome-wallpaper-pmos
 	postmarketos-base-ui-qt-tweaks
 	postmarketos-base-ui-qt-wayland
-	tinydm
-	tinydm-openrc
 	udiskie
 	xdg-desktop-portal-wlr
 	"
@@ -46,7 +44,11 @@ source="
 	mimeapps.list
 	udiskie.desktop
 	"
-options="!check pmb:gpu-accel"
+options="!check pmb:gpu-accel pmb:systemd"
+subpackages="
+	$pkgname-openrc:openrc
+	$pkgname-systemd:systemd
+"

 package() {
 	install -Dm644 "$srcdir"/01_postmarketos-ui-phosh.gschema.override \
@@ -57,6 +59,26 @@ package() {
 		"$pkgdir"/etc/xdg/autostart/udiskie.desktop
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install"
+	depends="
+		tinydm
+		tinydm-openrc
+	"
+	mkdir "$subpkgdir"
+}
+
+systemd() {
+	install_if="$pkgname=$pkgver-r$pkgrel systemd"
+	install="$subpkgname.post-install"
+	depends="
+		libcap-utils
+		phosh-service
+	"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 e577b8073df680ccee75ef5b6bb1f2877d5727687d63d6fd9211298e791b6c9f593eb79278c77a4b4918e3c57333c2a012030baf5a3c8d6d16000cc63a030f84  01_postmarketos-ui-phosh.gschema.override
 a741e8db9e4232334b924326c48be4e4c8f7a2382a7608926918a7491c518b2dda551e55a00d4d5fcf58c7950a78dc35d5cc5eaab53ad93a56de40887071f242  mimeapps.list
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+rc-update add tinydm default
+rc-update add waked default
+tinydm-set-session -s /usr/share/wayland-sessions/phosh.desktop
+
+exit 0
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+systemctl enable phosh
@@ -1,9 +1,5 @@
 #!/bin/sh

-rc-update add tinydm default
-rc-update add waked default
-tinydm-set-session -s /usr/share/wayland-sessions/phosh.desktop
-
 # Add the user to relevant groups in post-upgrade (symlink to post-install).
 # Note that we don't want to rely on users existing in post-install
 # (pmaports#820), therefore the group is also set via _pmb_groups during
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-plasma-desktop
 pkgver=3
-pkgrel=1
+pkgrel=2
 pkgdesc="(X11/Wayland) KDE Desktop Environment (works well with tablets)"
 url="https://www.kde.org"
 # armhf and riscv64 blocked by plasma
@@ -37,8 +37,11 @@ _pmb_recommends="$_pmb_recommends
 	wayland-utils
 	xdpyinfo
 	"
-install="$pkgname.post-install $pkgname.post-upgrade"
-options="!check" # No tests for a metapkg
+options="!check pmb:systemd" # No tests for a metapkg
+subpackages="
+	$pkgname-openrc:openrc
+	$pkgname-systemd:systemd
+	"

 package() {
 	mkdir -p "$pkgdir"
@@ -57,3 +60,17 @@ extras() {

 	mkdir -p "$subpkgdir"
 }
+
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir -p "$subpkgdir"
+}
+
+systemd() {
+	install_if="$pkgname=$pkgver-r$pkgrel systemd"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir -p "$subpkgdir"
+}
@@ -8,6 +8,5 @@ if [ -f ${SDDM_CONF} ]; then
 	fi
 fi

+rc-update add modemmanager default
 rc-update add sddm default
-rc-update add networkmanager default
-rc-update add bluetooth default
@@ -0,0 +1 @@
+postmarketos-ui-plasma-desktop-openrc.post-install
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+SDDM_CONF=/etc/sddm.conf
+
+if [ -f ${SDDM_CONF} ]; then
+	if ! grep -q "InputMethod" $SDDM_CONF; then
+		echo "InputMethod=qtvirtualkeyboard" >> $SDDM_CONF
+	fi
+fi
+
+systemctl enable sddm
@@ -0,0 +1 @@
+postmarketos-ui-plasma-desktop-systemd.post-install
@@ -1 +0,0 @@
-postmarketos-ui-plasma-desktop.post-install
@@ -29,15 +29,15 @@ _pmb_recommends="
 	spacebar
 	ttyescape
 	"
-install="$pkgname.post-install $pkgname.post-upgrade"
 source="
+	plasma-mobile.service
 	kscreenlockerrc
 	maliit-plasmamobile.json
 	org.kde.phone.homescreen.js
 	"
-subpackages="$pkgname-extras"
+subpackages="$pkgname-extras $pkgname-openrc $pkgname-systemd"
 replaces="plasma-mobile"
-options="!check pmb:gpu-accel"
+options="!check pmb:gpu-accel pmb:systemd"

 package() {
 	install -Dm644 \
@@ -72,8 +72,30 @@ extras() {
 	mkdir -p "$subpkgdir"
 }

+openrc() {
+	install_if="$pkgname=$pkgrel-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="
+		modemmanager-openrc
+		tinydm
+		tinydm-openrc
+		"
+
+	mkdir -p "$subpkgdir"
+}
+
+systemd() {
+	install_if="$pkgname=$pkgver-r$pkgrel systemd"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	install -Dm644 "$srcdir"/plasma-mobile.service \
+		"$subpkgdir"/usr/lib/systemd/system/plasma-mobile.service
+}
+
+

 sha512sums="
+e12d8e98e28a795f879aebcceb32a991ee4abcb3bc5ec458aa5378bb52ff86cf39be04bc4a196925f532d623304b3005f561fa5e55d1c87944d718058ec4c0e6  plasma-mobile.service
 b3aa8ee26c01de103c0c0af23532bf232f7071fdd02c53bd787d78e5974faa5662fc5776ce9be417392214ae73334b0eb0d073fe24f616a0ce99081f30b9158c  kscreenlockerrc
 70ee87860842057b557a433a9ae7d54653f076a612b3d9de2d413d598806d23ec19390262eaa398cddf39437f1213d14922402a8d978878e5e98f3767ce0b9eb  maliit-plasmamobile.json
 50dbb5e0b1550776ca6fc5b91468412b23d49aa502af77cf7d5d15af11eaf61b1632b205f42eac3274bf28a0b7b278a4d6bfc98c6c12ea29830fd258bad5107d  org.kde.phone.homescreen.js
@@ -0,0 +1,58 @@
+[Unit]
+Description=Open-source user interface for phones, based on Plasma technologies
+Documentation=https://invent.kde.org/plasma-mobile
+
+# replaces the getty
+Conflicts=getty@tty1.service
+After=getty@tty1.service
+
+# Needs all the dependencies of the services it's replacing
+# (currently getty@tty1.service):
+After=rc-local.service plymouth-quit-wait.service systemd-user-sessions.service
+
+OnFailure=getty@tty1.service
+
+# D-Bus is necessary for contacting logind. Logind is required.
+Wants=dbus.socket
+After=dbus.socket
+
+# This scope is created by pam_systemd when logging in as the user.
+# This directive is a workaround to a systemd bug, where the setup of the
+# user session by PAM has some race condition, possibly leading to a failure.
+# See README for more details.
+After=session-c1.scope
+
+# Since we are part of the graphical session, make sure we are started before
+# it is complete.
+Before=graphical.target
+
+# Prevent starting on systems without virtual consoles
+ConditionPathExists=/dev/tty0
+
+[Service]
+Environment=LANG=C.UTF-8
+ExecStart=/usr/bin/startplasmamobile
+TimeoutStartSec=30
+User=10000
+PAMName=login
+WorkingDirectory=~
+Restart=always
+RestartSec=5s
+
+# A virtual terminal is needed.
+TTYPath=/dev/tty7
+TTYReset=yes
+TTYVHangup=yes
+TTYVTDisallocate=yes
+
+# Fail to start if not controlling the tty.
+StandardInput=tty-fail
+StandardOutput=journal
+StandardError=journal
+
+# Log this user with utmp, letting it show up with commands 'w' and 'who'.
+UtmpIdentifier=tty7
+UtmpMode=user
+
+[Install]
+WantedBy=graphical.target
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+rc-update add modemmanager default
+rc-update add tinydm default
+
+tinydm-set-session -s /usr/share/wayland-sessions/plasma-mobile.desktop
@@ -0,0 +1 @@
+postmarketos-ui-plasma-mobile-openrc.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+systemctl enable plasma-mobile
@@ -0,0 +1 @@
+postmarketos-ui-plasma-mobile-systemd.post-install
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-rc-update add bluetooth default
-rc-update add elogind default
-rc-update add hfd-service default
-rc-update add iio-sensor-proxy default
-rc-update add networkmanager default
-rc-update add modemmanager default
-rc-update add tinydm default
-rc-update add urfkill default
-
-
-# Migrate from the old ofono setup
-if rc-update del ofono default; then
-	rc-update del ofono-auto-enable default
-	rc-service stop ofono
-	rc-service stop ofono-auto-enable
-
-	rc-service start modemmanager
-fi
-
-tinydm-set-session -s /usr/share/wayland-sessions/plasma-mobile.desktop
-
-glib-compile-schemas /usr/share/glib-2.0/schemas
@@ -1 +0,0 @@
-postmarketos-ui-plasma-mobile.post-install
@@ -44,7 +44,7 @@ _pmb_recommends="
 	"
 provides="postmarketos-ui-sxmo"
 provider_priority=5
-options="!check" # has no tests
+options="!check pmb:systemd-never"

 package() {
 	mkdir -p "$pkgdir"
@@ -49,7 +49,7 @@ _pmb_recommends="
 	"
 provides="postmarketos-ui-sxmo"
 provider_priority=10
-options="!check" # has no tests
+options="!check pmb:systemd-never"

 package() {
 	mkdir -p "$pkgdir"
@@ -11,3 +11,14 @@ supported_mkinitfs_without_flavors=True
 supported_arches=x86_64,x86,aarch64,armv7,armhf
 supported_fastboot_depends=android-tools
 supported_heimdall_depends=heimdall,android-tools
+
+[repo:systemd]
+pmaports_dir=systemd
+# Build forks of Alpine packages that support usr_merge
+bootstrap_1=apk-tools abuild alpine-base
+# Build systemd related pkgs without deps on each other
+bootstrap_2=[usr_merge] systemd dbus linux-pam
+# Build systemd related pkgs *with* deps on each other
+bootstrap_3=[usr_merge] systemd dbus linux-pam
+# Marker that bootstrap is done, only needs to be built once
+bootstrap_4=[usr_merge] postmarketos-base-systemd
Author	SHA1	Message	Date
Caleb Connolly	25ae831c68	main/postmarketos-config-nftables: systemd support Apparently nftables-openrc doesn't get pulled in automatically? But we can't just depend on it now. Add our own -openrc subpackage with the correct install_if property to pull in nftables-openrc. The upstream nftables-openrc subpackage should be fixed (if it's broken). Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:20 +00:00
Caleb Connolly	4fc1e8d5a1	main/postmarketos-bootsplash: systemd support Install a kill-pbsplash systemd service which is configured to be started as part of the graphical-session user target. Additionally install an override so that if the display-manager service (aliases to gdm, sddm, etc) fails to start it will still kill pbsplash. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:20 +00:00
Caleb Connolly	8d7dacafb4	main/postmarketos-base-ui: support systemd Not sure if dropping the networkmanager-openrc dependency causes issues. Otherwise, make the elogind subpackage conflict with systemd-logind. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:20 +00:00
Oliver Smith	0acf34aa9e	main/postmarketos-ui-sxmo-*: set pmb:systemd-never Sxmo maintainers have decided to stay with OpenRC on postmarketOS. Set this option, so pmbootstrap doesn't even ask the user if they want to install Sxmo with systemd. The idea is that users don't end up reporting issues about this unsupported use case.	2024-03-21 22:43:20 +00:00
Caleb Connolly	f23ace4d8b	main/postmarketos-base-ui-gnome: split openrc depends to -openrc subpackage Allow this package to be used on systemd installs without pulling in a bunch of openrc services. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-03-21 22:43:20 +00:00
Bart Ribbers	35d6480437	main/postmarketos-ui-plasma-{mobile,desktop}: start with systemd (MR 4919) [ci:ignore-count]	2024-03-21 22:43:12 +00:00
Sam Day	6b4dfa8b07	postmarketos-ui-phosh: systemd support (MR 4904)	2024-03-21 22:31:24 +00:00
Oliver Smith	4116843606	pmaports.cfg: add repo:systemd section	2024-03-21 22:27:59 +00:00
Oliver Smith	b5c36f959c	main/postmarketos-ui-gnome-mobile: set pmb:systemd Let pmbootstrap install systemd along with postmarketos-ui-gnome-mobile, unless the user sets "never" for systemd in "pmbootstrap init".	2024-03-21 22:27:59 +00:00
				`@@ -1 +0,0 @@`
				`SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", ENV{PRODUCT}="2c7c/125/318", RUN+="/sbin/rc-service eg25-manager restart"`
				`@@ -0,0 +1 @@`
				`postmarketos-base-ui-plasma-openrc.post-install`
				`@@ -0,0 +1 @@`
				`postmarketos-base-ui-plasma-systemd.post-install`
				`@@ -0,0 +1 @@`
				`postmarketos-bootsplash-openrc.post-install`
				`@@ -0,0 +1 @@`
				`postmarketos-ui-plasma-desktop-openrc.post-install`
				`@@ -0,0 +1 @@`
				`postmarketos-ui-plasma-desktop-systemd.post-install`
				`@@ -1 +0,0 @@`
				`postmarketos-ui-plasma-desktop.post-install`
				`@@ -0,0 +1 @@`
				`postmarketos-ui-plasma-mobile-openrc.post-install`
				`@@ -0,0 +1 @@`
				`postmarketos-ui-plasma-mobile-systemd.post-install`