.ci/lib/build_changed_aports.py

@@ -2,6 +2,7 @@
 # Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import sys
+import os
 import pathlib
 
 # Same dir
@@ -9,6 +10,7 @@ import common
 
 # pmbootstrap
 import add_pmbootstrap_to_import_path
+import pmb.core
 import pmb.parse
 import pmb.parse._apkbuild
 import pmb.helpers.pmaports
@@ -66,9 +68,29 @@ if __name__ == "__main__":
     args = pmb.parse.arguments()
     context = get_context()
 
-    # Filter out packages that can't be built for given arch
+    # Get set of all buildable packages for the enabled repos, for skipping unbuildable
+    # aports later. We might be given a changed aport from e.g. extra-repos/systemd when
+    # that repo is not enabled
+    buildable_pkgs = set()
+    for path in pmb.core.pkgrepo.pkgrepo_iter_package_dirs():
+        buildable_pkgs.add(os.path.basename(path))
+
+    # To store a list of packages from extra-repos/systemd for special handling later:
+    systemd_pkgs = list()
+
+    # Filter out packages that either:
+    #  1. can't be built for given arch
+    #  2. are not found in enabled repos
     # (Iterate over copy of packages, because we modify it in this loop)
     for package in packages.copy():
+        if package not in buildable_pkgs:
+            print(f"{package}: not in any available repos, skipping")
+            packages.remove(package)
+            # FIXME: this should probably be more generic, if other repos are added later?
+            # This just tosses the package into the list of packages to try building later w/ systemd enabled, and assumes it'll be found there.
+            systemd_pkgs.append(package)
+            continue
+
         apkbuild_path = pmb.helpers.pmaports.find(package)
         apkbuild = pmb.parse._apkbuild.apkbuild(pathlib.Path(apkbuild_path, "APKBUILD"))
 
@@ -84,3 +106,10 @@ if __name__ == "__main__":
     # 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)

device/community/linux-postmarketos-qcom-sdm845/APKBUILD

@@ -5,8 +5,8 @@
 
 _flavor="postmarketos-qcom-sdm845"
 pkgname=linux-$_flavor
-pkgver=6.9.0
-pkgrel=4
+pkgver=6.11.0
+pkgrel=0
 pkgdesc="Mainline Kernel fork for SDM845 devices"
 arch="aarch64"
 _carch="arm64"
@@ -18,7 +18,7 @@ options="!check !tracedeps
 makedepends="bash bison findutils flex installkernel openssl-dev perl zstd python3"
 
 _config="config-$_flavor.$arch"
-_tag="sdm845-6.9.0-r2"
+_tag="sdm845-6.11"
 
 # Source
 source="
@@ -71,6 +71,6 @@ package() {
 }
 
 sha512sums="
-45fb653328776a7b3687b9192979ada93c5ac7c321d54d4b72f47cddc10120982701d4990edc9103f6ec3ffcd2bc917b43ce7fea6ec15a3d3aded2279ecd9226  linux-sdm845-6.9.0-r2.tar.gz
-daf67730b0f8a1280a40ee595e477fd2c86679cd28160227d60821f1feee74de092cb6d2568167086e9edc3f12eafd42024b07cdbbd994f1e71adf6705626391  config-postmarketos-qcom-sdm845.aarch64
+40a127d280404c61f3c87692b85de6270144f98109b6e026649629e50c8e52a6a067d7f841cbbba6337791b115620894f205016a0dce46e65f9b95bcccff793a  linux-sdm845-6.11.tar.gz
+caddc014452e7cd7300882d019370d78bf7eb900afa69b08b7df4f8a33997a7ec0e6cf1d997823e5364acabf3ca4e51ea4621a5e53f80dd0631657acfbe79bb6  config-postmarketos-qcom-sdm845.aarch64
 "

device/testing/device-google-blueline/APKBUILD

+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Victoria Brekenfeld <postmarketos@drakulix.de>
+# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+# Co-Maintainer: Caleb Connolly <caleb@postmarketos.org>
+
+pkgname=device-google-blueline
+pkgdesc="Google Pixel 3"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	linux-postmarketos-qcom-sdm845
+	mkbootimg
+	firmware-google-blueline
+	firmware-google-blueline-dtbo
+	postmarketos-base
+	soc-qcom-sdm845
+	soc-qcom-sdm845-ucm
+	soc-qcom-sdm845-qbootctl
+	soc-qcom-sdm845-nonfree-firmware
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	modules-initfs
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+1a6c56470ccf94a51d235b011d0069ed028f781eb94863759113b62646138e3a8a34936536715eb908b5bea06c360567b0f217427fc4e5b34a617388072367ec  deviceinfo
+e92b431723994d0edc9d946d45746282d7ff25d13b799bada703ba13669de131a97f317ed0fecdedeefea7879a06bafe1df7e4a42f86c46e9e4f30309a928b15  modules-initfs
+"

