main/pmos-base-ui: use dnsane for DNS

Fixes #1430 by basically filtering DNS queries to remove any with addresses
that might cause traffic to go over a lower priority interface. See that issue
for a more detailed explanation of the problem.

It does this by:
        1) configuring NetworkManager to send DNS config to resolvconf, instead
           of writing to resolv.conf directly. In my (limited) testing, this
           seems to be necessary to get NM to trigger resolvconf which is
           needed for...
        2) configuring resolvconf to ignore any DNS it receives and use
           localhost, when writing resolv.conf

openresolv is used because the alternative of modifying resolv.conf
manually gets messy, specifically with apk where it may not replace
/etc/resolv.conf if the user / something else has modified it...

Note that there's still some possibilities for apps that have hardcoded DNS
nameservers to bypass dnsane. It's not trivial to catch this. The most straight
forward way is to use a firewall rule to redirect all outbound DNS to dnsane.
But this would break mmsd and any other apps that actually need to query
specific nameservers to function properly.

I used a SIM that had a mobile data connection, but traffic was dropped by the
carrier outside of the phone. In other words, my phone was often in the exact
situation described in #1430. When connected to wifi, I could very easily
notice when traffic was being routed incorrectly because anything destined for
mobile data would fail (pages stopped loading, etc). After some amount of
casual testing while using the phone "normally", I haven't noticed any failures
yet from that problem.

channels.cfg

@@ -9,13 +9,13 @@ branch_aports=master
 mirrordir_alpine=edge
 
 [v22.12]
-description=Upcoming stable release (DO NOT USE)
+description=Latest release / Recommended for best stability
 branch_pmaports=v22.12
 branch_aports=3.17-stable
 mirrordir_alpine=v3.17
 
 [v22.06]
-description=Latest release / Recommended for best stability
+description=Old release (supported until 2023-01-18)
 branch_pmaports=v22.06
 branch_aports=3.16-stable
 mirrordir_alpine=v3.16

cross/binutils-aarch64/APKBUILD

@@ -8,7 +8,7 @@ CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
 
 pkgname=binutils-aarch64
 pkgver=2.39
-pkgrel=2
+pkgrel=3
 pkgdesc="Tools necessary to build programs for aarch64 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends_build="bison flex texinfo"
@@ -59,6 +59,19 @@ build() {
 	local _gold_configure="--disable-gold"
 	local _plugin_configure="--enable-plugins"
 
+	case "$CARCH" in
+	riscv64)
+		# binutils creates empty textrels here
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=25694
+		local no_textrels=""
+		;;
+	*)
+		# set -z text by default
+		# this is the default for linkers such as ld.lld too
+		local no_textrels="--enable-textrel-check=error"
+		;;
+	esac
+
 	if [ "$CHOST" != "$CTARGET" ]; then
 		_sysroot="$CBUILDROOT"
 		_cross_configure="--disable-install-libiberty"
@@ -103,6 +116,7 @@ build() {
 		$_cross_configure \
 		$_arch_configure \
 		$_hash_style_configure \
+		$no_textrels \
 		--with-pic \
 		--disable-werror \
 		--disable-nls \

cross/binutils-armhf/APKBUILD

@@ -8,7 +8,7 @@ CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
 
 pkgname=binutils-armhf
 pkgver=2.39
-pkgrel=2
+pkgrel=3
 pkgdesc="Tools necessary to build programs for armhf targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends_build="bison flex texinfo"
@@ -59,6 +59,19 @@ build() {
 	local _gold_configure="--disable-gold"
 	local _plugin_configure="--enable-plugins"
 
+	case "$CARCH" in
+	riscv64)
+		# binutils creates empty textrels here
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=25694
+		local no_textrels=""
+		;;
+	*)
+		# set -z text by default
+		# this is the default for linkers such as ld.lld too
+		local no_textrels="--enable-textrel-check=error"
+		;;
+	esac
+
 	if [ "$CHOST" != "$CTARGET" ]; then
 		_sysroot="$CBUILDROOT"
 		_cross_configure="--disable-install-libiberty"
@@ -103,6 +116,7 @@ build() {
 		$_cross_configure \
 		$_arch_configure \
 		$_hash_style_configure \
+		$no_textrels \
 		--with-pic \
 		--disable-werror \
 		--disable-nls \

cross/binutils-armv7/APKBUILD

@@ -8,7 +8,7 @@ CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
 
 pkgname=binutils-armv7
 pkgver=2.39
-pkgrel=2
+pkgrel=3
 pkgdesc="Tools necessary to build programs for armv7 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends_build="bison flex texinfo"
@@ -59,6 +59,19 @@ build() {
 	local _gold_configure="--disable-gold"
 	local _plugin_configure="--enable-plugins"
 
+	case "$CARCH" in
+	riscv64)
+		# binutils creates empty textrels here
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=25694
+		local no_textrels=""
+		;;
+	*)
+		# set -z text by default
+		# this is the default for linkers such as ld.lld too
+		local no_textrels="--enable-textrel-check=error"
+		;;
+	esac
+
 	if [ "$CHOST" != "$CTARGET" ]; then
 		_sysroot="$CBUILDROOT"
 		_cross_configure="--disable-install-libiberty"
@@ -103,6 +116,7 @@ build() {
 		$_cross_configure \
 		$_arch_configure \
 		$_hash_style_configure \
+		$no_textrels \
 		--with-pic \
 		--disable-werror \
 		--disable-nls \

cross/binutils-riscv64/APKBUILD

@@ -8,7 +8,7 @@ CTARGET="$(arch_to_hostspec $CTARGET_ARCH)"
 
 pkgname=binutils-riscv64
 pkgver=2.39
-pkgrel=2
+pkgrel=3
 pkgdesc="Tools necessary to build programs for riscv64 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends_build="bison flex texinfo"
@@ -59,6 +59,19 @@ build() {
 	local _gold_configure="--disable-gold"
 	local _plugin_configure="--enable-plugins"
 
+	case "$CARCH" in
+	riscv64)
+		# binutils creates empty textrels here
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=25694
+		local no_textrels=""
+		;;
+	*)
+		# set -z text by default
+		# this is the default for linkers such as ld.lld too
+		local no_textrels="--enable-textrel-check=error"
+		;;
+	esac
+
 	if [ "$CHOST" != "$CTARGET" ]; then
 		_sysroot="$CBUILDROOT"
 		_cross_configure="--disable-install-libiberty"
@@ -103,6 +116,7 @@ build() {
 		$_cross_configure \
 		$_arch_configure \
 		$_hash_style_configure \
+		$no_textrels \
 		--with-pic \
 		--disable-werror \
 		--disable-nls \

cross/busybox-static-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-aarch64
 pkgver=1.35.0
-pkgrel=29
+pkgrel=30
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-990d9149099ae2f3a8856d4041e7aff2a44ca69ebf6a0332b2d738598710b09401a1693c3fead9295fa0a36580b447bdac74df71c2c241b0c156a79448d1b861  busybox-static-1.35.0-r29-aarch64-edge.apk
+d34c0d16d77bd18548e4b2764ab4bde59611480aaaab5a47f585158a91fad413ccfb7954d5ebcf4aa6e04fdda4621832f46e8b13e313ce1fd7b4b96b3298d425  busybox-static-1.35.0-r30-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armhf
 pkgver=1.35.0
-pkgrel=29
+pkgrel=30
 
 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-6b7b76b2413e99af3f2f373a17cef24604e0f4b0077e1e8ecc2858e17510f8f55029f61e3bf62f4bdbc5c95954d5a12d47790a23e9d08d04ac1f4b4acf6cc096  busybox-static-1.35.0-r29-armhf-edge.apk
+805bcf5416d70db8a68a90e85dbf9728213f4e996862ce9d4af3eea35ac25bc1bf6ecddb7dc18d2881dfda59ecfbc64bfbaf148022209f26eb034a10e65494aa  busybox-static-1.35.0-r30-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armv7
 pkgver=1.35.0
-pkgrel=29
+pkgrel=30
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-c808618d9a3f8ae05846276982e06000211b725123d9118426854569a35506e03fa89d8a234994affb822dae7e03c1f50295c069716ac30294e1d137b6353ab1  busybox-static-1.35.0-r29-armv7-edge.apk
+1beffa9f0b7a93d72b793c3ebac99a6243ca1a385064388fe6189753210775ff65bd4be30a540b5e0fa85ea795b7e3ad42cf4f9446c52ca1db285eea59a84c1a  busybox-static-1.35.0-r30-armv7-edge.apk
 "

cross/gcc-aarch64/0033-gcc-go-link-to-libucontext.patch

@@ -1,42 +1,101 @@
-From 0631e2b9453b33c42e12a14c11e8257d470016c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 30 Aug 2020 19:17:42 +0200
-Subject: [PATCH] gcc-go: support libucontext
+From ecc2a2e70e44fa76a75b12d0893bc1702b72a1b4 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Mon, 19 Dec 2022 10:37:06 -0800
+Subject: [PATCH] libgo: check for makecontext in -lucontext
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-This patch allows using gcc-go with libucontext. For this purpose,
-it unconditionally links gcc-go against -lucontext. Furthermore,
-it undefines SETCONTEXT_CLOBBERS_TLS in proc.c to prevent usage
-of makecontext/swapcontext feature that are not support by libucontext.
+Patch from Sören Tempel.
+
+Change-Id: I74b4052cc7aca19224afd6d9a2739c3fae46b722
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/458396
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Than McIntosh <thanm@google.com>
 ---
- Makefile.in          | 2 +-
- libgo/runtime/proc.c | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
+ libgo/configure    | 57 ++++++++++++++++++++++++++++++++++++++++++++++
+ libgo/configure.ac |  3 +++
+ 2 files changed, 60 insertions(+)
 
-diff --git a/Makefile.in b/Makefile.in
-index 593495e1650..c3e5d489bc0 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52801,7 +52801,7 @@ configure-target-libgo:
- 	esac; \
- 	module_srcdir=libgo; \
- 	rm -f no-such-file || : ; \
--	CONFIG_SITE=no-such-file $(SHELL) \
-+	CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
- 	  $$s/$$module_srcdir/configure \
- 	  --srcdir=$${topdir}/$$module_srcdir \
- 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
-index 3a30748d329..a987678fa84 100644
---- a/libgo/runtime/proc.c
-+++ b/libgo/runtime/proc.c
-@@ -66,6 +66,10 @@ static void gscanstack(G*);
+diff --git a/libgo/configure b/libgo/configure
+index 460fdad7..a607dbff 100755
+--- a/libgo/configure
++++ b/libgo/configure
+@@ -14818,6 +14818,63 @@ fi
  
- __thread G *g __asm__(GOSYM_PREFIX "runtime.g");
  
-+/* libucontext does not seem to support tlsbase, undef the macro
-+ * here to make sure we define initcontext and fixcontext as dummies. */
-+#undef SETCONTEXT_CLOBBERS_TLS
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing makecontext" >&5
++$as_echo_n "checking for library containing makecontext... " >&6; }
++if ${ac_cv_search_makecontext+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
 +
- #ifndef SETCONTEXT_CLOBBERS_TLS
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char makecontext ();
++int
++main ()
++{
++return makecontext ();
++  ;
++  return 0;
++}
++_ACEOF
++for ac_lib in '' ucontext; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_makecontext=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if ${ac_cv_search_makecontext+:} false; then :
++  break
++fi
++done
++if ${ac_cv_search_makecontext+:} false; then :
++
++else
++  ac_cv_search_makecontext=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_makecontext" >&5
++$as_echo "$ac_cv_search_makecontext" >&6; }
++ac_res=$ac_cv_search_makecontext
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++fi
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sched_yield" >&5
+ $as_echo_n "checking for library containing sched_yield... " >&6; }
+ if ${ac_cv_search_sched_yield+:} false; then :
+diff --git a/libgo/configure.ac b/libgo/configure.ac
+index 09554a37..a59aa091 100644
+--- a/libgo/configure.ac
++++ b/libgo/configure.ac
+@@ -570,6 +570,9 @@ PTHREAD_LIBS=
+ AC_CHECK_LIB([pthread], [pthread_create], PTHREAD_LIBS=-lpthread)
+ AC_SUBST(PTHREAD_LIBS)
  
- static inline void
++dnl Test if -lucontext is required for makecontext.
++AC_SEARCH_LIBS([makecontext], [ucontext])
++
+ dnl Test if -lrt is required for sched_yield or nanosleep or clock_gettime.
+ AC_SEARCH_LIBS([sched_yield], [rt])
+ AC_SEARCH_LIBS([nanosleep], [rt])

cross/gcc-aarch64/APKBUILD

@@ -26,13 +26,13 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 pkgname=gcc-aarch64
 _pkgbase=12.2.1 # must match gcc/BASE-VER
 _pkgsnap=20220924
-pkgver=${_pkgbase}_git${_pkgsnap}
+pkgver=${_pkgbase}_git$_pkgsnap
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=5
+pkgrel=8
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -212,7 +212,7 @@ makedepends="$makedepends_build $makedepends_host"
 #
 # PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
 # so that they can be properly tracked and easily rebased if needed.
-source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-${_pkgbase%%.*}-${_pkgsnap}.tar.xz
+source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -262,7 +262,7 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-
 	"
 
 # we build out-of-tree
-_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-${_pkgsnap}
+_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
 _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 _gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 
