cross/busybox-static-aarch64/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=busybox-static-aarch64
 pkgver=1.31.1
-pkgrel=13
+pkgrel=14
 
 _arch="aarch64"
 _mirror="http://dl-cdn.alpinelinux.org/alpine/"
@@ -26,4 +26,4 @@ package() {
     rm .PKGINFO .SIGN.*
 }
 
-sha512sums="4a3dd5607bfd131e111580820eaaa5e0fff808e169e01cf8a665aa118a2e9274a8129709737a89eaa478625ab9c77db6a0c5af1ad7b99c016f95d0f3bcc286a3  busybox-static-1.31.1-r13-aarch64.apk"
+sha512sums="d8b821b9f03837fde107cd6b4260b339c57c532d0c643d4bdf142c2cc33248029023238240a863117deed1ea3cb4531f51cbad0de4767f44801ce18cef4b3475  busybox-static-1.31.1-r14-aarch64.apk"

cross/busybox-static-armhf/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=busybox-static-armhf
 pkgver=1.31.1
-pkgrel=13
+pkgrel=14
 
 _arch="armhf"
 _mirror="http://dl-cdn.alpinelinux.org/alpine/"
@@ -26,4 +26,4 @@ package() {
     rm .PKGINFO .SIGN.*
 }
 
-sha512sums="95097f79353c2f7e5cf03829379e091d84e041f667c5dc21c8a6a06dbd15a8caf82141fb8aa5e6bd7b6353344b28b5e7d104d13b5c93c8b37aa69010bcae1a95  busybox-static-1.31.1-r13-armhf.apk"
+sha512sums="ceeb5786a2ca8a904dece9b9b3132e883c03eeb216b9343def3faa2a0d64a4744ee359f991730c531859ed7e82baa88a9f95349265735ac6e1c539f28adf668e  busybox-static-1.31.1-r14-armhf.apk"

cross/busybox-static-armv7/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=busybox-static-armv7
 pkgver=1.31.1
-pkgrel=13
+pkgrel=14
 
 _arch="armv7"
 _mirror="http://dl-cdn.alpinelinux.org/alpine/"
@@ -26,4 +26,4 @@ package() {
     rm .PKGINFO .SIGN.*
 }
 
-sha512sums="2a341fb8941e6da61e9cc2dd67c4257ab0df1c7b11e43285143f95d1186f4e412949d0820847c5fd577ff0a18c78b3560f82134f979811c558ccf5c33cc0d3bb  busybox-static-1.31.1-r13-armv7.apk"
+sha512sums="7c5053f6eb683917708b36fc255630386e9b6e6deb265ee44bdcb7fdd272a54a0b9d0d589355f454bacdd6be75ebe5eeec9e0650d90e403c81c080204d422a59  busybox-static-1.31.1-r14-armv7.apk"

cross/gcc-aarch64/405-dlang-mips.patch

+--- gcc-9.3.0.orig/libphobos/libdruntime/core/sys/posix/fcntl.d
++++ gcc-9.3.0/libphobos/libdruntime/core/sys/posix/fcntl.d
+@@ -870,6 +870,21 @@
+             F_SETLKW       = 7,
+         }
+     }
++    else version (MIPS_Any)
++    {
++        enum 
++        {
++            O_DIRECTORY     = 0x010000, // octal   0200000
++            O_NOFOLLOW      = 0x020000, // octal   0400000
++            O_DIRECT        = 0x008000, // octal   0100000
++            O_LARGEFILE     = 0x002000, // octal   0020000
++            O_TMPFILE       = 0x410000, // octal 020200000
++
++            F_GETLK        = 33,
++            F_SETLK        = 34,
++            F_SETLKW       = 35,
++        }
++    }
+     else
+         static assert(0, "Platform not supported");
+ 
+--- gcc-9.3.0.orig/libphobos/configure.tgt
++++ gcc-9.3.0/libphobos/configure.tgt
+@@ -38,6 +38,7 @@
+ 	;;
+   mips*-*-linux*)
+ 	LIBPHOBOS_SUPPORTED=yes
++	LIBDRUNTIME_NEEDS_UCONTEXT=yes
+ 	;;
+   riscv*-*-linux*)
+ 	LIBPHOBOS_SUPPORTED=yes

cross/gcc-aarch64/APKBUILD