device/testing/device-google-blueline/deviceinfo

+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Google Pixel 3"
+deviceinfo_manufacturer="Google"
+deviceinfo_codename="google-blueline"
+deviceinfo_year="2018"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_gpu_accelerated="true"
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="false"
+deviceinfo_screen_width="1080"
+deviceinfo_screen_height="2160"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_flash_offset_base="0x00000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x00000000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="4096"
+deviceinfo_flash_sparse="true"
+
+# Kernel options
+deviceinfo_dtb="qcom/sdm845-google-blueline"
+deviceinfo_append_dtb="true"
+deviceinfo_flash_kernel_on_update="true"
+
+# Required for devices using UFS as storage (instead of e.g. eMMC)
+deviceinfo_rootfs_image_sector_size="4096"

device/testing/device-google-blueline/modules-initfs

+i2c_qcom_geni
+rmi_core
+rmi_i2c
+qcom_fg
+qcom_pmi8998_charger
+ftm5

device/testing/firmware-google-blueline-dtbo/APKBUILD

+# Maintainer: Victoria Brekenfeld <postmarketos@drakulix.de>
+# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+# Co-Maintainer: Caleb Connolly <caleb@postmarketos.org>
+
+pkgname=firmware-google-blueline-dtbo
+pkgver=1
+pkgrel=0
+_commit="88468ea69b2598551861cb48f0785463a61f066c"
+pkgdesc="dtbo.img needed to boot mainline on Pixel 3"
+url="https://gitlab.com/phodina/dtbo-google-blueline"
+arch="aarch64"
+license="GPL-2.0-only"
+makedepends="dtc android-tools"
+source="$pkgname-$_commit.tar.gz::https://gitlab.com/phodina/dtbo-google-blueline/-/archive/$_commit.tar.gz"
+options="!check !archcheck !strip !tracedeps pmb:cross-native"
+builddir="$srcdir/dtbo-google-blueline-$_commit"
+
+build() {
+	dtc -O dtb -o sdm845-b1-dvt1.1.dtbo -b 0 -@ sdm845-b1-dvt.dts
+	mkdtboimg cfg_create dtbo.img dtboimg.cfg
+}
+
+package() {
+	install -D -m644 dtbo.img \
+		"$pkgdir"/boot/dtbo-google-blueline.img
+}
+
+sha512sums="7c8e27ab8c29027b53a699954f62571a6750a3c7337659d166507b063a843feff9e357f0b5f5ebbb30ffbb8ae7f4bc7fe3da267cb86b0c77c2e36d62fb471061  firmware-google-blueline-dtbo-88468ea69b2598551861cb48f0785463a61f066c.tar.gz"

device/testing/firmware-google-blueline/APKBUILD