@@ -366,9 +366,9 @@ build() {
 		--prefix=/usr
 		--mandir=/usr/share/man
 		--infodir=/usr/share/info
-		--build=${CBUILD}
-		--host=${CHOST}
-		--target=${CTARGET}
+		--build=$CBUILD
+		--host=$CHOST
+		--target=$CTARGET
 		--enable-checking=release
 		--disable-fixed-point
 		--disable-libstdcxx-pch
@@ -438,7 +438,7 @@ package() {
 		-o -name libitm.a -o -name libgo.a -o -name libcaf\*.a \
 		-o -name libatomic.a -o -name libasan.a -o -name libtsan.a \) \
 		-a -type f \
-		-exec ${STRIP_FOR_TARGET} -g {} +
+		-exec $STRIP_FOR_TARGET -g {} +
 
 	if $_libgomp; then
 		mv "$pkgdir"/usr/lib/libgomp.spec "$pkgdir"/$_gcclibdir
@@ -655,7 +655,6 @@ gdc() {
 	mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
 }
 
-
 libgo() {
 	pkgdesc="Go runtime library for GCC"
 	depends=
@@ -794,7 +793,7 @@ b40d7e4712c035674c993bbb55475290ec14523b3f0fd05493514bac4e9adaa6641faf815fc40ffc
 674360ce2ee9f704d0632cc98756f9fe8dd8ca30064fb9d3423b437f7e679c1c51e765b15e535dcb278cd2769583690acb3395b91e4fd5f6f4e3b97879fcc313  0027-always-build-libgcc_eh.a.patch
 f060687adcd5297124e4000f1ba1e3fd5d7d124da04d948cbd0d4a6c69a90a2b29a4a0dbbe13a83ab6950724f434de012b681bdbcdf53c0100b40fe3d00f2f2f  0028-ada-libgnarl-compatibility-for-musl.patch
 5160bae68e20a1966c1f6d655ee98af759e9b9ee842718ae6007d467b418e1cf3b307528a0841477b5259671ce868521b06c0f2e947b7b8f3a398c53dd978252  0029-ada-musl-support-fixes.patch
-3c04b26554a78096296ca9542c77a91219bd26044dd2cb2006db4c1944889a97c215900b3828ba7e8c675162406db543605a815bdfbd915bf810663b1b253bdd  0033-gcc-go-link-to-libucontext.patch
+72631fbef4843d6ada52f3173b257e027605866a3faf1d8e34438cbf2581952f97bf6f9569ee44fcd7c4b3b337612eaeb0612fb2e6451903f219e4d99bf719db  0033-gcc-go-link-to-libucontext.patch
 141c0428f988cbd102000d4db8d4150485f6da5c064469493ea378cd579bed99330658f41fe106c0d07d1c1aa436ec3f864403ed1ba79f791a1d727b42d46910  0034-Use-generic-errstr.go-implementation-on-musl.patch
 d9ba710f770e053c8f212e821817c188091a829658050b9ab5906388553ec60fec37943ea43c270e92a9014902949f3c98fc4639032d92b8145b375bb29e193e  0035-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 ab90d8fdd977d6cd3da096a1c76d77be3e89a020b2127247771711a32eb608cceed21834ef488ab4b69bb0f408b098fdfb61630819e3d1a1e57d5af67800ee74  0036-configure-fix-detection-of-atomic-builtins-in-libato.patch

cross/gcc-armhf/0033-gcc-go-link-to-libucontext.patch

@@ -1,42 +1,101 @@
-From 0631e2b9453b33c42e12a14c11e8257d470016c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 30 Aug 2020 19:17:42 +0200
-Subject: [PATCH] gcc-go: support libucontext
+From ecc2a2e70e44fa76a75b12d0893bc1702b72a1b4 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Mon, 19 Dec 2022 10:37:06 -0800
+Subject: [PATCH] libgo: check for makecontext in -lucontext
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-This patch allows using gcc-go with libucontext. For this purpose,
-it unconditionally links gcc-go against -lucontext. Furthermore,
-it undefines SETCONTEXT_CLOBBERS_TLS in proc.c to prevent usage
-of makecontext/swapcontext feature that are not support by libucontext.
+Patch from Sören Tempel.
+
+Change-Id: I74b4052cc7aca19224afd6d9a2739c3fae46b722
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/458396
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Than McIntosh <thanm@google.com>
 ---
- Makefile.in          | 2 +-
- libgo/runtime/proc.c | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
+ libgo/configure    | 57 ++++++++++++++++++++++++++++++++++++++++++++++
+ libgo/configure.ac |  3 +++
+ 2 files changed, 60 insertions(+)
 
-diff --git a/Makefile.in b/Makefile.in
-index 593495e1650..c3e5d489bc0 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52801,7 +52801,7 @@ configure-target-libgo:
- 	esac; \
- 	module_srcdir=libgo; \
- 	rm -f no-such-file || : ; \
--	CONFIG_SITE=no-such-file $(SHELL) \
-+	CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
- 	  $$s/$$module_srcdir/configure \
- 	  --srcdir=$${topdir}/$$module_srcdir \
- 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
-index 3a30748d329..a987678fa84 100644
---- a/libgo/runtime/proc.c
-+++ b/libgo/runtime/proc.c
-@@ -66,6 +66,10 @@ static void gscanstack(G*);
+diff --git a/libgo/configure b/libgo/configure
+index 460fdad7..a607dbff 100755
+--- a/libgo/configure
++++ b/libgo/configure
+@@ -14818,6 +14818,63 @@ fi
  
- __thread G *g __asm__(GOSYM_PREFIX "runtime.g");
  
-+/* libucontext does not seem to support tlsbase, undef the macro
-+ * here to make sure we define initcontext and fixcontext as dummies. */
-+#undef SETCONTEXT_CLOBBERS_TLS
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing makecontext" >&5
++$as_echo_n "checking for library containing makecontext... " >&6; }
++if ${ac_cv_search_makecontext+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
 +
- #ifndef SETCONTEXT_CLOBBERS_TLS
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char makecontext ();
++int
++main ()
++{
++return makecontext ();
++  ;
++  return 0;
++}
++_ACEOF
++for ac_lib in '' ucontext; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_makecontext=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if ${ac_cv_search_makecontext+:} false; then :
++  break
++fi
++done
++if ${ac_cv_search_makecontext+:} false; then :
++
++else
++  ac_cv_search_makecontext=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_makecontext" >&5
++$as_echo "$ac_cv_search_makecontext" >&6; }
++ac_res=$ac_cv_search_makecontext
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++fi
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sched_yield" >&5
+ $as_echo_n "checking for library containing sched_yield... " >&6; }
+ if ${ac_cv_search_sched_yield+:} false; then :
+diff --git a/libgo/configure.ac b/libgo/configure.ac
+index 09554a37..a59aa091 100644
+--- a/libgo/configure.ac
++++ b/libgo/configure.ac
+@@ -570,6 +570,9 @@ PTHREAD_LIBS=
+ AC_CHECK_LIB([pthread], [pthread_create], PTHREAD_LIBS=-lpthread)
+ AC_SUBST(PTHREAD_LIBS)
  
- static inline void
++dnl Test if -lucontext is required for makecontext.
++AC_SEARCH_LIBS([makecontext], [ucontext])
++
+ dnl Test if -lrt is required for sched_yield or nanosleep or clock_gettime.
+ AC_SEARCH_LIBS([sched_yield], [rt])
+ AC_SEARCH_LIBS([nanosleep], [rt])

cross/gcc-armhf/APKBUILD

@@ -26,13 +26,13 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 pkgname=gcc-armhf
 _pkgbase=12.2.1 # must match gcc/BASE-VER
 _pkgsnap=20220924
-pkgver=${_pkgbase}_git${_pkgsnap}
+pkgver=${_pkgbase}_git$_pkgsnap
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armhf
-pkgrel=5
+pkgrel=8
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -212,7 +212,7 @@ makedepends="$makedepends_build $makedepends_host"
 #
 # PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
 # so that they can be properly tracked and easily rebased if needed.
-source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-${_pkgbase%%.*}-${_pkgsnap}.tar.xz
+source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -262,7 +262,7 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-
 	"
 
 # we build out-of-tree
-_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-${_pkgsnap}
+_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
 _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 _gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 
@@ -366,9 +366,9 @@ build() {
 		--prefix=/usr
 		--mandir=/usr/share/man
 		--infodir=/usr/share/info
-		--build=${CBUILD}
-		--host=${CHOST}
-		--target=${CTARGET}
+		--build=$CBUILD
+		--host=$CHOST
+		--target=$CTARGET
 		--enable-checking=release
 		--disable-fixed-point
 		--disable-libstdcxx-pch
@@ -438,7 +438,7 @@ package() {
 		-o -name libitm.a -o -name libgo.a -o -name libcaf\*.a \
 		-o -name libatomic.a -o -name libasan.a -o -name libtsan.a \) \
 		-a -type f \
-		-exec ${STRIP_FOR_TARGET} -g {} +
+		-exec $STRIP_FOR_TARGET -g {} +
 
 	if $_libgomp; then
 		mv "$pkgdir"/usr/lib/libgomp.spec "$pkgdir"/$_gcclibdir
@@ -655,7 +655,6 @@ gdc() {
 	mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
 }
 
-
 libgo() {
 	pkgdesc="Go runtime library for GCC"
 	depends=
@@ -794,7 +793,7 @@ b40d7e4712c035674c993bbb55475290ec14523b3f0fd05493514bac4e9adaa6641faf815fc40ffc
 674360ce2ee9f704d0632cc98756f9fe8dd8ca30064fb9d3423b437f7e679c1c51e765b15e535dcb278cd2769583690acb3395b91e4fd5f6f4e3b97879fcc313  0027-always-build-libgcc_eh.a.patch
 f060687adcd5297124e4000f1ba1e3fd5d7d124da04d948cbd0d4a6c69a90a2b29a4a0dbbe13a83ab6950724f434de012b681bdbcdf53c0100b40fe3d00f2f2f  0028-ada-libgnarl-compatibility-for-musl.patch
 5160bae68e20a1966c1f6d655ee98af759e9b9ee842718ae6007d467b418e1cf3b307528a0841477b5259671ce868521b06c0f2e947b7b8f3a398c53dd978252  0029-ada-musl-support-fixes.patch
-3c04b26554a78096296ca9542c77a91219bd26044dd2cb2006db4c1944889a97c215900b3828ba7e8c675162406db543605a815bdfbd915bf810663b1b253bdd  0033-gcc-go-link-to-libucontext.patch
+72631fbef4843d6ada52f3173b257e027605866a3faf1d8e34438cbf2581952f97bf6f9569ee44fcd7c4b3b337612eaeb0612fb2e6451903f219e4d99bf719db  0033-gcc-go-link-to-libucontext.patch
 141c0428f988cbd102000d4db8d4150485f6da5c064469493ea378cd579bed99330658f41fe106c0d07d1c1aa436ec3f864403ed1ba79f791a1d727b42d46910  0034-Use-generic-errstr.go-implementation-on-musl.patch
 d9ba710f770e053c8f212e821817c188091a829658050b9ab5906388553ec60fec37943ea43c270e92a9014902949f3c98fc4639032d92b8145b375bb29e193e  0035-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 ab90d8fdd977d6cd3da096a1c76d77be3e89a020b2127247771711a32eb608cceed21834ef488ab4b69bb0f408b098fdfb61630819e3d1a1e57d5af67800ee74  0036-configure-fix-detection-of-atomic-builtins-in-libato.patch

cross/gcc-armv7/0033-gcc-go-link-to-libucontext.patch

@@ -1,42 +1,101 @@
-From 0631e2b9453b33c42e12a14c11e8257d470016c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 30 Aug 2020 19:17:42 +0200
-Subject: [PATCH] gcc-go: support libucontext
+From ecc2a2e70e44fa76a75b12d0893bc1702b72a1b4 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Mon, 19 Dec 2022 10:37:06 -0800
+Subject: [PATCH] libgo: check for makecontext in -lucontext
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-This patch allows using gcc-go with libucontext. For this purpose,
-it unconditionally links gcc-go against -lucontext. Furthermore,
-it undefines SETCONTEXT_CLOBBERS_TLS in proc.c to prevent usage
-of makecontext/swapcontext feature that are not support by libucontext.
+Patch from Sören Tempel.
+
+Change-Id: I74b4052cc7aca19224afd6d9a2739c3fae46b722
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/458396
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Than McIntosh <thanm@google.com>
 ---
- Makefile.in          | 2 +-
- libgo/runtime/proc.c | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
+ libgo/configure    | 57 ++++++++++++++++++++++++++++++++++++++++++++++
+ libgo/configure.ac |  3 +++
+ 2 files changed, 60 insertions(+)
 
-diff --git a/Makefile.in b/Makefile.in
-index 593495e1650..c3e5d489bc0 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52801,7 +52801,7 @@ configure-target-libgo:
- 	esac; \
- 	module_srcdir=libgo; \
- 	rm -f no-such-file || : ; \
--	CONFIG_SITE=no-such-file $(SHELL) \
-+	CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
- 	  $$s/$$module_srcdir/configure \
- 	  --srcdir=$${topdir}/$$module_srcdir \
- 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
-index 3a30748d329..a987678fa84 100644
---- a/libgo/runtime/proc.c
-+++ b/libgo/runtime/proc.c
-@@ -66,6 +66,10 @@ static void gscanstack(G*);
+diff --git a/libgo/configure b/libgo/configure
+index 460fdad7..a607dbff 100755
+--- a/libgo/configure
++++ b/libgo/configure
+@@ -14818,6 +14818,63 @@ fi
  
- __thread G *g __asm__(GOSYM_PREFIX "runtime.g");
  
-+/* libucontext does not seem to support tlsbase, undef the macro
-+ * here to make sure we define initcontext and fixcontext as dummies. */
-+#undef SETCONTEXT_CLOBBERS_TLS
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing makecontext" >&5
++$as_echo_n "checking for library containing makecontext... " >&6; }
++if ${ac_cv_search_makecontext+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
 +
- #ifndef SETCONTEXT_CLOBBERS_TLS
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char makecontext ();
++int
++main ()
++{
++return makecontext ();
++  ;
++  return 0;
++}
++_ACEOF
++for ac_lib in '' ucontext; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_makecontext=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if ${ac_cv_search_makecontext+:} false; then :
++  break
++fi
++done
++if ${ac_cv_search_makecontext+:} false; then :
++
++else
++  ac_cv_search_makecontext=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_makecontext" >&5
++$as_echo "$ac_cv_search_makecontext" >&6; }
++ac_res=$ac_cv_search_makecontext
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++fi
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sched_yield" >&5
+ $as_echo_n "checking for library containing sched_yield... " >&6; }
+ if ${ac_cv_search_sched_yield+:} false; then :
+diff --git a/libgo/configure.ac b/libgo/configure.ac
+index 09554a37..a59aa091 100644
+--- a/libgo/configure.ac
++++ b/libgo/configure.ac
+@@ -570,6 +570,9 @@ PTHREAD_LIBS=
+ AC_CHECK_LIB([pthread], [pthread_create], PTHREAD_LIBS=-lpthread)
+ AC_SUBST(PTHREAD_LIBS)
  
- static inline void
++dnl Test if -lucontext is required for makecontext.
++AC_SEARCH_LIBS([makecontext], [ucontext])
++
+ dnl Test if -lrt is required for sched_yield or nanosleep or clock_gettime.
+ AC_SEARCH_LIBS([sched_yield], [rt])
+ AC_SEARCH_LIBS([nanosleep], [rt])

cross/gcc-armv7/APKBUILD

@@ -26,13 +26,13 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 pkgname=gcc-armv7
 _pkgbase=12.2.1 # must match gcc/BASE-VER
 _pkgsnap=20220924
-pkgver=${_pkgbase}_git${_pkgsnap}
+pkgver=${_pkgbase}_git$_pkgsnap
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armv7
-pkgrel=5
+pkgrel=8
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -212,7 +212,7 @@ makedepends="$makedepends_build $makedepends_host"
 #
 # PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
 # so that they can be properly tracked and easily rebased if needed.
