.ci/testcases/test_ui.py

@@ -15,7 +15,9 @@ def test_aports_ui(args):
     """
     Raise an error if package in _pmb_recommends is not found
     """
-    for arch in pmb.config.build_device_architectures:
+    pmaports_cfg = pmb.config.pmaports.read_config(args)
+
+    for arch in pmaports_cfg["supported_arches"].split(","):
         for path in glob.iglob(args.aports + "/main/postmarketos-ui-*/APKBUILD"):
             apkbuild = pmb.parse.apkbuild(path)
             # Skip if arch isn't enabled

cross/busybox-static-aarch64/APKBUILD

@@ -8,10 +8,10 @@ fi
 
 pkgname=busybox-static-aarch64
 pkgver=1.35.0
-pkgrel=13
+pkgrel=14
 
 _arch="aarch64"
-_mirror="http://uk.alpinelinux.org/alpine/"
+_mirror="http://dl-4.alpinelinux.org/alpine/"
 
 url="http://busybox.net"
 license="GPL2"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-cea078b709b3bb1e1a4eec3e2b75ebaa9057131461cbf8be799f4840a510d8d0341cd218bfd154533c735f7ddc000b606ad590f44b5e997855e7e300d1b4effa  busybox-static-1.35.0-r13-aarch64-edge.apk
+c4206b47355e10e5b671508a629aafbbb054cffd2a1feac14b462908b0e8142d905f34acf8fd95246944605aa9d2a3312e5259e1812432f07995489b4586e827  busybox-static-1.35.0-r14-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -8,10 +8,10 @@ fi
 
 pkgname=busybox-static-armhf
 pkgver=1.35.0
-pkgrel=13
+pkgrel=14
 
 _arch="armhf"
-_mirror="http://uk.alpinelinux.org/alpine/"
+_mirror="http://dl-4.alpinelinux.org/alpine/"
 
 url="http://busybox.net"
 license="GPL2"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-c62128c0c1bb4e9888342f079b4306f73ae6771173606e0a60802f95d31673f9bbf3426f301f2161c08c72137da5373bb6ea8acbf0b9ababc003aee4786d6229  busybox-static-1.35.0-r13-armhf-edge.apk
+0d43bf31d0875267c06f4dbc9bd5bcaacf723809859f88ae6765ab94be089b6b0dde921a62bfd323760c67ac0584d0e9f7aeff2566e11349c7a3837e776d14df  busybox-static-1.35.0-r14-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -8,10 +8,10 @@ fi
 
 pkgname=busybox-static-armv7
 pkgver=1.35.0
-pkgrel=13
+pkgrel=14
 
 _arch="armv7"
-_mirror="http://uk.alpinelinux.org/alpine/"
+_mirror="http://dl-4.alpinelinux.org/alpine/"
 
 url="http://busybox.net"
 license="GPL2"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-5b1bca1f7d8c0c331c7a2712a909507c1cab8710fb5cce7199e584dbbc67612850e8c87edbdd8a0ca2d901819d0eab343ca9bb537b824eb438fc1d3b1faaa32b  busybox-static-1.35.0-r13-armv7-edge.apk
+748597c5f6b2b93d8741df2966168a15763299fa5dcf39c68768a420351f9ebbafafdabb71863e0df0955596fdfe87780db9bc069c836d79baa8f2be74b1b241  busybox-static-1.35.0-r14-armv7-edge.apk
 "

device/community/device-asus-me176c/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-asus-me176c
 pkgdesc="ASUS MeMO Pad 7 (ME176C(X))"
-pkgver=4
-pkgrel=1
+pkgver=5
+pkgrel=0
 _commit=3155254999ac36c3051a2118c415de25a072c0f6
 url="https://postmarketos.org"
 license="MIT"
@@ -16,7 +16,6 @@ depends="
 	intel-ucode
 	linux-asus-me176c
 	mesa-dri-classic
-	mesa-vulkan-intel
 	postmarketos-base
 	"
 makedepends="devicepkg-dev meson eudev-dev"
@@ -24,7 +23,13 @@ source="https://github.com/me176c-dev/linux-me176c/archive/$_commit.tar.gz
 	deviceinfo
 	phoc.ini
 	"