+# Maintainer: Victoria Brekenfeld <postmarketos@drakulix.de>
+# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+# Co-Maintainer: Caleb Connolly <caleb@postmarketos.org>
+
+pkgname=firmware-google-blueline
+pkgver=1
+pkgrel=0
+pkgdesc="Firmware for Google Pixel 3 (blueline)"
+url="https://gitlab.com/phodina/firmware-google-blueline"
+# Suggested by Caleb as it has working Wifi
+url="https://gitlab.com/sdm845-mainline/firmware-google-pixel3"
+arch="aarch64"
+depends="linux-firmware-qcom linux-firmware-ath10k"
+license="proprietary"
+options="!check !strip !archcheck !tracedeps pmb:cross-native"
+
+_commit="7deb5f8e0b0499a80ea85dfc7941351c77e7738c"
+
+source="firmware-google-blueline-$_commit.tar.gz::https://gitlab.com/phodina/firmware-google-blueline/-/archive/$_commit/firmware-google-blueline-$_commit.tar.gz
+	firmware.files"
+
+builddir="$srcdir/firmware-google-blueline-$_commit"
+
+package() {
+
+	while IFS="" read -r _i || [ -n "$_i" ]; do
+		install -Dm644 "$_i" "$pkgdir/$_i"
+	done < "$srcdir/firmware.files"
+
+	# TODO: Do we need these? If so put them into correct paths and into
+	# NFC/Secure Element firmware
+	#install -Dm644 misc/pn557.bin "$pkgdir/lib/firmware/postmarketos/"
+	# Haptic driver firmware
+	#install -Dm644 misc/cs40l20.bin "$pkgdir/lib/firmware/postmarketos/"
+	# Haptic driver firmware
+	#install -Dm644 misc/drv2624.bin "$pkgdir/lib/firmware/postmarketos/"
+}
+
+sha512sums="
+a556672e5c463a6421c97da679819e8a7d327194d56f7c02eac03dbbb9d34117331a8bdcb71e0e9fd6b965129ae0788db76d8c34c436a26bf5e030e57d01fab7  firmware-google-blueline-7deb5f8e0b0499a80ea85dfc7941351c77e7738c.tar.gz
+4fb96f0cda7cac67bb31afdb86fbc6d587d51318fc0b377f37af794423e185bdcba5304670cc53bd618cf8839db6cc1ed7a1d84ba149df817bc2e345b2787694  firmware.files
+"

device/testing/firmware-google-blueline/firmware.files

+./lib/firmware/postmarketos/qca/crbtfw21.tlv
+./lib/firmware/qcom/sdm845/pixel3/a630_zap.mbn
+./lib/firmware/qcom/sdm845/pixel3/adsp.mbn
+./lib/firmware/qcom/sdm845/pixel3/adspr.jsn
+./lib/firmware/qcom/sdm845/pixel3/adspua.jsn
+./lib/firmware/qcom/sdm845/pixel3/cdsp.mbn
+./lib/firmware/qcom/sdm845/pixel3/cdspr.jsn
+./lib/firmware/qcom/sdm845/pixel3/ipa_fws.mbn
+./lib/firmware/qcom/sdm845/pixel3/mba.mbn
+./lib/firmware/qcom/sdm845/pixel3/modem.mbn
+./lib/firmware/qcom/sdm845/pixel3/modemr.jsn
+./lib/firmware/qcom/sdm845/pixel3/modemuw.jsn
+./lib/firmware/qcom/sdm845/pixel3/slpi.mbn
+./lib/firmware/qcom/sdm845/pixel3/venus.mbn
+./lib/firmware/qcom/sdm845/pixel3/wlanmdsp.mbn

device/testing/kobo-epdc-extractor/APKBUILD

 # Maintainer: Andreas Kemnade <andreas@kemnade.info>
 pkgname=kobo-epdc-extractor
-pkgver=1.0
-pkgrel=1
+pkgver=1.1
+pkgrel=0
 pkgdesc="Extractor for waveform on the kobo devices"
 arch="armv7"
 license="MIT"
-url="https://postmarketos.org"
+url="https://github.com/akemnade/kobo-firmware-extractor"
 install="$pkgname.post-install"
 source="
-	kobo-firmware-extractor-1.0.tar.gz::https://github.com/akemnade/kobo-firmware-extractor/archive/refs/tags/1.0.tar.gz
+	kobo-firmware-extractor-$pkgver.tar.gz::https://github.com/akemnade/kobo-firmware-extractor/archive/refs/tags/$pkgver.tar.gz
 	start-epd.sh
 	kobo-epdc-extractor.files
 	extract-waveform.initd
 	"