@@ -30,7 +30,7 @@ pkgver=9.3.0
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname="gcc-aarch64"
-pkgrel=0
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -117,11 +117,6 @@ fi
 # See libphobos/configure.tgt in GCC sources for supported targets
 [ "$CARCH" = ppc64le ] && LANG_D=false
 
-# GDC requires libucontext on mips, which is not yet available
-case "$CTARGET_ARCH" in
-mips*)		LANG_D=false ;;
-esac
-
 # Go needs {set,make,swap}context, unimplemented in musl
 [ "$CTARGET_LIBC" = musl ] && LANG_GO=false
 
@@ -155,7 +150,7 @@ fi
 if $LANG_D; then
 	subpackages="$subpackages libgphobos::$CTARGET_ARCH gcc-gdc$_target:gdc"
 	_languages="$_languages,d"
-	[ "$CTARGET_ARCH" == "s390x" ] && makedepends_build="$makedepends_build libucontext-dev"
+	makedepends_build="$makedepends_build libucontext-dev"
 fi
 if $LANG_OBJC; then
 	subpackages="$subpackages libobjc::$CTARGET_ARCH gcc-objc$_target:objc"
@@ -218,6 +213,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	402-dlang-stat.patch
 	403-dlang-ibmz.patch
 	404-dlang-zlib.patch
+	405-dlang-mips.patch
 	"
 
 #	gcc-4.8-build-args.patch
@@ -527,7 +523,7 @@ libgphobos() {
 gdc() {
 	pkgdesc="GCC-based D language compiler"
 	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
-	[ "$CTARGET_ARCH" == "s390x" ] && depends="$depends libucontext-dev"
+	depends="$depends libucontext-dev"
 
 	mkdir -p "$subpkgdir"/$_gcclibdir/include/d/ \
 		"$subpkgdir"/usr/lib \
@@ -663,4 +659,5 @@ f4ef08454e28c8732db69115e4998ec153399e8d229dd27f923dbdcf57b68128a65640d026cc7f45
 84bdbdfcb972161765b81220ea2e80e83c32f3ab27596b77eb451d8cac4bd6312210df468581c2b0e1363f5e3b31654e369c47ae84c907f3b54a1786d7c17830  401-dlang-32bits.patch
 9d73f21eaa2458d28a144dd0e5478ed52763a4d8bbf62084b607db52bce1e2242f773c853fc34e6aae2d53c4124948139954627064e850e9dabaddaef5cb9d69  402-dlang-stat.patch
 fd056014d0c6f627108d7387bfe46b5fb66786a16fa964da55b0442658b1c8e9e903c641a9e3233000ef37691e32ea4fef22029ab5eba217ccbc8bd5941e81ae  403-dlang-ibmz.patch
-ddb3ca26b5e55f6d376036c2ed87959770bfb72d1175d0dba332f705edf6817806d53765c838ff670472a16ab175bd1ce88946c19d83f9d5e53ff2b4d3558dfb  404-dlang-zlib.patch"
+ddb3ca26b5e55f6d376036c2ed87959770bfb72d1175d0dba332f705edf6817806d53765c838ff670472a16ab175bd1ce88946c19d83f9d5e53ff2b4d3558dfb  404-dlang-zlib.patch
+3f40f796f50d49ea0a185d3454c79606fb5f90ed48c030fe25c1df8c4a72ba7cae37dccdb260cf737beb3e921dc2ddad68effbe446dbf220a07d0158b9b9ca8d  405-dlang-mips.patch"

cross/gcc-armhf/405-dlang-mips.patch

+--- gcc-9.3.0.orig/libphobos/libdruntime/core/sys/posix/fcntl.d
++++ gcc-9.3.0/libphobos/libdruntime/core/sys/posix/fcntl.d
+@@ -870,6 +870,21 @@
+             F_SETLKW       = 7,
+         }
+     }
++    else version (MIPS_Any)
++    {
++        enum 
++        {
++            O_DIRECTORY     = 0x010000, // octal   0200000
++            O_NOFOLLOW      = 0x020000, // octal   0400000
++            O_DIRECT        = 0x008000, // octal   0100000
++            O_LARGEFILE     = 0x002000, // octal   0020000
++            O_TMPFILE       = 0x410000, // octal 020200000
++
++            F_GETLK        = 33,
++            F_SETLK        = 34,
++            F_SETLKW       = 35,
++        }
++    }
+     else
+         static assert(0, "Platform not supported");
+ 
+--- gcc-9.3.0.orig/libphobos/configure.tgt
++++ gcc-9.3.0/libphobos/configure.tgt
+@@ -38,6 +38,7 @@
+ 	;;
+   mips*-*-linux*)
+ 	LIBPHOBOS_SUPPORTED=yes
++	LIBDRUNTIME_NEEDS_UCONTEXT=yes
+ 	;;
+   riscv*-*-linux*)
+ 	LIBPHOBOS_SUPPORTED=yes