-source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-${_pkgbase%%.*}-${_pkgsnap}.tar.xz
+source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -262,7 +262,7 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-
 	"
 
 # we build out-of-tree
-_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-${_pkgsnap}
+_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
 _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 _gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 
@@ -366,9 +366,9 @@ build() {
 		--prefix=/usr
 		--mandir=/usr/share/man
 		--infodir=/usr/share/info
-		--build=${CBUILD}
-		--host=${CHOST}
-		--target=${CTARGET}
+		--build=$CBUILD
+		--host=$CHOST
+		--target=$CTARGET
 		--enable-checking=release
 		--disable-fixed-point
 		--disable-libstdcxx-pch
@@ -438,7 +438,7 @@ package() {
 		-o -name libitm.a -o -name libgo.a -o -name libcaf\*.a \
 		-o -name libatomic.a -o -name libasan.a -o -name libtsan.a \) \
 		-a -type f \
-		-exec ${STRIP_FOR_TARGET} -g {} +
+		-exec $STRIP_FOR_TARGET -g {} +
 
 	if $_libgomp; then
 		mv "$pkgdir"/usr/lib/libgomp.spec "$pkgdir"/$_gcclibdir
@@ -655,7 +655,6 @@ gdc() {
 	mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
 }
 
-
 libgo() {
 	pkgdesc="Go runtime library for GCC"
 	depends=
@@ -794,7 +793,7 @@ b40d7e4712c035674c993bbb55475290ec14523b3f0fd05493514bac4e9adaa6641faf815fc40ffc
 674360ce2ee9f704d0632cc98756f9fe8dd8ca30064fb9d3423b437f7e679c1c51e765b15e535dcb278cd2769583690acb3395b91e4fd5f6f4e3b97879fcc313  0027-always-build-libgcc_eh.a.patch
 f060687adcd5297124e4000f1ba1e3fd5d7d124da04d948cbd0d4a6c69a90a2b29a4a0dbbe13a83ab6950724f434de012b681bdbcdf53c0100b40fe3d00f2f2f  0028-ada-libgnarl-compatibility-for-musl.patch
 5160bae68e20a1966c1f6d655ee98af759e9b9ee842718ae6007d467b418e1cf3b307528a0841477b5259671ce868521b06c0f2e947b7b8f3a398c53dd978252  0029-ada-musl-support-fixes.patch
-3c04b26554a78096296ca9542c77a91219bd26044dd2cb2006db4c1944889a97c215900b3828ba7e8c675162406db543605a815bdfbd915bf810663b1b253bdd  0033-gcc-go-link-to-libucontext.patch
+72631fbef4843d6ada52f3173b257e027605866a3faf1d8e34438cbf2581952f97bf6f9569ee44fcd7c4b3b337612eaeb0612fb2e6451903f219e4d99bf719db  0033-gcc-go-link-to-libucontext.patch
 141c0428f988cbd102000d4db8d4150485f6da5c064469493ea378cd579bed99330658f41fe106c0d07d1c1aa436ec3f864403ed1ba79f791a1d727b42d46910  0034-Use-generic-errstr.go-implementation-on-musl.patch
 d9ba710f770e053c8f212e821817c188091a829658050b9ab5906388553ec60fec37943ea43c270e92a9014902949f3c98fc4639032d92b8145b375bb29e193e  0035-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 ab90d8fdd977d6cd3da096a1c76d77be3e89a020b2127247771711a32eb608cceed21834ef488ab4b69bb0f408b098fdfb61630819e3d1a1e57d5af67800ee74  0036-configure-fix-detection-of-atomic-builtins-in-libato.patch

cross/gcc-riscv64/0033-gcc-go-link-to-libucontext.patch

@@ -1,42 +1,101 @@
-From 0631e2b9453b33c42e12a14c11e8257d470016c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Sun, 30 Aug 2020 19:17:42 +0200
-Subject: [PATCH] gcc-go: support libucontext
+From ecc2a2e70e44fa76a75b12d0893bc1702b72a1b4 Mon Sep 17 00:00:00 2001
+From: Ian Lance Taylor <iant@golang.org>
+Date: Mon, 19 Dec 2022 10:37:06 -0800
+Subject: [PATCH] libgo: check for makecontext in -lucontext
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-This patch allows using gcc-go with libucontext. For this purpose,
-it unconditionally links gcc-go against -lucontext. Furthermore,
-it undefines SETCONTEXT_CLOBBERS_TLS in proc.c to prevent usage
-of makecontext/swapcontext feature that are not support by libucontext.
+Patch from Sören Tempel.
+
+Change-Id: I74b4052cc7aca19224afd6d9a2739c3fae46b722
+Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/458396
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Reviewed-by: Than McIntosh <thanm@google.com>
 ---
- Makefile.in          | 2 +-
- libgo/runtime/proc.c | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
+ libgo/configure    | 57 ++++++++++++++++++++++++++++++++++++++++++++++
+ libgo/configure.ac |  3 +++
+ 2 files changed, 60 insertions(+)
 
-diff --git a/Makefile.in b/Makefile.in
-index 593495e1650..c3e5d489bc0 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52801,7 +52801,7 @@ configure-target-libgo:
- 	esac; \
- 	module_srcdir=libgo; \
- 	rm -f no-such-file || : ; \
--	CONFIG_SITE=no-such-file $(SHELL) \
-+	CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
- 	  $$s/$$module_srcdir/configure \
- 	  --srcdir=$${topdir}/$$module_srcdir \
- 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c
-index 3a30748d329..a987678fa84 100644
---- a/libgo/runtime/proc.c
-+++ b/libgo/runtime/proc.c
-@@ -66,6 +66,10 @@ static void gscanstack(G*);
+diff --git a/libgo/configure b/libgo/configure
+index 460fdad7..a607dbff 100755
+--- a/libgo/configure
++++ b/libgo/configure
+@@ -14818,6 +14818,63 @@ fi
  
- __thread G *g __asm__(GOSYM_PREFIX "runtime.g");
  
-+/* libucontext does not seem to support tlsbase, undef the macro
-+ * here to make sure we define initcontext and fixcontext as dummies. */
-+#undef SETCONTEXT_CLOBBERS_TLS
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing makecontext" >&5
++$as_echo_n "checking for library containing makecontext... " >&6; }
++if ${ac_cv_search_makecontext+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
 +
- #ifndef SETCONTEXT_CLOBBERS_TLS
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char makecontext ();
++int
++main ()
++{
++return makecontext ();
++  ;
++  return 0;
++}
++_ACEOF
++for ac_lib in '' ucontext; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_search_makecontext=$ac_res
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext
++  if ${ac_cv_search_makecontext+:} false; then :
++  break
++fi
++done
++if ${ac_cv_search_makecontext+:} false; then :
++
++else
++  ac_cv_search_makecontext=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_makecontext" >&5
++$as_echo "$ac_cv_search_makecontext" >&6; }
++ac_res=$ac_cv_search_makecontext
++if test "$ac_res" != no; then :
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++fi
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sched_yield" >&5
+ $as_echo_n "checking for library containing sched_yield... " >&6; }
+ if ${ac_cv_search_sched_yield+:} false; then :
+diff --git a/libgo/configure.ac b/libgo/configure.ac
+index 09554a37..a59aa091 100644
+--- a/libgo/configure.ac
++++ b/libgo/configure.ac
+@@ -570,6 +570,9 @@ PTHREAD_LIBS=
+ AC_CHECK_LIB([pthread], [pthread_create], PTHREAD_LIBS=-lpthread)
+ AC_SUBST(PTHREAD_LIBS)
  
- static inline void
++dnl Test if -lucontext is required for makecontext.
++AC_SEARCH_LIBS([makecontext], [ucontext])
++
+ dnl Test if -lrt is required for sched_yield or nanosleep or clock_gettime.
+ AC_SEARCH_LIBS([sched_yield], [rt])
+ AC_SEARCH_LIBS([nanosleep], [rt])

cross/gcc-riscv64/APKBUILD

@@ -26,13 +26,13 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 pkgname=gcc-riscv64
 _pkgbase=12.2.1 # must match gcc/BASE-VER
 _pkgsnap=20220924
-pkgver=${_pkgbase}_git${_pkgsnap}
+pkgver=${_pkgbase}_git$_pkgsnap
 [ "$BOOTSTRAP" = "nolibc" ] && pkgname="gcc-pass2"
 [ "$CBUILD" != "$CHOST" ] && _cross="-$CARCH" || _cross=""
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-riscv64
-pkgrel=5
+pkgrel=8
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -212,7 +212,7 @@ makedepends="$makedepends_build $makedepends_host"
 #
 # PLEASE submit all patches to gcc to https://gitlab.alpinelinux.org/kaniini/alpine-gcc-patches,
 # so that they can be properly tracked and easily rebased if needed.
-source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-${_pkgbase%%.*}-${_pkgsnap}.tar.xz
+source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-$_pkgsnap/gcc-${_pkgbase%%.*}-$_pkgsnap.tar.xz
 	0001-posix_memalign.patch
 	0002-gcc-poison-system-directories.patch
 	0003-specs-turn-on-Wl-z-now-by-default.patch
@@ -262,7 +262,7 @@ source="https://dev.alpinelinux.org/archive/gcc/${_pkgbase%%.*}-${_pkgsnap}/gcc-
 	"
 
 # we build out-of-tree
-_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-${_pkgsnap}
+_gccdir="$srcdir"/gcc-${_pkgbase%%.*}-$_pkgsnap
 _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 _gcclibexec="/usr/libexec/gcc/$CTARGET/${_pkgbase:-$pkgver}"
 