-builddir="$srcdir"/kobo-firmware-extractor-1.0
+builddir="$srcdir"/kobo-firmware-extractor-$pkgver
 
 build() {
 	make
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	make PREFIX="/usr" DESTDIR="$pkgdir" install
 	touch kobo-epdc-extractor
 	# we need it in case we want to do use a graphical display unlock
 	install -Dm644 kobo-epdc-extractor -t \
@@ -35,8 +35,8 @@ package() {
 }
 
 sha512sums="
-2e44387b1275902f296ce77efd18b4759487891b28cb6b88477f44cd21ac6bc81b23c8d3016f81fe926bf87750b588d621fc1c36ca477dce42d3150f0b010953  kobo-firmware-extractor-1.0.tar.gz
+0f7c3dc3f08543ecabf8ab9e5abbaed3e04b75da666150ade8afbfa6482958ee9efe5df49412445aec9eccbe9722b0d37c2ae6a8211c2633bc2d2ba696cc21c0  kobo-firmware-extractor-1.1.tar.gz
 d008a75fb6ae229e1257af517e741717611cb2bc9cd11ab736f9e066493986cf4a6199854deaf90a1e8c91cbc02e7f79b2cf67ccd92ba110290d4af0b5c5f8ef  start-epd.sh
-c71bf714bd05f9c4c2724fc855b90f5a7fa4c1014ff41f16a07a91e791ada67fede5b92536e22ef3634724a881492fa4151b1fb8060561e1bea2a2f960ba794e  kobo-epdc-extractor.files
+d2d4aab75a39e7c7667c15fbaac081e6007950b1b6e8c7073ee75eb0266e86c312d6ba3d9976bc9046ca07bbf761ec9e7091476037f952b8a2335a872e2e92a2  kobo-epdc-extractor.files
 380a131085f50c1a5a80504368c943f3a9372c21ef9dc7fab74eccfc03795652f65a5f4dcf436930f316ba03ad13472e9bc4bfc045f5f0acdb1b94cb0bb5d687  extract-waveform.initd
 "

device/testing/kobo-epdc-extractor/kobo-epdc-extractor.files

-/bin/extract-kobohidden
-/bin/extract-waveform.sh
+/usr/bin/extract-kobohidden
+/usr/bin/extract-waveform.sh

main/boot-deploy/APKBUILD

 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=boot-deploy
 pkgver=0.18
-pkgrel=0
+pkgrel=1
 pkgdesc="tool for finalizing and deploying boot related files"
 url="https://gitlab.com/postmarketos/boot-deploy"
 arch="noarch"
@@ -16,7 +16,7 @@ check() {
 }
 
 package() {
-	install -Dm755 boot-deploy "$pkgdir"/sbin/boot-deploy
+	install -Dm755 boot-deploy "$pkgdir"/usr/bin/boot-deploy
 	install -Dm755 boot-deploy-functions.sh \
 		"$pkgdir"/usr/share/boot-deploy/boot-deploy-functions.sh
 	install -Dm644 "$srcdir"/os-customization \

main/bootchart2/APKBUILD

 # Maintainer: Pops Dylan <popsdylan@protonmail.com>
 pkgname=bootchart2
 pkgver=0.14.8_git20170531
-pkgrel=4
+pkgrel=5
 pkgdesc="Boot Process Performance Visualization"
 url="https://github.com/xrmx/bootchart"
 arch="all"
@@ -26,7 +26,7 @@ check() {
 package() {
 	# install everything but the service
 	for target in "py-install-compile" "install-collector" "install-docs"; do
-		make PYTHON=python3 DESTDIR="$pkgdir" "$target"
+		make PYTHON=python3 EARLY_PREFIX="/usr" DESTDIR="$pkgdir" "$target"
 	done
 }
 

main/mdss-fb-init-hack/APKBUILD

 # Maintainer: Atilla Szollosi <ata2001@airmail.cc>
 pkgname=mdss-fb-init-hack
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Workaround for buggy framebuffer driver (mdss-fb)"
 url="https://gitlab.com/postmarketOS/pmaports"
 arch="noarch"
@@ -13,7 +13,7 @@ subpackages="$pkgname-openrc"
 
 package() {
 	install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
-	install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/sbin/mdss-fb-hack"
+	install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/mdss-fb-hack"
 }
 
 openrc() {

main/postmarketos-android-recovery-installer/APKBUILD

 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-android-recovery-installer
 pkgver=1.0.7
-pkgrel=0
+pkgrel=1
 pkgdesc="TWRP compatible postmarketOS installer script"
 arch="all"
 url="https://postmarketos.org"
@@ -17,7 +17,7 @@ build() {
 
 package() {
 	install -Dm755 build_zip.sh \
-		"$pkgdir"/sbin/build-recovery-zip
+		"$pkgdir"/usr/bin/build-recovery-zip
 	install -Dm644 update-binary \
 		"$pkgdir"/var/lib/postmarketos-android-recovery-installer/META-INF/com/google/android/update-binary
 	install -Dm755 pmos_chroot \

main/postmarketos-base/APKBUILD

 pkgname=postmarketos-base
 pkgver=36
-pkgrel=2
+pkgrel=3
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://postmarketos.org"
 arch="noarch"
@@ -70,7 +70,7 @@ _source755="
 	etc/init.d/deferred-initcalls
 	etc/init.d/swapfile
 	etc/init.d/tmpfs
-	sbin/swapfile
+	usr/bin/swapfile
 	usr/lib/firmwareload.sh
 	"
 
@@ -188,8 +188,8 @@ de4d8f258cb2ce654be15abe0188caa6ca9cc163fd45350f2025e7e9d043878e3f1202ef9033b1b1
 f5c6913040a0448c346fdd0b5dbea865a3ac92ac1a21646d32753e6521642a27b061c314f10a14b612b78aa6bc8d3209e51f7ced95c478f1be55e478ff04067b  rootfs-usr-lib-udev-rules.d-90-feedbackd-regulator-haptic.rules
 d89a7e4b9d601431c62c11f83c9c72fdb90384d9100ee5fc4aff25dda0836fd3bf9e48c0536615be791374459eb8fbaf36d27358d4402ce768a9b9a32bed4f93  rootfs-usr-share-mkinitfs-files-postmarketos-base.files
 3c049c5e6fbe3079ac333f416cbaf5d3890a7941b79d68741bfc861ee94358fba6d8b72614fe99ab84563f9208613037c6702a7d0fc5a6dfa9d0518b5a13b0cb  rootfs-etc-init.d-deferred-initcalls
-f5cc0f1265955d2646e5f099dd4b5d4c287945bfc18c16044db57670d456f55c678fc11cc59e6dab3fa340832ce869d516302a3a35c13518539ed0cedca51819  rootfs-etc-init.d-swapfile
+42d6bce78b6e3c118dcbd9228b138661a05f8f321f17457e8df8f2398c0b780399d8d056f0a7c50d91557ac8698ab37dde61ec1a13fd69a7b3faad092f126580  rootfs-etc-init.d-swapfile
 0cd9a0b8490028d854b65d0648aaf84e4703921b8b7797517dd65ffaa1ec9e225487007dcccd42c249a9f2470e5adacf95760536c9508138b14de7252de38473  rootfs-etc-init.d-tmpfs
-23df2632e8ef372dccd6b9abac61441dd0ee447ccc7428fba495e28f1b697ebc415f7580dbb9a39d22d162a175d7264b47bdf9f66552347e35d9d0bb7828647d  rootfs-sbin-swapfile
+23df2632e8ef372dccd6b9abac61441dd0ee447ccc7428fba495e28f1b697ebc415f7580dbb9a39d22d162a175d7264b47bdf9f66552347e35d9d0bb7828647d  rootfs-usr-bin-swapfile
 72c73bd67bfe2a659c469781e4def038a9b2482e014c0304150fbc25c5325fc7a36b288de76447837741bb9a828eb1db6df0d33b41cf67c7a25bb27b03777b1f  rootfs-usr-lib-firmwareload.sh
 "

main/postmarketos-base/rootfs-etc-init.d-swapfile

@@ -8,14 +8,14 @@ depend()
 start()
 {
 	ebegin "Activating swap file"
-	/sbin/swapfile
+	swapfile
 	eend $?
 }
 
 stop()
 {
 	ebegin "Deactivating swap file"
-	/sbin/swapoff -a >/dev/null
+	swapoff -a >/dev/null
 	eend $?
 }
 

main/postmarketos-installkernel/APKBUILD

@@ -4,7 +4,7 @@
 # https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/main/installkernel
 pkgname=postmarketos-installkernel
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="postmarketOS script for installing mainline kernels"
 url="https://gitlab.com/postmarketOS/pmaports/tree/main/postmarketos-installkernel"
 arch="noarch"
@@ -20,7 +20,7 @@ build() {
 }
 
 package() {
-	install -Dm755 "$srcdir"/installkernel-pmos "$pkgdir"/sbin/installkernel
+	install -Dm755 "$srcdir"/installkernel-pmos "$pkgdir"/usr/bin/installkernel
 }
 
 sha512sums="

main/postmarketos-ui-lxqt/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
 pkgname=postmarketos-ui-lxqt
 pkgver=0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="(X11) Lightweight Qt Desktop Environment (stylus recommended)"
 url="https://lxqt-project.org/"
 # armhf: lxqt-desktop not available
@@ -12,6 +12,7 @@ depends="
 	dbus-x11
 	dnsmasq
 	elogind
+	font-dejavu
 	lxqt-desktop
 	lxqt-policykit
 	mesa-egl