.ci/lib/build_changed_aports.py

@@ -55,14 +55,6 @@ if __name__ == "__main__":
     # Package count sanity check
     common.get_changed_packages_sanity_check(len(packages))
 
-    # [ci:skip-build]: verify checksums and stop
-    verify_only = common.commit_message_has_string("[ci:skip-build]")
-    if verify_only:
-        print("WARNING: not building changed packages ([ci:skip-build])!")
-        print("verifying checksums: " + ", ".join(packages))
-        verify_checksums(packages, arch)
-        sys.exit(0)
-
     # Load context
     sys.argv = ["pmbootstrap.py", "chroot"]
     args = pmb.parse.arguments()
@@ -101,15 +93,31 @@ if __name__ == "__main__":
     # No packages: skip build
     if len(packages) == 0:
         print(f"no packages changed, which can be built for {arch}")
-        sys.exit(0)
 
-    # Build packages
-    print(f"building in strict mode for {arch}: {', '.join(packages)}")
-    build_strict(packages, arch)
+    else:
+        verify_only = common.commit_message_has_string("[ci:skip-build]")
+        if verify_only:
+            # [ci:skip-build]: verify checksums and stop
+            print("WARNING: not building changed packages ([ci:skip-build])!")
+            print("verifying checksums: " + ", ".join(packages))
+            verify_checksums(packages, arch)
+        else:
+            # Build packages
+            print(f"building in strict mode for {arch}: {', '.join(packages)}")
+            build_strict(packages, arch)
 
     # Build packages in extra-repos/systemd
     # FIXME: this should probably be more generic, if other repos are added later?
     if systemd_pkgs:
-        print(f"building in strict mode for {arch}, from extra-repos/systemd: {', '.join(packages)}")
         common.run_pmbootstrap(["config", "systemd", "always"])
-        build_strict(systemd_pkgs, arch)
+
+        verify_only = common.commit_message_has_string("[ci:skip-build]")
+        if verify_only:
+            # [ci:skip-build]: verify checksums
+            print("WARNING: not building changed packages for extra-repos/systemd: ([ci:skip-build])!")
+            print("verifying checksums: " + ", ".join(systemd_pkgs))
+            verify_checksums(systemd_pkgs, arch)
+        else:
+            # Build packages
+            print(f"building in strict mode for {arch}, from extra-repos/systemd: {', '.join(systemd_pkgs)}")
+            build_strict(systemd_pkgs, arch)

device/testing/device-lenovo-kuntao/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-kuntao
 pkgdesc="Lenovo P2"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	firmware-lenovo-kuntao
+	firmware-qcom-adreno-a530
 	linux-postmarketos-qcom-msm8953
 	lk2nd-msm8953
 	mkbootimg
+	msm-firmware-loader
 	postmarketos-base
+	soc-qcom-msm8953-modem
 "
 makedepends="devicepkg-dev"
-source="deviceinfo"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
+source="deviceinfo modules-initfs"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -27,12 +28,7 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="GPU/Wi-Fi/Bluetooth/Audio/Video/Modem firmware"
-	depends="msm-firmware-loader"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 0eb7a1a0b10e79d4d8b64b22cda74ccd6f8ef1d5f30ac75dd08e3eb6858ac730f4cba4561adb74d23dc5cf118df6708ea4508c1fc4d347a7dd0ae510fb8b7f60  deviceinfo
+2ce6911ef54351f46819b3323e361ce60297b30f94e81a77e2d20b1bc294e51e3a0fa859ad8e257fa3fdef404a47dd3b64c247222cb7ca73f03cb4dcd083d1f8  modules-initfs
 "

device/testing/device-lenovo-kuntao/modules-initfs

+msm
+panel_lenovo_kuntao_549

device/testing/device-qcom-msm8953/APKBUILD

