.ci/shellcheck.sh

@@ -24,7 +24,7 @@ sh_files="
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
-	./device/community/soc-qcom-sdm845/call_audio_idle_suspend_workaround.sh
+	./device/community/soc-qcom/call_audio_idle_suspend_workaround.sh
 
 	$(find . -path './main/postmarketos-ui-*/*.sh')
 	$(find . -path './main/postmarketos-ui-*/*.pre-install')

.ci/testcases/test_device.py

@@ -14,9 +14,6 @@ import pmb.parse._apkbuild
 from pmb.core.pkgrepo import pkgrepo_default_path, pkgrepo_iglob, pkgrepo_relative_path
 from pmb.core.arch import Arch
 
-# Cache for codeowners_parse
-codeowners_parsed = {}
-
 # Don't complain if these nicknames are the only maintainers of an APKBUILD,
 # because they are actually a group of people
 gitlab_groups = [
@@ -102,72 +99,12 @@ def test_aports_device_kernel():
                                f" <https://postmarketos.org/devicepkg>): {path}")
 
 
-def codeowners_parse():
-    global codeowners_parsed
-
-    pattern_prev = None
-    aports = pkgrepo_default_path()
-
-    with open(aports / "CODEOWNERS") as h:
-        for line in h:
-            line = line.rstrip()
-            if not line or line.startswith("#"):
-                continue
-
-            pattern_nicks = line.split()
-            assert len(pattern_nicks) > 1, f"CODEOWNERS line without nicks: {line}"
-
-            pattern = pattern_nicks[0]
-            if pattern.endswith("/"):
-                pattern += "*"
-
-            nicks = []
-            for word in pattern_nicks[1:]:
-                if word.startswith("@"):
-                    nicks += [word]
-            codeowners_parsed[pattern] = nicks
-
-            if pattern_prev:
-                assert pattern_prev <= pattern, "CODEOWNERS: please order entries alphabetically"
-            pattern_prev = pattern
-
-
-def require_enough_codeowners_entries(path, maintainers):
-    """
-    :param path: full path to an APKBUILD (e.g. /home/user/…/APKBUILD)
-    :param maintainers: list of one or more maintainers
-    """
-
-    _, path = pkgrepo_relative_path(path)
-
-    nicks = set()
-    for pattern, pattern_nicks in codeowners_parsed.items():
-        if fnmatch.fnmatch(path, pattern):
-            for nick in pattern_nicks:
-                nicks.add(nick)
-
-    print(f"{path}:")
-    print(f"  APKBUILD: {maintainers}")
-    print(f"  CODEOWNERS: {nicks}")
-
-    if len(nicks) < len(maintainers):
-        for nick in nicks:
-            if nick in gitlab_groups:
-                print(f"  -> {nick} is a group")
-                return
-
-    assert len(nicks) >= len(maintainers), \
-        f"{path}: make sure that each maintainer is listed in CODEOWNERS!"
-
-
 # @pytest.mark.xfail # Not all aports have been updated yet
 def test_aports_maintained():
     """
     Ensure that aports in /device/{main,community} have "Maintainer:" and
-    "Co-Maintainer:" (only required for main) listed in their APKBUILDs. Also
-    check that at least as many are listed in CODEOWNERS.
+    "Co-Maintainer:" (only required for main) listed in their APKBUILDs.
     """
-    codeowners_parse()
 
     for path in pkgrepo_iglob("device/main/*/APKBUILD"):
         if 'firmware-' in path.parent.name:
@@ -175,14 +112,12 @@ def test_aports_maintained():
         maintainers = pmb.parse._apkbuild.maintainers(path)
         assert maintainers and len(maintainers) >= 2, \
             f"{path} in main needs at least 1 Maintainer and 1 Co-Maintainer"