-subpackages="$pkgname-factory $pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"
+subpackages="
+	$pkgname-factory
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-phosh
+	$pkgname-vulkan
+	$pkgname-libva
+	"
 builddir="$srcdir/linux-me176c-$_commit"
 
 build() {
@@ -60,6 +65,18 @@ phosh() {
 		"$subpkgdir"/etc/phosh/phoc.ini
 }
 
+vulkan() {
+	install_if="$pkgname vulkan-loader"
+	depends="mesa-vulkan-intel"
+	mkdir "$subpkgdir"
+}
+
+libva() {
+	install_if="$pkgname libva"
+	depends="libva-intel-driver"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 75243e3d0bc9a352465683ec8cf8b83566e4131bb7fae0f388267a62bdbf4691c955ed034b30df550f921b771080688123ae8db144b72f786bf1677ef1d83f57  3155254999ac36c3051a2118c415de25a072c0f6.tar.gz
 c8bb189b08035e647e07dec120a6e166d871c17a227987387228c8bf6ff264e029f950c69bb560d3062cee0e27e4fb93449523592558108690a82c6d40931de1  deviceinfo

device/community/device-pine64-pinebookpro/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
 pkgver=9
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -50,9 +50,10 @@ package() {
 		"$pkgdir"/etc/sysfs.d/mem_sleep.conf
 
 	# Alsa usecase manager config
-	install -Dm644 -t "$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card \
-		"$srcdir"/rockchip,es8316-codec.conf \
-		"$srcdir"/HiFi
+	install -D -m644 "$srcdir"/HiFi \
+		"$pkgdir"/usr/share/alsa/ucm2/rockchip_es8316/HiFi
+	install -D -m644 "$srcdir"/rockchip,es8316-codec.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card/rockchip,es8316-codec.conf
 
 	install -D -m755 "$srcdir"/nvme-powersave.initd \
 		"$pkgdir"/etc/init.d/nvme-powersave

device/community/linux-asus-me176c/APKBUILD

@@ -3,7 +3,7 @@
 
 _flavor="asus-me176c"
 pkgname=linux-$_flavor
-pkgver=5.4.165
+pkgver=5.4.197
 _kernver=${pkgver%.*}
 _me176cver=5.4.17
 pkgrel=0
@@ -64,7 +64,7 @@ package() {
 
 sha512sums="
 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f  linux-5.4.tar.xz
-c64606085a57f7068f393fe4ae62733602cf84709fe9599bfc18f066700766dbafa5ce9c93e50bfbeca7f4663b38da376a8460a53901f1edf5b07c1c3d552602  linux-5.4.165.patch.xz
+74d40207bec5273988759660cee5d5ed4fdd993ca92027a726d4d4f45a23c2c86f4a42fc060af8bcf2a367cab8c17f19eccb85c7f473e11bae6c5cac405c32dc  linux-5.4.197.patch.xz
 aa462bfcbba87469a617e2ffd4058cd41137b74f836aae47ac89bc70de2836b8f3ddce94f597e61bb287eb009bb71f4e831c487b0073011673d5db4a8d8ae080  linux-me176c-5.4.17.patch.xz
-56d565703da993f1908948b2232e42625783c18ef3e7053f71e3c808e98d35a472c27b32b7afcd91838b5ac6850bf6284d4c3bd7017e2964b80f4d9617952807  config-asus-me176c.x86_64
+c4ad6bfb37990a51ee83b8791bc6f9fb47ccd566de0282deb595a00d9a4787e13e1a01810212a966e3e8090c61bd513869af346704b8c2f22c7bbeea5e8eada4  config-asus-me176c.x86_64
 "

device/community/linux-asus-me176c/config-asus-me176c.x86_64

 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.4.159 Kernel Configuration
+# Linux/x86_64 5.4.197 Kernel Configuration
 #
 
 #
-# Compiler: gcc (Alpine 10.3.1_git20211027) 10.3.1 20211027
+# Compiler: gcc (Alpine 11.2.1_git20220219) 11.2.1 20220219
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100301
+CONFIG_GCC_VERSION=110201
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
@@ -233,6 +233,7 @@ CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
+# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
 # CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_RSEQ=y
@@ -782,12 +783,8 @@ CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
-CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_PLUGIN_HOSTCC=""
 CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
-# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -2038,6 +2035,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 CONFIG_ZRAM=m
@@ -2653,7 +2651,6 @@ CONFIG_IEEE802154_HWSIM=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -6500,17 +6497,11 @@ CONFIG_LSM="yama"
 #
 # Kernel hardening options
 #
-CONFIG_GCC_PLUGIN_STRUCTLEAK=y
 
 #
 # Memory initialization
 #
-# CONFIG_INIT_STACK_NONE is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
-CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
-# CONFIG_GCC_PLUGIN_STACKLEAK is not set
+CONFIG_INIT_STACK_NONE=y
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization

main/postmarketos-release-upgrade/APKBUILD

+# Maintainer: Oliver Smith <ollieparaoid@postmarketos.org>
+pkgname=postmarketos-release-upgrade
+pkgver=1.1.0
+pkgrel=0
+pkgdesc="Upgrade from one pmOS release to the next one"
+url="https://gitlab.com/postmarketOS/postmarketos-release-upgrade/"
+source="
+	https://gitlab.com/postmarketOS/postmarketos-release-upgrade/-/archive/$pkgver/postmarketos-release-upgrade-$pkgver.tar.bz2
+"
+arch="noarch"
+license="GPL-3.0-or-later"
+options="!check" # No tests
+
+package() {
+	install -Dm755 upgrade.sh "$pkgdir"/usr/bin/postmarketos-release-upgrade
+}
+
+sha512sums="
+27a81fb165e1763c2fb741a0539784f40d4d66c6eaeb9f3af0080c096f70d9de4c0f0e0d4853088228480ca4fc74db9e8899cb38ad03b0d93d6843e2c0270e9b  postmarketos-release-upgrade-1.1.0.tar.bz2
+"

main/postmarketos-ui-phosh/APKBUILD

@@ -47,7 +47,6 @@ _pmb_recommends="
 	postmarketos-welcome-gtk3
 	ttyescape
 	xdg-user-dirs
-	yelp
 	"
 _pmb_groups="feedbackd"
 subpackages="$pkgname-qt_tweaks $pkgname-firefox"

pmaports.cfg

@@ -8,3 +8,4 @@ supported_firewall=nftables
 supported_base_nofde=True
 supported_install_boot_label=pmOS_i_boot
 supported_mkinitfs_without_flavors=True
+supported_arches=x86_64,x86,aarch64,armv7,armhf