@@ -366,9 +366,9 @@ build() {
 		--prefix=/usr
 		--mandir=/usr/share/man
 		--infodir=/usr/share/info
-		--build=${CBUILD}
-		--host=${CHOST}
-		--target=${CTARGET}
+		--build=$CBUILD
+		--host=$CHOST
+		--target=$CTARGET
 		--enable-checking=release
 		--disable-fixed-point
 		--disable-libstdcxx-pch
@@ -438,7 +438,7 @@ package() {
 		-o -name libitm.a -o -name libgo.a -o -name libcaf\*.a \
 		-o -name libatomic.a -o -name libasan.a -o -name libtsan.a \) \
 		-a -type f \
-		-exec ${STRIP_FOR_TARGET} -g {} +
+		-exec $STRIP_FOR_TARGET -g {} +
 
 	if $_libgomp; then
 		mv "$pkgdir"/usr/lib/libgomp.spec "$pkgdir"/$_gcclibdir
@@ -655,7 +655,6 @@ gdc() {
 	mv "$pkgdir"/usr/bin/gdc "$subpkgdir"/usr/bin/
 }
 
-
 libgo() {
 	pkgdesc="Go runtime library for GCC"
 	depends=
@@ -794,7 +793,7 @@ b40d7e4712c035674c993bbb55475290ec14523b3f0fd05493514bac4e9adaa6641faf815fc40ffc
 674360ce2ee9f704d0632cc98756f9fe8dd8ca30064fb9d3423b437f7e679c1c51e765b15e535dcb278cd2769583690acb3395b91e4fd5f6f4e3b97879fcc313  0027-always-build-libgcc_eh.a.patch
 f060687adcd5297124e4000f1ba1e3fd5d7d124da04d948cbd0d4a6c69a90a2b29a4a0dbbe13a83ab6950724f434de012b681bdbcdf53c0100b40fe3d00f2f2f  0028-ada-libgnarl-compatibility-for-musl.patch
 5160bae68e20a1966c1f6d655ee98af759e9b9ee842718ae6007d467b418e1cf3b307528a0841477b5259671ce868521b06c0f2e947b7b8f3a398c53dd978252  0029-ada-musl-support-fixes.patch
-3c04b26554a78096296ca9542c77a91219bd26044dd2cb2006db4c1944889a97c215900b3828ba7e8c675162406db543605a815bdfbd915bf810663b1b253bdd  0033-gcc-go-link-to-libucontext.patch
+72631fbef4843d6ada52f3173b257e027605866a3faf1d8e34438cbf2581952f97bf6f9569ee44fcd7c4b3b337612eaeb0612fb2e6451903f219e4d99bf719db  0033-gcc-go-link-to-libucontext.patch
 141c0428f988cbd102000d4db8d4150485f6da5c064469493ea378cd579bed99330658f41fe106c0d07d1c1aa436ec3f864403ed1ba79f791a1d727b42d46910  0034-Use-generic-errstr.go-implementation-on-musl.patch
 d9ba710f770e053c8f212e821817c188091a829658050b9ab5906388553ec60fec37943ea43c270e92a9014902949f3c98fc4639032d92b8145b375bb29e193e  0035-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
 ab90d8fdd977d6cd3da096a1c76d77be3e89a020b2127247771711a32eb608cceed21834ef488ab4b69bb0f408b098fdfb61630819e3d1a1e57d5af67800ee74  0036-configure-fix-detection-of-atomic-builtins-in-libato.patch

cross/grub-efi-x86/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=grub-efi-x86
 pkgver=2.06
-pkgrel=6
+pkgrel=7
 
 _arch="x86"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -22,5 +22,5 @@ package() {
 }
 
 sha512sums="
-ab6731f2486a1c58af91839c758491cfafad48b899287c3015194699639e2349f3b49cefccdc4040c87c1dc3c3c2fdedfdd023481e613156e4e3e3f455bc8a2b  grub-efi-2.06-r6-x86-edge.apk
+f748735b1b15d7424640a22c00b2c0ea23f392521ae0839f6a582bb1a67410da46bf51274991eb88d7a36a5f7036b7ed89b965cccf0dab293a692dd0d73c467c  grub-efi-2.06-r7-x86-edge.apk
 "

device/community/device-nokia-n900/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=8.3
-pkgrel=3
+pkgver=8.4
+pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@@ -41,6 +41,7 @@ source="
 	keymaps/rx51_fise.map
 	keymaps/rx51_it.map
 	keymaps/rx51_us.map
+	lock.sh
 	n900-wlan-data.initd
 	pointercal
 	uboot-script.cmd
@@ -118,10 +119,13 @@ package() {
 
 x11() {
 	install_if="$pkgname xorg-server"
+	depends="xset xinput"
 	install -D -m644 "$srcdir"/40-xkb.conf \
 		"$subpkgdir"/etc/X11/xorg.conf.d/40-xkb.conf
 	install -D -m644 "$srcdir"/xorg.conf \
 		"$subpkgdir"/etc/X11/xorg.conf.d/11-n900.conf
+	install -Dm755 "$srcdir"/lock.sh \
+		"$pkgdir"/usr/bin/lock.sh
 }
 
 xkeyboard_config() {
@@ -187,6 +191,7 @@ dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058ed
 0a3e58a3a81c463937caf508a76461b4cc43f593f0817a52b6581fdd132cc894c0960fe7b950b6e6bfac1fad15cd9dd230c103fcf08a30b44ef7d8fbe31cea28  rx51_fise.map
 082a5166e38296b097e873b0b4aeaf007e594d3bf4470c74e91ee3efedcf28ad25cd55c23dd63e460339898ae08e77e111b0e1092fa5e661db90bb40732103a1  rx51_it.map
 e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba  rx51_us.map
+caf9f4c45d11c28e1a6681255fafe5a286b0c417737fac1ca0ee37d3f82fd65c1712f5180375d7813fa308dfdca91d96876b5ce5b05b55ac14cfc31303b1ea5f  lock.sh
 b50e7f37ffb1fa0bb782b117a4e8bcfdb722b6127c3e5d643e90cd901a1f4e65e77a0773ed418673c8195595347482be0c8096f5a723e840315ad61ccd043b66  n900-wlan-data.initd
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
 9aaae66ae159236346f67818c44da61aed84a63b3bac0c706492f198db82fc67c2378bcabaf260b695b980bf2faf144472f15355bb097b021551db9547f2e1bc  uboot-script.cmd

device/community/device-pine64-pinebookpro/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
-pkgver=10
-pkgrel=2
+pkgver=11
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -21,7 +21,6 @@ subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="
 	deviceinfo
-	extlinux.conf
 	10-pinebookpro.hwdb
 	70-edp-backlight.rules
 	nvme-powersave.initd
@@ -34,8 +33,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -D -m644 "$srcdir"/extlinux.conf \
-		"$pkgdir"/boot/extlinux/extlinux.conf
 
 	# Keyboard mapping
 	install -D -m644 "$srcdir"/10-pinebookpro.hwdb \
@@ -57,8 +54,7 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 sha512sums="
-d748d300043b5f3d87af5ac4a7bb916b5af15186d30830273c2bb921cd67937b7bc4019505931c7152216d88d4043f89880c91a497713c510ba92c64ddc7830a  deviceinfo
-faab3ef38ca5850dc0e323587fa8a46cda609af86278fae95b6ec05ed355184385620ecc844c390e6ff1a0df97b28e60e66a45c8af81a7f2fe3366ac84cbf673  extlinux.conf
+6d6fcb8bbfa2eb0fda691cc646f484ce383ba80bbfd5affde17852913e1f8fe68290fd764f5d7a1cc2f3e9de288a7f4db9ff90dfed66b3a0daf47a0c836e0926  deviceinfo
 d3988fe83c54228d743f4a8c190e9530404a436a7fbc0b004bf20d3986b502d864717d8cc9c76812e599266bf84cb08f9a86e1bfd220875799c5a022aea588ec  10-pinebookpro.hwdb
 6e9e9ef54ee9aa9491be6dc30451fdcd9038b0efeb959509f48626d97a1696ee81711a46510049557b73269ff48acc85fad6496c65451e2e24908241b7655444  70-edp-backlight.rules
 2abfa31fa56028339efc6d2b6cb838f310990d7110ac4dd996bc4cfcf90f0a8770e70f28f77f7b6929d110e494bc33731302f16b9717729f991c2732be0731d5  nvme-powersave.initd

device/community/device-pine64-pinebookpro/deviceinfo

@@ -6,6 +6,7 @@ deviceinfo_name="PINE64 Pinebook Pro"
 deviceinfo_manufacturer="PINE64"
 deviceinfo_codename="pine64-pinebookpro"
 deviceinfo_year="2019"
+deviceinfo_dtb="rockchip/rk3399-pinebook-pro"
 deviceinfo_modules_initfs="gpu_sched dw_wdt fusb302"
 deviceinfo_arch="aarch64"
 
@@ -24,5 +25,7 @@ deviceinfo_dev_internal_storage_repartition="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"
+deviceinfo_kernel_cmdline="console=tty0 console=ttyS2,1500000n8 panic=10 coherent_pool=1M video=HDMI-A-1:1920x1080@60 video=eDP-1:1920x1080@60 loglevel=5 PMOS_NO_OUTPUT_REDIRECT fw_devlink=off nvme_core.default_ps_max_latency_us=5500 pcie_aspm.policy=performance"
+deviceinfo_generate_extlinux_config="true"
 deviceinfo_sd_embed_firmware="u-boot/pine64-rockpro64/u-boot-rockchip.bin:32"
 deviceinfo_boot_part_start="32768"

device/community/device-pine64-pinebookpro/extlinux.conf

@@ -1,9 +0,0 @@
-timeout 10
-default POSTMARKETOS
-menu title boot prev kernel
-
-label POSTMARKETOS
-  kernel /vmlinuz
-  fdt /dtbs-postmarketos-rockchip/rockchip/rk3399-pinebook-pro.dtb
-  initrd /initramfs
-  append console=tty0 console=ttyS2,1500000n8 panic=10 coherent_pool=1M video=HDMI-A-1:1920x1080@60 video=eDP-1:1920x1080@60 loglevel=5 PMOS_NO_OUTPUT_REDIRECT fw_devlink=off nvme_core.default_ps_max_latency_us=5500 pcie_aspm.policy=performance

device/community/device-pine64-pinephonepro/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=device-pine64-pinephonepro
 pkgdesc="PINE64 PinePhone Pro"
-pkgver=3.5
-pkgrel=1
+pkgver=3.6
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -33,8 +33,6 @@ source="
 	51_keyboard.gschema.override
 	90-modem-eg25.rules
 	deviceinfo
-	grub.cfg
-	grub_early.cfg
 	modemmanager.conf
 	ppkb.sh
 	setup-modem.sh
@@ -47,8 +45,7 @@ build() {
 	devicepkg_build $startdir $pkgname
 
 	grub-mkimage \
-		--config="$srcdir/grub_early.cfg" \
-		--prefix="" \
+		--prefix="/grub" \
 		--output="bootaa64.efi" \
 		--format="arm64-efi" \
 		--compression="xz" \
@@ -78,8 +75,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 
 	# Grub / bootloader
-	install -Dm644 -t "$pkgdir"/boot/grub \
-		"$srcdir"/grub.cfg
 	install -Dm644 -t "$pkgdir"/boot/EFI/Boot \
 		"$srcdir"/bootaa64.efi
 
@@ -126,9 +121,7 @@ gnome() {
 sha512sums="
 2d68ffe143f633a86670f30e45dbad1cc313f219f22b7cd3319ab44bb7209c20cb29f2ff2c60c92390154af9c9a6815c4186be555364cf31552005eba024c0e7  51_keyboard.gschema.override
 98e9dcfb36dd5843ff441b148e3bffb70757c59601c5f01f55a584e8f017c7ca73f2275c1bff46e4236dd8174df36a43d10abf9b8dadee988b962036846dc6ed  90-modem-eg25.rules
-e591572d0bfc4d7d990fcc15bc82e78e60404becf62a38283b4ceee6f49a812b63eebbc5c304907330e33dce5f023edba26c9b86f1375affa3cf6b49fbd06539  deviceinfo
-065b88a825a2b32c66ffe2ef3b4004560f41cdeedbd1a9cdbdc7bc29d52b43c698e4cd6881ce80eacac56b4689176a697dbfd0a89b20afb06963af2970db99cc  grub.cfg
-0f9357d4eea089628fbceb1e3e96d21a3f4329aeb6743158a6f877f967ef274506404eba949d5f01b7e1adea149f9a3aef992a5e8cd4181f93ab00909b1c5ecd  grub_early.cfg
+969e0b786e1697f1071e443e1bc5c08253b78c0ecdb410cfc70eeb4216ac464c18d02f543bd5d707fc8bb4ecbff52a6b4be18a94c26e6522b12ec0a38cb0eaaf  deviceinfo
 c5006c38828eb519917d57756f7831c4552feffef2d4922a384073f6a551535f615ad397d784e313818e0b943e1f6212bcca0aff9ce37da60b29547b1631f24b  modemmanager.conf
 43f67e94491791685cdbb4874bb3034b1d297bdf3d23e7405c45ba8c58de72b4fb6a9943b79f46ef7b8f4dbc4d9db254ebec8eb3453d720a5a8fad277c6a9d88  ppkb.sh
 420ee1d7522d4d56c2909580fd6ba7580483ca5455b13eb6d22e700063ce0c1a5c6d2f5b161dfce0d777636fe9a712aa82f38a0585f2feabea3785b02bae7515  setup-modem.sh

device/community/device-pine64-pinephonepro/deviceinfo

@@ -6,6 +6,7 @@ deviceinfo_name="PINE64 PinePhone Pro"
 deviceinfo_manufacturer="PINE64"
 deviceinfo_codename="pine64-pinephonepro"
 deviceinfo_year="2021"
+deviceinfo_dtb="rockchip/rk3399-pinephone-pro"
 deviceinfo_modules_initfs="gpu_sched dw_wdt fusb302 panel_himax_hx8394 goodix_ts"
 deviceinfo_arch="aarch64"
 
@@ -24,5 +25,7 @@ deviceinfo_dev_internal_storage_repartition="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"
+deviceinfo_kernel_cmdline="console=tty0 earlycon=uart8250,mmio32,0xff1a0000 console=ttyS2,115200 panic=10 coherent_pool=1M loglevel=1 mem_sleep_default=s2idle PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE fw_devlink=off"
+deviceinfo_generate_grub_config="true"
 deviceinfo_boot_filesystem="fat32"
 deviceinfo_partition_type="gpt"

device/community/device-pine64-pinephonepro/grub.cfg

@@ -1,7 +0,0 @@
-timeout=0
-
-menuentry "postmarketOS" {
-	linux ($root)/vmlinuz console=tty0 earlycon=uart8250,mmio32,0xff1a0000 console=ttyS2,115200 panic=10 coherent_pool=1M loglevel=1 mem_sleep_default=s2idle PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE fw_devlink=off
-	initrd ($root)/initramfs
-	devicetree ($root)/dtbs-pine64-pinephonepro/rockchip/rk3399-pinephone-pro.dtb
-}

device/community/device-samsung-grandmax/APKBUILD

@@ -1,4 +1,5 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Raymond Hackley <raymondhackley@protonmail.com>
 pkgname=device-samsung-grandmax
 pkgdesc="Samsung Galaxy Grand Max"
 pkgver=1.1

device/community/firmware-motorola-osprey/APKBUILD

@@ -0,0 +1,55 @@
+# Maintainer: Martijn Braam <martijn@brixit.nl>
+pkgname=firmware-motorola-osprey
+pkgver=3
+pkgrel=0
+pkgdesc="Firmware for Motorola Moto G 2015"
+url="https://github.com/pmsourcedump/firmware-motorola-osprey"
+subpackages="$pkgname-wcnss $pkgname-wcnss-nv:wcnss_nv $pkgname-venus"
+arch="aarch64"
+license="proprietary"
+options="!check !strip !archcheck !tracedeps pmb:cross-native"
+makedepends="pil-squasher"
+
+_commit="a47c5a1c2dd806226c61305c9c97135f2734d0c7"
+_muppets_commit="d2ff868a61c42ab84e85597600fe9e1064802c7b"
+source="$pkgname-$_commit.tar.gz::https://github.com/pmsourcedump/firmware-motorola-osprey/archive/$_commit.tar.gz
+	WCNSS_qcom_wlan_nv_osprey.bin::https://github.com/TheMuppets/proprietary_vendor_motorola/raw/$_muppets_commit/osprey/proprietary/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin"
+builddir="$srcdir/firmware-motorola-osprey-$_commit"
+
+_fwdir="/lib/firmware/postmarketos"
+
+build() {
+	pil-squasher wcnss.mbn wcnss.mdt
+	# venus.mbn exists already but seems a bit different
+	pil-squasher venus2.mbn venus.mdt
+}
+
+package() {
+	mkdir -p "$pkgdir"
+}
+
+wcnss() {
+	pkgdesc="Motorola Moto G 2015 WiFi/BT firmware"
+
+	# Linux detects squashed (.mbn) vs non-squashed (.mdt + .b*) based on
+	# file contents, so it is fine to install wcnss.mbn to wcnss.mdt
+	install -Dm644 "$builddir"/wcnss.mbn "$subpkgdir/$_fwdir"/wcnss.mdt
+}
+
+wcnss_nv() {
+	pkgdesc="Motorola Moto G 2015 WiFi/BT firmware configuration"
+	install -Dm644 "$srcdir"/WCNSS_qcom_wlan_nv_osprey.bin "$subpkgdir/$_fwdir"/wlan/prima/WCNSS_qcom_wlan_nv.bin
+}
+
+venus() {
+	pkgdesc="Motorola Moto G 2015 video firmware"
+
+	# Linux detects squashed (.mbn) vs non-squashed (.mdt + .b*) based on
+	# file contents, so it is fine to install venus.mbn to venus.mdt
+	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
+}
+
+sha512sums="
+7e8d02baa8864c50b4a8be1f9af830e8b5440eee61a012725ed114d93012f0fb19ec005908832d3c96e0ba54b51a5ec7bcf137bfcc64c63594212f2497604629  firmware-motorola-osprey-a47c5a1c2dd806226c61305c9c97135f2734d0c7.tar.gz
+1ee2e4f6eb3662b0f6b6034313d30a81d48dab78680ccd5f3c84ca023719e2c6021b2dbec79468719dc01e27b53b76e1097c9ed5edc476b601c4fd1d80373a7a  WCNSS_qcom_wlan_nv_osprey.bin
+"

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

@@ -5,8 +5,8 @@
 
 _flavor="postmarketos-qcom-sdm845"
 pkgname=linux-$_flavor
-pkgver=6.1.0
-pkgrel=0
+pkgver=6.1.3
+pkgrel=1
 pkgdesc="Mainline Kernel fork for SDM845 devices"
 arch="aarch64"
 _carch="arm64"
@@ -18,7 +18,7 @@ options="!strip !check !tracedeps
 makedepends="bash bison findutils flex installkernel openssl-dev perl"
 
 _config="config-$_flavor.$arch"
-_tag="sdm845-6.1.0"
+_tag="sdm845-6.1.3-r1"
 
 # Source
 source="
@@ -55,6 +55,6 @@ package() {
 }
 
 sha512sums="
-eabd65315e8372eef96628c71f9eec7ca3a5cdc7160c52f8a6abd5b6d8b12cc6b83ef551dfd51fad3f6239c993164053935e1c2408a758238cc5de53b9ce1b4e  linux-sdm845-6.1.0.tar.gz
-e8b12365070eff6ffcb96fc9d44f568ef584ccde1dab6911f2d2d6be4c6ffaa379d09485f104a09950c1e6f3078a179a0deae14e90e0b6f7a993e377590e7ca2  config-postmarketos-qcom-sdm845.aarch64
+e92d046eb071617b3844382173f20fc3efc982c78fc07f4d7d7c9cc762eeb3221fc502fd09a9d928798831a808c2bf2121a2e62fe5a84611d7b696123b4e5b2d  linux-sdm845-6.1.3-r1.tar.gz
+8d05bb3d838c3a2cd8b3204917a453ec800d1b56b8374f5ccc5f0c81f2ffdb7e0dedeb0621a08bc201969d7be9520c322fe442f3f7e8065329bcfd15e990ff52  config-postmarketos-qcom-sdm845.aarch64
 "

device/community/linux-postmarketos-qcom-sdm845/config-postmarketos-qcom-sdm845.aarch64

@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.1.0 Kernel Configuration
+# Linux/arm64 6.1.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r5) 12.2.1 20220924"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r6) 12.2.1 20220924"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=120201
 CONFIG_CLANG_VERSION=0
@@ -7360,6 +7360,7 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM64_CE=m
 CONFIG_CRYPTO_SHA3_ARM64=m
+# CONFIG_CRYPTO_SM3_NEON is not set
 CONFIG_CRYPTO_SM3_ARM64_CE=m
 # CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
 # CONFIG_CRYPTO_AES_ARM64 is not set

device/main/device-purism-librem5/APKBUILD

@@ -3,7 +3,7 @@
 # Co-Maintainer: Alistair Francis <alistair@alistair23.me>
 pkgname=device-purism-librem5
 pkgdesc="Purism Librem 5 Phone"
-pkgver=1.37
+pkgver=1.38
 pkgrel=0
 _confver=54
 _purismrel=1
@@ -44,6 +44,7 @@ source="
 	l5-ship-mode.initd
 	l5-lockdown-support.initd
 	org.freedesktop.GeoClue2.service
+	brcmfmac-no-powersave.conf
 "
 subpackages="
 	$pkgname-geoclue
@@ -169,6 +170,12 @@ package() {
 	install -Dm755 "$srcdir"/l5-lockdown-support.initd \
 		"$pkgdir"/etc/init.d/l5-lockdown-support
 
+
+	# disable PM for brcmfmac wifi / Sparklan WLAN
+	# see: https://source.puri.sm/Librem5/linux/-/issues/404
+	install -D -m644 "$srcdir"/brcmfmac-no-powersave.conf \
+		-t "$pkgdir"/etc/NetworkManager/conf.d
+
 	devicepkg_package $startdir $pkgname
 }
 
@@ -196,4 +203,5 @@ b45749fcddfd65a302b502bcabfa5828d1b63e45d844fd50e44009a756b919db20fe9526102947c0
 c723764d507ccd4b04aa5ce79b1d1ebc131873cdc37a943cb0f92b8a08a3c69eb9e0d31fcd4589fd8c40a9676bae9897e4f12ec2ebe4db8214ac85669ef35a53  l5-ship-mode.initd
 f4b314d553655f7975445ac0a33099923e20dabb082c07e2cf6a78e4118c143d777dd4ad2c09cbc388600bdefe8deb3073fbd15b238772ddf09c66ac46415590  l5-lockdown-support.initd
 fd91bcd8cecd509587f0a26d454157a1df094d2d86c75329d1002e9474946494d4d1b5407e055fbd5f21e22394eeb1bbd4b3439ae6925db50a3427b4fac101cf  org.freedesktop.GeoClue2.service
+7e679cbd0970d017790e4217a027128a0c99c20a1b757cbce49d92eb0df9fa54148017313dc27bcd1029ab6c904f98c5c4032a1f5db7849401a55cb2e564add1  brcmfmac-no-powersave.conf
 "

device/main/device-purism-librem5/brcmfmac-no-powersave.conf

@@ -0,0 +1,4 @@
+[connection-wifi-brcmfmac]
+match-device=driver:brcmfmac
+# 2 = disable powersave
+wifi.powersave=2

device/main/linux-postmarketos-allwinner/APKBUILD

@@ -7,9 +7,9 @@
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=6.1.0_rc7_git20221205
-pkgrel=2
-_tag="orange-pi-6.1-20221205-1151"
+pkgver=6.1.3_git20230104
+pkgrel=0
+_tag="orange-pi-6.1-20230104-1712"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
 url="https://megous.com/git/linux/"
@@ -83,9 +83,9 @@ package() {
 }
 
 sha512sums="
-f947f76e29f9ffe77583af9fe6fb985afd86e6da48111ded26ee5ef0796e7a4afc9aca8d2598f0eaed69c9022d21a972d922fd540ea878125417b887b3388d31  linux-postmarketos-allwinner-orange-pi-6.1-20221205-1151.tar.gz
-74663ef36af38c977d831563bce9952f4d88cecdfa420ac41f9155fc6ae5d9de1027c29e6a9d333378b00af63e4facf6a3659dc49e878a6a17b1a9d209dba9aa  config-postmarketos-allwinner.aarch64
-16e1fd952f65cccd41876fe66924b5a3182bd46f5fc7e97d677083e5a952e0e0e751b4ab38639b653626b80823215b1e325ecfe93a9cb27bb749acf9292ac99e  config-postmarketos-allwinner.armv7
+4795a261e1016c9d5d4c11cfee43d8cd020b2c2cfed50b87840dba28b8aaee236e533c6eef582ccbbdef65fc36dd7381189c2b0bc0da0922f1282ade8252d75f  linux-postmarketos-allwinner-orange-pi-6.1-20230104-1712.tar.gz
+ee97a92819533dd390ec0c97e5c622894953fdf5c61d8511af5ca28cc84d9b984f29024b0f17092879973ec44c96eb090fc7d0efc3e2fba9c5a416828cf57cb5  config-postmarketos-allwinner.aarch64
+82fd47f5b6fc489856dfd47d62aedb76300a49ef18e458283f7b0a3df13481e2a084ce8d49a1245ec407e97ddceca9d92db83c226f4dbeb12c28f48a64a6cadb  config-postmarketos-allwinner.armv7
 126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367  0001-dts-add-dontbeevil-pinephone-devkit.patch
 1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04  0002-dts-add-pinetab-dev-old-display-panel.patch
 96849f40f6defc4ad7646256814bea5ac353c4e0479fd069365ff27456d63da801541ec616f6db736d60f3134384321a9eeb5bfbd555363bf1259c8de63d17fa  0003-dts-pinetab-add-missing-bma223-ohci1.patch

device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64

@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.1.0-rc7 Kernel Configuration
+# Linux/arm64 6.1.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r5) 12.2.1 20220924"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r6) 12.2.1 20220924"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=120201
 CONFIG_CLANG_VERSION=0
@@ -6054,6 +6054,7 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_CRYPTO_SHA512_ARM64=y
 CONFIG_CRYPTO_SHA512_ARM64_CE=y
 CONFIG_CRYPTO_SHA3_ARM64=y
+# CONFIG_CRYPTO_SM3_NEON is not set
 CONFIG_CRYPTO_SM3_ARM64_CE=y
 # CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
 CONFIG_CRYPTO_AES_ARM64=y

device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7

@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.1.0-rc7 Kernel Configuration
+# Linux/arm 6.1.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 12.2.1_git20220924-r5) 12.2.1 20220924"
+CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 12.2.1_git20220924-r6) 12.2.1 20220924"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=120201
 CONFIG_CLANG_VERSION=0

device/main/linux-purism-librem5/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer:  Clayton Craft <clayton@craftyguy.net>
 # Co-Maintainer: Alistair Francis <alistair@alistair23.me>
 pkgname=linux-purism-librem5
-pkgver=6.1.0
+pkgver=6.1.1
 pkgrel=0
 _purismrel=1
 # <kernel ver>.<purism kernel release>
@@ -71,6 +71,6 @@ package() {
 }
 
 sha512sums="
-120ac18a0b93c302062578b3b80ef0d18f351be94b6b89322b25b4fdce416261ef311a327acd42718741db5e1d5516d45109fc7ef8ef338f6af6dfb78cf2beb1  linux-purism-librem5-6.1.0pureos1.tar.gz
+496d668cb75a60c74a147157d5d7b633c9e0ca52f0da141fc5f694960c3c37047918824b48ac35b8311221b1cc8c4fbf865ae298167d5b44aa9f85f4bae6b2d9  linux-purism-librem5-6.1.1pureos1.tar.gz
 18826512ca9b78d61bda5d892afa31404dccc4be4492ff9a29e69d8c68edebc2ed0c470d6fe8d577f3840a5db0f79221e55ee334dd9b841d2cfd0a2ebe59c22a  config-purism-librem5.aarch64
 "

device/testing/device-bq-piccolo/APKBUILD

@@ -2,18 +2,20 @@
 pkgname=device-bq-piccolo
 pkgdesc="BQ Aquaris M5"
 pkgver=4
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 soc-qcom-msm8939"
+depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
+	 soc-qcom-msm8939 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
 source="deviceinfo phoc.ini pointercal"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-phosh
 "
+_pmb_select="soc-qcom-msm8916-rproc"
 
 build() {
 	devicepkg_build $startdir $pkgname

device/testing/device-fairphone-fp2/APKBUILD

@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-fairphone-fp2
 pkgdesc="Fairphone 2"
-pkgver=6
-pkgrel=1
+pkgver=7
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -10,6 +10,7 @@ options="!check !archcheck"
 depends="
 	mkbootimg
 	postmarketos-base
+	swclock-offset
 	"
 makedepends="devicepkg-dev"
 source="deviceinfo

device/testing/device-fairphone-fp3/APKBUILD

@@ -1,16 +1,16 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-fairphone-fp3
 pkgdesc="Fairphone 3"
-pkgver=0.5
+pkgver=0.6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	msm-fb-refresher
 	mkbootimg
 	postmarketos-base
+	swclock-offset
 "
 makedepends="devicepkg-dev"
 source="deviceinfo"
@@ -32,7 +32,7 @@ package() {
 
 kernel_downstream() {
 	pkgdesc="Downstream kernel (recommended)"
-	depends="linux-fairphone-fp3"
+	depends="linux-fairphone-fp3 msm-fb-refresher"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 

device/testing/device-google-bob/APKBUILD

@@ -0,0 +1,56 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Jenneron <jenneron@protonmail.com>
+pkgname=device-google-bob
+pkgdesc="ASUS Chromebook Flip C101"
+pkgver=2
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	alsa-ucm-conf-google-gru
+	depthcharge-tools
+	linux-postmarketos-rockchip
+	postmarketos-base
+	postmarketos-update-depthcharge-kernel
+"
+makedepends="devicepkg-dev"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-phosh
+"
+source="
+	deviceinfo
+	phoc.ini
+	modprobe.d/accel.conf
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+
+	install -Dm644 "$srcdir"/accel.conf \
+		"$pkgdir"/etc/modprobe.d/accel.conf
+}
+
+nonfree_firmware() {
+	pkgdesc="WiFi/BT and DP firmware"
+	depends="linux-firmware-mrvl linux-firmware-rockchip"
+	mkdir "$subpkgdir"
+}
+
+phosh() {
+	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
+	install -Dm644 "$srcdir"/phoc.ini \
+		"$subpkgdir"/etc/phosh/phoc.ini
+}
+
+sha512sums="
+6860511450fa5f0a3ac0e36ef720fc581fb55f27f3a5b89d0cf8ad5b9845af3c8dd52c309dc0163ba8e6e3894b3c5c51e15cb64942cf985f431f4606aabe4a30  deviceinfo
+bd63cfc97d37e81dd9559dad60f330c10dc280afd20081495c6302960fcacf32954e3edab53294fcd5278e86c53c47a95b345a8d9e18807d88fe4313d519d259  phoc.ini
+1ba29c50747458b68ed98706c008cfaeea9eff56d2977a23e060f3a9fcf306c9d62d162e2906472d24a6c25596af95e26722c6b55ca97a031b2d5c8db2661390  accel.conf
+"

device/testing/device-google-bob/deviceinfo

@@ -0,0 +1,30 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="ASUS Chromebook Flip C101"
+deviceinfo_manufacturer="ASUS"
+deviceinfo_codename="google-bob"
+deviceinfo_year="2017"
+deviceinfo_dtb="rockchip/rk3399-gru-bob"
+deviceinfo_modules_initfs="gpu-sched elants-i2c elan-i2c-core cros-ec-keyb sbs-battery"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_chassis="convertible"
+deviceinfo_keyboard="true"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1280"
+deviceinfo_screen_height="800"
+deviceinfo_gpu_accelerated="true"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_kernel_cmdline="console=null"
+deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
+deviceinfo_cgpt_kpart_start="8192"
+deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="bob"
+deviceinfo_generate_depthcharge_image="true"
+deviceinfo_generate_extlinux_config="true"

device/testing/device-google-bob/modprobe.d/accel.conf

@@ -0,0 +1 @@
+blacklist cros-ec-sensorhub

device/testing/device-google-bob/phoc.ini

@@ -0,0 +1,5 @@
+[cursor:seat0]
+map-to-output = eDP-1
+
+[output:eDP-1]
+scale = 1

device/testing/device-google-burnet/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-burnet
 pkgdesc="HP Chromebook x360 11MK G3 EE"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -41,6 +41,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-5514c588d76bef7a9fa8c8f7ad012efd5da34422f4808f819a795ea753f232322a63bbc68a648adc939ad9ade57d60e736ce5ebdcf6ea4173864978579460e2b  deviceinfo
+7a39024e1f4b697b2bde13794cdc51e269b9883322e17a608349489ffed0a10db9e785ec3d3291abe0860c7e6bed31e7cb9508f4532f9d05866077a9e012992c  deviceinfo
 bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf
 "

device/testing/device-google-burnet/deviceinfo

@@ -25,4 +25,5 @@ deviceinfo_flash_method="none"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="burnet"
 deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-cozmo/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-cozmo
 pkgdesc="Acer Chromebook 314 (CB314-2H / CB314-2HT)"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -41,6 +41,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-dd1c4b2dacf03ccb81a51838bc4ebc7ce6114070f5d8a8035b9693bccf2a2aebd026df36f5cb9ec38ca93237026d7e1d5671be8c8d9e3c5821772e10bb2f4302  deviceinfo
+41a90f9abe98eb1442f6d1e68acfda7d50f5d025df9de2bf8b2658fdd5e79de4804bc9e4c3c890d81ec6bc0c2715f0e73155a0288dd5635476a6915b9dcccd75  deviceinfo
 bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf
 "

device/testing/device-google-cozmo/deviceinfo

@@ -25,4 +25,5 @@ deviceinfo_flash_method="none"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="cozmo"
 deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-damu/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-damu
 pkgdesc="ASUS Chromebook Flip CM3 (CM3200, MT8183)"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -41,6 +41,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-8172d3d8c7095b1155509e46c991d91fa2160462ba982a415421cb09a600b36ebf38f42eb12d30ed14995b06253a9b16005594a9cefd3e8581357096bdc696b6  deviceinfo
+06fb84b1c7c144fe3511dda65530441d42073b62a95e36c50e53eb1d1dafcee58974cd74287c407c0839f9ecc6065f5cc3fd6bf518d8faf98698b63def540959  deviceinfo
 37f11d243c4ecfd07bfb74e2d34e4c261db3a6aff755bf2dd08dad998de47e511c21082ca0d181e77e093e6f940fc570d8aef87fbc3a73ba55cb9f34b8c510f2  sound.conf
 "

device/testing/device-google-damu/deviceinfo

@@ -25,4 +25,5 @@ deviceinfo_flash_method="none"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="damu"
 deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-dru/APKBUILD

@@ -0,0 +1,38 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Jenneron <jenneron@protonmail.com>
+pkgname=device-google-dru
+pkgdesc="Acer Chromebook Tab 10"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	alsa-ucm-conf-google-gru
+	depthcharge-tools
+	linux-postmarketos-rockchip
+	postmarketos-base
+	postmarketos-update-depthcharge-kernel
+"
+makedepends="devicepkg-dev"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="WiFi/BT and DP firmware"
+	depends="linux-firmware-ath10k linux-firmware-rockchip"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+e07c02df50314681fd939dd9ab531c5f9fc4258bf970dcb4b2695bb1275ceef9fb34ef3d047cbe848ff4735a470d9bbdc4570412d80b9d9aac553250283df145  deviceinfo
+"

device/testing/device-google-dru/deviceinfo

@@ -0,0 +1,28 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Acer Chromebook Tab 10"
+deviceinfo_manufacturer="Acer"
+deviceinfo_codename="google-dru"
+deviceinfo_year="2018"
+deviceinfo_dtb="rockchip/rk3399-gru-scarlet-kd rockchip/rk3399-gru-scarlet-inx"
+deviceinfo_modules_initfs="gpu-sched elants-i2c sbs-battery"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_chassis="tablet"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1536"
+deviceinfo_screen_height="2048"
+deviceinfo_gpu_accelerated="true"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_kernel_cmdline="console=null"
+deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
+deviceinfo_cgpt_kpart_start="8192"
+deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="dru"
+deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-druwl/APKBUILD

@@ -0,0 +1,38 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Jenneron <jenneron@protonmail.com>
+pkgname=device-google-druwl
+pkgdesc="AOpen Chromebook Commercial Tab / CTL Chromebook Tablet Tx1"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	alsa-ucm-conf-google-gru
+	depthcharge-tools
+	linux-postmarketos-rockchip
+	postmarketos-base
+	postmarketos-update-depthcharge-kernel
+"
+makedepends="devicepkg-dev"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="WiFi/BT and DP firmware"
+	depends="linux-firmware-ath10k linux-firmware-rockchip"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+0e24f9073517f74f0281419df06a0a01fd296df911b8681348a6da0d71e8b282d61c201e10596bd9dfe0e0c36cf923b069535392894951008b51823ce1e43858  deviceinfo
+"

device/testing/device-google-druwl/deviceinfo

@@ -0,0 +1,28 @@
+# 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 Druwl Chromebook tablet"
+deviceinfo_manufacturer="Google"
+deviceinfo_codename="google-druwl"
+deviceinfo_year="2019"
+deviceinfo_dtb="rockchip/rk3399-gru-scarlet-kd rockchip/rk3399-gru-scarlet-inx"
+deviceinfo_modules_initfs="gpu-sched elants-i2c sbs-battery"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_chassis="tablet"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1536"
+deviceinfo_screen_height="2048"
+deviceinfo_gpu_accelerated="true"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_kernel_cmdline="console=null"
+deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
+deviceinfo_cgpt_kpart_start="8192"
+deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="druwl"
+deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-dumo/APKBUILD

@@ -0,0 +1,38 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Jenneron <jenneron@protonmail.com>
+pkgname=device-google-dumo
+pkgdesc="ASUS Chromebook Tablet CT100"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	alsa-ucm-conf-google-gru
+	depthcharge-tools
+	linux-postmarketos-rockchip
+	postmarketos-base
+	postmarketos-update-depthcharge-kernel
+"
+makedepends="devicepkg-dev"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="WiFi/BT and DP firmware"
+	depends="linux-firmware-ath10k linux-firmware-rockchip"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+046dafb336f5c26233cc18169d46d997c4ca1c11ee596c777f928a7367df2dcf1dcff9f67d6dde9f8d137cfcec0b660c29077d38581f8a27482a024e56895519  deviceinfo
+"

device/testing/device-google-dumo/deviceinfo

@@ -0,0 +1,28 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="ASUS Chromebook Tablet CT100"
+deviceinfo_manufacturer="ASUS"
+deviceinfo_codename="google-dumo"
+deviceinfo_year="2019"
+deviceinfo_dtb="rockchip/rk3399-gru-scarlet-dumo"
+deviceinfo_modules_initfs="gpu-sched elants-i2c sbs-battery"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_chassis="tablet"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1536"
+deviceinfo_screen_height="2048"
+deviceinfo_gpu_accelerated="true"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_kernel_cmdline="console=null"
+deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
+deviceinfo_cgpt_kpart_start="8192"
+deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="dumo"
+deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-elm/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-elm
 pkgdesc="Acer Chromebook R13"
-pkgver=1
-pkgrel=2
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -34,5 +34,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-baca81e238cf5d272204f34b0189cb3504421b9fa86022de78c31d8631b929ebfa3e5fbe5262a69952df3d00a0e2da31af40857fdbcf1fe48e4681d25a76ca96  deviceinfo
+c318dbbd023cee698a0fcf32fd994bc88d26d907b5eedd77eb2edab3b252064211738fce0e5e5ecac449a01cf4533b0c40f30617921166899b1a29837ce99090  deviceinfo
 "

device/testing/device-google-elm/deviceinfo

@@ -24,4 +24,5 @@ deviceinfo_kernel_cmdline="console=null"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="elm"
 deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-fennel/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-fennel
 pkgdesc="Lenovo IdeaPad Flex 3 Chromebook (MT8183)"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -70,7 +70,7 @@ kernel_sku7() {
 }
 
 sha512sums="
-e11742515a9820be610be39beb20e8c427fedbc84ca4eee38a21ef90ecc61c85c14f56510d69811336398fdf23ade644264ea4216b367e7a5e40ac249b4d7bea  deviceinfo
+4baf53df10fd495caa6bbc89018518377217f06d0b05dc0a08428e569ce8cccf7f01d7b236885355d4ed7c38079824435a0d02af220ad642c0370c5aa987e47c  deviceinfo
 37f11d243c4ecfd07bfb74e2d34e4c261db3a6aff755bf2dd08dad998de47e511c21082ca0d181e77e093e6f940fc570d8aef87fbc3a73ba55cb9f34b8c510f2  sound.conf.sku1.sku6
 bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf.sku7
 "

device/testing/device-google-fennel/deviceinfo

@@ -27,4 +27,5 @@ deviceinfo_flash_method="none"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="fennel"
 deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-fennel14/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-fennel14
 pkgdesc="Lenovo IdeaPad 3 Chromebook (MT8183)"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -60,7 +60,7 @@ kernel_sku2() {
 }
 
 sha512sums="
-ca56d4b4c3331e232f4bb22ede08ce7ae675db3e3662a1f0bd3e105f4a5892339bf395e49029ccdfc0daa05f2324efdbef45b4f18c8350c5919b1b0de028db73  deviceinfo
+e88e0e58e3d3529c3dbb3ef28345aead4d3250400f80b0f664b43c4185996ee46aebc02218555ba9ca1d493432b572366f0eb6957f6176b1821f6faa767696d9  deviceinfo
 37f11d243c4ecfd07bfb74e2d34e4c261db3a6aff755bf2dd08dad998de47e511c21082ca0d181e77e093e6f940fc570d8aef87fbc3a73ba55cb9f34b8c510f2  sound.conf.sku0
 bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf.sku2
 "

device/testing/device-google-fennel14/deviceinfo

@@ -26,4 +26,5 @@ deviceinfo_flash_method="none"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="fennel14"
 deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-hana/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-hana
 pkgdesc="Google Hana Chromebooks"
-pkgver=1
-pkgrel=2
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,16 +11,13 @@ options="!check !archcheck"
 depends="
 	alsa-utils
 	depthcharge-tools
+	linux-postmarketos-mediatek-mt8173
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel
 "
 makedepends="devicepkg-dev"
 source="deviceinfo"
-subpackages="
-	$pkgname-kernel-hana:kernel_hana
-	$pkgname-kernel-hana-rev7:kernel_hana_rev7
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -30,18 +27,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-kernel_hana() {
-	pkgdesc="Google Hana Rev 1-6"
-	depends="linux-postmarketos-mediatek-mt8173"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_hana_rev7() {
-	pkgdesc="Google Hana Rev 7"
-	depends="linux-postmarketos-mediatek-mt8173"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
 nonfree_firmware() {
 	pkgdesc="WiFi/BT and GPU firmware"
 	depends="linux-firmware-mrvl linux-firmware-mediatek firmware-powervr-gx6250"
@@ -49,5 +34,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-a6bcef8552c7b64d966701b774c91c977a432813af217aa72fd2e2b2378dd93e2290becbf6cd38275e92082157b9757eddd7af606caa69036a5aea113ba4789d  deviceinfo
+86e687aa69807136aeb3c6dc1013c142b4405ac001e9e3e66db21da2912deb517d76593849b747d5f24fddcae586f15a8912a417202ed883266ebc6a749b835d  deviceinfo
 "

device/testing/device-google-hana/deviceinfo

@@ -7,8 +7,7 @@ deviceinfo_name="Google Hana Chromebook"
 deviceinfo_manufacturer="Google"
 deviceinfo_codename="google-hana"
 deviceinfo_year="2017"
-deviceinfo_dtb_hana="mediatek/mt8173-elm-hana"
-deviceinfo_dtb_hana_rev7="mediatek/mt8173-elm-hana-rev7"
+deviceinfo_dtb="mediatek/mt8173-elm-hana mediatek/mt8173-elm-hana-rev7"
 deviceinfo_modules_initfs="hid-i2c-of hid-multitouch elants-i2c elan-i2c elan-i2c-core melfas-mip4 cros-ec-keyb"
 deviceinfo_arch="aarch64"
 
@@ -25,4 +24,5 @@ deviceinfo_kernel_cmdline="console=null"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="hana"
 deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-juniper/APKBUILD

@@ -3,8 +3,8 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-juniper
 pkgdesc="Acer Chromebook Spin 311"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -17,7 +17,6 @@ depends="
 	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
-
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
@@ -43,6 +42,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-f0cdce2360b8d93c4d3d421c524be036450ba35f3eb5dee14d6070ec00e29166c799ecf392c60fd01678a58fb3c773fe12a620a9ce91f4dd18c22335189e9f90  deviceinfo
+c8909d33923fe7c3248aed6f7d4bfa3aae29fd269a9155f5379803213a6d4d8f3f4a3427a6ea5336ba4907bcbed80b8a85819eaca525b7bca6262a1a8cbb78aa  deviceinfo
 bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf
 "

device/testing/device-google-juniper/deviceinfo

@@ -25,4 +25,5 @@ deviceinfo_flash_method="none"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="juniper"
 deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-kakadu/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-kakadu
 pkgdesc="ASUS Chromebook Detachable CM3 (CM3000)"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -60,7 +60,7 @@ kernel_kakadu_sku22() {
 }
 
 sha512sums="
-09507acaa2ae9dc7a33ed5d75bc5dd7ace1bbba5267a68e9d9c29f3a8c5cd902d9b96196ce820a7ca0f71a1d38c0f3b8d762951b029493f888f4baf2458547c7  deviceinfo
+973065514b393e318b782e920ce6469ce9e28afe30db205a8108adbd32fb5c5386a641da3c7568edc55c06bfc3e1fe95f5a60c07f6b53a97234de78d646d19cf  deviceinfo
 37f11d243c4ecfd07bfb74e2d34e4c261db3a6aff755bf2dd08dad998de47e511c21082ca0d181e77e093e6f940fc570d8aef87fbc3a73ba55cb9f34b8c510f2  sound.conf
 bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf.sku22
 "

device/testing/device-google-kakadu/deviceinfo

@@ -26,4 +26,5 @@ deviceinfo_flash_method="none"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="kakadu"
 deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-kappa/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-kappa
 pkgdesc="HP Chromebook 11a"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -41,6 +41,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-a61e3482fb7ddac2e7f032630a24b6e54951c680227387b2d5c9295e1e743218185434ede169b5b4cc1798f451cc5994e5b7d2c8e1aa86964876d13ae4e40375  deviceinfo
+caf3c6f16a4fb085c6261842b91eb27b20afb01bbb2999de0daf56d973a323d07fe0713cecf152a6616e60232174ccd7d9f27ae988ff5e6398faa7396e00b2b2  deviceinfo
 bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf
 "

device/testing/device-google-kappa/deviceinfo

@@ -25,4 +25,5 @@ deviceinfo_flash_method="none"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="kappa"
 deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-kenzo/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-kenzo
 pkgdesc="Acer Chromebook 311 (CB311-11H / CB311-11HT)"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -41,6 +41,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-4cb67b7d6603a100e1888e161668f82251b78c2a695ba433d7b9a6ce33f27b552764649786b46d5c3b458b1af86096e7b89a09ea79be417d6753f595fcac6633  deviceinfo
+9254f78c303b25480f619b9530b4ea7f3a8107049c25fad4a560c05cbe886af499eb0f695045265c653ff5bdc57d681b7291283716dd806c3386e3550987231b  deviceinfo
 bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf
 "

device/testing/device-google-kenzo/deviceinfo

@@ -25,4 +25,5 @@ deviceinfo_flash_method="none"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="kenzo"
 deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-kevin/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-kevin
 pkgdesc="Samsung Chromebook Plus"
-pkgver=1
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -54,7 +54,7 @@ phosh() {
 }
 
 sha512sums="
-89aa4e11906a99af3c0b6606c085cc8d4ac16d92d108aae0ca29f077215e61aed126f0e8c9a223807c5145efc51b9adfe9c242af8af6d23b54549aaac602a435  deviceinfo
+c6580a56b36f587cd25c913cc5f8cc9af3d4401d2925055ebf65d8370cfe1360bf34c9a9a0169eececc6d5d194cb97ea884133ee1e4fe6fa717f401be8f3b49d  deviceinfo
 e8186b97016b49f810cce60c1c08d703ae0d91c25f776ed804f20f3f5e477693086c83a1ec5849a6cb5c9f0f2503b88d5fcac7c68ff0d6018812e43557839808  phoc.ini
 1ba29c50747458b68ed98706c008cfaeea9eff56d2977a23e060f3a9fcf306c9d62d162e2906472d24a6c25596af95e26722c6b55ca97a031b2d5c8db2661390  accel.conf
 926b662d7836046c7be53e75cf05989d6ab12296f1ad0fea61f7718adb360abbd4cf96666e9e154526a1fe179ce5b08391d85d01a4b17fca37b6615d2e6b3b0d  pointercal

device/testing/device-google-kevin/deviceinfo

@@ -25,4 +25,6 @@ deviceinfo_kernel_cmdline="console=null"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="kevin"
 deviceinfo_generate_depthcharge_image="true"
+deviceinfo_generate_extlinux_config="true"

device/testing/device-google-kodama/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-kodama
 pkgdesc="Lenovo 10e Chromebook Tablet"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,6 +11,7 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-kukui
 	depthcharge-tools
+	linux-postmarketos-mediatek-mt8183
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
@@ -20,13 +21,7 @@ source="
 	deviceinfo
 	modules-load.d/sound.conf
 "
-subpackages="
-	$pkgname-kernel-sku16:kernel_sku16
-	$pkgname-kernel-sku32:kernel_sku32
-	$pkgname-kernel-sku272:kernel_sku272
-	$pkgname-kernel-sku288:kernel_sku288
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -45,31 +40,7 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-kernel_sku16() {
-	pkgdesc="Google Kodama Sku 16"
-	depends="linux-postmarketos-mediatek-mt8183"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_sku32() {
-	pkgdesc="Google Kodama Sku 32"
-	depends="linux-postmarketos-mediatek-mt8183"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_sku272() {
-	pkgdesc="Google Kodama Sku 272"
-	depends="linux-postmarketos-mediatek-mt8183"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_sku288() {
-	pkgdesc="Google Kodama Sku 288"
-	depends="linux-postmarketos-mediatek-mt8183"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
 sha512sums="
-8cd59c8d3fb45fbd5e4520dfb01c037e273b264090550f479dab1622f594cf715563945f82ba08c97da455ca0e749aaeab27c45a5d366d08ab24a7077465b262  deviceinfo
+78a2288faf43dc60c6c236bb91ef479cff42d7441dadccc67bc35a83dded4c21f082e49851ad7d68dc8b2c8a3002d4a0e1acfb39a506da5ee702e48c6c3141cd  deviceinfo
 bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf
 "

device/testing/device-google-kodama/deviceinfo

@@ -7,10 +7,7 @@ deviceinfo_name="Lenovo 10e Chromebook Tablet"
 deviceinfo_manufacturer="Lenovo"
 deviceinfo_codename="google-kodama"
 deviceinfo_year="2020"
-deviceinfo_dtb_sku16="mediatek/mt8183-kukui-kodama-sku16"
-deviceinfo_dtb_sku32="mediatek/mt8183-kukui-kodama-sku32"
-deviceinfo_dtb_sku272="mediatek/mt8183-kukui-kodama-sku272"
-deviceinfo_dtb_sku288="mediatek/mt8183-kukui-kodama-sku288"
+deviceinfo_dtb="mediatek/mt8183-kukui-kodama-sku16 mediatek/mt8183-kukui-kodama-sku32 mediatek/mt8183-kukui-kodama-sku272 mediatek/mt8183-kukui-kodama-sku288"
 deviceinfo_modules_initfs="gpu-sched i2c-hid-of hid-multitouch cros-ec-keyb sbs-battery"
 deviceinfo_arch="aarch64"
 
@@ -28,4 +25,5 @@ deviceinfo_flash_method="none"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="kodama"
 deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-krane/APKBUILD

@@ -3,8 +3,8 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-krane
 pkgdesc="Lenovo IdeaPad Duet Chromebook"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,6 +12,7 @@ options="!check !archcheck"
 depends="
 	alsa-ucm-conf-google-kukui
 	depthcharge-tools
+	linux-postmarketos-mediatek-mt8183
 	postmarketos-base
 	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
@@ -21,11 +22,7 @@ source="
 	deviceinfo
 	modules-load.d/sound.conf
 "
-subpackages="
-	$pkgname-kernel-sku0:kernel_sku0
-	$pkgname-kernel-sku176:kernel_sku176
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -44,20 +41,7 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-kernel_sku0() {
-	pkgdesc="Google Krane Sku 0"
-	depends="linux-postmarketos-mediatek-mt8183"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_sku176() {
-	pkgdesc="Google Krane Sku 176"
-	depends="linux-postmarketos-mediatek-mt8183"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-
 sha512sums="
-9f54b26fbbb4184dc54727b767b7756ce98bd409e2fbf8566e3d484eadd37b0e99d6383099e29af7d14905756f88b4f14c45d0fe2fd138be37405745c7a8bb34  deviceinfo
+3cee30adc42daa052e0cca078c5cdad5b936fb639d240b747382b7c0e4c2a184578cbdf097c24cb792f500e414ee92dc614c7f7fc30ae28aeb8d625639d03542  deviceinfo
 bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf
 "

device/testing/device-google-krane/deviceinfo

@@ -7,8 +7,7 @@ deviceinfo_name="Lenovo IdeaPad Duet Chromebook"
 deviceinfo_manufacturer="Lenovo"
 deviceinfo_codename="google-krane"
 deviceinfo_year="2020"
-deviceinfo_dtb_sku0="mediatek/mt8183-kukui-krane-sku0"
-deviceinfo_dtb_sku176="mediatek/mt8183-kukui-krane-sku176"
+deviceinfo_dtb="mediatek/mt8183-kukui-krane-sku0 mediatek/mt8183-kukui-krane-sku176"
 deviceinfo_modules_initfs="gpu-sched i2c-hid-of hid-multitouch cros-ec-keyb sbs-battery"
 deviceinfo_arch="aarch64"
 
@@ -26,4 +25,5 @@ deviceinfo_flash_method="none"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="krane"
 deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-spring/APKBUILD

@@ -0,0 +1,37 @@
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-google-spring
+pkgdesc="HP Chromebook 11 G1"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	alsa-ucm-conf
+	depthcharge-tools
+	postmarketos-base
+	linux-postmarketos-exynos5
+	postmarketos-update-depthcharge-kernel
+"
+makedepends="devicepkg-dev"
+source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="WiFi/BT and MFC firmware"
+	depends="linux-firmware-mrvl linux-firmware-other"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+57cebf5aba84ff095bb65d789e33b2e9108ce17af0961273469133396b9f3cab2c253017887e3a0ed446b32ac97bff39fa95e3c566609006a3a05295591e0e2f  deviceinfo
+"

device/testing/device-google-spring/deviceinfo

@@ -0,0 +1,28 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="HP Chromebook 11 G1"
+deviceinfo_manufacturer="HP"
+deviceinfo_codename="google-spring"
+deviceinfo_year="2013"
+deviceinfo_dtb="exynos5250-spring"
+deviceinfo_modules_initfs="drm-dp-aux-bus panel-edp drm-kms-helper atmel-mxt-ts cros-ec-keyb sbs-battery tps65090-charger"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="laptop"
+deviceinfo_keyboard="true"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1366"
+deviceinfo_screen_height="768"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_kernel_cmdline="console=tty1 PMOS_NOSPLASH"
+deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
+deviceinfo_cgpt_kpart_start="8192"
+deviceinfo_cgpt_kpart_size="16384"
+deviceinfo_depthcharge_board="spring"
+deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-veyron-fievel/APKBUILD

@@ -0,0 +1,38 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Jenneron <jenneron@protonmail.com>
+pkgname=device-google-veyron-fievel
+pkgdesc="AOpen Chromebox Mini"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	alsa-ucm-conf
+	depthcharge-tools
+	linux-google-veyron
+	postmarketos-base
+	postmarketos-update-depthcharge-kernel
+"
+makedepends="devicepkg-dev"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="WiFi/BT firmware"
+	depends="linux-firmware-mrvl"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+4433ea8b17be4300846ddd801c7f6076cebd80186f59f5688e78c1e309d71f6f8f778ea5bc30dd2b4224c1e65d96f745e8f7efaca4795a76cc51a8615eeb9802  deviceinfo
+"

device/testing/device-google-veyron-fievel/deviceinfo

@@ -0,0 +1,29 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="AOpen Chromebox Mini"
+deviceinfo_manufacturer="AOpen"
+deviceinfo_codename="google-veyron-fievel"
+deviceinfo_year="2017"
+deviceinfo_dtb="rk3288-veyron-fievel"
+deviceinfo_modules_initfs="panel_simple pwm_bl rockchipdrm dw_mipi_dsi drm_kms_helper gpu_sched phy_rockchip_dp pwm_rockchip dw_wdt videobuf2_dma_sg analogix_dp drm-dp-aux-bus panel-edp gpio-charger cros-ec cros-ec-spi sbs-battery cros-ec-keyb"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="desktop"
+deviceinfo_keyboard="true"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="800"
+deviceinfo_screen_height="600"
+deviceinfo_gpu_accelerated="true"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_kernel_cmdline="console=null"
+deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
+deviceinfo_cgpt_kpart_start="24576"
+deviceinfo_cgpt_kpart_size="32768"
+deviceinfo_depthcharge_board="fievel"
+deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-veyron-jaq/APKBUILD

@@ -0,0 +1,38 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Jenneron <jenneron@protonmail.com>
+pkgname=device-google-veyron-jaq
+pkgdesc="Google Veyron Jaq Chromebooks"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	alsa-ucm-conf
+	depthcharge-tools
+	linux-google-veyron
+	postmarketos-base
+	postmarketos-update-depthcharge-kernel
+"
+makedepends="devicepkg-dev"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="WiFi/BT firmware"
+	depends="linux-firmware-mrvl"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+d8d46836b2e26b6fc9c070d044a135a499809e62a6f52da6c439d265e4051505307251c1386e57228bef87fbd111b4b3896433eb65f39dfa66134ac9e5b3f4e2  deviceinfo
+"

device/testing/device-google-veyron-jaq/deviceinfo

@@ -0,0 +1,29 @@
+# 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 Veyron Jaq Chromebook"
+deviceinfo_manufacturer="Google"
+deviceinfo_codename="google-veyron-jaq"
+deviceinfo_year="2014"
+deviceinfo_dtb="rk3288-veyron-jaq"
+deviceinfo_modules_initfs="panel_simple pwm_bl rockchipdrm dw_mipi_dsi drm_kms_helper gpu_sched phy_rockchip_dp pwm_rockchip dw_wdt videobuf2_dma_sg analogix_dp drm-dp-aux-bus panel-edp gpio-charger cros-ec cros-ec-spi sbs-battery cros-ec-keyb"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="laptop"
+deviceinfo_keyboard="true"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1366"
+deviceinfo_screen_height="768"
+deviceinfo_gpu_accelerated="true"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_kernel_cmdline="console=null"
+deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
+deviceinfo_cgpt_kpart_start="24576"
+deviceinfo_cgpt_kpart_size="32768"
+deviceinfo_depthcharge_board="jaq"
+deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-veyron-mickey/APKBUILD

@@ -0,0 +1,38 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Jenneron <jenneron@protonmail.com>
+pkgname=device-google-veyron-mickey
+pkgdesc="ASUS Chromebit CS10"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	alsa-ucm-conf
+	depthcharge-tools
+	linux-google-veyron
+	postmarketos-base
+	postmarketos-update-depthcharge-kernel
+"
+makedepends="devicepkg-dev"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="WiFi/BT firmware"
+	depends="firmware-google-veyron-brcm"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+31254c8c606dd450db0ea159cd7c3ae13e7be2a8f03f7fb990f03aa5aa9e180d822770766cfdd51429f2cbfc9a98051e598efa80396e8c613513fac71eae98ea  deviceinfo
+"

device/testing/device-google-veyron-mickey/deviceinfo

@@ -0,0 +1,29 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="ASUS Chromebit CS10"
+deviceinfo_manufacturer="ASUS"
+deviceinfo_codename="google-veyron-mickey"
+deviceinfo_year="2015"
+deviceinfo_dtb="rk3288-veyron-mickey"
+deviceinfo_modules_initfs="panel_simple pwm_bl rockchipdrm dw_mipi_dsi drm_kms_helper gpu_sched phy_rockchip_dp pwm_rockchip dw_wdt videobuf2_dma_sg analogix_dp drm-dp-aux-bus panel-edp gpio-charger cros-ec cros-ec-spi sbs-battery cros-ec-keyb"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="desktop"
+deviceinfo_keyboard="true"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="800"
+deviceinfo_screen_height="600"
+deviceinfo_gpu_accelerated="true"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_kernel_cmdline="console=null"
+deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
+deviceinfo_cgpt_kpart_start="24576"
+deviceinfo_cgpt_kpart_size="32768"
+deviceinfo_depthcharge_board="mickey"
+deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-veyron-mighty/APKBUILD

@@ -0,0 +1,38 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Jenneron <jenneron@protonmail.com>
+pkgname=device-google-veyron-mighty
+pkgdesc="Google Veyron Mighty Chromebooks"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	alsa-ucm-conf
+	depthcharge-tools
+	linux-google-veyron
+	postmarketos-base
+	postmarketos-update-depthcharge-kernel
+"
+makedepends="devicepkg-dev"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="WiFi/BT firmware"
+	depends="linux-firmware-mrvl"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+5ca1b1cae646ed6582d37efd20c9c0be5b9c71f4fd42c2c4320b27678489ce466b4a3c51ee46ae4b3643979f4ea176b6745f9a1adc236448395463baf2537284  deviceinfo
+"

device/testing/device-google-veyron-mighty/deviceinfo

@@ -0,0 +1,29 @@
+# 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 Veyron Mighty Chromebook"
+deviceinfo_manufacturer="Google"
+deviceinfo_codename="google-veyron-mighty"
+deviceinfo_year="2016"
+deviceinfo_dtb="rk3288-veyron-mighty"
+deviceinfo_modules_initfs="panel_simple pwm_bl rockchipdrm dw_mipi_dsi drm_kms_helper gpu_sched phy_rockchip_dp pwm_rockchip dw_wdt videobuf2_dma_sg analogix_dp drm-dp-aux-bus panel-edp gpio-charger cros-ec cros-ec-spi sbs-battery cros-ec-keyb"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="laptop"
+deviceinfo_keyboard="true"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1366"
+deviceinfo_screen_height="768"
+deviceinfo_gpu_accelerated="true"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_kernel_cmdline="console=null"
+deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
+deviceinfo_cgpt_kpart_start="24576"
+deviceinfo_cgpt_kpart_size="32768"
+deviceinfo_depthcharge_board="mighty"
+deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-veyron-minnie/APKBUILD

@@ -3,62 +3,35 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-veyron-minnie
 pkgdesc="ASUS Chromebook Flip C100"
-pkgver=3
+pkgver=4
 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"
+options="!check !archcheck"
 depends="
 	alsa-ucm-conf>=1.2.7.1-r0
+	depthcharge-tools
 	linux-google-veyron
-	u-boot-veyron-minnie
 	postmarketos-base
+	postmarketos-update-depthcharge-kernel
 "
 subpackages="
 	$pkgname-i3wm
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-phosh
 "
-makedepends="devicepkg-dev grub grub-efi"
+makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	i3wm/xorg.conf.d/90-tap-to-click.conf
-	grub.cfg
 	phoc.ini
 	pointercal
 "
 
-build() {
-	devicepkg_build $startdir $pkgname
-
-	grub-mkimage \
-		--prefix="/grub" \
-		--output="bootarm.efi" \
-		--format="arm-efi" \
-		--compression="xz" \
-		\
-		all_video \
-		disk \
-		efi_gop \
-		fat \
-		gzio \
-		iso9660 \
-		linux \
-		normal \
-		part_gpt \
-		part_msdos
-}
-
 package() {
 	devicepkg_package $startdir $pkgname
 
-	install -D "$srcdir"/grub.cfg \
-		"$pkgdir"/boot/grub/grub.cfg
-	install -D "$srcdir"/bootarm.efi \
-		"$pkgdir"/boot/EFI/Boot/bootarm.efi
-
 	install -Dm644 "$srcdir"/pointercal \
 		"$pkgdir"/etc/pointercal
 }
@@ -83,9 +56,8 @@ phosh() {
 }
 
 sha512sums="
-d41d4e356cb8723a5cb5d3bd7f221f0892bc0d8a5b7daece67058f8308a7edd9ca8ac16a1305b4667b2964ec5685d7dadbf2a96f4ea81789f8a885a4ec6f3525  deviceinfo
+150b9cb7c5fad3542c7786c540c9aaa325f73081828e7021d2067accaa056fc7ba69cdb4f675f18f0ee9ea850109612664809148a95655022f7bd149267c1a10  deviceinfo
 e53ca475830930ecfc1fd537702e850e2abcb66fbed521cb6c3a2918d762649254bd0244ec93a47b20dfc593ec3afc9bdebdec1759a7bc96dcbe4800f40893da  90-tap-to-click.conf
-21624192f017b03ce0619deab6eb743592b7dd12dc4e288068c7354e887169e2a4cb3b2f069e95728ec4dfa3d5304a031a961cb247b4efc3ee31a4ce6a08f505  grub.cfg
 bd63cfc97d37e81dd9559dad60f330c10dc280afd20081495c6302960fcacf32954e3edab53294fcd5278e86c53c47a95b345a8d9e18807d88fe4313d519d259  phoc.ini
 754eb3c09aadf552aaea3ade7cddf737769f800ddeafbf0665b61141397a58bea4595652ec3d7d1803863257cd163114a330f040a3f2352051b2215f7efa46a6  pointercal
 "

device/testing/device-google-veyron-minnie/deviceinfo

@@ -8,6 +8,7 @@ deviceinfo_manufacturer="ASUS"
 deviceinfo_codename="google-veyron-minnie"
 deviceinfo_year="2015"
 deviceinfo_arch="armv7"
+deviceinfo_dtb="rk3288-veyron-minnie"
 deviceinfo_modules_initfs="pwm-bl rockchipdrm dw-mipi-dsi drm-kms-helper gpu-sched phy-rockchip-dp pwm-rockchip dw-wdt videobuf2-dma-sg analogix-dp drm-dp-aux-bus panel-edp gpio-charger sbs-battery cros-ec cros-ec-spi cros-ec-keyb elants-i2c"
 
 # Device related
@@ -20,7 +21,10 @@ deviceinfo_gpu_accelerated="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_boot_filesystem="fat32"
-deviceinfo_cgpt_kpart="/usr/share/u-boot/google-veyron-minnie/u-boot-dtb.img.kpart"
+deviceinfo_kernel_cmdline="console=null"
+deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="24576"
 deviceinfo_cgpt_kpart_size="32768"
+deviceinfo_depthcharge_board="minnie"
+deviceinfo_generate_depthcharge_image="true"
+deviceinfo_generate_extlinux_config="true"

device/testing/device-google-veyron-minnie/grub.cfg

@@ -1,7 +0,0 @@
-timeout=0
-
-menuentry "postmarketOS" {
-	linux /vmlinuz console=null
-	initrd /initramfs
-	devicetree /dtbs/rk3288-veyron-minnie.dtb
-}

device/testing/device-google-veyron-speedy/APKBUILD

@@ -2,60 +2,33 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-veyron-speedy
 pkgdesc="ASUS Chromebook C201"
-pkgver=3
+pkgver=4
 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"
+options="!check !archcheck"
 depends="
 	alsa-ucm-conf>=1.2.7.1-r0
+	depthcharge-tools
 	linux-google-veyron
-	u-boot-veyron-speedy
 	postmarketos-base
+	postmarketos-update-depthcharge-kernel
 "
 subpackages="
 	$pkgname-i3wm
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-phosh
 "
-makedepends="devicepkg-dev grub grub-efi"
+makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	i3wm/xorg.conf.d/90-tap-to-click.conf
-	grub.cfg
 	phoc.ini
 "
 
-build() {
-	devicepkg_build $startdir $pkgname
-
-	grub-mkimage \
-		--prefix="/grub" \
-		--output="bootarm.efi" \
-		--format="arm-efi" \
-		--compression="xz" \
-		\
-		all_video \
-		disk \
-		efi_gop \
-		fat \
-		gzio \
-		iso9660 \
-		linux \
-		normal \
-		part_gpt \
-		part_msdos
-}
-
 package() {
 	devicepkg_package $startdir $pkgname
-
-	install -D "$srcdir"/grub.cfg \
-		"$pkgdir"/boot/grub/grub.cfg
-	install -D "$srcdir"/bootarm.efi \
-		"$pkgdir"/boot/EFI/Boot/bootarm.efi
 }
 
 # The only way to right click on this device
@@ -78,8 +51,7 @@ phosh() {
 }
 
 sha512sums="
-104a29143e44713c28ef576c96f3ae856041fd2e05dbff0505fcc85da3a1931f79e6854fbc9dd3e48182d08bb152194d1e4077d1c6a05fda3b10928c8b2bb789  deviceinfo
+a4a5f381ae311ca167ca22fbe184bd3f281a47b48972c6df8916d93740e7da05b2cfe2b18c23af4b9433b3b5eed9c8cd58ca399e44aed1b02ef11734d42b971a  deviceinfo
 e53ca475830930ecfc1fd537702e850e2abcb66fbed521cb6c3a2918d762649254bd0244ec93a47b20dfc593ec3afc9bdebdec1759a7bc96dcbe4800f40893da  90-tap-to-click.conf
-8c40a36932830871dcc406efc35fc7535c834ece0a0540cd0af6b57795b9ed0aff7d41d765ef83b38c1bcd3f215827244b9d74bc29e65f33dc1dafc96416ceeb  grub.cfg
 bd63cfc97d37e81dd9559dad60f330c10dc280afd20081495c6302960fcacf32954e3edab53294fcd5278e86c53c47a95b345a8d9e18807d88fe4313d519d259  phoc.ini
 "

device/testing/device-google-veyron-speedy/deviceinfo

@@ -8,6 +8,7 @@ deviceinfo_manufacturer="ASUS"
 deviceinfo_codename="google-veyron-speedy"
 deviceinfo_year="2015"
 deviceinfo_arch="armv7"
+deviceinfo_dtb="rk3288-veyron-speedy"
 deviceinfo_modules_initfs="pwm-bl rockchipdrm dw-mipi-dsi drm-kms-helper gpu-sched phy-rockchip-dp pwm-rockchip dw-wdt videobuf2-dma-sg analogix-dp drm-dp-aux-bus panel-edp gpio-charger sbs-battery cros-ec cros-ec-spi cros-ec-keyb"
 
 # Device related
@@ -20,7 +21,10 @@ deviceinfo_gpu_accelerated="true"
 
 # Bootloader related
 deviceinfo_flash_method="none"
-deviceinfo_boot_filesystem="fat32"
-deviceinfo_cgpt_kpart="/usr/share/u-boot/google-veyron-speedy/u-boot-dtb.img.kpart"
+deviceinfo_kernel_cmdline="console=null"
+deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="24576"
 deviceinfo_cgpt_kpart_size="32768"
+deviceinfo_depthcharge_board="speedy"
+deviceinfo_generate_depthcharge_image="true"
+deviceinfo_generate_extlinux_config="true"

device/testing/device-google-veyron-speedy/grub.cfg

@@ -1,7 +0,0 @@
-timeout=0
-
-menuentry "postmarketOS" {
-	linux /vmlinuz console=null
-	initrd /initramfs
-	devicetree /dtbs/rk3288-veyron-speedy.dtb
-}

device/testing/device-google-veyron-tiger/APKBUILD

@@ -0,0 +1,38 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Jenneron <jenneron@protonmail.com>
+pkgname=device-google-veyron-tiger
+pkgdesc="AOpen Chromebase Mini"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	alsa-ucm-conf
+	depthcharge-tools
+	linux-google-veyron
+	postmarketos-base
+	postmarketos-update-depthcharge-kernel
+"
+makedepends="devicepkg-dev"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="WiFi/BT firmware"
+	depends="linux-firmware-mrvl"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="
+c10385a205ce9902057ceee1871a5f259d44be157498428368286d48c7556021ab2abfe7b2f88e89775ac32bcc26d3073dcec59cb42dd1d69fa1d366f5779b70  deviceinfo
+"

device/testing/device-google-veyron-tiger/deviceinfo

@@ -0,0 +1,29 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="AOpen Chromebase Mini"
+deviceinfo_manufacturer="AOpen"
+deviceinfo_codename="google-veyron-tiger"
+deviceinfo_year="2017"
+deviceinfo_dtb="rk3288-veyron-tiger"
+deviceinfo_modules_initfs="panel_simple pwm_bl rockchipdrm dw_mipi_dsi drm_kms_helper gpu_sched phy_rockchip_dp pwm_rockchip dw_wdt videobuf2_dma_sg analogix_dp drm-dp-aux-bus panel-edp gpio-charger cros-ec cros-ec-spi sbs-battery cros-ec-keyb"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="desktop"
+deviceinfo_keyboard="true"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="800"
+deviceinfo_screen_height="600"
+deviceinfo_gpu_accelerated="true"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_kernel_cmdline="console=null"
+deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
+deviceinfo_cgpt_kpart_start="24576"
+deviceinfo_cgpt_kpart_size="32768"
+deviceinfo_depthcharge_board="tiger"
+deviceinfo_generate_depthcharge_image="true"

device/testing/device-google-willow/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=device-google-willow
 pkgdesc="Acer Chromebook 311 (C722/C722T)"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -60,7 +60,7 @@ kernel_sku1() {
 }
 
 sha512sums="
-3f36890256150756686085c1de922827d621f402f525eb7a28cc522e24fcf521b740cbe8436a20f6e982647a7060401077beac3a2e3e23f9a61a893e8751687e  deviceinfo
+a19ddaeb4922df889b851d248a4ac1b3ce7d473b4d67317c8cf20d7a2b655bc17e3c03e2629eaa5c163d7421bce68dc6843a0985d2c9bbd7916eb1806adf436d  deviceinfo
 37f11d243c4ecfd07bfb74e2d34e4c261db3a6aff755bf2dd08dad998de47e511c21082ca0d181e77e093e6f940fc570d8aef87fbc3a73ba55cb9f34b8c510f2  sound.conf.sku0
 bdf45461873b9754bc91d7f72afd6cef1aa6e523ead0a7816c8976ed98ff2d39b66c53dba2f2d92e36162c092360d1524845f27160f6af2bb010cd3259d5b7ed  sound.conf.sku1
 "

device/testing/device-google-willow/deviceinfo

@@ -26,4 +26,5 @@ deviceinfo_flash_method="none"
 deviceinfo_cgpt_kpart="/boot/vmlinuz.kpart"
 deviceinfo_cgpt_kpart_start="8192"
 deviceinfo_cgpt_kpart_size="65536"
+deviceinfo_depthcharge_board="willow"
 deviceinfo_generate_depthcharge_image="true"

device/testing/device-kobo-librah2o/APKBUILD

@@ -0,0 +1,38 @@
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-kobo-librah2o
+pkgdesc="Kobo Libra H2O"
+pkgver=0.1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	kobo-epdc-extractor
+	linux-kobo-clara-mainline
+	postmarketos-base
+	u-boot-kobo-librah2o
+	u-boot-tools
+"
+makedepends="devicepkg-dev"
+
+source="
+	deviceinfo
+	uboot-script.cmd
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+	mkimage -A arm -O linux -T script -n postmarketOS \
+		-d "$srcdir/uboot-script.cmd" "$srcdir/boot.scr"
+	install -Dm644 "$srcdir/boot.scr" "$pkgdir/boot/boot.scr"
+}
+
+sha512sums="
+0365f6c88c15f9d99d00c28d45144bf0321a8484fbf44b491cbe1493643180f1fcd5192d42991073d771be17eae2ec0a8b6826018e9ffb68e530fad11f02b96c  deviceinfo
+778674f41c19c56ed8677f151175d22da53e94e03c48d900036287b17a37ba9816976138ad317ec220d807a6ff97ca1006c6ae73c39801929f23927e665f35df  uboot-script.cmd
+"

device/testing/device-kobo-librah2o/deviceinfo

@@ -0,0 +1,29 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Kobo Libra H2O"
+deviceinfo_manufacturer="Kobo"
+deviceinfo_codename="kobo-librah2o"
+deviceinfo_year="2019"
+deviceinfo_arch="armv7"
+deviceinfo_dtb="imx6sll-kobo-librah2o"
+
+# Device related
+deviceinfo_chassis="tablet"
+deviceinfo_keyboard="false"
+# eMMC can be exported as mass storage
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1264"
+deviceinfo_screen_height="1680"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_boot_part_start="49152"
+deviceinfo_getty="ttymxc0;115200"
+deviceinfo_generate_legacy_uboot_initfs="true"
+deviceinfo_no_framebuffer="true"
+
+deviceinfo_sd_embed_firmware_step_size="512"
+deviceinfo_sd_embed_firmware="u-boot/kobo-librah2o/u-boot.imx:2,u-boot/kobo-librah2o/u-boot-env.bin:1536"