-        require_enough_codeowners_entries(path, maintainers)
 
     for path in pkgrepo_iglob("device/community/*/APKBUILD"):
         if 'firmware-' in path.parent.name:
             continue
         maintainers = pmb.parse._apkbuild.maintainers(path)
         assert maintainers, f"{path} in community needs at least 1 Maintainer"
-        require_enough_codeowners_entries(path, maintainers)
 
 
 def test_aports_unmaintained():

CODEOWNERS

@@ -36,6 +36,7 @@ device/*/*-qcom-sdm670/				@flamingradian
 device/*/*-qcom-sdm845/				@sdm845-mainline
 device/*/*-qcom-sm6350/				@z3ntu
 device/*/*-qcom-sm8250/				@jianhua
+device/*/*-qcom/					@calebccff
 device/*/*-samsung-a3/				@Mis012 @TravMurav @Minecrell
 device/*/*-samsung-a5/				@Minecrell @minlexx
 device/*/*-samsung-a51/				@manoedinata

device/community/alsa-ucm-conf-sdm845/APKBUILD

+# Maintainer: Caleb Connolly (kalube) <caleb@connolly.tech>
+# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+pkgname=alsa-ucm-conf-sdm845
+pkgver=1
+pkgrel=0
+pkgdesc="ALSA UCM configuration for Qualcomm SDM845 devices"
+url="https://postmarketos.org"
+arch="aarch64"
+license="BSD-3-Clause"
+provides="alsa-ucm-conf"
+provider_priority=1
+replaces="soc-qcom-sdm845-ucm"
+_commit="70d89261a7d30273fba9c6e67a072699f9f88151"
+source="$pkgname-$_commit.tar.gz::https://gitlab.com/sdm845-mainline/alsa-ucm-conf/-/archive/$_commit/alsa-ucm-conf-$_commit.tar.gz"
+options="!check"
+builddir="$srcdir/$pkgname-$_commit"
+
+package() {
+	# install audio config files
+	mkdir -p "$pkgdir"/usr/share/alsa
+	cp -r "$srcdir/alsa-ucm-conf-$_commit"/ucm2 \
+		"$pkgdir"/usr/share/alsa/
+}
+
+sha512sums="
+f6d03f3b03f944b29b588464e2e26f4f4cc185368714f9e623c1211174ea172efb81a765980c9a289112f5bf8c5c4aafdfd87c0094890069fc3d7c73b29456bc  alsa-ucm-conf-sdm845-70d89261a7d30273fba9c6e67a072699f9f88151.tar.gz
+"

device/community/device-google-sargo/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
 pkgver=9
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -19,10 +19,9 @@ depends="
 	make-dynpart-mappings
 	mkbootimg
 	postmarketos-base
-	soc-qcom-sdm845
-	soc-qcom-sdm845-modem
-	soc-qcom-sdm845-nonfree-firmware
-	soc-qcom-sdm845-qbootctl
+	soc-qcom
+	soc-qcom-modem
+	soc-qcom-qbootctl
 	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"

device/community/device-oneplus-enchilada/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
 pkgver=15
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,11 +15,10 @@ depends="
 	linux-postmarketos-qcom-sdm845
 	mkbootimg
 	postmarketos-base
-	soc-qcom-sdm845
-	soc-qcom-sdm845-modem
-	soc-qcom-sdm845-nonfree-firmware
-	soc-qcom-sdm845-qbootctl
-	soc-qcom-sdm845-ucm
+	alsa-ucm-conf-sdm845
+	soc-qcom
+	soc-qcom-modem
+	soc-qcom-qbootctl
 	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"

device/community/device-oneplus-fajita/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
 pkgver=15
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,9 +13,9 @@ depends="
 	linux-postmarketos-qcom-sdm845
 	mkbootimg
 	postmarketos-base
-	soc-qcom-sdm845
-	soc-qcom-sdm845-ucm
-	soc-qcom-sdm845-qbootctl
+	alsa-ucm-conf-sdm845
+	soc-qcom
+	soc-qcom-qbootctl
 	unl0kr-fbforcerefresh
 "
 makedepends="devicepkg-dev"