@@ -3,8 +3,8 @@
 
 pkgname=device-qcom-msm8953
 pkgdesc="Generic device package for various Qualcomm MSM8953/SDM450/SDM632-based devices"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -36,5 +36,5 @@ package() {
 
 sha512sums="
 b624c27c7e87cc57c20f79682ca119765b826e0f95bec94f18617d67a832cd2869475fa212d7c21e36a9b448312cb98c497007e0081e1a3c64bf3d60b40bb87a  deviceinfo
-bd17b9384a4aba90d3938b170e47349b98f5e035715abac6ae8cb2e65431159e20e5324c72e69f8f0492d12dd45813615850f1f83a48327fd1a7313e82183d43  modules-initfs
+70917147c1c49f9419ff8be2a03e38c24ad7730091c53a2182797dde85fd8c2073f71187e8e583774974a1509b634433725543547e528364f41d85e63b2ace85  modules-initfs
 "

device/testing/device-qcom-msm8953/modules-initfs

@@ -20,6 +20,7 @@ panel_huawei_milan_jdi_r63452
 panel_huawei_milan_tianma_fic8736
 panel_huawei_milan_tianma_focal8716
 panel_huawei_milan_tianma_otm1906c
+panel_lenovo_kuntao_549
 panel_mdss_ft8716_fhd
 panel_mdss_ili7807_fhd
 panel_mdss_ili7807_fhdplus

device/testing/firmware-lenovo-kuntao/APKBUILD

+pkgname=firmware-lenovo-kuntao
+pkgver=1
+pkgrel=0
+pkgdesc="Firmware files for Lenovo P2"
+url="https://gitlab.com/raihan2000/$pkgname"
+arch="aarch64"
+license="proprietary"
+options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
+
+_commit="009a366625c413aee2cc827ae94ed8ca75a3cebb"
+
+source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz"
+builddir="$srcdir/$pkgname-$_commit"
+
+_fwdir="/lib/firmware/qcom/msm8953/lenovo/kuntao"
+
+package() {
+	# GPU Firmware files
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir"
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir"
+}
+
+sha512sums="
+ebf5a43df59ec99ae63483cff1d0cfd25fa754e30910d8f9130bf43cc5c44278b5a23652585c44902fca943b022b858e3c6d55822aea45930a999dcce16285ee  firmware-lenovo-kuntao-009a366625c413aee2cc827ae94ed8ca75a3cebb.tar.gz
+"

device/testing/linux-next/APKBUILD

@@ -2,7 +2,7 @@
 # Kernel config based on: arch/arm64/configs/defconfig
 
 pkgname=linux-next
-pkgver=6.12_git20241112
+pkgver=6.12_git20241113
 pkgrel=3
 _nextver="${pkgver#*_git}"
 pkgdesc="Linux next kernel"
@@ -69,7 +69,7 @@ package() {
 }
 
 sha512sums="
-93cc6772ee555c3c9c787284ba65e15d51d3cc4f613cdded75d20adbad4ac565c4841f3b4c8a6e8039f1b1ab8f7802a3049caa855224f7caa398136b580fdc56  linux-next-next-20241112.tar.gz
+414bf35bb5b2006883723a757bddcff9fc247b9a1c5330899e1af4fd5d5ffcb6c31fb2c625675ffe0b835c3f6a66e103159d72bc3f36f20d35196f7caee2da53  linux-next-next-20241113.tar.gz
 8de0a3791ea671528a9fc753071683dfea68ea4f4c22060fc0ca8a4b1b3d76eaa2a3fd40bb013173f0e55da15dde91cf285902779beb35781b6c90f39244ce11  devices.config
 a30df186f06519e2f519bfe622bbd46caec6c2473a1fd3df370320a661d53882b49cfb2b3be7edd92fabdb4a8e6e3419194e8d43cca3cf4ab1615275dab4fee4  pmos.config
 "

main/postmarketos-ui-sxmo-de-dwm/APKBUILD

@@ -4,8 +4,8 @@
 # Co-Maintainer: Maarten van Gompel <proycon@anaproy.nl>
 # Co-Maintainer: Peter John Hartman <peterjohnhartman@gmail.com>
 pkgname=postmarketos-ui-sxmo-de-dwm
-pkgver=1.15.0
-pkgrel=5
+pkgver=1.16.3
+pkgrel=0
 pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on dwm"
 url="http://sr.ht/~mil/Sxmo"
 # riscv64: builder currently stuck, libphonenumber needs rebuild
@@ -15,7 +15,6 @@ depends="
 	postmarketos-base-ui
 	postmarketos-base-ui-networkmanager
 
-	sxmo-common
 	sxmo-utils-dwm
 	sxmo-utils-audio-bluetooth
 

main/postmarketos-ui-sxmo-de-sway/APKBUILD

@@ -4,8 +4,8 @@
 # Co-Maintainer: Maarten van Gompel <proycon@anaproy.nl>
 # Co-Maintainer: Peter John Hartman <peterjohnhartman@gmail.com>
 pkgname=postmarketos-ui-sxmo-de-sway
-pkgver=1.15.0
-pkgrel=5
+pkgver=1.16.3
+pkgrel=0
 pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on sway"
 url="http://sr.ht/~mil/Sxmo"
 # riscv64: builder currently stuck, libphonenumber needs rebuild
@@ -15,7 +15,6 @@ depends="
 	postmarketos-base-ui
 	postmarketos-base-ui-networkmanager
 
-	sxmo-common
 	sxmo-utils-sway
 	sxmo-utils-audio-bluetooth