cross/gcc-armhf/APKBUILD

@@ -30,7 +30,7 @@ pkgver=9.3.0
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname="gcc-armhf"
-pkgrel=0
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -117,11 +117,6 @@ fi
 # See libphobos/configure.tgt in GCC sources for supported targets
 [ "$CARCH" = ppc64le ] && LANG_D=false
 
-# GDC requires libucontext on mips, which is not yet available
-case "$CTARGET_ARCH" in
-mips*)		LANG_D=false ;;
-esac
-
 # Go needs {set,make,swap}context, unimplemented in musl
 [ "$CTARGET_LIBC" = musl ] && LANG_GO=false
 
@@ -155,7 +150,7 @@ fi
 if $LANG_D; then
 	subpackages="$subpackages libgphobos::$CTARGET_ARCH gcc-gdc$_target:gdc"
 	_languages="$_languages,d"
-	[ "$CTARGET_ARCH" == "s390x" ] && makedepends_build="$makedepends_build libucontext-dev"
+	makedepends_build="$makedepends_build libucontext-dev"
 fi
 if $LANG_OBJC; then
 	subpackages="$subpackages libobjc::$CTARGET_ARCH gcc-objc$_target:objc"
@@ -218,6 +213,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	402-dlang-stat.patch
 	403-dlang-ibmz.patch
 	404-dlang-zlib.patch
+	405-dlang-mips.patch
 	"
 
 #	gcc-4.8-build-args.patch
@@ -527,7 +523,7 @@ libgphobos() {
 gdc() {
 	pkgdesc="GCC-based D language compiler"
 	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
-	[ "$CTARGET_ARCH" == "s390x" ] && depends="$depends libucontext-dev"
+	depends="$depends libucontext-dev"
 
 	mkdir -p "$subpkgdir"/$_gcclibdir/include/d/ \
 		"$subpkgdir"/usr/lib \
@@ -663,4 +659,5 @@ f4ef08454e28c8732db69115e4998ec153399e8d229dd27f923dbdcf57b68128a65640d026cc7f45
 84bdbdfcb972161765b81220ea2e80e83c32f3ab27596b77eb451d8cac4bd6312210df468581c2b0e1363f5e3b31654e369c47ae84c907f3b54a1786d7c17830  401-dlang-32bits.patch
 9d73f21eaa2458d28a144dd0e5478ed52763a4d8bbf62084b607db52bce1e2242f773c853fc34e6aae2d53c4124948139954627064e850e9dabaddaef5cb9d69  402-dlang-stat.patch
 fd056014d0c6f627108d7387bfe46b5fb66786a16fa964da55b0442658b1c8e9e903c641a9e3233000ef37691e32ea4fef22029ab5eba217ccbc8bd5941e81ae  403-dlang-ibmz.patch
-ddb3ca26b5e55f6d376036c2ed87959770bfb72d1175d0dba332f705edf6817806d53765c838ff670472a16ab175bd1ce88946c19d83f9d5e53ff2b4d3558dfb  404-dlang-zlib.patch"
+ddb3ca26b5e55f6d376036c2ed87959770bfb72d1175d0dba332f705edf6817806d53765c838ff670472a16ab175bd1ce88946c19d83f9d5e53ff2b4d3558dfb  404-dlang-zlib.patch
+3f40f796f50d49ea0a185d3454c79606fb5f90ed48c030fe25c1df8c4a72ba7cae37dccdb260cf737beb3e921dc2ddad68effbe446dbf220a07d0158b9b9ca8d  405-dlang-mips.patch"

cross/gcc-armv7/405-dlang-mips.patch

+--- gcc-9.3.0.orig/libphobos/libdruntime/core/sys/posix/fcntl.d
++++ gcc-9.3.0/libphobos/libdruntime/core/sys/posix/fcntl.d
+@@ -870,6 +870,21 @@
+             F_SETLKW       = 7,
+         }
+     }
++    else version (MIPS_Any)
++    {
++        enum 
++        {
++            O_DIRECTORY     = 0x010000, // octal   0200000
++            O_NOFOLLOW      = 0x020000, // octal   0400000
++            O_DIRECT        = 0x008000, // octal   0100000
++            O_LARGEFILE     = 0x002000, // octal   0020000
++            O_TMPFILE       = 0x410000, // octal 020200000
++
++            F_GETLK        = 33,
++            F_SETLK        = 34,
++            F_SETLKW       = 35,
++        }
++    }
+     else
+         static assert(0, "Platform not supported");
+ 
+--- gcc-9.3.0.orig/libphobos/configure.tgt
++++ gcc-9.3.0/libphobos/configure.tgt
+@@ -38,6 +38,7 @@
+ 	;;
+   mips*-*-linux*)
+ 	LIBPHOBOS_SUPPORTED=yes
++	LIBDRUNTIME_NEEDS_UCONTEXT=yes
+ 	;;
+   riscv*-*-linux*)
+ 	LIBPHOBOS_SUPPORTED=yes