@@ -46,8 +46,7 @@ nonfree_firmware() {
 	depends="
 		firmware-oneplus-sdm845>=9
 		hexagonrpcd>=0.3.2-r3
-		soc-qcom-sdm845-nonfree-firmware
-		soc-qcom-sdm845-modem
+		soc-qcom-modem
 	"
 
 	install -Dm644 "$srcdir"/81-libssc-oneplus-fajita.rules -t "$subpkgdir"/usr/lib/udev/rules.d/

device/community/device-shift-axolotl/APKBUILD

@@ -5,7 +5,7 @@
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
 pkgver=15
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,9 +15,9 @@ depends="
 	make-dynpart-mappings
 	mkbootimg
 	postmarketos-base
-	soc-qcom-sdm845
-	soc-qcom-sdm845-ucm
-	soc-qcom-sdm845-qbootctl
+	alsa-ucm-conf-sdm845
+	soc-qcom
+	soc-qcom-qbootctl
 	fwupd>=1.8.6
 "
 makedepends="devicepkg-dev postmarketos-test"
@@ -47,8 +47,8 @@ nonfree_firmware() {
 	depends="
 		firmware-shift-sdm845>=20230815-r2
 		hexagonrpcd>=0.3.2-r3
-		soc-qcom-sdm845-nonfree-firmware
-		soc-qcom-sdm845-modem
+		hexagonrpcd
+		soc-qcom-modem
 	"
 
 	install -Dm644 "$srcdir"/81-libssc-shift-axolotl.rules -t "$subpkgdir"/usr/lib/udev/rules.d/

device/community/device-xiaomi-beryllium/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
 pkgver=12
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,8 +11,8 @@ options="!check !archcheck"
 depends="
 	postmarketos-base
 	mkbootimg
-	soc-qcom-sdm845
-	soc-qcom-sdm845-ucm
+	alsa-ucm-conf-sdm845
+	soc-qcom
 "
 makedepends="devicepkg-dev"
 subpackages="
@@ -43,9 +43,9 @@ nonfree_firmware() {
 	pkgdesc="GPU, venus, modem and sensor firmware"
 	depends="
 		firmware-xiaomi-beryllium
-		soc-qcom-sdm845-nonfree-firmware
-		soc-qcom-sdm845-modem
 		hexagonrpcd>=0.3.2-r3
+		soc-qcom-modem
+		hexagonrpcd
 	"
 
 	install -Dm644 81-libssc-xiaomi-beryllium.rules \

device/community/soc-qcom-sdm845/10-initramfs-sdm845.files

-/sbin/modprobe
\ No newline at end of file

device/community/soc-qcom-sdm845/soc-qcom-sdm845-modem-openrc.post-upgrade

-soc-qcom-sdm845-modem-openrc.post-install
\ No newline at end of file

device/community/soc-qcom-sdm845/soc-qcom-sdm845-nonfree-firmware-openrc.post-upgrade

-soc-qcom-sdm845-nonfree-firmware-openrc.post-install
\ No newline at end of file

device/community/soc-qcom-sdm845/soc-qcom-sdm845-pulseaudio-openrc.post-upgrade

-soc-qcom-sdm845-pulseaudio-openrc.post-install
\ No newline at end of file

device/community/soc-qcom-sdm845/soc-qcom-sdm845-qbootctl-openrc.post-upgrade

-soc-qcom-sdm845-qbootctl-openrc.post-install
\ No newline at end of file

device/community/soc-qcom-sdm845/APKBUILD → device/community/soc-qcom/APKBUILD

-# Maintainer: Caleb Connolly (kalube) <caleb@connolly.tech>
-# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
-pkgname=soc-qcom-sdm845
-pkgdesc="Common package for Qualcomm SDM845 devices"
-pkgver=25
-pkgrel=2
+# Maintainer: Caleb Connolly <caleb@connolly.tech>
+pkgname=soc-qcom
+pkgdesc="Common package for Qualcomm devices"
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
 options="!check !archcheck !tracedeps"
 depends="
+	bootmac
+	msm-modem
+	pd-mapper
 	swclock-offset
+	tqftpserv
+"
+replaces="
+	soc-qcom-sdm845
+	soc-qcom-sdm845-nonfree-firmware
+	upower
 "
-replaces="upower"
 subpackages="
 	$pkgname-gstreamer-openrc:gstreamer_openrc
 	$pkgname-gstreamer-systemd:gstreamer_systemd
 	$pkgname-modem
 	$pkgname-modem-openrc:modem_openrc
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
+	$pkgname-openrc
 	$pkgname-pulseaudio
 	$pkgname-pulseaudio-openrc:pulseaudio_openrc
 	$pkgname-qbootctl
 	$pkgname-qbootctl-openrc:qbootctl_openrc
-	$pkgname-ucm
 	$pkgname-vulkan
 "
 
-_ucm_commit="70d89261a7d30273fba9c6e67a072699f9f88151"
 source="
-	10-initramfs-sdm845.files
-	51-qcom-sdm845.conf
+	51-qcom.conf
 	90-feedbackd-pmi8998.rules
 	UPower.conf
-	alsa-ucm-conf-$_ucm_commit.tar.gz::https://gitlab.com/sdm845-mainline/alsa-ucm-conf/-/archive/$_ucm_commit/alsa-ucm-conf-$_ucm_commit.tar.gz
 	call_audio_idle_suspend_workaround.confd
 	call_audio_idle_suspend_workaround.initd
 	call_audio_idle_suspend_workaround.sh
@@ -51,25 +53,24 @@ package() {
 	install -Dm644 "$srcdir"/UPower.conf \
 		"$pkgdir"/etc/UPower/UPower.conf
 
-	install -Dm644 "$srcdir"/10-initramfs-sdm845.files \
-		-t "$pkgdir"/usr/share/mkinitfs/files/
-
-	install -Dm644 "$srcdir"/51-qcom-sdm845.conf \
+	install -Dm644 "$srcdir"/51-qcom.conf \
 		-t "$pkgdir"/usr/share/wireplumber/wireplumber.conf.d
 }
 
 gstreamer_openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	replaces="soc-qcom-sdm845-gstreamer-openrc"
 
 	install -Dm755 "$srcdir"/gstreamer.sh \
-		"$subpkgdir"/etc/profile.d/50-soc-qcom-sdm845-gstreamer.sh
+		"$subpkgdir"/etc/profile.d/50-soc-qcom-gstreamer.sh
 }
 
 gstreamer_systemd() {
 	install_if="$pkgname=$pkgver-r$pkgrel systemd"
+	replaces="soc-qcom-sdm845-gstreamer-systemd"
 
 	install -Dm644 "$srcdir"/gstreamer.conf \
-		"$subpkgdir"/etc/environment.d/50-soc-qcom-sdm845-gstreamer.conf
+		"$subpkgdir"/etc/environment.d/50-soc-qcom-gstreamer.conf
 }
 
 modem() {
@@ -86,26 +87,15 @@ modem() {
 modem_openrc() {
 	install_if="$pkgname-modem=$pkgver-r$pkgrel openrc"
 	depends="q6voiced-openrc"
+	replaces="soc-qcom-sdm845-modem-openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 
 	install -Dm644 "$srcdir"/modemmanager.conf \
 		"$subpkgdir"/etc/conf.d/modemmanager
 }
 
-nonfree_firmware() {
-	pkgdesc="Modem, WiFi and GPU Firmware"
-	depends="
-		pd-mapper
-		tqftpserv
-		msm-modem
-		bootmac
-	"
-
-	mkdir "$subpkgdir"
-}
-
-nonfree_firmware_openrc() {
-	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	depends="
 		pd-mapper-openrc
 		tqftpserv-openrc
@@ -115,15 +105,6 @@ nonfree_firmware_openrc() {
 	mkdir "$subpkgdir"
 }
 
-ucm() {
-	provides="alsa-ucm-conf"
-	provider_priority=1
-
-	# install audio config files
-	mkdir -p "$subpkgdir"/usr/share/alsa/ucm2
-	cp -r "$srcdir/alsa-ucm-conf-$_ucm_commit"/ucm2 "$subpkgdir"/usr/share/alsa/
-}
-
 qbootctl() {
 	pkgdesc="Enable qbootctl mark-boot-successful service"
 	depends="qbootctl"
@@ -147,6 +128,7 @@ vulkan() {
 
 pulseaudio() {
 	install_if="$pkgname=$pkgver-r$pkgrel pulseaudio"
+	replaces="soc-qcom-sdm845-pulseaudio"
 
 	# Call Audio idle suspend workaround code
 	install -Dm755 "$srcdir"/call_audio_idle_suspend_workaround.sh \
@@ -156,6 +138,7 @@ pulseaudio() {
 pulseaudio_openrc() {
 	install_if="$pkgname-pulseaudio=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	replaces="soc-qcom-sdm845-pulseaudio-openrc"
 
 	# Call Audio idle suspend workaround init script
 	install -Dm755 "$srcdir"/call_audio_idle_suspend_workaround.initd \
@@ -166,11 +149,9 @@ pulseaudio_openrc() {
 }
 
 sha512sums="
-56845726c5e7b685953f96c381404181ad9b70ea7dbfe5a3d963fb6f15821addaead43a65c9b140cb938c2d45173cfb5421816bd36024fd7e1b8555e0b32622f  10-initramfs-sdm845.files
-28c14f47eaedec577d152001c51753537c98f267ac4a0acf78a304efebe5f6a1b4dc6d501497da9a0a925806a1d9c80b25e001cf9b1eb21efa22cd6a41ff753b  51-qcom-sdm845.conf
+28c14f47eaedec577d152001c51753537c98f267ac4a0acf78a304efebe5f6a1b4dc6d501497da9a0a925806a1d9c80b25e001cf9b1eb21efa22cd6a41ff753b  51-qcom.conf
 4f2c22a3a3fc7d380e200ad977578107d81f0e7ade7918e03bdb15b60a564e8db5f47e13cce22f636d38fd3722696bb46076b8872dae0ca2d8a3838522a1f025  90-feedbackd-pmi8998.rules
 9d455b56558d453d501a1ad869ffa79f9952ed43485a9847d506db6a78bfcd9f9c9d855660ee1d368eb74f4429385ec166addc30d802261c75562e785fe84c52  UPower.conf
-f6d03f3b03f944b29b588464e2e26f4f4cc185368714f9e623c1211174ea172efb81a765980c9a289112f5bf8c5c4aafdfd87c0094890069fc3d7c73b29456bc  alsa-ucm-conf-70d89261a7d30273fba9c6e67a072699f9f88151.tar.gz
 6fb4c0bd8b7ed534d855a6732ccff783960e3cfa0e0cc7effcbb93afa00798dec15361a37a3200081bc114c8d266b7a0851cc4e819ad36eabdb47a50c72620d9  call_audio_idle_suspend_workaround.confd
 5a58475b6e2ee1d655f3f23d8dc19e1cb2f32f1dfff3b9a9337d9c5baad1ec24bfaec0fb9cc03f00e5a291bee27c6b8bffbc65157e2bee5d65ef6d1adcb0910b  call_audio_idle_suspend_workaround.initd
 6da0a9209f114354aa2aa1185ec3896a8e0bb1bfce0dc3fc4c0de339cf1389feaa2d724e733c251ff032a5e86d37d9549e94f8f7c7a5accfedbd8a4d6316bbfd  call_audio_idle_suspend_workaround.sh