microsoft-surface-2: new device

2024-03-19 02:15:49 +02:00
202 changed files with 286 additions and 8585 deletions
@@ -56,7 +56,7 @@ device/*/device-google-snow/			@jenneron
 device/*/device-huawei-plank/			@gtrxAC
 device/*/device-lg-judyln/			@Newbyte
 device/*/device-lg-judyp/			@jenneron
-device/*/device-microsoft-surface-rt/		@jenneron @jethrob
+device/*/device-microsoft-surface-rt/		@jenneron
 device/*/device-nvidia-tegra-armv7/		@clamor95 @okias @mschwalm @nokun
 device/*/device-odroid-xu4/			@Grimler
 device/*/device-oneplus-enchilada/		@calebccff
@@ -82,7 +82,7 @@ device/*/linux-postmarketos-allwinner/		@Arnavion @PsychoGame
 device/*/linux-postmarketos-amlogic/		@vitali64yt @exkc
 device/*/linux-postmarketos-exynos4/		@Newbyte @ThiagaoPlusPlus
 device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
-device/*/linux-postmarketos-grate/		@clamor95 @jenneron @jethrob
+device/*/linux-postmarketos-grate/		@clamor95 @jenneron
 device/*/linux-postmarketos-mediatek-mt8173/	@jenneron @adamthiede
 device/*/linux-postmarketos-mediatek-mt8183/	@jenneron @binarycraft
 device/*/linux-postmarketos-omap/		@MightyM17 @Sicelo
@@ -4,7 +4,7 @@

 pkgname=linux-postmarketos-exynos4
 pkgver=6.7.6
-pkgrel=1
+pkgrel=0
 pkgdesc="Mainline kernel fork for Samsung Exynos4 devices"
 arch="armv7"
 _carch="arm"
@@ -80,7 +80,7 @@ package() {

 sha512sums="
 705cd617d135900cb25c8b6da7177d507e6a179b521e04aeae18080995514cbd69381a21f942ebf4d8cee427e3c60d53e6a06ed918ddcaacc243ca585ef61c11  linux-postmarketos-exynos4-v6.7.6-exynos4.tar.bz2
-ee4cec8100ebe1d85bd18ba0ba5bdf9746f1fb7a7cb6dff0d8f6782d03f51e5d87f0d05a388ff641c276db7857e729ceb900bf33061d079e97cf6e7b43dd5027  config-postmarketos-exynos4.armv7
+aa49010195935a5a849a04f41e017fe98dc33312ff3a889a0f20b40a8a30682791e7d1173d09d70dc273c9e0454e14cc8a88d3cc5b9af37cc1a2949c8262d42f  config-postmarketos-exynos4.armv7
 aaff0332b90e1f9f62de1128cace934717336e54ab09de46477369fa808302482d97334e43a85ee8597c1bcab64d3484750103559fea2ce8cd51776156bf7591  initramfs.list
 09f1f214a24300696809727a7b04378887c06ca6f40803ca51a12bf2176a360b2eb8632139d6a0722094e05cb2038bdb04018a1e3d33fc2697674552ade03bee  init
 "
@@ -2,7 +2,7 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm 6.7.6 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
@@ -49,9 +49,8 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
 # CONFIG_WATCH_QUEUE is not set
 CONFIG_CROSS_MEMORY_ATTACH=y
 # CONFIG_USELIB is not set
-CONFIG_AUDIT=y
+# CONFIG_AUDIT is not set
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
-CONFIG_AUDITSYSCALL=y

 #
 # IRQ subsystem
@@ -1029,7 +1028,6 @@ CONFIG_NETFILTER_XT_MARK=m
 #
 # Xtables targets
 #
-# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
 # CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
@@ -1733,7 +1731,6 @@ CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
 # CONFIG_DM_INTEGRITY is not set
-# CONFIG_DM_AUDIT is not set
 # CONFIG_TARGET_CORE is not set
 CONFIG_NETDEVICES=y
 CONFIG_MII=y
@@ -6382,7 +6379,6 @@ CONFIG_CRC32_SLICEBY8=y
 CONFIG_LIBCRC32C=m
 # CONFIG_CRC8 is not set
 CONFIG_XXHASH=y
-CONFIG_AUDIT_GENERIC=y
 # CONFIG_RANDOM32_SELFTEST is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
@@ -1,6 +1,5 @@
 # Maintainer: Svyatoslav Ryhel <clamor95@gmail.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
-# Co-Maintainer: Jethrob <jeybee@hotmail.com>

 pkgname=linux-postmarketos-grate
 pkgver=6.6.22
@@ -2,8 +2,8 @@

 _flavor="postmarketos-qcom-sm6350"
 pkgname=linux-$_flavor
-pkgver=6.8.1
-pkgrel=0
+pkgver=6.7.0
+pkgrel=2
 pkgdesc="Mainline Kernel fork for SM6350/SM7225 devices"
 arch="aarch64"
 _carch="arm64"
@@ -54,6 +54,6 @@ package() {
 }

 sha512sums="
-d1ad03e14f6968550ee13cc96b546ff20edb8bbbb81701ef117f3a64429f591fc90131fcde5b241b82159d409d9819a2d7eff0ceaf90a22eed65d9a39e9955f6  linux-v6.8.1-sm6350.tar.gz
-88c8993c27136dbe5a83bf59d74d6694ccd5a3d2b637f59d2ed33f649540e873f7928be459b30df77c88af0f4b84940f83f0f80eb3a6ccbad1dfb830d65ba680  config-postmarketos-qcom-sm6350.aarch64
+2129b3fbf2ac585130ef53c768597fe7d4372b3f1fbbcafeae4ed781d2643884735d349aae72c885a510f28179fb37d5c1075c75e8f72676b8ab4600ededaba8  linux-v6.7.0-sm6350.tar.gz
+941d2ed85b5bc2b2ecead7d2cf3f1c77b1f2d5ec1064ccb924fcdb031fd8eab15a0b3f6a90ec31b5fdb8210e0d4ecdde0a4ad099ce912706fa498e4a67378f47  config-postmarketos-qcom-sm6350.aarch64
 "
@@ -1,19 +1,18 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.8.1 Kernel Configuration
+# Linux/arm64 6.7.0 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20240309) 13.2.1 20240309"
+CONFIG_CC_VERSION_TEXT="aarch64-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
 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
@@ -152,10 +151,8 @@ 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
 CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -234,14 +231,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

 #
@@ -375,9 +372,7 @@ CONFIG_ARM64_ERRATUM_2067961=y
 CONFIG_ARM64_ERRATUM_2441009=y
 CONFIG_ARM64_ERRATUM_2457168=y
 CONFIG_ARM64_ERRATUM_2645198=y
-CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y
 CONFIG_ARM64_ERRATUM_2966298=y
-CONFIG_ARM64_ERRATUM_3117295=y
 # CONFIG_CAVIUM_ERRATUM_22375 is not set
 CONFIG_CAVIUM_ERRATUM_23144=y
 # CONFIG_CAVIUM_ERRATUM_23154 is not set
@@ -712,7 +707,6 @@ CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
 CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y
-CONFIG_ARCH_HAS_HW_PTE_YOUNG=y

 #
 # GCOV-based kernel profiling
@@ -754,7 +748,6 @@ CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_INTEGRITY_T10=y
-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
@@ -878,8 +871,9 @@ CONFIG_ZSMALLOC=m
 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
@@ -887,7 +881,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 is not set
@@ -923,7 +917,6 @@ CONFIG_ARCH_WANTS_THP_SWAP=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-# CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set
 CONFIG_THP_SWAP=y
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
@@ -1313,6 +1306,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
@@ -1528,7 +1522,6 @@ CONFIG_HAVE_PCI=y
 #
 # Generic Driver Options
 #
-CONFIG_AUXILIARY_BUS=y
 CONFIG_UEVENT_HELPER=y
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
@@ -1555,7 +1548,6 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
-CONFIG_GENERIC_CPU_DEVICES=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_SOC_BUS=y
@@ -1605,6 +1597,8 @@ CONFIG_ARM_SCMI_TRANSPORT_OPTEE=y
 CONFIG_ARM_SCMI_TRANSPORT_SMC=y
 # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set
 # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set
+CONFIG_ARM_SCMI_POWER_DOMAIN=y
+CONFIG_ARM_SCMI_PERF_DOMAIN=y
 # CONFIG_ARM_SCMI_POWER_CONTROL is not set
 # end of ARM System Control and Management Interface Protocol

@@ -1634,7 +1628,6 @@ CONFIG_EFI_EARLYCON=y
 # CONFIG_EFI_COCO_SECRET is not set
 # end of EFI (Extensible Firmware Interface) Support

-# CONFIG_TEE_STMM_EFI is not set
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set

@@ -1678,7 +1671,6 @@ CONFIG_ZRAM=m
 CONFIG_ZRAM_DEF_COMP_LZ4=y
 CONFIG_ZRAM_DEF_COMP="lz4"
 # CONFIG_ZRAM_WRITEBACK is not set
-# CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZRAM_MULTI_COMP is not set
 CONFIG_BLK_DEV_LOOP=y
@@ -1723,7 +1715,6 @@ CONFIG_QCOM_FASTRPC=m
 # CONFIG_HISI_HIKEY_USB is not set
 # CONFIG_OPEN_DICE is not set
 # CONFIG_VCPU_STALL_DETECTOR is not set
-# CONFIG_NSM is not set
 # CONFIG_C2PORT is not set

 #
@@ -1940,6 +1931,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_QCOM_IPA=m
 CONFIG_PHYLIB=y
@@ -1999,7 +1991,6 @@ CONFIG_FIXED_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_PSE_CONTROLLER is not set
@@ -2059,7 +2050,6 @@ CONFIG_ATH10K_SNOC=m
 CONFIG_ATH10K_DEBUG=y
 # CONFIG_ATH10K_DEBUGFS is not set
 # CONFIG_WCN36XX is not set
-# CONFIG_ATH11K is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
 # CONFIG_AT76C50X_USB is not set
 CONFIG_WLAN_VENDOR_BROADCOM=y
@@ -2067,8 +2057,10 @@ CONFIG_WLAN_VENDOR_BROADCOM=y
 # CONFIG_B43LEGACY is not set
 # CONFIG_BRCMSMAC is not set
 # CONFIG_BRCMFMAC 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
@@ -2107,8 +2099,10 @@ CONFIG_WLAN_VENDOR_TI=y
 # CONFIG_WL18XX is not set
 # CONFIG_WLCORE is not set
 CONFIG_WLAN_VENDOR_ZYDAS=y
+# CONFIG_USB_ZD1201 is not set
 # CONFIG_ZD1211RW is not set
 CONFIG_WLAN_VENDOR_QUANTENNA=y
+# CONFIG_USB_NET_RNDIS_WLAN is not set
 # CONFIG_MAC80211_HWSIM is not set
 # CONFIG_VIRT_WIFI is not set
 # CONFIG_WAN is not set
@@ -2561,7 +2555,6 @@ CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_SDM670 is not set
 # CONFIG_PINCTRL_SDM845 is not set
 # CONFIG_PINCTRL_SDX75 is not set
-# CONFIG_PINCTRL_SM4450 is not set
 # CONFIG_PINCTRL_SM6115 is not set
 # CONFIG_PINCTRL_SM6125 is not set
 CONFIG_PINCTRL_SM6350=y
@@ -2572,8 +2565,6 @@ CONFIG_PINCTRL_SM6350=y
 # CONFIG_PINCTRL_SM8350 is not set
 # CONFIG_PINCTRL_SM8450 is not set
 # CONFIG_PINCTRL_SM8550 is not set
-# CONFIG_PINCTRL_SM8650 is not set
-# CONFIG_PINCTRL_X1E80100 is not set
 CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set
 # CONFIG_PINCTRL_LPASS_LPI is not set
@@ -2747,7 +2738,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_F71882FG is not set
 # CONFIG_SENSORS_F75375S is not set
 # CONFIG_SENSORS_FTSTEUTATES is not set
-# CONFIG_SENSORS_GIGABYTE_WATERFORCE is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_G760A is not set
@@ -2869,7 +2859,6 @@ CONFIG_HWMON=y
 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
@@ -3008,6 +2997,7 @@ CONFIG_MFD_SPMI_PMIC=y
 # CONFIG_MFD_SKY81452 is not set
 # CONFIG_MFD_STMPE is not set
 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
@@ -3054,7 +3044,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
@@ -3144,7 +3133,6 @@ CONFIG_REGULATOR_QCOM_RPMH=y
 #
 # Graphics support
 #
-CONFIG_APERTURE_HELPERS=y
 CONFIG_VIDEO_CMDLINE=y
 CONFIG_VIDEO_NOMODESET=y
 # CONFIG_AUXDISPLAY is not set
@@ -3160,8 +3148,6 @@ CONFIG_DRM_DISPLAY_HELPER=m
 CONFIG_DRM_DISPLAY_DP_HELPER=y
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
 # CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_EXEC=m
-CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_SCHED=m

 #
@@ -3219,7 +3205,6 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
 CONFIG_DRM_PANEL_HIMAX_HX83112A=m
 # CONFIG_DRM_PANEL_HIMAX_HX8394 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_P079ZCA is not set
@@ -3263,7 +3248,6 @@ CONFIG_DRM_PANEL_HIMAX_HX83112A=m
 # CONFIG_DRM_PANEL_SHARP_LS060T1SX01 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
-# CONFIG_DRM_PANEL_SYNAPTICS_R63353 is not set
 # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
 # CONFIG_DRM_PANEL_STARTEK_KD070FHFID015 is not set
@@ -3277,7 +3261,6 @@ CONFIG_DRM_PANEL_HIMAX_HX83112A=m

 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
-CONFIG_DRM_AUX_BRIDGE=y

 #
 # Display Interface Bridges
@@ -3326,20 +3309,21 @@ CONFIG_DRM_AUX_BRIDGE=y
 # CONFIG_DRM_LOGICVC is not set
 # CONFIG_DRM_ARCPGU is not set
 # CONFIG_DRM_GM12U320 is not set
-CONFIG_DRM_SIMPLEDRM=y
+# CONFIG_DRM_SIMPLEDRM is not set
 # CONFIG_DRM_PL111 is not set
 # CONFIG_DRM_LIMA is not set
 # CONFIG_DRM_PANFROST is not set
 # CONFIG_DRM_TIDSS is not set
 # CONFIG_DRM_GUD is not set
 # CONFIG_DRM_SSD130X is not set
-# CONFIG_DRM_POWERVR 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_EFI is not set
 # CONFIG_FB_OPENCORES is not set
 # CONFIG_FB_S1D13XXX is not set
@@ -3348,6 +3332,7 @@ CONFIG_FB=y
 # CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
+# CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SSD1307 is not set
 CONFIG_FB_CORE=y
 CONFIG_FB_NOTIFY=y
@@ -3357,8 +3342,9 @@ 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_IOMEM_FOPS=y
 CONFIG_FB_SYSMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
 # CONFIG_FB_MODE_HELPERS is not set
@@ -3567,7 +3553,6 @@ CONFIG_HID_LOGITECH=y
 # CONFIG_HID_ZYDACRON is not set
 # CONFIG_HID_SENSOR_HUB is not set
 # CONFIG_HID_ALPS is not set
-# CONFIG_HID_MCP2200 is not set
 # CONFIG_HID_MCP2221 is not set
 # end of Special HID drivers

@@ -3840,6 +3825,8 @@ CONFIG_MMC_CQHCI=y
 # CONFIG_MMC_HSQ is not set
 # CONFIG_MMC_MTK is not set
 # CONFIG_MMC_SDHCI_XENON is not set
+# CONFIG_MMC_SDHCI_OMAP is not set
+# CONFIG_MMC_SDHCI_AM654 is not set
 CONFIG_SCSI_UFSHCD=y
 CONFIG_SCSI_UFS_BSG=y
 CONFIG_SCSI_UFS_CRYPTO=y
@@ -3972,7 +3959,6 @@ CONFIG_RTC_INTF_DEV=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
@@ -4143,7 +4129,6 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_QCOM_GDSC=y
 CONFIG_COMMON_CLK_QCOM=y
-# CONFIG_CLK_X1E80100_GCC is not set
 # CONFIG_QCOM_A53PLL is not set
 # CONFIG_QCOM_A7PLL is not set
 # CONFIG_QCOM_CLK_APCC_MSM8996 is not set
@@ -4172,7 +4157,6 @@ CONFIG_QCOM_CLK_RPMH=y
 # CONFIG_QCS_GCC_404 is not set
 # CONFIG_SC_CAMCC_7180 is not set
 # CONFIG_SC_CAMCC_7280 is not set
-# CONFIG_SC_CAMCC_8280XP is not set
 # CONFIG_SC_DISPCC_7180 is not set
 # CONFIG_SC_DISPCC_7280 is not set
 # CONFIG_SC_DISPCC_8280XP is not set
@@ -4199,7 +4183,6 @@ CONFIG_QCOM_CLK_RPMH=y
 # CONFIG_QCS_TURING_404 is not set
 # CONFIG_QCS_Q6SSTOP_404 is not set
 # CONFIG_QDU_GCC_1000 is not set
-# CONFIG_QDU_ECPRICC_1000 is not set
 # CONFIG_SDM_GCC_845 is not set
 # CONFIG_SDM_GPUCC_845 is not set
 # CONFIG_SDM_VIDEOCC_845 is not set
@@ -4211,7 +4194,6 @@ CONFIG_SM_CAMCC_6350=y
 # CONFIG_SM_CAMCC_8450 is not set
 # CONFIG_SM_CAMCC_8550 is not set
 CONFIG_SM_DISPCC_6350=y
-# CONFIG_SM_DISPCC_8650 is not set
 # CONFIG_SM_GCC_4450 is not set
 # CONFIG_SM_GCC_6115 is not set
 # CONFIG_SM_GCC_6125 is not set
@@ -4223,7 +4205,6 @@ CONFIG_SM_GCC_6350=y
 # CONFIG_SM_GCC_8350 is not set
 # CONFIG_SM_GCC_8450 is not set
 # CONFIG_SM_GCC_8550 is not set
-# CONFIG_SM_GCC_8650 is not set
 # CONFIG_SM_GPUCC_6115 is not set
 # CONFIG_SM_GPUCC_6125 is not set
 # CONFIG_SM_GPUCC_6375 is not set
@@ -4233,9 +4214,7 @@ CONFIG_SM_GPUCC_6350=y
 # CONFIG_SM_GPUCC_8350 is not set
 # CONFIG_SM_GPUCC_8450 is not set
 # CONFIG_SM_GPUCC_8550 is not set
-# CONFIG_SM_GPUCC_8650 is not set
 # CONFIG_SM_TCSRCC_8550 is not set
-# CONFIG_SM_TCSRCC_8650 is not set
 # CONFIG_SM_VIDEOCC_8150 is not set
 # CONFIG_SM_VIDEOCC_8250 is not set
 # CONFIG_SM_VIDEOCC_8350 is not set
@@ -4400,7 +4379,7 @@ CONFIG_QCOM_SOCINFO=y
 # CONFIG_QCOM_STATS is not set
 # CONFIG_QCOM_WCNSS_CTRL is not set
 # CONFIG_QCOM_APR is not set
-CONFIG_QCOM_ICC_BWMON=y
+# CONFIG_QCOM_ICC_BWMON is not set
 CONFIG_QCOM_INLINE_CRYPTO_ENGINE=y
 # end of Qualcomm SoC drivers

@@ -4421,9 +4400,6 @@ CONFIG_QCOM_INLINE_CRYPTO_ENGINE=y
 #
 # end of Amlogic PM Domains

-CONFIG_ARM_SCMI_PERF_DOMAIN=y
-CONFIG_ARM_SCMI_POWER_DOMAIN=y
-
 #
 # Broadcom PM Domains
 #
@@ -4531,7 +4507,6 @@ CONFIG_IIO=y
 # CONFIG_LTC2485 is not set
 # CONFIG_LTC2497 is not set
 # CONFIG_MAX1363 is not set
-# CONFIG_MAX34408 is not set
 # CONFIG_MAX9611 is not set
 # CONFIG_MCP3422 is not set
 # CONFIG_NAU7802 is not set
@@ -4577,7 +4552,6 @@ CONFIG_QCOM_SPMI_ADC5=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
@@ -4684,7 +4658,6 @@ CONFIG_QCOM_SPMI_ADC5=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
@@ -4695,7 +4668,6 @@ CONFIG_QCOM_SPMI_ADC5=y
 # Inertial measurement units
 #
 # CONFIG_BMI160_I2C is not set
-# CONFIG_BMI323_I2C is not set
 # CONFIG_BOSCH_BNO055_SERIAL is not set
 # CONFIG_BOSCH_BNO055_I2C is not set
 # CONFIG_FXOS8700_I2C is not set
@@ -4728,12 +4700,10 @@ CONFIG_QCOM_SPMI_ADC5=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
@@ -4759,7 +4729,6 @@ CONFIG_QCOM_SPMI_ADC5=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 +4792,6 @@ CONFIG_QCOM_SPMI_ADC5=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_MPL3115 is not set
@@ -4870,14 +4838,12 @@ CONFIG_QCOM_SPMI_ADC5=y
 #
 # 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
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 # CONFIG_MAX30208 is not set
-# CONFIG_MCP9600 is not set
 # end of Temperature sensors

 # CONFIG_PWM is not set
@@ -4984,7 +4950,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
@@ -5036,8 +5001,6 @@ CONFIG_INTERCONNECT_QCOM_SM6350=y
 # CONFIG_INTERCONNECT_QCOM_SM8350 is not set
 # CONFIG_INTERCONNECT_QCOM_SM8450 is not set
 # CONFIG_INTERCONNECT_QCOM_SM8550 is not set
-# CONFIG_INTERCONNECT_QCOM_SM8650 is not set
-# CONFIG_INTERCONNECT_QCOM_X1E80100 is not set
 # CONFIG_COUNTER is not set
 # CONFIG_MOST is not set
 # CONFIG_PECI is not set
@@ -5051,7 +5014,6 @@ CONFIG_INTERCONNECT_QCOM_SM6350=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 is not set
@@ -5413,12 +5375,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
@@ -5711,7 +5675,6 @@ CONFIG_FONT_8x16=y
 CONFIG_SG_POOL=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
@@ -5746,7 +5709,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
@@ -0,0 +1,86 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Jenneron <jenneron@protonmail.com>
+pkgname=device-microsoft-surface-2
+pkgdesc="Microsoft Surface 2"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+# pmb:strict: avoid grub-related install error during build with pmbootstrap
+options="!check !archcheck pmb:strict"
+depends="
+	alsa-ucm-conf
+	postmarketos-base
+"
+makedepends="devicepkg-dev grub grub-efi"
+subpackages="
+	$pkgname-kernel-0b:kernel_0b
+	$pkgname-kernel-13:kernel_13
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-x11
+"
+source="deviceinfo modules-initfs"
+
+build() {
+	devicepkg_build $startdir $pkgname
+
+	grub-mkimage \
+		--prefix="/grub" \
+		--output="bootarm.efi" \
+		--format="arm-efi" \
+		--compression="xz" \
+
+		\
+		all_video \
+		cat \
+		configfile \
+		disk \
+		echo \
+		efi_gop \
+		fat \
+		gzio \
+		help \
+		iso9660 \
+		linux \
+		normal \
+		ls \
+		part_gpt \
+		part_msdos
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+
+	install -D "$srcdir"/bootarm.efi \
+		"$pkgdir"/boot/EFI/Boot/bootarm.efi
+}
+
+kernel_0b() {
+	pkgdesc="Microsoft Surface 2 with BDID 0B"
+	depends="linux-postmarketos-grate"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_13() {
+	pkgdesc="Microsoft Surface 2 with BDID 13"
+	depends="linux-postmarketos-grate"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="WiFi firmware"
+	depends="linux-firmware-mrvl"
+	mkdir "$subpkgdir"
+}
+
+x11() {
+	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
+	depends="xf86-video-opentegra libvdpau-tegra"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+8ecfa7720b0fc33505ee77121139b241b8c321e04d9051485935bf2df91eb6812e8d4d05a07c711f50eb8826abbe5f0c6c7a68c238b4f42ef8d12da5b124acc6  deviceinfo
+cbc29204c85619f32912c673ce3b3d4e8052cb91bbb80c255095c8fb4eda367c2a03ab0959819e4a5a4a2b79022640a4c6413b92962d38c14cddcaf077260ade  modules-initfs
+"
@@ -0,0 +1,24 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Microsoft Surface 2"
+deviceinfo_manufacturer="Microsoft"
+deviceinfo_codename="microsoft-surface-2"
+deviceinfo_year="2013"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="tablet"
+deviceinfo_keyboard="true"
+deviceinfo_external_storage="true"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_dtb_0b="tegra114-microsoft-surface-2-0b-efi"
+deviceinfo_dtb_13="tegra114-microsoft-surface-2-13-efi"
+deviceinfo_kernel_cmdline="cpuidle.off=1 console=ttyS0,115200 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE"
+deviceinfo_generate_grub_config="true"
+deviceinfo_generate_bootimg="false"
+deviceinfo_boot_filesystem="fat32"
@@ -0,0 +1,5 @@
+surface-rt-ec
+hid-generic
+i2c-hotplug-gpio
+i2c-hid-of
+panel-samsung-ltl106hl02
@@ -1,6 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Jenneron <jenneron@protonmail.com>
-# Co-Maintainer: Jethrob <jeybee@hotmail.com>
 pkgname=device-microsoft-surface-rt
 pkgdesc="Microsoft Surface RT"
 pkgver=7
@@ -1,23 +1,16 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=cros-keyboard-map
 pkgdesc="Keyboard mapping for Chrome OS devices"
-pkgver=0_git20240313
+pkgver=0_git20240215
 pkgrel=0
 url="https://github.com/WeirdTreeThing/cros-keyboard-map"
 license="BSD-3-Clause"
 arch="aarch64 armv7 x86_64" # there are no cros devices of other arches
 depends="keyd python3"
-
-case "$CARCH" in
-aarch64|armv7)
-	depends="$depends py3-libfdt"
-	;;
-esac
-
 options="!check !archcheck !tracedeps"
 subpackages="$pkgname-openrc"
 _repo="WeirdTreeThing/cros-keyboard-map"
-_commit="1cf87a401dfc99d518ef84965ce3cb83993a3f25"
+_commit="b044528586c44f9b8fec9d58a6d533cf8e0e661c"
 source="
 	cros-keyboard-map-$_commit::https://raw.githubusercontent.com/$_repo/$_commit/cros-keyboard-map.py
 	$pkgname.initd
@@ -43,7 +36,7 @@ package() {
 }

 sha512sums="
-596743d994d118e52b3f1cdf30748f03f6520dd458af34107ec68c5ab31e2de4984275835c920b33568b6bf210a77e92e3b01b6359bb06d547b9b76d177d284e  cros-keyboard-map-1cf87a401dfc99d518ef84965ce3cb83993a3f25
+2a7ebb57f875682fdab07d0c82f64cc6bf7404c170a50782fdd51a1da77722cc95217a722bed473abc139074707c4d18a3384f04c51cd6c65c1d602ce2ec615e  cros-keyboard-map-b044528586c44f9b8fec9d58a6d533cf8e0e661c
 bcb3bfa30b3e670dca3c90168eb71d9eef4cad6b098dc878e8b572102f43f958ac5f9af603df393cabf4278ee4232714d626ada9d5ac22174ed7ceac17176c3d  cros-keyboard-map.initd
 81d435d611927bc69d49cf4ed7f1fe3df33f001aec27397a8683b827ba9f5d5b3bfa0a3ab2b58d07b275e49e0300c0d91b5a1930b023791e312e55569b329dcb  cros-keyboard-map.confd
 "
@@ -1,17 +1,21 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-base-ui-gnome
-pkgver=4
-pkgrel=0
+pkgver=3
+pkgrel=2
 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
@@ -28,10 +32,7 @@ source="
 	10_pmOS-wallpaper.gschema.override
 	"
 options="!check"
-subpackages="
-	$pkgname-wallpaper-pmos:wallpaper_pmos
-	$pkgname-openrc:openrc
-"
+subpackages="$pkgname-wallpaper-pmos:wallpaper_pmos"

 _pmb_recommends="
 	evince
@@ -59,18 +60,6 @@ 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=1
+pkgrel=0
 pkgdesc="Meta package for shared configuration for Plasma-based UIs"
 url="https://postmarketos.org"
 arch="noarch !armhf" # armhf is not supported
@@ -12,11 +12,15 @@ 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
@@ -24,10 +28,13 @@ depends="
 	powerdevil
 	pulseaudio
 	urfkill
+	urfkill-openrc
 	xdg-desktop-portal-kde
 	"
 # Required to launch
 depends="$depends
+	tinydm
+	tinydm-openrc
 	xorg-server
 	"
 _pmb_recommends="
@@ -44,7 +51,7 @@ _pmb_recommends="
 	postmarketos-artwork-wallpapers
 	xdg-user-dirs
 	"
-subpackages="$pkgname-openrc $pkgname-systemd"
+install="$pkgname.post-install $pkgname.post-upgrade"
 source="
 	gtk-app-wayland.sh
 	kdewallet.kwl
@@ -69,26 +76,6 @@ 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
@@ -1,8 +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 urfkill default
@@ -1 +0,0 @@
-postmarketos-base-ui-plasma-openrc.post-install
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-systemctl enable bluetooth
-#systemctl enable hfd-service
-systemctl enable iio-sensor-proxy
-#systemctl enable networkmanager
-#systemctl enable urfkill
@@ -1 +0,0 @@
-postmarketos-base-ui-plasma-systemd.post-install
@@ -0,0 +1,22 @@
+#!/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
@@ -0,0 +1 @@
+postmarketos-base-ui-plasma.post-install
@@ -1,6 +1,6 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-base-ui
-pkgver=99920
+pkgver=20
 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 !systemd-logind"
+	depends="sleep-inhibitor"
 	install="$subpkgname.pre-upgrade $subpkgname.post-install"
 	replaces="
 		elogind
@@ -177,6 +177,7 @@ 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.2
+pkgver=0.2.1
 pkgrel=0
 pkgdesc="pmOS integration components for pbsplash"
 url="https://postmarketos.org"
@@ -8,11 +8,9 @@ arch="all"
 license="CC-BY-SA-3.0"
 depends="devicepkg-utils pbsplash"
 options="!check" # no testsuite
-subpackages="$pkgname-openrc $pkgname-service"
+subpackages="$pkgname-openrc"
 source="
 	kill-pbsplash
-	kill-pbsplash.service
-	kill-pbsplash-override.conf
 	99-shutdown-pbsplash.stop
 	OpenSans-Regular.svg
 	pmos-logo.svg
@@ -23,8 +21,6 @@ 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/
@@ -32,7 +28,6 @@ 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() {
@@ -40,15 +35,8 @@ 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
@@ -1,3 +0,0 @@
-[Unit]
-# Trigger killing pbsplash when the display manager starts
-OnFailure=kill-pbsplash.service
@@ -1,12 +0,0 @@
-[Unit]
-Description=Kill pbsplash!
-After=graphical.target
-Requisite=graphical.target
-
-[Service]
-ExecStart=-/usr/bin/killall pbsplash
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=graphical.target
@@ -1 +0,0 @@
-postmarketos-bootsplash-openrc.post-install
@@ -1,12 +1,12 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-config-nftables
-pkgver=0.17
+pkgver=0.16
 pkgrel=0
 pkgdesc="nftables firewall configuration for postmarketOS"
 url="https://gitlab.com/postmarketos"
 arch="noarch"
 license="MIT"
-depends=""
+depends="nftables-openrc"
 subpackages="
 	$pkgname-openusb:openusb
 	$pkgname-log:log
@@ -19,7 +19,6 @@ subpackages="
 	$pkgname-vlc-chromecast:vlc_chromecast
 	$pkgname-vncserver:vncserver
 	$pkgname-wifi-display:wifi_display
-	$pkgname-openrc:openrc
 "
 source="
 	rules/00_log_all.nft
@@ -56,13 +55,6 @@ 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"
@@ -1,38 +0,0 @@
-# Maintainer: Caleb Connolly <caleb@postmarketos.org>
-pkgname=postmarketos-dev
-pkgver=1
-pkgrel=0
-pkgdesc="postmarketOS development tools"
-url="https://postmarketos.org"
-arch="noarch"
-license="MIT"
-options="!check"
-depends="
-	htop
-	coreutils
-	nano
-	psutils
-	iputils
-	alpine-sdk
-	findutils
-	gawk
-	bash
-	bash-completion
-"
-makedepends=""
-checkdepends=""
-install="$pkgname.post-install $pkgname.post-deinstall"
-
-package() {
-	mkdir -p "$pkgdir/etc/skel"
-	cat > "$pkgdir/etc/skel/.bashrc" <<EOF
-# Just set a nice prompt
-PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] '
-EOF
-
-	cat > "$pkgdir/etc/skel/.bash_profile" <<EOF
-# Source the users bashrc (global one is sourced by /etc/profile.d/00-bashrc.sh)
-[[ -f ~/.bashrc ]] && . ~/.bashrc
-EOF
-}
-
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ -s /usr/local/bin/vim ]; then
-	rm /usr/local/bin/vim
-fi
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ ! -e /usr/local/bin/vim ]; then
-	echo "Installing vim -> neovim symlink..."
-	ln -s /usr/bin/nvim /usr/local/bin/vim
-fi
@@ -17,6 +17,5 @@ nls_iso8859_1
 nls_utf8
 usb_f_rndis
 usb_f_ncm
-usb-storage
 vfat
 xts
@@ -1,7 +1,7 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-initramfs
-pkgver=2.5.5
+pkgver=2.5.4
 pkgrel=0
 pkgdesc="Base files for the postmarketOS initramfs / initramfs-extra"
 url="https://postmarketos.org"
@@ -84,7 +84,7 @@ package() {
 }

 sha512sums="
-8ea356aa81b5be431c67ecb6288e43022790fcd7a82eae839ccb55fc88292e48311dafaa3ffcd730d22de25545a442b9a319ae2302cf55a4db66ca34a5993807  00-default.modules
+0f8e57dd6e5169ffc3579d85ee64447d0f89b727db05bd72d31457fd40268aad672ce650b860c3a9e25be4b0705d49101e1df7346b08bd477b6b285710a4b7d1  00-default.modules
 5b364300f31c91fd0591eb0715f67cbf5383f45246a5fb9f34b79f7cb2e3b15768b2130e5f32f816cc169950f988c1beabc879ba31645c58ce131a288dbc071d  00-initramfs-base.dirs
 ab41b45b0613f25a61114ed8c8b92bc53c60838f6e2e0ba18c76e5369b2984e6023a0661887692673aca3f647f268c468a468f6b1ac424cfee609017a89481dd  00-initramfs-base.files
 8a4adad3785af474b36a09a05f6a3b2c4b4f43aac331a53b903abfa51ea12be1e3d1d807b7a6e66a1346815f3b0044daf8cd62e21e2dc75d2db13ee265a72985  00-initramfs-extra-base.files
@@ -1,8 +1,7 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-mkinitfs
-pkgver=9992.3.1
-_pkgver=2.2.2
+pkgver=2.4.0
 pkgrel=0
 pkgdesc="Tool to generate initramfs images for postmarketOS"
 url="https://postmarketos.org"
@@ -24,12 +23,11 @@ triggers="$pkgname.trigger=\

 # mkinitfs-vendor-$pkgver.tar.gz: vendored Go deps, is part of the release:
 # https://gitlab.com/postmarketOS/postmarketos-mkinitfs/-/releases
-_commit="23183e62daa08984bf38ba22ca041cf75bd30cae"
 source="
-	postmarketos-mkinitfs-$_commit.tar.gz::https://gitlab.com/postmarketOS/postmarketos-mkinitfs/-/archive/$_commit/postmarketos-mkinitfs-$_commit.tar.gz
-	https://gitlab.com/api/v4/projects/postmarketOS%2Fpostmarketos-mkinitfs/packages/generic/mkinitfs-vendor-$_pkgver/$_pkgver/mkinitfs-vendor-$_pkgver.tar.gz
+	https://gitlab.com/postmarketOS/postmarketos-mkinitfs/-/archive/$pkgver/postmarketos-mkinitfs-$pkgver.tar.gz
+	https://gitlab.com/api/v4/projects/postmarketOS%2Fpostmarketos-mkinitfs/packages/generic/mkinitfs-vendor-$pkgver/$pkgver/mkinitfs-vendor-$pkgver.tar.gz
 	"
-builddir="$srcdir/postmarketos-mkinitfs-$_commit"
+
 install="$pkgname.post-upgrade"
 arch="all"
 license="GPL-2.0-or-later"
@@ -49,7 +47,7 @@ prepare() {

 build() {
 	unset LDFLAGS  # passed to Go as linker flags, which are invalid
-	make VERSION="$_pkgver"
+	make VERSION="$pkgver"
 }

 package() {
@@ -61,6 +59,6 @@ check() {
 }

 sha512sums="
-39e7ed557d76f7b7997d0a9ea82dc7cc528fca3d1a5c572e88fdf4c4cb51619e11419f984c2bd480119ac53711b87bdc1d37b5225309b83f4ab3196d8653f7db  postmarketos-mkinitfs-23183e62daa08984bf38ba22ca041cf75bd30cae.tar.gz
-34ecfb29d3b0e547ba3ba3e50fa0e962c3c381cc200b12504354a9cfcc46a1b2987a69f298eedb5c39a6cdb06bc270119c991ffe1f96399e37ec8c20e90385f4  mkinitfs-vendor-2.2.2.tar.gz
+999cc57ebd9c9a1ef22f76093802bd95712b8f03578d50884818f4452cbc1887e306a8856a3631b6fcca6f132c7b12ce55023d0673f809b884c36c31ad3e861f  postmarketos-mkinitfs-2.4.0.tar.gz
+ee20b2bf71f5cd584aab04da9937462d87a8ec29691681588208d862ae85dedc02f1ca0e0aa8d3020fdbe65e16f4dcf215fd12e285056a3f654523c7891afac3  mkinitfs-vendor-2.4.0.tar.gz
 "
@@ -48,7 +48,7 @@ source="
 	20_pmOS-wallpaper-gnome-mobile.gschema.override
 	firefox-wayland.sh
 	"
-options="!check pmb:systemd"
+options="!check"

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

 package() {
 	install -Dm644 "$srcdir"/01_postmarketos-ui-phosh.gschema.override \
@@ -59,26 +57,6 @@ 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
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-rc-update add tinydm default
-rc-update add waked default
-tinydm-set-session -s /usr/share/wayland-sessions/phosh.desktop
-
-exit 0
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-systemctl enable phosh
@@ -1,5 +1,9 @@
 #!/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=2
+pkgrel=1
 pkgdesc="(X11/Wayland) KDE Desktop Environment (works well with tablets)"
 url="https://www.kde.org"
 # armhf and riscv64 blocked by plasma
@@ -37,11 +37,8 @@ _pmb_recommends="$_pmb_recommends
 	wayland-utils
 	xdpyinfo
 	"
-options="!check pmb:systemd" # No tests for a metapkg
-subpackages="
-	$pkgname-openrc:openrc
-	$pkgname-systemd:systemd
-	"
+install="$pkgname.post-install $pkgname.post-upgrade"
+options="!check" # No tests for a metapkg

 package() {
 	mkdir -p "$pkgdir"
@@ -60,17 +57,3 @@ 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"
-}
@@ -1 +0,0 @@
-postmarketos-ui-plasma-desktop-openrc.post-install
@@ -1,11 +0,0 @@
-#!/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
@@ -1 +0,0 @@
-postmarketos-ui-plasma-desktop-systemd.post-install
@@ -8,5 +8,6 @@ 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.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 $pkgname-openrc $pkgname-systemd"
+subpackages="$pkgname-extras"
 replaces="plasma-mobile"
-options="!check pmb:gpu-accel pmb:systemd"
+options="!check pmb:gpu-accel"

 package() {
 	install -Dm644 \
@@ -72,30 +72,8 @@ 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
@@ -1,58 +0,0 @@
-[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
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-rc-update add modemmanager default
-rc-update add tinydm default
-
-tinydm-set-session -s /usr/share/wayland-sessions/plasma-mobile.desktop
@@ -1 +0,0 @@
-postmarketos-ui-plasma-mobile-openrc.post-install
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-systemctl enable plasma-mobile
@@ -1 +0,0 @@
-postmarketos-ui-plasma-mobile-systemd.post-install
@@ -0,0 +1,24 @@
+#!/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
@@ -0,0 +1 @@
+postmarketos-ui-plasma-mobile.post-install
@@ -44,7 +44,7 @@ _pmb_recommends="
 	"
 provides="postmarketos-ui-sxmo"
 provider_priority=5
-options="!check pmb:systemd-never"
+options="!check" # has no tests

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

 package() {
 	mkdir -p "$pkgdir"
@@ -11,14 +11,3 @@ 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
@@ -1,103 +0,0 @@
-# Forked from Alpine to add systemd-service support
-
-pkgname=abuild
-pkgver=99993.12.0
-_pkgver=3.12.0
-_commit="d45c6dbee9171fa9dc25b2d6b298469619fbedb6"
-_ver=${_pkgver%_git*}
-pkgrel=1
-pkgdesc="Script to build Alpine Packages"
-url="https://git.alpinelinux.org/cgit/abuild/"
-arch="all"
-license="GPL-2.0-only"
-depends="fakeroot scanelf openssl>3 apk-tools>=2.0.7-r1 libc-utils
-	attr tar pkgconf patch lzip curl libcap-getcap"
-makedepends="openssl-dev>3 zlib-dev pkgconfig scdoc"
-checkdepends="kyua git"
-install="$pkgname.pre-install $pkgname.pre-upgrade"
-subpackages="
-	apkbuild-cpan:cpan:noarch
-	apkbuild-gem-resolver:gems:noarch
-	apkbuild-pypi:pypi:noarch
-	abuild-rootbld:_rootbld:noarch
-	$pkgname-doc
-	"
-options="suid !check" # tests are SLOW in qemu
-pkggroups="abuild"
-source="https://gitlab.com/calebccff/abuild/-/archive/$_commit/abuild-$_commit.tar.gz"
-builddir="$srcdir"/abuild-"$_commit"
-
-build() {
-	make VERSION="$_pkgver-r$pkgrel"
-}
-
-check() {
-	make check
-}
-
-package() {
-	make install VERSION="$_pkgver-r$pkgrel" DESTDIR="$pkgdir"
-
-	install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
-
-	case "$CARCH" in
-	x86*|ppc64le)
-		# binutils only supports it here
-		cat >>"$pkgdir"/usr/share/abuild/default.conf <<-EOF
-
-		# binutils ld.bfd supports this on this architecture; default to it
-		export RUSTFLAGS="\$RUSTFLAGS -Clink-arg=-Wl,-z,pack-relative-relocs"
-		export LDFLAGS="\$LDFLAGS -Wl,-z,pack-relative-relocs"
-		EOF
-	esac
-
-	case "$CARCH" in
-	x86_64)
-		# https://lists.alpinelinux.org/~alpine/devel/%3C1628515011.zujvcn248v.none%40localhost%3E
-		# note that this is x86-exclusive. on other architectures, this is pretty much always bad
-		# https://github.com/rust-lang/rust/pull/106380
-		cat >>"$pkgdir"/usr/share/abuild/default.conf <<-EOF
-
-		# -fno-plt has very slight improvements to general code size and speed on x86-only,
-		# for the common system dynamic linking case
-		export CFLAGS="\$CFLAGS -fno-plt"
-		export CXXFLAGS="\$CXXFLAGS -fno-plt"
-		EOF
-		;;
-	esac
-
-	install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles
-}
-
-cpan() {
-	pkgdesc="Script to generate perl APKBUILD from CPAN"
-	depends="perl perl-libwww perl-json perl-module-build perl-module-build-tiny
-		perl-lwp-protocol-https"
-
-	amove usr/bin/apkbuild-cpan
-}
-
-gems() {
-	pkgdesc="APKBUILD dependency resolver for RubyGems"
-	depends="ruby ruby-augeas"
-
-	amove usr/bin/apkbuild-gem-resolver
-}
-
-pypi() {
-	pkgdesc="Script to generate python3 APKBUILD from PYPI"
-	depends="perl perl-libwww perl-json perl-module-build-tiny perl-lwp-protocol-https
-	perl-ipc-system-simple"
-
-	amove usr/bin/apkbuild-pypi
-}
-
-_rootbld() {
-	pkgdesc="Build packages in chroot"
-	depends="abuild bubblewrap cmd:envsubst git"
-	mkdir -p "$subpkgdir"
-}
-
-sha512sums="
-3959c47c8ada26a23f647b4af4258e6ff1a8c7b6b4821cafe655da953933f12fed8c5753a8ec2cde6abd1e3e9b67dccaa74acc0633827d581d532905af9fb1e4  abuild-d45c6dbee9171fa9dc25b2d6b298469619fbedb6.tar.gz
-"
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-addgroup -S abuild 2>/dev/null
-
-exit 0
@@ -1 +0,0 @@
-abuild.pre-install
@@ -1,59 +0,0 @@
-# Forked from Alpine to build with systemd support
-# this provides the ability to activate user sessions
-# from dbus by invoking logind
-
-pkgname=accountsservice
-pkgver=99923.13.9
-_pkgver=23.13.9
-pkgrel=0
-pkgdesc="D-Bus interface for user account query and manipulation"
-url="https://www.freedesktop.org/software/accountsservice/"
-arch="all"
-license="GPL-3.0-or-later"
-depends_dev="gobject-introspection-dev"
-makedepends="
-	$depends_dev
-	dbus-dev
-	systemd-dev
-	glib-dev
-	meson
-	polkit-dev
-	vala
-	"
-subpackages="$pkgname-dev $pkgname-lang lib$pkgname:libs"
-source="https://www.freedesktop.org/software/accountsservice/accountsservice-$_pkgver.tar.xz
-	musl-fgetspent_r.patch
-	musl-wtmp.patch
-	opt-tests.patch
-	"
-# mocklibc fails to build with implicits
-options="!check"
-builddir="$srcdir/accountsservice-$_pkgver"
-
-build() {
-	abuild-meson \
-		-Db_lto=true \
-		-Dsystemdsystemunitdir=/usr/lib/systemd/system \
-		-Dintrospection=true \
-		-Ddocbook=false \
-		-Dgtk_doc=false \
-		-Dadmin_group=wheel \
-		-Dtests="$(want_check && echo true || echo false)" \
-		. output
-	meson compile -C output
-}
-
-check() {
-	meson test --print-errorlogs --no-rebuild -C output
-}
-
-package() {
-	DESTDIR="$pkgdir" meson install --no-rebuild -C output
-}
-
-sha512sums="
-c6eb543ce2e07b61bbdfa454e388949bc688517be0536b14f30c66383ed105b15d3fab8b6c62b1eaa08f67d9bdc29b928729d9f7c704f47de4decf0de8e12f89  accountsservice-23.13.9.tar.xz
-469392beca8f5941eafaa193c4fcb0472770ee4183ce520416a1b5d6abafe0e201990eb74d06bfbd9e20af08e55aff5f0031f267083f6c6879f0fe4e5028103c  musl-fgetspent_r.patch
-6d81caed730473d5c94d575c580a236b4267b374bf50588860922a7ecbeef0b2a1d50124fa3ae195c4f26abe8c3bd6df2aea6d27a0ce23e99acef9fff3eb9652  musl-wtmp.patch
-cc5ea18d885ccc5a85f5f4191d3157f3953878af289a9cabc373afea67726042144d66fd9f8d08dac7090fc23037ab98adb4101e8378a16ab2eb04043c88378f  opt-tests.patch
-"
@@ -1,34 +0,0 @@
-diff --git a/src/daemon.c b/src/daemon.c
-index 312394a..e7b3c58 100644
--- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -140,6 +140,28 @@ error_get_type (void)
- #define MAX_LOCAL_USERS 50
- #endif
- 
-+#ifndef __GLIBC__
-+ /* Musl libc does not support fgetspent_r(), write own
-+  * wrapper
-+  */
-+static int fgetspent_r(FILE *fp, struct spwd *spbuf, char *buf, size_t buflen, struct spwd **spbufp) {
-+       struct spwd *shadow_entry = fgetspent(fp);
-+       if(!shadow_entry)
-+               return -1;
-+       size_t namplen = strlen(shadow_entry->sp_namp);
-+       size_t pwdplen = strlen(shadow_entry->sp_pwdp);
-+
-+       if(namplen + pwdplen + 2 > buflen)
-+               return -1;
-+
-+       *spbufp = memcpy(spbuf, shadow_entry, sizeof(struct spwd));
-+       spbuf->sp_namp = strncpy(buf, shadow_entry->sp_namp, namplen + 1);
-+       spbuf->sp_pwdp = strncpy(buf + namplen + 1, shadow_entry->sp_pwdp, pwdplen + 1);
-+
-+       return 0;
-+}
-+#endif
-+
- static struct passwd *
- entry_generator_fgetpwent (Daemon       *daemon,
-                            GHashTable   *users,
-
@@ -1,15 +0,0 @@
-the assert expects a working /var/log/wtmp at build time
-diff --git a/meson.build b/meson.build
-index 4a509e7..f995d28 100644
--- a/meson.build
-+++ b/meson.build
-@@ -103,8 +103,7 @@ elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
- 
-   config_h.set('PATH_WTMP', '_PATH_WTMPX')
- else
-  path_wtmp = '/var/log/utx.log'
-  assert(run_command('test', '-e', path_wtmp, check: false).returncode() == 0, 'Do not know which filename to watch for wtmp changes')
-+  path_wtmp = '/var/log/wtmp'
-   config_h.set_quoted('PATH_WTMP', path_wtmp)
- endif
- 
@@ -1,24 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 4a509e7..5119fab 100644
--- a/meson.build
-+++ b/meson.build
-@@ -232,7 +232,9 @@ if get_option('gtk_doc')
-   subdir('doc/libaccountsservice')
- endif
- 
-subdir('tests')
-+if get_option('tests')
-+  subdir('tests')
-+endif
- 
- configure_file(
-   output: 'config.h',
-diff --git a/meson_options.txt b/meson_options.txt
-index b34a0fa..56872c7 100644
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -13,3 +13,4 @@ option('vapi', type: 'boolean', value: true, description : 'Enable Vala bindings
- 
- option('docbook', type: 'boolean', value: false, description: 'build documentation (requires xmlto)')
- option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
-+option('tests', type: 'boolean', value: true, description: 'tests')
@@ -1,37 +0,0 @@
-# Forked from Alpine to remove openrc dependency
-
-pkgname=alpine-base
-pkgver=9999
-pkgrel=0
-pkgdesc="Meta package for minimal alpine base"
-url="https://alpinelinux.org"
-arch="noarch"
-license="MIT"
-depends="
-	alpine-baselayout
-	alpine-release
-	apk-tools
-	busybox
-	busybox-suid
-	libc-utils
-"
-
-# can't include systemd here, as we wan't to upgrade from alpine's base to our systemd-base while building
-subpackages="alpine-release:release"
-replaces="alpine-baselayout"
-options="pmb:strict !check"
-source="rc-update"
-
-package() {
-	install -Dm755 rc-update "$pkgdir"/usr/bin/rc-update
-}
-
-release() {
-	depends="alpine-keys"
-	pkgdesc="Alpine release data"
-
-	mkdir -p "$subpkgdir"
-}
-sha512sums="
-18227112a559e2b90c9a3cf4eb16762595370130c88cb7b7d1a0fda2ba894918802dd084f7c505f8eb379f078d4c2ed2e384f03d16ff25075acdb31ab0186813  rc-update
-"
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# Dummy to make post-install scripts work
-# Will fail in chroot for sysV compat services
-# FIXME: FIXME: FIXME: FIXME: FIXME:
-
-# Get the last argument to rc-update, it's
-instruction="enable"
-for service; do
-    case "$service" in
-        "rc-update")
-            ;;
-        "-q")
-            ;;
-        "add")
-            instruction="enable"
-            ;;
-        "del")
-            instruction="disable"
-            ;;
-        *)
-            break
-            ;;
-    esac
-done
-
-case "$service" in
-    "networkmanager")
-        service="NetworkManager"
-        ;;
-    "modemmanager")
-        service="ModemManager"
-        ;;
-esac
-
-# The service files might be missing due to how apk orders the install
-# so we record them all to let systemd-services.trigger enable them
-# at the end of installation
-if ! systemctl $instruction $service; then
-    echo "$instruction $service" >> /run/rc-update.failed
-fi
@@ -1,100 +0,0 @@
-# Forked from Alpine INSERT-REASON-HERE (CHANGEME!)
-
-pkgname=apk-tools
-pkgver=9992.14
-_pkgver=2.14.0
-pkgrel=7
-pkgdesc="Alpine Package Keeper - package manager for alpine"
-arch="all"
-url="https://gitlab.alpinelinux.org/alpine/apk-tools"
-license="GPL-2.0-only"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-static $pkgname-doc $pkgname-zsh-completion"
-# Musl 1.2 introduced new ABI for time64 => upgrading apk-tools
-# while staying on musl <1.2 causes missing symbols
-# starting with musl 1.2.3_git (pre 1.2.3), we added DT_RELR
-# it is possible for old systems to upgrade, and apk-tools would upgrade first,
-# which would upgrade to a binary that cannot run until musl is upgraded.
-# forcing this constraint makes apk upgrade musl as part of the 'critical' transaction,
-# and update musl first.
-depends="musl>=1.2.3_git20230424"
-makedepends_build="openssl>3 lua5.3 lua5.3-lzlib scdoc"
-makedepends_host="zlib-dev openssl-dev zlib-static openssl-libs-static linux-headers"
-makedepends="$makedepends_build $makedepends_host lua-dev"
-_lua="no"
-if [ "$CBUILD" = "$CHOST" ]; then
-	_lua="lua5.3"
-	subpackages="$subpackages $_lua-apk:luaapk"
-	makedepends="$makedepends $_lua-dev"
-
-	# ca-certificates-bundle needed for https certificate validation
-	depends="$depends ca-certificates-bundle"
-fi
-
-_commit="f13b73df2fc25875b1e19b093f818d2cce889cc0"
-source="https://gitlab.alpinelinux.org/calebccff/apk-tools/-/archive/$_commit/apk-tools-$_commit.tar.gz
-	_apk
-	"
-builddir="$srcdir/$pkgname-$_commit"
-
-# secfixes:
-#   2.12.6-r0:
-#     - CVE-2021-36159
-#   2.12.5-r0:
-#     - CVE-2021-30139
-
-prepare() {
-	default_prepare
-	sed -i -e 's:-Werror::' Make.rules
-	echo "FULL_VERSION=$_pkgver-r$pkgrel" > config.mk
-}
-
-build() {
-	make LUA="$_lua"
-	make static LUA="$_lua"
-}
-
-check() {
-	make check LUA="$_lua"
-}
-
-package() {
-	make DESTDIR="$pkgdir" LUA="$_lua" install
-	install -d "$pkgdir"/var/lib/apk \
-		"$pkgdir"/lib/apk/exec \
-		"$pkgdir"/etc/apk/keys \
-		"$pkgdir"/etc/apk/protected_paths.d
-
-	install -Dm644 "$srcdir"/_apk "$pkgdir"/usr/share/zsh/site-functions/_apk
-	rm -r "$pkgdir"/usr/share/doc
-}
-
-static() {
-	pkgdesc="Alpine Package Keeper - static binary"
-	install -Dm755 "$builddir"/src/apk.static \
-		"$subpkgdir"/sbin/apk.static
-
-	# lets sign the static binary so it can be vefified from distros
-	# that does not have apk-tools
-	local abuild_conf=${ABUILD_CONF:-"/etc/abuild.conf"}
-	local abuild_home=${ABUILD_USERDIR:-"$HOME/.abuild"}
-	local abuild_userconf=${ABUILD_USERCONF:-"$abuild_home/abuild.conf"}
-	[ -f "$abuild_userconf" ] && . "$abuild_userconf"
-	local privkey="$PACKAGER_PRIVKEY"
-	local pubkey=${PACKAGER_PUBKEY:-"$privkey.pub"}
-	local keyname=${pubkey##*/}
-	${CROSS_COMPILE}strip "$subpkgdir"/sbin/apk.static
-	openssl dgst -sha1 -sign "$privkey" \
-		-out "$subpkgdir"/sbin/apk.static.SIGN.RSA.$keyname \
-		"$subpkgdir"/sbin/apk.static
-}
-
-luaapk() {
-	pkgdesc="Lua module for apk-tools"
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/
-}
-
-sha512sums="
-88b1eab6d6e96b9cff3c9688bda8349ace9c5a54acf835819e763ffbdae299877d5db8c14519b9c1ab9606cc743f21c1fe92cd9957af82ad7aee47e1e673094b  apk-tools-f13b73df2fc25875b1e19b093f818d2cce889cc0.tar.gz
-7870676720f5007eee9482786e02246f8e3474afb90e76c9c83aebe914747a8e007b5d2eed6441933f4922024b3f0664db270f21981ad6c2db877a110b0cd79e  _apk
-"
@@ -1,268 +0,0 @@
-#compdef apk
-
-function _apk {
-
-	local -a global_opts=(
-		"(-h --help)"{-h,--help}"[Print help information]"
-		"(-i --interactive)"{-i,--interactive}"[Ask confirmation before performing certain operations]"
-		"(-p --root)"{-p,--root}"[Manage file system at ROOT]"
-		"(-q --quiet)"{-q,--quiet}"[Print less information]"
-		"(-U --update-cache)"{-U,--update-cache}"[Alias for '--cache-max-age 1']"
-		"(-v --verbose)"{-v,--verbose}"[Print more information]"
-		"(-V --version)"{-V,--version}"[Print program version and exit]"
-		"(-X --repository)"{-X,--repository}"[Specify additional package repository]:repository:_host"
-		"--allow-untrusted[Install packages with untrusted signature or no signature]"
-		"--arch[Temporarily override architecture]:arch:(armhf mips64 s390x x86_64 x86 aarch64 ppc64le armv7 riscv64)"
-		"--cache-dir[Temporarily override the cache directory]:directory:_dir_list"
-		"--cache-max-age[Maximum age for index in cache before it's refreshed]:minutes"
-		"--force-binary-stdout[Continue even if binary data will be printed to the terminal]"
-		"--force-broken-world[Continue even if world cannot be satisfied]"
-		"--force-non-repository[Continue even if packages may be lost on reboot]"
-		"--force-old-apk[Continue even if packages use unsupported features]"
-		"--force-overwrite[Overwrite files in other packages]"
-		"--force-refresh[Do not use cached files]"
-		"--keys-dir[Override directory of trusted keys]:directory:_dir_list"
-		"--no-cache[Do not use any local cache path]"
-		"--no-network[Do not use the network]"
-		"--no-progress[Disable progress bar even for TTYs]"
-		"--print-arch[Print default arch and exit]"
-		"--progress[Show progress]"
-		"--progress-fd[Write progress to the specified file descriptor]:file descriptor"
-		"--purge[Delete modified configuration files or uninstalled packages from cache]"
-		"--repositories-file[Override system repositories]:repository file:_files"
-		"--wait[Wait to get an exclusive repository lock before failing]:seconds"
-	)
-
-	local -a commit_opts=(
-		"(-s --simulate)"{-s,--simulate}"[Simulate the requested operation without making any changes]"
-		"--clean-protected[Do not create .apk-new files in configuration directories]"
-		"--overlay-from-stdin[Read list of overlay files from stdin]"
-		"--no-scripts[Do not execute any scripts]"
-		"--no-commit-hooks[Skip pre/post hook scripts]"
-		"--initramfs-diskless-boot[Enables selected force options, disables commit hooks and more]"
-	)
-
-	local -a latest_opt=("(-l --latest)"{-l,--latest}"[Always choose the latest package by version]")
-	local -a upgrade_opt=("(-u --upgrade)"{-u,--upgrade}"[Upgrade packages and it's dependencies]")
-
-	local context state state_descr line
-	typeset -A opt_args
-	local curcontext="$curcontext"
-	local ret=1
-
-	function _ccache_apk_world { [[ "$1" -ot /etc/apk/world ]] }
-	function _ccache_apk_avail {
-		for i in /var/cache/apk/APKINDEX.*; do
-			[[ "$1" -ot "$i" ]] && return
-		done
-	}
-
-	function _apk_available_pkgs {
-		local -a _apk_available_packs
-		zstyle ":completion:${curcontext}:" cache-policy _ccache_apk_avail
-		local IFS=$'\n'
-		if _cache_invalid apk_index_packages_available || ! _retrieve_cache apk_index_packages_available; then
-			_apk_available_packs=(${${$(/sbin/apk list -a 2>/dev/null)%% *}%-*-r[[:digit:]]*})
-			_store_cache apk_index_packages_available _apk_available_packs
-		fi
-		_describe 'available packages' _apk_available_packs
-	}
-
-	function _apk_installed_pkgs {
-		local -a _apk_installed_packs
-		zstyle ":completion:${curcontext}:" cache-policy _ccache_apk_world
-		local IFS=$'\n'
-		if _cache_invalid apk_index_packages_installed || ! _retrieve_cache apk_index_packages_installed; then
-			_apk_installed_packs=(${${$(/sbin/apk list -I 2>/dev/null)%% *}%-*-r[[:digit:]]*})
-			_store_cache apk_index_packages_installed _apk_installed_packs
-		fi
-		_describe 'installed packages' _apk_installed_packs
-	}
-
-	function _apk_packages {
-		_alternative 'repo:available packages:_apk_available_pkgs' 'localpkgs:local packages:_files -g "*.apk"'
-	}
-
-	function _apk_cache {
-		local -a cache_subcmds=(
-			"clean:Remove package files which are no longer necessary"
-			"download:Fetch package files from the repositories and store them in the cache"
-			"sync:Clean and Download"
-		)
-		_describe 'subcommand' cache_subcmds
-	}
-
-	function _apk_subcmds {
-		local -a cmds=(
-			"add:Add packages to world and commit changes"
-			"del:Remove packages from world and commit changes"
-			"fix:Fix, reinstall or upgrade packages without modifying world"
-			"update:Update repository indexes"
-			"upgrade:Install upgrades available from repositories"
-			"cache:Manage the local package cache"
-			"info:Give detailed information about packages or repositories"
-			"list:List packages matching a pattern or other criteria"
-			"dot:Render dependencies as graphviz graphs"
-			"policy:Show repository policy for packages"
-			"search:Search for packages by name or description"
-			"index:Create repository index file from packages"
-			"fetch:Download packages from global repositories to a local directory"
-			"manifest:Show checksums of package contents"
-			"verify:Verify package integrity and signature"
-			"audit:Audit system for changes"
-			"stats:Show statistics about repositories and installations"
-			"version:Compare package versions or perform tests on version strings"
-		)
-		_describe 'subcommand' cmds
-	}
-
-	local -a completion_spec=($global_opts ':subcommand:_apk_subcmds')
-
-	case ${${words:#-*}[2]} in
-	(add)
-		completion_spec+=(
-			$commit_opts \
-			$latest_opt \
-			$upgrade_opt \
-			"--initdb[Initialize a new package database]" \
-			"(-t --virtual)"{-t,--virtual}"[Create virtual package with given dependencies]" \
-			"--no-chown[Do not change file owner or group]" \
-			"*:package:_apk_packages"
-		)
-	;;
-	(del)
-		completion_spec+=(
-			$commit_opts \
-			"(-r --rdepends)"{-r,--rdepends}"[Recursively delete all top-level reverse dependencies]" \
-			"*:installed package:_apk_installed_pkgs"
-		)
-	;;
-	(fix)
-		completion_spec+=(
-			$commit_opts \
-			"(-d --depends)"{-d,--depends}"[Fix dependencies of specified packages]" \
-			"(-r --reinstall)"{-r,--reinstall}"[Reinstall packages]" \
-			"(-u --upgrade)"{-u,--upgrade}"[Upgrade if an upgrade is available and does not break dependencies]" \
-			"(-x --xattr)"{-x,--xattr}"[Fix packages with broken xattrs]" \
-			"--directory-permissions[Reset all directory permissions]" \
-			"*:package:_apk_packages"
-		)
-	;;
-	(update) completion_spec+=($commit_opts);;
-	(upgrade)
-		completion_spec+=(
-			$commit_opts \
-			$latest_opt \
-			"(-a --available)"{-a,--available}"[Reset all packages to versions available from current repositories]" \
-			"--ignore[Upgrade all other packages than the ones listed]" \
-			"--no-self-upgrade[Do not do an early upgrade of the 'apk-tools' package]" \
-			"--prune[Remove packages which are no longer available from any configured repository]" \
-			"--self-upgrade-only[Only perform a self-upgrade of the 'apk-tools' package]" \
-			"*:package:_apk_packages"
-		)
-	;;
-	(cache)
-		completion_spec+=(
-			$latest_opt \
-			$upgrade_opt \
-			'2:subcommand:_apk_cache'
-		)
-	;;
-	(info)
-		completion_spec+=(
-			"(-a --all)"{-a,--all}"[List all information known about the package]" \
-			"(-d --description)"{-d,--descripton}"[Print the package description]" \
-			"(-e --installed)"{-e,--installed}"[Check package installed status]" \
-			"(-L --contents)"{-L,--contents}"[List files included in the package]" \
-			"(-P --provides)"{-P,--provides}"[List what the package provides]" \
-			"(-r --rdepends)"{-r,--rdepends}"[List reverse dependencies of the package]" \
-			"(-R --depends)"{-R,--depends}"[List the dependencies of the package]" \
-			"(-s --size)"{-s,--size}"[Print the package's installed size]" \
-			"(-w --webpage)"{-w,--webpage}"[Print the URL for the package's upstream webpage]" \
-			"(-W --who-owns)"{-W,--who-owns}"[Print the package which owns the specified file]:file:_files" \
-			"(-i --install-if)"{-i,--install-if}"[List the package's install_if rule]" \
-			"--license[Print the package SPDX license identifier]" \
-			"--replaces[List the other packages for which this package is marked as a replacement]" \
-			"(-I --rinstall-if)"{-I,--rinstall-if}"[List other packages whose install_if rules refer to this package]" \
-			"--triggers[Print active triggers for the package]" \
-			"*:package:_apk_packages"
-		)
-	;;
-	(list)
-		completion_spec+=(
-			"(-I --installed)"{-I,--installed}"[Consider only installed packages]" \
-			"(-O --orphaned)"{-O,--orphaned}"[Consider only orphaned packages]" \
-			"(-a --available)"{-a,--available}"[Consider only available packages]" \
-			"(-u --upgradable --upgradeable)"{-u,--upgradable,--upgradeable}"[Consider only upgradable packages]" \
-			"(-o --origin)"{-o,--origin}"[List packages by origin]" \
-			"(-d --depends)"{-d,--depends}"[List packages by dependency]" \
-			"(-P --providers)"{-P,--providers}"[List packages by provider]" \
-			"*:pattern"
-		)
-	;;
-	(dot)
-		completion_spec+=(
-			"--errors[Consider only packages with errors]" \
-			"--installed[Consider only installed packages]"
-		)
-	;;
-	(index)
-		completion_spec+=(
-			"(-d --description)"{-d,--description}"[Add a description to the index]:description" \
-			"(-o --output)"{-o,--output}"[Output generated index to file]:output:_files" \
-			"(-x --index)"{-x,--index}"[Read an existing index to speed up the creation of the new index]" \
-			"--no-warnings[Disable warnings about missing dependencies]" \
-			"--rewrite-arch[Set all package's architecture to arch]:arch:(armhf mips64 s390x x86_64 x86 aarch64 ppc64le armv7 riscv64)" \
-			"*:package:_apk_packages"
-		)
-	;;
-	(fetch)
-		completion_spec+=(
-			"(-l --link)"{-l,--link}"[Create hard links if possible]" \
-			"(-o --output)"{-o,--output}"[Where to write the downloaded files]:directory:_dir_list" \
-			"(-r --recursive)"{-r,--recursive}"[Fetch packages and all of their dependencies]" \
-			"(-s --stdout)"{-s,--stdout}"[Dump the .apk file(s) to stdout]" \
-			"--simulate[Simulate the requested operation without making any changes]" \
-			"--url[Print the full URL for downloaded packages]" \
-			"*:package:_apk_packages"
-		)
-	;;
-	(manifest) completion_spec+=("*:package:_apk_packages");;
-	(verify) completion_spec+=("*:package:_apk_packages");;
-	(audit)
-		completion_spec+=(
-			"--backup[Audit configuration files only (default)]" \
-			"--check-permissions[Check file permissions too]" \
-			"--packages[Print only the packages with changed files]" \
-			"--system[Audit all system files]" \
-			"(-r --recursive)"{-r,--recursive}"[Descent into directories and audit them as well]" \
-			"*:files:_files"
-		)
-	;;
-	(version)
-		completion_spec+=(
-			"(-a --all)"{-a,--all}"[Consider packages from all repository tags]" \
-			"(-c --check)"{-c,--check}"[Check versions for validity]:*: " \
-			"(-I --indexes)"{-I,--indexes}"[Print the version and description for each repository's index]:*: " \
-			"(-l --limit)"{-l,--limit}"[Limit to packages with output matching given operand]:operand:('>' '=' '<' '>=' '<=')" \
-			"(-t --test)"{-t,--test}"[Compare two version strings]:*: " \
-			"*:package:_apk_packages"
-		)
-	;;
-	(policy) completion_spec+=("*:package:_apk_packages");;
-	(search)
-		completion_spec+=(
-			"(-a --all)"{-a,--all}"[Print all matching package versions]" \
-			"(-d --description)"{-d,--description}"[Search in description as well]" \
-			"(-e -x --exact)"{-e,-x,--exact}"[Match package names exactly]" \
-			"--has-origin[Match by package origin]" \
-			"(-o --origin)"{-o,--origin}"[Print base package name]" \
-			"(-r --rdepends)"{-r,--rdepends}"[Print reverse dependencies]" \
-			"*:package:_apk_packages"
-		)
-	;;
-	esac
-
-	_arguments -C -s $completion_spec && ret=0
-	return ret
-}
@@ -1,109 +0,0 @@
-# Forked from Alpine to enable systemd
-
-pkgname=dbus
-pkgver=9991.14.10
-_pkgver=1.14.10
-pkgrel=1
-pkgdesc="Freedesktop.org message bus system"
-url="https://www.freedesktop.org/Software/dbus"
-arch="all"
-license="AFL-2.1 OR GPL-2.0-or-later"
-depends_dev="util-linux-dev"
-makedepends="
-	$depends_dev
-	expat-dev
-	glib-dev
-	libsm-dev
-	libx11-dev
-	meson
-	systemd-dev
-	xmlto
-	libcap-getcap
-	"
-pkggroups="messagebus"
-provider_priority=1
-install="$pkgname.pre-install $pkgname.post-install"
-triggers="$pkgname.trigger=/usr/share/dbus-1/system.d"
-options="!check" # Borked in pmbootstrap...
-subpackages="
-	$pkgname-daemon-launch-helper:launchhelper
-	$pkgname-dev
-	$pkgname-doc
-	$pkgname-libs
-	$pkgname-x11
-	$pkgname-service
-	"
-source="https://dbus.freedesktop.org/releases/dbus/dbus-$_pkgver.tar.xz"
-builddir="$srcdir/dbus-$_pkgver"
-
-# secfixes:
-#   1.14.4-r0:
-#     - CVE-2022-42010
-#     - CVE-2022-42011
-#     - CVE-2022-42012
-#   1.12.18-r0:
-#     - CVE-2020-12049
-#   1.12.16-r0:
-#     - CVE-2019-12749
-
-build() {
-	CFLAGS="$CFLAGS -flto=auto" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--localstatedir=/var \
-		--sysconfdir=/etc \
-		--with-system-pid-file=/run/dbus/dbus.pid \
-		--enable-checks \
-		--disable-assertions \
-		--enable-systemd \
-		--enable-inotify \
-		--enable-libaudit \
-		--enable-user-session \
-		--disable-static
-
-	make
-}
-
-check() {
-	make check
-}
-
-package() {
-	depends="$pkgname-libs=$pkgver-r$pkgrel"
-
-	make DESTDIR="$pkgdir" install
-
-	# can't  install tmpfs
-	rm -r "$pkgdir"/var/run
-}
-
-libs() {
-	pkgdesc="D-BUS access libraries"
-	depends="systemd-libs"
-
-	amove usr/lib/lib*.so.*
-}
-
-x11() {
-	pkgdesc="X11 add-ons for D-BUS"
-	depends="$pkgname=$pkgver-r$pkgrel"
-
-	amove usr/bin/dbus-launch
-}
-
-launchhelper() {
-	pkgdesc="DBus SUID launch helper for autospawning"
-	install_if="$pkgname=$pkgver-r$pkgrel"
-
-	amove usr/libexec/dbus-daemon-launch-helper
-}
-
-dev() {
-	default_dev
-}
-
-sha512sums="
-775b708326059692937acb69d4ce1a89e69878501166655b5d1b1628ac31b50dd53d979d93c84e57f95e90b15e25aa33893e51a7421d3537e9c2f02b1b91bfae  dbus-1.14.10.tar.xz
-"
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Don't populate this, we want systemd-firstboot to do it instead.
-exec dbus-uuidgen --ensure=/etc/machine-id
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S messagebus 2>/dev/null
-adduser -S -D -H -h /dev/null -s /sbin/nologin -G messagebus -g messagebus messagebus 2>/dev/null
-
-exit 0
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-dbus-send --system --type=method_call --dest=org.freedesktop.DBus / \
-	org.freedesktop.DBUS.ReloadConfig >/dev/null 2>&1 || :
@@ -1,71 +0,0 @@
-From a12b01f4f71d7ca1ed528ea11f99520c10b0d93c Mon Sep 17 00:00:00 2001
-From: Newbyte <newbie13xd@gmail.com>
-Date: Tue, 14 Mar 2023 19:37:17 +0100
-Subject: [PATCH 1/2] DOWNSTREAM: use /bin/touch instead of /usr/bin/touch
-
-as that's the path here in Alpine.
---
- data/61-gdm.rules.in | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
-index a4f841bdf..481c5b4dd 100644
--- a/data/61-gdm.rules.in
-+++ b/data/61-gdm.rules.in
-@@ -2,13 +2,13 @@ SUBSYSTEM!="pci", GOTO="gdm_pci_device_end"
- ACTION!="bind", ACTION!="add", GOTO="gdm_pci_device_end"
- 
- # cirrus
-ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
-+ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
- # virtio
-ATTR{vendor}=="0x1af4", ATTR{device}=="0x1050", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
-+ATTR{vendor}=="0x1af4", ATTR{device}=="0x1050", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
- # qxl
-ATTR{vendor}=="0x1b36", ATTR{device}=="0x0100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
-+ATTR{vendor}=="0x1b36", ATTR{device}=="0x0100", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
- # vga
-ATTR{vendor}=="0x1234", ATTR{device}=="0x1111", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
-+ATTR{vendor}=="0x1234", ATTR{device}=="0x1111", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
- 
- # disable Wayland on Hi1710 chipsets
- ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland"
-@@ -36,7 +36,7 @@ SUBSYSTEM!="drm", GOTO="gdm_nomodeset_end"
- # but keep it enabled for simple framebuffer drivers
- DRIVERS=="simple-framebuffer", GOTO="gdm_nomodeset_end"
- IMPORT{parent}="GDM_MACHINE_HAS_VIRTUAL_GPU"
-ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hardware-gpu"
-+ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}!="1", RUN+="/bin/touch /run/udev/gdm-machine-has-hardware-gpu"
- IMPORT{cmdline}="nomodeset", GOTO="gdm_disable_wayland"
- LABEL="gdm_nomodeset_end"
- 
-@@ -46,7 +46,7 @@ LABEL="gdm_nomodeset_end"
- KERNEL!="nvidia", GOTO="gdm_nvidia_end"
- SUBSYSTEM!="module", GOTO="gdm_nvidia_end"
- ACTION!="add", GOTO="gdm_nvidia_end"
-RUN+="/usr/bin/touch /run/udev/gdm-machine-has-vendor-nvidia-driver"
-+RUN+="/bin/touch /run/udev/gdm-machine-has-vendor-nvidia-driver"
- 
- # Check if suspend/resume services necessary for working wayland support is available
- TEST{0711}!="/usr/bin/nvidia-sleep.sh", GOTO="gdm_disable_wayland"
-@@ -68,7 +68,7 @@ LABEL="gdm_nvidia_end"
- KERNEL!="card[0-9]-eDP-*", GOTO="gdm_laptop_check_end"
- SUBSYSTEM!="drm", GOTO="gdm_laptop_check_end"
- ACTION!="add", GOTO="gdm_laptop_check_end"
-RUN+="/usr/bin/touch /run/udev/gdm-machine-is-laptop"
-+RUN+="/bin/touch /run/udev/gdm-machine-is-laptop"
- GOTO="gdm_hybrid_nvidia_laptop_check"
- LABEL="gdm_laptop_check_end"
- 
-@@ -79,7 +79,7 @@ SUBSYSTEM!="drm", GOTO="gdm_hybrid_graphics_check_end"
- ACTION!="add", GOTO="gdm_hybrid_graphics_check_end"
- IMPORT{program}="/bin/sh -c \"echo GDM_NUMBER_OF_GRAPHICS_CARDS=`ls -1d /sys/class/drm/card[0-9] | wc -l`\""
- ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}=="1", RUN+="/usr/bin/rm -f /run/udev/gdm-machine-has-hybrid-graphics"
-ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
-+ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
- LABEL="gdm_hybrid_graphics_check_end"
- 
- # If this is a hybrid graphics laptop with vendor nvidia driver, disable wayland
-- 
-2.39.2
-
@@ -1,45 +0,0 @@
-diff --git a/data/pam-openembedded/gdm-autologin.pam b/data/pam-openembedded/gdm-autologin.pam
-index a9f4354..3e0708b 100644
--- a/data/pam-openembedded/gdm-autologin.pam
-+++ b/data/pam-openembedded/gdm-autologin.pam
-@@ -1,5 +1,5 @@
- #%PAM-1.0
-auth       required    pam_permit.so
-account    include     common-account
-password   include     common-auth
-session    include     common-session
-+auth       required    pam_rootok.so
-+account    include     base-account
-+password   include     base-auth
-+session    include     base-session
-diff --git a/data/pam-openembedded/gdm-launch-environment.pam b/data/pam-openembedded/gdm-launch-environment.pam
-index a9f4354..6f095e7 100644
--- a/data/pam-openembedded/gdm-launch-environment.pam
-+++ b/data/pam-openembedded/gdm-launch-environment.pam
-@@ -1,5 +1,5 @@
- #%PAM-1.0
-auth       required    pam_permit.so
-account    include     common-account
-password   include     common-auth
-session    include     common-session
-+auth       required    pam_rootok.so
-+account    include     base-account
-+password   include     base-auth
-+session    include     base-session
-diff --git a/data/pam-openembedded/gdm-password.pam b/data/pam-openembedded/gdm-password.pam
-index 758464d..dd324f8 100644
--- a/data/pam-openembedded/gdm-password.pam
-+++ b/data/pam-openembedded/gdm-password.pam
-@@ -1,5 +1,8 @@
- #%PAM-1.0
-auth       include     common-auth
-account    include     common-account
-password   include     common-password
-session    include     common-session
-+auth       include     base-auth
-+auth       optional    pam_gnome_keyring.so
-+account    include     base-account
-+password   include     base-password
-+password   optional    pam_gnome_keyring.so use_authtok
-+session    include     base-session
-+session    optional    pam_gnome_keyring.so auto_start
@@ -1,83 +0,0 @@
-# Forked from Alpine INSERT-REASON-HERE (CHANGEME!)
-
-pkgname=gdm
-pkgver=9999
-_pkgver=45.0.1
-pkgrel=0
-pkgdesc="GNOME display manager"
-url="https://wiki.gnome.org/Projects/GDM"
-# blocked by gnome-shell
-arch="all !armhf !s390x"
-license="GPL-2.0-or-later"
-depends="
-	dbus
-	gnome-session
-	gnome-settings-daemon
-	gnome-shell
-	gsettings-desktop-schemas
-	linux-pam>=1.4
-	xrdb
-	xwayland
-	"
-makedepends="
-	accountsservice-dev
-	dconf
-	eudev-dev
-	gettext
-	glib-dev
-	gtk+3.0-dev
-	itstool
-	libcanberra-dev
-	libgudev-dev
-	libsm-dev
-	libx11-dev
-	libxau-dev
-	libxcb-dev
-	libxdmcp-dev
-	linux-pam-dev
-	meson
-	systemd-dev
-	"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-service"
-options="!check" # Causes circular dep with gnome-shell
-source="https://download.gnome.org/sources/gdm/${_pkgver%%.*}/gdm-$_pkgver.tar.xz
-	0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch
-	0003-pam-rename-common-to-base.patch
-	Xsession
-	"
-install="gdm.pre-install"
-builddir="$srcdir/gdm-$_pkgver"
-
-build() {
-	abuild-meson \
-		-Db_lto=true \
-		-Ddefault-pam-config=openembedded \
-		-Dgdm-xsession=false \
-		-Dpam-mod-dir=/usr/lib/security \
-		-Dselinux=disabled \
-		-Dlibaudit=disabled \
-		-Dsystemdsystemunitdir=/usr/lib/systemd/system \
-		-Dsystemduserunitdir=/usr/lib/systemd/user \
-		. output
-	meson compile -C output
-}
-
-package() {
-	DESTDIR="$pkgdir" meson install --no-rebuild -C output
-
-#	install -Dm644 /dev/stdin usr/lib/sysusers.d/gdm.conf <<END
-#g gdm 120 -
-#u gdm 120 "Gnome Display Manager" /var/lib/gdm
-#END
-
-	#sed -i "s/pam_systemd\.so/pam_elogind.so/" "$pkgdir"/etc/pam.d/*
-
-	install -m755 -D "$srcdir/Xsession" "$pkgdir"/etc/gdm
-}
-
-sha512sums="
-f0c667dd5df034087e284c2ec1131b55a85cd9e832c15c2aff1637e1e36d4d62a7d86528a2e524bb2782ca7d7cc7cb9c34a9ce9bba688ad222af409e2eb69abe  gdm-45.0.1.tar.xz
-f91ad0ccae448649e4a7c707b83c796988968a698718db0aedbf2b7c2b9aec0d0cfb12fb4bb7f5de99d3cf337bf4528608625d701872bad8bdc98f8020f0ea95  0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch
-eef64cbc347a2ce894a84f7d1d7612af71b6731492ab67f78a17c9ab37db9cfa0f9d6e8415e58821404eb15336eedd263ca14bfc542b808b62bf684b1594e0fe  0003-pam-rename-common-to-base.patch
-f836cf0acdf148f2ae09ac28251b5126ce597f08254c43b1ec77596f75e1a3229926116c13f98554625be763e8d28415b27bd679b0a5de9f86bdca7857054c82  Xsession
-"
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "$@"
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-
-supervisor=supervise-daemon
-
-name="Display Manager"
-description="GNOME Display Manager"
-
-command=/usr/sbin/gdm
-command_args="$GDM_OPTS"
-
-depend() {
-	provide display-manager
-	need net dbus
-}
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S gdm 2>/dev/null
-adduser -S -D -H -h /var/lib/gdm -s /sbin/nologin -G gdm -g gdm gdm 2>/dev/null
-
-exit 0
@@ -1,57 +0,0 @@
-https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/gnome-keyring/trunk/0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patc
-
-From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
-Date: Sat, 21 May 2022 18:42:21 +0000
-Subject: [PATCH] build: Use p11_module_configs as default pkcs11-config dir
-
-When building p11-kit with meson, `p11_system_config_modules` points at
-the dir for system config in `/etc. This is its proper meaning.
-
-When building p11-kit with autotools, `p11_system_config_modules` is a
-copy of `p11_module_configs` "for compatibility", and points to the dir
-for packaged configs in `/usr/share`.
-
-We want the dir for packaged configs, so use the right variable.
---
- configure.ac                 | 10 +++++-----
- pkcs11/rpc-layer/Makefile.am |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1bf7c14c8ccc..98d8c01018fb 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -294,15 +294,15 @@ AC_ARG_WITH(pkcs11-config, [
-                            [directory to install PKCS#11 config])
-             ])
- if test -z "$with_pkcs11_config" ; then
-	P11_SYSTEM_CONFIG_MODULES=$($PKG_CONFIG p11-kit-1 --variable=p11_system_config_modules)
-+	P11_MODULE_CONFIGS=$($PKG_CONFIG p11-kit-1 --variable=p11_module_configs)
- else
-	P11_SYSTEM_CONFIG_MODULES="$with_pkcs11_config"
-+	P11_MODULE_CONFIGS="$with_pkcs11_config"
- fi
-if test "$P11_SYSTEM_CONFIG_MODULES" = ""; then
-+if test "$P11_MODULE_CONFIGS" = ""; then
- 	AC_MSG_ERROR([Could not find location for pkcs11 module config])
- fi
-AC_MSG_RESULT($P11_SYSTEM_CONFIG_MODULES)
-AC_SUBST(P11_SYSTEM_CONFIG_MODULES)
-+AC_MSG_RESULT($P11_MODULE_CONFIGS)
-+AC_SUBST(P11_MODULE_CONFIGS)
- 
- AC_MSG_CHECKING([module path to install pkcs11 modules])
- AC_ARG_WITH(pkcs11-modules, [
-diff --git a/pkcs11/rpc-layer/Makefile.am b/pkcs11/rpc-layer/Makefile.am
-index ccdff9191ad4..d3a3b57bbc6e 100644
--- a/pkcs11/rpc-layer/Makefile.am
-+++ b/pkcs11/rpc-layer/Makefile.am
-@@ -46,7 +46,7 @@ gnome_keyring_pkcs11_la_LDFLAGS = \
- 	-no-undefined -export-symbols-regex 'C_GetFunctionList'
- 
- # This is the configuration file that p11-kit uses to load the module
-pkcs11configdir = $(P11_SYSTEM_CONFIG_MODULES)
-+pkcs11configdir = $(P11_MODULE_CONFIGS)
- pkcs11config_DATA = \
- 	pkcs11/rpc-layer/gnome-keyring.module
- 
@@ -1,68 +0,0 @@
-# Forked from Alpine
-# systemd unit activation
-
-pkgname=gnome-keyring
-pkgver=99942.1
-_pkgver=42.1
-pkgrel=2
-pkgdesc="GNOME keyring"
-url="https://wiki.gnome.org//Projects/GnomeKeyring"
-arch="all"
-license="GPL-2.0-only LGPL-2.0-only"
-# the gcr binaries are needed for things to open the keyring via libsecret
-depends="gcr"
-makedepends="
-	autoconf
-	automake
-	gcr-dev
-	gobject-introspection-dev
-	gtk+3.0-dev
-	gtk-doc
-	intltool
-	libcap-ng-dev
-	libgcrypt-dev
-	libxslt
-	linux-pam-dev
-	openssh-client
-	systemd-dev
-	"
-checkdepends="
-	dbus-x11
-	python3
-	xvfb-run
-	"
-provides="dbus:org.freedesktop.Secrets"
-# Highest priority of the bunch since it has the least deps
-provider_priority=500
-options="!check" # Failing tests on 32-bit architectures
-subpackages="$pkgname-lang $pkgname-doc"
-source="https://download.gnome.org/sources/gnome-keyring/${_pkgver%.*}/gnome-keyring-$_pkgver.tar.xz
-	0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch"
-builddir="$srcdir/gnome-keyring-$_pkgver"
-
-build() {
-	export LDFLAGS="$LDFLAGS -lintl"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--with-pam-dir=/usr/lib/security \
-		--disable-selinux \
-		--with-libcap-ng=no
-	make
-}
-
-check() {
-	xvfb-run make check -j1
-}
-
-package() {
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="
-560dc409c21768dcbdf42151986a5bbbfb9a092d2c36295cf76bd603cdf9650fa80670631c7fb8b3e1822bed6a1f55c34b2170a1419ce45fbe8ca08c7eaf3a57  gnome-keyring-42.1.tar.xz
-427b6f95d1860fb2d8bdb44782d3e504d8adcec9ffe949726b2bf278ce9d483e8ae72362f339d49cdd945988e6b21a3863e2249a14c2b3c8fc5c351fa3f8b25a  0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch
-"
@@ -1,54 +0,0 @@
-# Forked from Alpine for systemd
-
-pkgname=gnome-session
-pkgver=99945.0
-_pkgver=45.0
-pkgrel=0
-pkgdesc="GNOME session manager"
-url="https://gitlab.gnome.org/GNOME/gnome-session"
-arch="all"
-license="GPL-2.0-or-later"
-depends="
-	alsa-plugins-pulse
-	bash
-	dconf
-	polkit
-	"
-makedepends="
-	docbook-xml
-	systemd-dev
-	gnome-desktop-dev
-	gnome-settings-daemon-dev
-	gtk+3.0-dev
-	itstool
-	json-glib-dev
-	libsm-dev
-	libxml2-utils
-	libxslt
-	meson
-	upower-dev
-	xmlto
-	"
-options="!check" #no tests
-subpackages="$pkgname-lang $pkgname-doc"
-source="https://download.gnome.org/sources/gnome-session/${_pkgver%%.*}/gnome-session-$_pkgver.tar.xz"
-builddir="$srcdir/gnome-session-$_pkgver"
-
-build() {
-	abuild-meson \
-		-Db_lto=true \
-		. output
-	meson compile -C output
-}
-
-check() {
-	meson test --no-rebuild --print-errorlogs -C output
-}
-
-package() {
-	DESTDIR="$pkgdir" meson install --no-rebuild -C output
-	rm -rf "$pkgdir"/DELETEME
-}
-sha512sums="
-3eb3b4b9fcab2ec35bb61bac6257b254f142167250bbc1eb71d46aed350372f8942601c9d5ca5856e8686b53b70321f914cb55f1639daecfe6c61d84cb6d8aba  gnome-session-45.0.tar.xz
-"
@@ -1,74 +0,0 @@
-# Forked from Alpine INSERT-REASON-HERE (CHANGEME!)
-
-pkgname=gnome-settings-daemon
-pkgver=9999
-_pkgver=44.1
-pkgrel=1
-pkgdesc="GNOME settings daemon"
-url="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
-arch="all"
-options="!check" # tests fail on builders
-license="GPL-2.0-only AND LGPL-2.1-only"
-depends="pulseaudio"
-depends_dev="
-	alsa-lib-dev
-	colord-dev
-	cups-dev
-	geoclue-dev
-	geocode-glib-dev>=3.26.4-r1
-	lcms2-dev
-	libcanberra-dev
-	libgweather4-dev
-	libnotify-dev
-	libwacom-dev
-	modemmanager-dev
-	networkmanager-dev
-	nss-dev
-	pango-dev
-	polkit-dev
-	pulseaudio-dev
-	upower-dev
-	"
-makedepends="
-	$depends_dev
-	coreutils
-	gcr4-dev
-	glib-dev
-	gnome-desktop-dev
-	gsettings-desktop-schemas-dev
-	gtk+3.0-dev
-	libxml2-utils
-	meson
-	"
-checkdepends="
-	gnome-session
-	gnome-shell
-	py3-dbusmock
-	py3-gobject3
-	umockdev-dev
-	"
-subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.gnome.org/sources/gnome-settings-daemon/${_pkgver%.*}/gnome-settings-daemon-$_pkgver.tar.xz
-	dont-use-logind-for-brightness-changing.patch
-	"
-builddir="$srcdir/gnome-settings-daemon-$_pkgver"
-
-build() {
-	abuild-meson \
-		-Db_lto=true \
-		-Dsystemd=true \
-		. output
-	meson compile -C output
-}
-
-check() {
-	meson test --no-rebuild --print-errorlogs -C output
-}
-
-package() {
-	DESTDIR="$pkgdir" meson install --no-rebuild -C output
-}
-sha512sums="
-a955d74a594d49f67a5c27ac60d6f1e9b4aba7b12cbd0af8d3be02c4b2e8385f1abfbe08b62177b69851e9202960a17429373bf5533adbd73699232fefea6c79  gnome-settings-daemon-44.1.tar.xz
-fd80b939a14bbc5dd502afda0bc6511f2d9c045018680e5ae7fbec32efadb564c5060ec91d374330f246d70571aad5979ce8c175175a29b5ccec3443c8286dc6  dont-use-logind-for-brightness-changing.patch
-"
@@ -1,16 +0,0 @@
-Brightness control is currently broken with elogind, so fall back to
-the previous codepath which doesn't use elogind.
-See https://github.com/elogind/elogind/issues/158
-diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c
-index ca5f272..59048d9 100644
--- a/plugins/power/gsd-backlight.c
-+++ b/plugins/power/gsd-backlight.c
-@@ -482,7 +482,7 @@ gsd_backlight_set_brightness_val_async (GsdBacklight *backlight,
-         if (backlight->udev_device != NULL) {
-                 BacklightHelperData *task_data;
- 
-                if (backlight->logind_proxy) {
-+                if (0) {
-                         g_dbus_proxy_call (backlight->logind_proxy,
-                                            "SetBrightness",
-                                            g_variant_new ("(ssu)",
@@ -1,6 +0,0 @@
-#!/usr/bin/sh
-
-sleep 5
-uclampset --pid $(pidof gnome-shell) -m 900 2>&1 >/dev/null || true
-
-echo "Configured gnome-shell uclamp..."
@@ -1,2 +0,0 @@
-[Service]
-ExecStartPost=-/usr/libexec/gnome-shell-uclamp
@@ -1,55 +0,0 @@
-# Contributor: Bart Ribbers <bribbers@disroot.org>
-# Maintainer: team/kde <bribbers@disroot.org>
-
-# The group tag is just to easily find this APKBUILD by some scripts for automation
-# group=kde-plasma
-pkgname=kactivitymanagerd
-pkgver=6.0.2
-pkgrel=1
-pkgdesc="System service to manage user's activities and track the usage patterns"
-# armhf blocked by qt6-qtdeclarative
-arch="all !armhf"
-url="https://kde.org/plasma-desktop/"
-license="GPL-2.0-only OR GPL-3.0-only"
-depends="qt6-qtbase-sqlite"
-makedepends="
-	boost-dev
-	extra-cmake-modules
-	kconfig-dev
-	kcoreaddons-dev
-	kdbusaddons-dev
-	kglobalaccel-dev
-	ki18n-dev
-	kio-dev
-	kwindowsystem-dev
-	kxmlgui-dev
-	qt6-qtbase-dev
-	samurai
-	"
-
-case "$pkgver" in
-	*.90*) _rel=unstable;;
-	*) _rel=stable;;
-esac
-subpackages="$pkgname-lang"
-_repo_url="https://invent.kde.org/plasma/kactivitymanagerd.git"
-source="https://download.kde.org/stable/plasma/$pkgver/kactivitymanagerd-$pkgver.tar.xz"
-
-build() {
-	cmake -B build -G Ninja \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib
-	cmake --build build
-}
-
-check() {
-	ctest --test-dir build --output-on-failure
-}
-
-package() {
-	DESTDIR="$pkgdir" cmake --install build
-}
-sha512sums="
-9eff8a65c485003b01e344c48343a5e75ff350b97a8e134faaecb9b62142dbcddcd2db72d835e19cb7be5402f7a4cbaa22b0f475beaaf39c51454749ab77c4f7  kactivitymanagerd-6.0.2.tar.xz
-"
@@ -1,12 +0,0 @@
-diff --git a/lib/journaldexportreader.cpp b/lib/journaldexportreader.cpp
-index 7ad19d6..b304a46 100644
--- a/lib/journaldexportreader.cpp
-+++ b/lib/journaldexportreader.cpp
-@@ -5,6 +5,7 @@
- 
- #include "journaldexportreader.h"
- #include "kjournaldlib_log_general.h"
-+#include <endian.h>
- #include <QDebug>
- #include <QVector>
- #include <QIODevice>
@@ -1,56 +0,0 @@
-# Contributor: Bart Ribbers <bribbers@disroot.org>
-# Maintainer: Bart Ribbers <bribbers@disroot.org>
-
-# The group tag is just to easily find this APKBUILD by some scripts for automation
-# group=kde-applications
-pkgname=kjournald
-pkgver=24.02.0
-pkgrel=0
-pkgdesc="Framework for interacting with systemd-journald"
-# armhf blocked by extra-cmake-modules
-arch="all !armhf"
-url="https://invent.kde.org/system/kjournald"
-license="BSD-3-Clause AND LGPL-2.1-or-later AND MIT"
-depends_dev="
-	kcoreaddons-dev
-	ki18n-dev
-	qt6-qtbase-dev
-	qt6-qtdeclarative-dev
-	systemd-dev
-	"
-makedepends="$depends_dev
-	extra-cmake-modules
-	samurai
-	"
-checkdepends="xvfb-run"
-subpackages="$pkgname-dev $pkgname-lang"
-
-case "$pkgver" in
-	*.90*) _rel=unstable;;
-	*) _rel=stable;;
-esac
-_repo_url="https://invent.kde.org/system/kjournald.git"
-source="https://download.kde.org/$_rel/release-service/$pkgver/src/kjournald-$pkgver.tar.xz
-	0001-kjournald-missing-include.patch
-	"
-
-build() {
-	cmake -B build -G Ninja \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib
-	cmake --build build
-}
-
-check() {
-	ctest --test-dir build --output-on-failure -E "test_(viewmodel|filtercriteriamodel|remotejournal)"
-}
-
-package() {
-	DESTDIR="$pkgdir" cmake --install build
-}
-
-sha512sums="
-a0104b4a9e3de9a5d8186d87743685dd4ee2fa20ec20efd4c3f978c494592bf6088b6381ce98ee695f92f112df39581b170757969da5d6e087c3ee0e39ae9492  kjournald-24.02.0.tar.xz
-5e5b67d49d45fb3721522f4682c8cfbf6cd6a68caba45b58c52712dc173652bc48409f5d0f4b2b9872b0f44f2e0daeefb32f4db351ad79fe0b3d69801d01d985  0001-kjournald-missing-include.patch
-"
@@ -1,83 +0,0 @@
-# Contributor: Bart Ribbers <bribbers@disroot.org>
-# Maintainer: Bart Ribbers <bribbers@disroot.org>
-
-# The group tag is just to easily find this APKBUILD by some scripts for automation
-# group=kde-plasma
-pkgname=kscreenlocker
-pkgver=6.0.2
-pkgrel=1
-pkgdesc="Library and components for secure lock screen architecture"
-# armhf blocked by extra-cmake-modules
-arch="all !armhf"
-url="https://kde.org/plasma-desktop/"
-license="GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only)"
-depends="linux-pam"
-depends_dev="
-	kcmutils-dev
-	kcrash-dev
-	kdeclarative-dev
-	kglobalaccel-dev
-	ki18n-dev
-	kidletime-dev
-	knotifications-dev
-	ksvg-dev
-	ktextwidgets-dev
-	kwayland-dev
-	kwindowsystem-dev
-	kxmlgui-dev
-	layer-shell-qt-dev
-	libkscreen-dev
-	libplasma-dev
-	libseccomp-dev
-	linux-pam-dev
-	qt6-qtbase-dev
-	solid-dev
-	systemd-dev
-	xcb-util-keysyms-dev
-	"
-makedepends="
-	$depends_dev
-	extra-cmake-modules
-	samurai
-	"
-checkdepends="xvfb-run"
-
-case "$pkgver" in
-	*.90*) _rel=unstable;;
-	*) _rel=stable;;
-esac
-_repo_url="https://invent.kde.org/plasma/kscreenlocker.git"
-source="https://download.kde.org/$_rel/plasma/$pkgver/kscreenlocker-$pkgver.tar.xz
-	kde.pam
-	kde-fingerprint.pam
-	kde-smartcard.pam
-	"
-subpackages="$pkgname-dev $pkgname-lang"
-options="!check" # Requires running loginctl
-
-build() {
-	cmake -B build -G Ninja \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib
-	cmake --build build
-}
-
-check() {
-	xvfb-run ctest --test-dir build --output-on-failure
-}
-
-package() {
-	DESTDIR="$pkgdir" cmake --install build
-
-	install -D -m644 "$srcdir"/kde.pam "$pkgdir"/etc/pam.d/kde
-	install -m644 "$srcdir"/kde-fingerprint.pam "$pkgdir"/etc/pam.d/kde-fingerprint
-	install -m644 "$srcdir"/kde-smartcard.pam "$pkgdir"/etc/pam.d/kde-smartcard
-}
-
-sha512sums="
-e303d5b2e737c2cd40e10a8b60b9ec16314739758c60f4ca44252030504b77cac513ceb738eed1034cad6e6c2f70aa7588c6fc5225fbcba2a8da2ba0020c128e  kscreenlocker-6.0.2.tar.xz
-cdbc45fb74a3c43fb2302fe09bf2f9f644ca93693e0110cf748c403762236aaeea8284a8d21fc495014c69b6d5fe4789aaff7687ce9f03dda270490fa5042e2b  kde.pam
-fe2f244b73b5cccf4b7125b9e3cac0a35566840e4ba2f69937fd8053aa56af71ee43dcbfa9c0f79de9ebe31f656e98a5d38955f77560be5c3535b08215ad8789  kde-fingerprint.pam
-2ae866d25224ba345ea9d5ddb2fce668de5c51d1cfbb4d7a048c50107ccd6cffc3231a46855599c0ba3d62ff002a26e45b69d9029f88f4ab42661465a5e526c5  kde-smartcard.pam
-"
@@ -1,15 +0,0 @@
-auth        substack      fingerprint-auth
-auth        include       postlogin
-
-account     required      pam_nologin.so
-account     include       fingerprint-auth
-
-password    include       fingerprint-auth
-
-session     required      pam_selinux.so close
-session     required      pam_loginuid.so
-session     required      pam_selinux.so open
-session     optional      pam_keyinit.so force revoke
-session     required      pam_namespace.so
-session     include       fingerprint-auth
-session     include       postlogin
@@ -1,15 +0,0 @@
-auth        substack      smartcard-auth
-auth        include       postlogin
-
-account     required      pam_nologin.so
-account     include       smartcard-auth
-
-password    include       smartcard-auth
-
-session     required      pam_selinux.so close
-session     required      pam_loginuid.so
-session     required      pam_selinux.so open
-session     optional      pam_keyinit.so force revoke
-session     required      pam_namespace.so
-session     include       smartcard-auth
-session     include       postlogin
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth       include     base-auth
-account    include     base-account
-password   include     base-password
-session    include     base-session
@@ -1,118 +0,0 @@
-# Contributor: Bart Ribbers <bribbers@disroot.org>
-# Maintainer: team/kde <bribbers@disroot.org>
-
-# The group tag is just to easily find this APKBUILD by some scripts for automation
-# group=kde-plasma
-pkgname=kwin
-pkgver=6.0.2
-pkgrel=1
-pkgdesc="An easy to use, but flexible, composited Window Manager"
-# armhf blocked by qt6-qtdeclarative
-arch="all !armhf"
-url="https://kde.org/plasma-desktop/"
-license="GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1-only"
-depends="
-	hwdata
-	kirigami
-	qt6-qtmultimedia
-	qt6-qtwayland
-	xwayland
-	"
-depends_dev="$pkgname
-	breeze-dev
-	fontconfig-dev
-	kcmutils-dev
-	kcompletion-dev
-	kconfig-dev
-	kconfigwidgets-dev
-	kcoreaddons-dev
-	kcrash-dev
-	kdeclarative-dev
-	kdecoration-dev
-	kglobalaccel-dev
-	ki18n-dev
-	kiconthemes-dev
-	kidletime-dev
-	kio-dev
-	knewstuff-dev
-	knotifications-dev
-	kpackage-dev
-	krunner-dev
-	kscreenlocker-dev
-	kservice-dev
-	ksvg-dev
-	ktextwidgets-dev
-	kwayland-dev
-	kwidgetsaddons-dev
-	kwindowsystem-dev
-	kxmlgui-dev
-	lcms2-dev
-	libdrm-dev
-	libepoxy-dev
-	libinput-dev
-	libplasma-dev
-	libqaccessibilityclient-dev
-	libxcvt-dev
-	libxi-dev
-	libxkbcommon-dev
-	mesa-dev
-	mesa-gbm
-	pipewire-dev
-	plasma-activities-dev
-	qt6-qtbase-dev
-	qt6-qtdeclarative-dev
-	qt6-qtsensors-dev
-	wayland-dev
-	xcb-util-cursor-dev
-	xcb-util-image-dev
-	xcb-util-wm-dev
-	"
-makedepends="$depends_dev
-	extra-cmake-modules
-	kdoctools-dev
-	kglobalacceld-dev
-	kpipewire-dev
-	libcap-utils
-	libdisplay-info-dev
-	plasma-wayland-protocols
-	qt6-qttools-dev
-	samurai
-	systemd-dev
-	"
-checkdepends="xvfb-run"
-
-case "$pkgver" in
-	*.90*) _rel=unstable;;
-	*) _rel=stable;;
-esac
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-lang"
-_repo_url="https://invent.kde.org/plasma/kwin.git"
-source="https://download.kde.org/stable/plasma/$pkgver/kwin-$pkgver.tar.xz
-	0001-$pkgname-Fix-building-of-tests.patch::https://invent.kde.org/plasma/kwin/-/commit/a879c59a082707e0e7dfa8ebeb7b239551ec9c71.patch
-	"
-# Broken, fails to setup due to missing or invalid XDG_RUNTIME_DIR?
-options="!check"
-
-build() {
-	# significantly reduce debug symbol size
-	# use None here to not make cmake pass bare -g (-g2)
-	CFLAGS="$CFLAGS -O2 -g1" CXXFLAGS="$CXXFLAGS -O2 -g1" \
-	cmake -B build -G Ninja \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib
-	cmake --build build
-}
-
-check() {
-	XDG_RUNTIME_DIR="$(mktemp -p -d "$builddir")" \
-	xvfb-run ctest --test-dir build --output-on-failure
-}
-
-package() {
-	DESTDIR="$pkgdir" cmake --install build
-}
-sha512sums="
-f6f82afe2f007a14114fbf18e0aba6859328d928d14bf5369e9f879ec24baa50a9a1084db49877067eab17ab3dae13991d507c85458b4a588086ecfb4924a8a6  kwin-6.0.2.tar.xz
-14c4ddceca2ef51a139319bdd64bc84d7a1df7c6419e86bdbb04572be3212ca46f5c25cd61fa3b511d7644046f92a07408e472e41d95aab93ec494138a09c1a9  0001-kwin-Fix-building-of-tests.patch
-"
@@ -1,93 +0,0 @@
-# Forked from Alpine enable systemd
-# MODIFIED base-sessionl.pamd for systemd!
-
-pkgname=linux-pam
-# MUST be kept in sync to avoid accidentally pulling in the alpine version
-# we hard depend on this exact version in postmarketos-base-systemd. When updating
-# the package here it must also be updated in postmarketos-base-systemd.
-pkgver=1.5.3
-pkgrel=8
-pkgdesc="Linux PAM (Pluggable Authentication Modules for Linux)"
-url="https://www.kernel.org/pub/linux/libs/pam"
-arch="all"
-license="BSD-3-Clause"
-depends_dev="gettext-dev"
-makedepends="
-	$depends_dev
-	autoconf
-	automake
-	bison
-	flex-dev
-	libtool
-	linux-headers
-	systemd-dev
-"
-options="pmb:strict suid !check"
-provider_priority=100
-subpackages="$pkgname-dev $pkgname-doc $pkgname-service"
-source="
-	https://github.com/linux-pam/linux-pam/releases/download/v$pkgver/Linux-PAM-$pkgver.tar.xz
-	no-examples.patch
-
-	base-auth.pamd
-	base-account.pamd
-	base-password.pamd
-	base-session.pamd
-	base-session-noninteractive.pamd
-	other.pamd
-	login.pamd
-	su.pamd
-	"
-builddir="$srcdir"/Linux-PAM-$pkgver
-
-# secfixes:
-#   1.5.1-r0:
-#     - CVE-2020-27780
-
-build() {
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--libdir=/usr/lib \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--with-systemdunitdir=/usr/lib/systemd/system \
-		--localstatedir=/var \
-		--disable-nls \
-		--disable-db
-	make
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-
-	# install our pam.d files
-	install -Dm644 "$srcdir"/base-auth.pamd "$pkgdir"/etc/pam.d/base-auth
-	install -Dm644 "$srcdir"/base-password.pamd "$pkgdir"/etc/pam.d/base-password
-	install -Dm644 "$srcdir"/base-account.pamd "$pkgdir"/etc/pam.d/base-account
-	install -Dm644 "$srcdir"/base-session.pamd "$pkgdir"/etc/pam.d/base-session
-	install -Dm644 "$srcdir"/base-session-noninteractive.pamd \
-		"$pkgdir"/etc/pam.d/base-session-noninteractive
-	install -Dm644 "$srcdir"/other.pamd "$pkgdir"/etc/pam.d/other
-	install -Dm644 "$srcdir"/login.pamd "$pkgdir"/etc/pam.d/login
-	install -Dm644 "$srcdir"/su.pamd "$pkgdir"/etc/pam.d/su
-
-	# make "unix_chkpwd" shadow group and enable g+s
-	chgrp shadow "$pkgdir"/sbin/unix_chkpwd \
-		&& chmod g+s "$pkgdir"/sbin/unix_chkpwd
-}
-
-sha512sums="
-af88e8c1b6a9b737ffaffff7dd9ed8eec996d1fbb5804fb76f590bed66d8a1c2c6024a534d7a7b6d18496b300f3d6571a08874cf406cd2e8cea1d5eff49c136a  Linux-PAM-1.5.3.tar.xz
-9407f38d0dc0f24eb3e1c74ecc3ac78ddbe9f9882a4738fa82bfb387be30f5bff5599b11cb2d70705a299587697d967ddf57923b9bd0270d05f71cc5140f8d62  no-examples.patch
-988e4ba32fe6b7adeb4898c784eb40d6f88f3fca78ead82b61686f0e1597f306abb3ee338aa2e4cf2db0191b8c1a7e319332e7f6d6aed3ab381f71c0a3355de9  base-auth.pamd
-5d3e960ead44dcb2b3f732825482eefab9a9ffa4d4d5fc1d30cbf2fe8c5c896f1114a0ad3a6c606fa9fbf5c43400388f4ee8d7fca8110721eabfc9691004756b  base-account.pamd
-b3a900d6067ba04faa8016d9408da75917e8c0502020a4048bba1de2ca54c705c4d5f8307e759080fd5a9d5f3522f52a708803f1f01627eac56d9d7c6d363d13  base-password.pamd
-2cf01d7cf2ec63d7cfe10bd90ed3cae8c5354e086495b0738e6e18df4c0ac14336228128a943731d186cc7492b15e7aee039f2c46dcd50c1fde434bb0c9af7fd  base-session.pamd
-2f18114b8a6a78ed798646962526876f3536b4759c00dce339e21f0695ea71d0917c048dc852c3d1c79bd17cd19dc513a3c6463abaffcff3f792b906cec98ede  base-session-noninteractive.pamd
-299bb3791652174a4d836d60f146200bb692ad80c20c18e6e872543ac8885156ff1a7ca00acaf55b89672fa98f00b8df53879c9ab1913a9cc91f620163dd50be  other.pamd
-ae3a807bc121eb59b54f5e53ff8efdde972610cf7463b6a38bccbc89b49954aa2e0a8693919b01f8bc7a956ba58c97de34a28963bc14f526b70b3073d64427b5  login.pamd
-a71ac72a21a5d18612365b2b0a4a0da1f9d1101a30d3f5d97f479f6378c3a0fbc219617000448c8b5a0ab2597f2e4944202b13a69624dbe849bf9ea39d00ca22  su.pamd
-"
@@ -1,4 +0,0 @@
-# basic PAM configuration for Alpine.
-
-account required pam_unix.so
-account required pam_nologin.so
@@ -1,8 +0,0 @@
-# basic PAM configuration for Alpine.
-
-auth required pam_unix.so nullok
-auth required pam_nologin.so
-auth required pam_env.so
-
-auth optional pam_gnome_keyring.so
-auth optional pam_kwallet5.so
@@ -1,7 +0,0 @@
-# basic PAM configuration for Alpine.
-
-password required pam_unix.so nullok sha512 shadow
-
-# desktop keyrings
-password optional pam_gnome_keyring.so use_authtok
-password optional pam_kwallet5.so
@@ -1,5 +0,0 @@
-# basic PAM configuration for Alpine.
-
-session required pam_env.so
-session required pam_limits.so
-session required pam_unix.so
@@ -1,14 +0,0 @@
-# basic PAM configuration for Alpine.
-
-session include base-session-noninteractive
-
-# potential providers that set up session stuff / a XDG_RUNTIME_DIR
-session optional pam_rundir.so
-session optional pam_elogind.so
-session optional pam_systemd.so
-session optional pam_ck_connector.so
-session optional pam_turnstile.so
-
-# desktop keyrings
-session optional pam_gnome_keyring.so auto_start
-session optional pam_kwallet5.so auto_start
@@ -1,6 +0,0 @@
-# "login" that is required by pam-enabled util-linux-login/shadow-login
-
-auth      include    base-auth
-account   include    base-account
-password  include    base-password
-session   include    base-session
@@ -1,24 +0,0 @@
-these don't build and aren't installed
--
-diff --git a/Makefile.in b/Makefile.in
-index f7e2c44..f98b2a2 100644
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -176,7 +176,7 @@ ETAGS = etags
- CTAGS = ctags
- CSCOPE = cscope
- DIST_SUBDIRS = libpam tests libpamc libpam_misc modules po conf \
-	examples xtests doc
-+	xtests doc
- am__DIST_COMMON = $(srcdir)/Make.xml.rules.in $(srcdir)/Makefile.in \
- 	$(srcdir)/config.h.in $(top_srcdir)/build-aux/compile \
- 	$(top_srcdir)/build-aux/config.guess \
-@@ -426,7 +426,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.9 gnu dist-xz no-dist-gzip check-news
-SUBDIRS = libpam tests libpamc libpam_misc modules po conf examples \
-+SUBDIRS = libpam tests libpamc libpam_misc modules po conf \
- 	xtests $(am__append_1)
- CLEANFILES = *~
- EXTRA_DIST = pgp.keys.asc CHANGELOG ChangeLog-CVS Copyright
@@ -1,6 +0,0 @@
-#%PAM-1.0
-# default config for any service don't specified
-auth     include    base-auth
-account  include    base-account
-password include    base-password
-session  include    base-session-noninteractive
@@ -1,6 +0,0 @@
-# basic PAM configuration for Alpine.
-auth        sufficient     pam_rootok.so
-auth        include        base-auth
-account     include        base-account
-password    include        base-password
-session     include        base-session-noninteractive
@@ -1,31 +0,0 @@
-From 1494b5a3d96d8e8273c8c4e12cb08b2a86162842 Mon Sep 17 00:00:00 2001
-From: Leonardo Arena <rnalrd@alpinelinux.org>
-Date: Mon, 13 Sep 2021 07:18:04 +0000
-Subject: [PATCH] Disable 'O2' and 'Werror' CFLAGS
-
--- a/Makefile.inc
-+++ b/Makefile.inc
-@@ -97,8 +97,8 @@ ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers
- WNOCLOBBERED := $(call TEST_CC_OPTION,-Wno-clobbered -Wno-error=clobbered,)
- WFORMATOVERFLOW := $(call TEST_CC_OPTION,-Wformat-overflow=2,)
- 
-OPTFLAGS	:= -O2 -g $(STACKPROT) --param=ssp-buffer-size=4
-WARNFLAGS	:= -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
-+OPTFLAGS	:= -Os -g $(STACKPROT) --param=ssp-buffer-size=4
-+WARNFLAGS	:= -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \
- 		  -Werror=implicit-function-declaration -Werror=format-security \
- 		  $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS)
- CPPFLAGS	:= -Wp,-D_FORTIFY_SOURCE=2
--- a/libmultipath/configure.c
-+++ b/libmultipath/configure.c
-@@ -10,6 +10,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
-+char *basename();
- #include <sys/file.h>
- #include <errno.h>
- #include <ctype.h>
-- 
-2.32.0
-
				`@@ -1 +0,0 @@`
				`postmarketos-base-ui-plasma-openrc.post-install`
				`@@ -1 +0,0 @@`
				`postmarketos-base-ui-plasma-systemd.post-install`
				`@@ -1 +0,0 @@`
				`postmarketos-bootsplash-openrc.post-install`
				`@@ -1 +0,0 @@`
				`postmarketos-ui-plasma-desktop-openrc.post-install`
				`@@ -1 +0,0 @@`
				`postmarketos-ui-plasma-desktop-systemd.post-install`
				`@@ -0,0 +1 @@`
				`postmarketos-ui-plasma-desktop.post-install`
				`@@ -1 +0,0 @@`
				`postmarketos-ui-plasma-mobile-openrc.post-install`
				`@@ -1 +0,0 @@`
				`postmarketos-ui-plasma-mobile-systemd.post-install`