cross/gcc-armv7/APKBUILD

@@ -30,7 +30,7 @@ pkgver=9.3.0
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname="gcc-armv7"
-pkgrel=0
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -117,11 +117,6 @@ fi
 # See libphobos/configure.tgt in GCC sources for supported targets
 [ "$CARCH" = ppc64le ] && LANG_D=false
 
-# GDC requires libucontext on mips, which is not yet available
-case "$CTARGET_ARCH" in
-mips*)		LANG_D=false ;;
-esac
-
 # Go needs {set,make,swap}context, unimplemented in musl
 [ "$CTARGET_LIBC" = musl ] && LANG_GO=false
 
@@ -155,7 +150,7 @@ fi
 if $LANG_D; then
 	subpackages="$subpackages libgphobos::$CTARGET_ARCH gcc-gdc$_target:gdc"
 	_languages="$_languages,d"
-	[ "$CTARGET_ARCH" == "s390x" ] && makedepends_build="$makedepends_build libucontext-dev"
+	makedepends_build="$makedepends_build libucontext-dev"
 fi
 if $LANG_OBJC; then
 	subpackages="$subpackages libobjc::$CTARGET_ARCH gcc-objc$_target:objc"
@@ -218,6 +213,7 @@ source="https://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$pkgver}/gcc-${_pkg
 	402-dlang-stat.patch
 	403-dlang-ibmz.patch
 	404-dlang-zlib.patch
+	405-dlang-mips.patch
 	"
 
 #	gcc-4.8-build-args.patch
@@ -527,7 +523,7 @@ libgphobos() {
 gdc() {
 	pkgdesc="GCC-based D language compiler"
 	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
-	[ "$CTARGET_ARCH" == "s390x" ] && depends="$depends libucontext-dev"
+	depends="$depends libucontext-dev"
 
 	mkdir -p "$subpkgdir"/$_gcclibdir/include/d/ \
 		"$subpkgdir"/usr/lib \
@@ -663,4 +659,5 @@ f4ef08454e28c8732db69115e4998ec153399e8d229dd27f923dbdcf57b68128a65640d026cc7f45
 84bdbdfcb972161765b81220ea2e80e83c32f3ab27596b77eb451d8cac4bd6312210df468581c2b0e1363f5e3b31654e369c47ae84c907f3b54a1786d7c17830  401-dlang-32bits.patch
 9d73f21eaa2458d28a144dd0e5478ed52763a4d8bbf62084b607db52bce1e2242f773c853fc34e6aae2d53c4124948139954627064e850e9dabaddaef5cb9d69  402-dlang-stat.patch
 fd056014d0c6f627108d7387bfe46b5fb66786a16fa964da55b0442658b1c8e9e903c641a9e3233000ef37691e32ea4fef22029ab5eba217ccbc8bd5941e81ae  403-dlang-ibmz.patch
-ddb3ca26b5e55f6d376036c2ed87959770bfb72d1175d0dba332f705edf6817806d53765c838ff670472a16ab175bd1ce88946c19d83f9d5e53ff2b4d3558dfb  404-dlang-zlib.patch"
+ddb3ca26b5e55f6d376036c2ed87959770bfb72d1175d0dba332f705edf6817806d53765c838ff670472a16ab175bd1ce88946c19d83f9d5e53ff2b4d3558dfb  404-dlang-zlib.patch
+3f40f796f50d49ea0a185d3454c79606fb5f90ed48c030fe25c1df8c4a72ba7cae37dccdb260cf737beb3e921dc2ddad68effbe446dbf220a07d0158b9b9ca8d  405-dlang-mips.patch"

cross/musl-aarch64/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname="musl-aarch64"
 pkgver="1.1.24"
-pkgrel=4
+pkgrel=5
 arch="armhf armv7 x86_64 x86"
 subpackages="musl-dev-aarch64:package_dev"
 
@@ -50,5 +50,5 @@ package_dev() {
     done
 }
 
-sha512sums="a00f98bab2859d1e42f05ec5aa62459e109dd460cbe6f6e7841e843ecf27893b72c4f0c0765cd502ec123332f62e3bdb193646ef0cbbf86bde81a168696ac150  musl-1.1.24-r4-aarch64.apk
-080933d8df0e3ab88d609b9a6716bed02394a377a03942b70bbd1eaff0043db753741cab6e358c33619ce6ed16d2b4ab39ba2051df62956a11c6dac982137015  musl-dev-1.1.24-r4-aarch64.apk"
+sha512sums="2476023793f418fd2a78aa6e0874849db5f2230d4931ed923aa9c7c85ce0f0e724a05a6ef86ecaee203e532765d5bd96995488383a266fc2c81898f457f0b7fb  musl-1.1.24-r5-aarch64.apk
+ec54095ee897bd5e70fdb26716467c0d5d17080548fe0e2d517341bc0dde547f3ae76ddf161b3820e322850ee4da6c9c2798dd001155bd858c32e04057194ec6  musl-dev-1.1.24-r5-aarch64.apk"

cross/musl-armhf/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname="musl-armhf"
 pkgver="1.1.24"
-pkgrel=4
+pkgrel=5
 arch="armv7 aarch64 x86_64 x86"
 subpackages="musl-dev-armhf:package_dev"
 
@@ -50,5 +50,5 @@ package_dev() {
     done
 }
 
-sha512sums="4e3a54292e15f0f4aacabedc52581f468dbfa31a0552e74e3c8f132d595b1805ce7ace21ee61bda62ffba7bd6e509c5aa31430ab16ebe363badedaa3a653b99b  musl-1.1.24-r4-armhf.apk
-c45c3632a767ed69ca8f3146b3fe3254e6005b52491beb8dcf9490f61945c726a072ffd8f20207217c8275077895030d8c7f1724453a181361a8529d44f00c04  musl-dev-1.1.24-r4-armhf.apk"
+sha512sums="7edf63371024161ab8befb25f57c8d11c31569c8b9cb428b40140100175e1b57c113d11694cc283aafe903777f0985f7cce8c69bd11365b064b6fbc431736480  musl-1.1.24-r5-armhf.apk
+741bce0e7f63335143d825ec744a147cbc222b9fee2bbe3179eff998d6a6e719b7f1cc7a8bd47c356314b64dd9e91bc8e34dcd7381e75dea38673707370916bf  musl-dev-1.1.24-r5-armhf.apk"

cross/musl-armv7/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname="musl-armv7"
 pkgver="1.1.24"
-pkgrel=4
+pkgrel=5
 arch="armhf aarch64 x86_64 x86"
 subpackages="musl-dev-armv7:package_dev"
 
@@ -50,5 +50,5 @@ package_dev() {
     done
 }
 
-sha512sums="ca40b8b3132a49edec46bb9c73b19275402bdd1064b1809ba4a1560f62458e7144748ab9dc5c70755073a7121bd73e6c45e8083e52e7f9bbc987c2547a4819c3  musl-1.1.24-r4-armv7.apk
-8107211e103eb782659bc5079bf7a0334838d8b7bd2be3f06559939b5db8d5a63797c5cee328497e41cfc3d502c8f4c13e0b7f4bccddbab1fd55243ea0f04b69  musl-dev-1.1.24-r4-armv7.apk"
+sha512sums="783dcc690de08346697905b7fa09956e4948ffcde3884b7dcbd1b9acd00c62bc9a316eb7a8fbff4e92e8826ba1b3b09b9e0d7f1bdd5eca7c81e1d0e59e2bf2c0  musl-1.1.24-r5-armv7.apk
+924622957eb02c6c41ba9c2920a2fcf6c4c25db9fcfe056596fd583f518524eeb9637725aaf971d3ce99e79f879ba548c4c20d8a6d9529622a33b09dfcd8152a  musl-dev-1.1.24-r5-armv7.apk"

device/testing/device-fairphone-fp2/APKBUILD

@@ -3,7 +3,7 @@
 pkgname="device-fairphone-fp2"
 pkgdesc="Fairphone 2"
 pkgver=2
-pkgrel=10
+pkgrel=11
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -70,6 +70,6 @@ alsa() {
 	install -Dm644 "$srcdir"/hifi "$subpkgdir"/usr/share/alsa/ucm/FP2/
 }
 
-sha512sums="fa832efdfffdc69fc919f0aac2ee3b1e75d3cf0776656942d72346fd3e0adc7afd7a6bfcda2b8358b469eb7ec7d011d921c6426bc2bf192d9c2768c2e72a239a  deviceinfo
+sha512sums="3d6bfa349f8590a254b345078fc7b294f6750b9b4274559224f9f2414305cd9e019acbb2f9f522e1cb0ce56755e04f4b9d6315dee92a765fc5fbe979c03d7543  deviceinfo
 55360b1ba4ddadea341c9edb13c32ba5f19aabf75ab28602f30cfb79b9df8834f115ef979c70569f23ec1293b1fcd408baf320d87803293ce7106bdc73a26c9f  FP2.conf
 b834461c6866bb0c473dd089dd5da641dd42a00f610aad6503117aa50fe6e200db9ad0a264bb609f12350d59faee1f772907bacd75439f702ea7d52f6f85e2b1  hifi"

device/testing/device-fairphone-fp2/deviceinfo

@@ -8,7 +8,7 @@ deviceinfo_codename="fairphone-fp2"
 deviceinfo_year="2015"
 deviceinfo_dtb_mainline="qcom-msm8974-fairphone-fp2"
 deviceinfo_append_dtb_mainline="true"
-deviceinfo_modules_initfs=""
+deviceinfo_modules_initfs_mainline="pm8941_pwrkey qnoc_msm8974 ili210x"
 deviceinfo_arch="armv7"
 
 # Device related
@@ -16,13 +16,12 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
-deviceinfo_dev_touchscreen="/dev/input/event0"
 deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline_downstream="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3b7 ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1"
-deviceinfo_kernel_cmdline_mainline="earlycon=msm_serial_dm,0xf991e000 PMOS_NO_OUTPUT_REDIRECT clk_ignore_unused pd_ignore_unused cma=300m msm.vram=200m"
+deviceinfo_kernel_cmdline_mainline="earlycon=msm_serial_dm,0xf991e000 PMOS_NO_OUTPUT_REDIRECT clk_ignore_unused pd_ignore_unused cma=500m msm.vram=400m"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt_downstream="true"
 deviceinfo_flash_offset_base="0x00000000"

device/testing/device-nokia-n900/APKBUILD

@@ -2,12 +2,12 @@
 # Contributor: Martijn Braam <martijn@brixit.nl>
 pkgname=device-nokia-n900
 pkgver=5
-pkgrel=7
+pkgrel=8
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
-depends="postmarketos-base linux-nokia-n900 uboot-tools kbd kbd-bkeymaps ofono mesa-dri-swrast"
+depends="postmarketos-base linux-nokia-n900 uboot-tools kbd kbd-bkeymaps ofono mesa-dri-swrast alsa-utils"
 makedepends="devicepkg-dev uboot-tools kbd kbd-bkeymaps"
 install="$pkgname.post-install"
 subpackages="
@@ -30,7 +30,8 @@ source="
 	keymaps/rx51_it.map
 	keymaps/40-xkb.conf
 	pointercal
-	asound.state
+	asound.state.speakers
+	asound.state.headset
 	weston.ini
 	i3wm/scripts/battery-bq27200
 	i3wm/scripts/ofono
@@ -44,6 +45,7 @@ source="
 	10-noroot-suspend
 	10-initfs-keymap.files
 	10-initfs-keymap.sh
+	device-nokia-n900.start
 "
 options="!check !archcheck"
 
@@ -68,12 +70,16 @@ package() {
 		"$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-$pkgname-backlight.sh
 	install -D -m644 "$srcdir"/pointercal \
 		"$pkgdir"/etc/pointercal
-	install -D -m644 "$srcdir"/asound.state \
-		"$pkgdir"/var/lib/alsa/asound.state
+	install -D -m644 "$srcdir"/asound.state.speakers \
+		"$pkgdir"/var/lib/alsa/asound.state.speakers
+	install -D -m644 "$srcdir"/asound.state.headset \
+		"$pkgdir"/var/lib/alsa/asound.state.headset
 	install -Dm644 "$srcdir"/10-initfs-keymap.files \
 		"$pkgdir"/etc/postmarketos-mkinitfs/files/10-initfs-keymap.files
 	install -Dm644 "$srcdir"/10-initfs-keymap.sh \
 		"$pkgdir"/etc/postmarketos-mkinitfs/hooks/10-initfs-keymap.sh
+	install -Dm755 "$srcdir"/$pkgname.start \
+		"$pkgdir"/etc/local.d/$pkgname.start
 
 	# Udev rules
 	install -D -m644 "$srcdir"/90-touchscreen-dev.rules \
@@ -151,14 +157,15 @@ sha512sums="65317422ccbb263dd1eeb92b4a37357769f4e3e6a6f0ef812b1d4ac46fc5f00bef20
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules
 9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762  10-nokia-modem.rules
-df5dcae9a32d04ba2fed8b4dbb8722f8d56d063a288dfbaeca37806bdbb8ba4de639b392859b9f24040a1032456d5dcd754f51314e3ab66515b91ae1e03c93a7  acpi_handler.sh
-7761aec6e6e219245b006e7bdc1d19812e9c5915cf3e64bb3dd46bb4b5570c1715650b53a1fc1007cb814076b5d81be0a66ba7ebf06d9a1fa4e364725c3ee633  acpi.map
+cd5ff582e935c4d28ba359944b197b5486645451790f59e96d9faa4136bf9010c425bfd3c8e46d4b490b4f36fd3336c1d49dd18bc0e2c5738b81520f356adf20  acpi_handler.sh
+b3612348af1465c6dc21ce30153fc7e2cce3ae7f9bf9ff34d5a560e173e174275c1701dd7c45337fa56caaadb252b9494bddf997a698d665d3a8c01cde6955c7  acpi.map
 e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba  rx51_us.map
 dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058edc6f87cc2877da2ecafd2f627d9b465d4fd24475fc21fdc71  rx51_ch.map
 082a5166e38296b097e873b0b4aeaf007e594d3bf4470c74e91ee3efedcf28ad25cd55c23dd63e460339898ae08e77e111b0e1092fa5e661db90bb40732103a1  rx51_it.map
 181187db6d88b872233f594759373f32fd08065ee340b60f0c3ff06396d99f4b1250192d70a054fcc9e51e067f6cc063c62b7d8dfff3427b292f1d0c766db206  40-xkb.conf
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
-e023df91295fe7e410e163747d17e5b92fe3c022ff076e286778b8334368f885603b8fda65671e4a7328766da7b2552ea4df1b1399df23e504a41a6655771142  asound.state
+67acc17a33bc75113300393b4a5bba15319014032407e774d079abf310368e75f4f697dbb4856ba2d2d8ea184b056bb33561f42918de3ee91ab6a77df89a133c  asound.state.speakers
+5b87071834313a389f83d29f86f6e3ea108d0921f17dc918be7a46de7e74c73a4418044ef600a0fbf72c8fad22b7730dcd5bfe3d6d01d76bf01556f8540f0b32  asound.state.headset
 7f48d1a044f8c02f7b1d11487ec1f83978d9b0ea12529156e7418f82be556d9baee32b70c4d911174e388bb4941dc19519e93e7551d00ffcd825c848665ff096  weston.ini
 d150c2766f75c0f585380ae5f088896f0c8b03dc39df7195c84fc5dc78e487dbb3d623621652daa46e3b8722690af6c0485834856e0967bc3729f67122d435a0  battery-bq27200
 82038d38f94cb975a8d38914afca49b64957446bef7490ab684efa1df47ede2ea1c769045789bb9fded673345eea01911fbbf85fdb54c28685cad8022bfaafac  ofono
@@ -171,4 +178,5 @@ d9ef88c714e9fce8822f63b7a9d7fc3e1ed472c8c876b44ba524d44efea322839f13ddd2fa652420
 a91f98daa60efa2beb2ff6b405097f92edca5f1bbb9e7675499139be52ca2570712f8f06f9032ef29f636f99c8f8da8b992f746eab6424aac04260c16158bcc2  xorg.conf
 38ecdf876b5aa9df2e5ea61c7ebb6f9ca871bdf433029808d028d563dfd740232b3dc21dba098a7622453212af1272e2e782be861b4a96a49fd475a618442d45  10-noroot-suspend
 ae5c4c2452d8da66174d4eef9644796b29b0188ad683a6516be3710e0893db5447583f8b46ec9b76144e030c1ce4d9c316542af25b9369d9f27b8c026f6e0fe1  10-initfs-keymap.files
-4656d3b3ced0a86e2d6315c89322899f646a689e9cb64609aa8ad5a676b23d93706d8a37f3be6f6b12c6b1e8501b7d26ecafecf27322333850513a6805c61910  10-initfs-keymap.sh"
+4656d3b3ced0a86e2d6315c89322899f646a689e9cb64609aa8ad5a676b23d93706d8a37f3be6f6b12c6b1e8501b7d26ecafecf27322333850513a6805c61910  10-initfs-keymap.sh
+e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b119fbc33d9801ab9f79a6ff213392596bff40bc17e931c05ef  device-nokia-n900.start"

device/testing/device-nokia-n900/acpi.map

@@ -23,8 +23,11 @@
 "EV_KEY" 0x01 "KEY_POWER" 116 1 PWR_BTN_DWN
 
 "EV_SW" 0x05 "SW_HEADPHONE_INSERT" 2 1 HEADPHONE_INSERT
+"EV_SW" 0x05 "SW_HEADPHONE_INSERT" 2 0 HEADPHONE_REMOVE
 "EV_SW" 0x05 "SW_MICROPHONE_INSERT" 2 1 MICROPHONE_INSERT
+"EV_SW" 0x05 "SW_MICROPHONE_INSERT" 2 0 MICROPHONE_REMOVE
 "EV_SW" 0x05 "SW_VIDEOOUT_INSERT" 2 1 VIDEOOUT_INSERT
+"EV_SW" 0x05 "SW_VIDEOOUT_INSERT" 2 0 VIDEOOUT_REMOVE
 
 "EV_KEY" 0x01 "KEY_VOLUMEUP" 66 1 VOL_UP
 "EV_KEY" 0x01 "KEY_VOLUMEDOWN" 65 1 VOL_DWN

device/testing/device-nokia-n900/acpi_handler.sh

@@ -8,9 +8,6 @@ function adjust_keypad_bl {
 	done
 }
 
-
-
-
 case $cmd in
 	KP_SLIDE_OPEN)
 		adjust_keypad_bl 255	
@@ -55,11 +52,17 @@ case $cmd in
 		echo "Not implemented yet"
 		;;
         HEADPHONE_INSERT)
-                echo "Not implemented yet"
+                alsactl restore -f /var/lib/alsa/asound.state.headset
+                ;;
+        HEADPHONE_REMOVE)
+                alsactl restore -f /var/lib/alsa/asound.state.speakers
                 ;;
         MICROPHONE_INSERT)
                 echo "Not implemented yet"
                 ;;
+        MICROPHONE_REMOVE)
+                echo "Not implemented yet"
+                ;;
         PWR_BTN_DWN)
                 echo "Not implemented yet"
                 ;;
@@ -69,6 +72,9 @@ case $cmd in
         VIDEOOUT_INSERT)
                 echo "Not implemented yet"
                 ;;
+        VIDEOOUT_REMOVE)
+                echo "Not implemented yet"
+                ;;
         VOL_DWN)
                 echo "Not implemented yet"
                 ;;

device/testing/device-nokia-n900/device-nokia-n900.start

+#!/bin/sh
+
+alsactl restore -f /var/lib/alsa/asound.state.speakers