.gitlab-ci.yml

@@ -45,6 +45,7 @@ testcases-linting:
       - merge_requests
     changes:
       - .gitlab-ci/*
+      - .gitlab-ci/*/*
   before_script:
     - apk -q add py-flake8
   script:
@@ -69,8 +70,7 @@ aports-static:
     - .gitlab-ci/install_pmbootstrap.sh pytest
   script:
     - apk -q add git
-    - su pmos -c ".gitlab-ci/run_testcases.sh
-        -m 'not pmaports_upstream_compat'"
+    - su pmos -c ".gitlab-ci/run_testcases.sh"
     - su pmos -c ".gitlab-ci/check_changed_aports_versions.py"
   artifacts:
     when: on_failure
@@ -117,24 +117,6 @@ mr-settings:
   script:
     - .gitlab-ci/check_mr_settings.py
 
-# aports checks (upstream compatibility)
-aports-static-upstream:
-  stage: second
-  only:
-    - master@postmarketOS/pmaports
-  before_script:
-    - .gitlab-ci/install_pmbootstrap.sh pytest
-  script:
-    - su pmos -c ".gitlab-ci/run_testcases.sh
-        -m 'pmaports_upstream_compat'"
-  artifacts:
-    when: on_failure
-    paths:
-      - log.txt
-      - log_testsuite_pmaports.txt
-      - pmbootstrap.cfg
-    expire_in: 1 week
-
 # build changed aports
 aports-build:
   stage: second

.gitlab-ci/apkbuild-linting.py

@@ -2,27 +2,27 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import common
+import os.path
 import subprocess
 import sys
 
 if __name__ == "__main__":
     common.add_upstream_git_remote()
-    packages = common.get_changed_packages(with_directory=True)
-
-    if len(packages) < 1:
+    apkbuilds = {file for file in common.get_changed_files(removed=False)
+                 if os.path.basename(file) == "APKBUILD"}
+    if len(apkbuilds) < 1:
         print("No APKBUILDs to lint")
         sys.exit(0)
 
     issues = []
-    for package in packages:
-        if "temp/" in package or \
-           "cross/" in package or \
-           "APKBUILD" not in package:
+    for apkbuild in apkbuilds:
+        if apkbuild.startswith("temp/") or apkbuild.startswith("cross/"):
+            print(f"NOTE: Skipping linting of {apkbuild}")
             continue
 
-        result = subprocess.run(["apkbuild-lint", package], capture_output=True)
+        result = subprocess.run(["apkbuild-lint", apkbuild], capture_output=True)
         if len(result.stdout) > 0:
-            issues.append([package, result.stdout.decode("utf-8")])
+            issues.append([apkbuild, result.stdout.decode("utf-8")])
 
     if len(issues) > 0:
         print("Linting issues found:")

.gitlab-ci/common.py

@@ -45,10 +45,11 @@ def run_pmbootstrap(parameters):
         exit(1)
 
 
-def get_changed_files():
+def get_changed_files(removed=True):
     """ Get all changed files and print them, as well as the branch and the
         commit that was used for the diff.
-        :returns: list of changed files
+        :param removed: also return removed files (default: True)
+        :returns: set of changed files
     """
     commit_head = run_git(["rev-parse", "HEAD"])[:-1]
     commit_upstream_master = run_git(["rev-parse", "upstream/master"])[:-1]
@@ -65,12 +66,16 @@ def get_changed_files():
     print("comparing HEAD with: " + commit)
 
     # Changed files
-    ret = run_git(["diff", "--name-only", commit, "HEAD"]).splitlines()
+    ret = set()
     print("changed file(s):")
-    for file in ret:
+    for file in run_git(["diff", "--name-only", commit, "HEAD"]).splitlines():
         message = "  " + file
         if not os.path.exists(file):
             message += " (deleted)"
+            if removed:
+                ret.add(file)
+        else:
+            ret.add(file)
         print(message)
     return ret
 
@@ -108,24 +113,40 @@ def get_changed_packages_sanity_check(count):
     sys.exit(1)
 
 
-def get_changed_packages(with_directory=False):
-    files = get_changed_files()
+def get_changed_packages():
     ret = set()
-    for file in files:
+    for file in get_changed_files():
+        dirname, filename = os.path.split(file)
+
         # Skip files:
         # * in the root dir of pmaports (e.g. README.md)
-        # * path beginning with a dot (e.g. .gitlab-ci/)
-        # * non-existing files (deleted packages)
-        hidden = file.startswith(".") or "/." in file
-        if "/" not in file or hidden or not os.path.exists(file):
+        # * path with a dot (e.g. .gitlab-ci/, device/.shared-patches/)
+        if not dirname or file.startswith(".") or "/." in file:
             continue
 
-        # Add to the ret set (removes duplicated automatically)
-        if with_directory:
-            ret.add(file)
-        else:
-            # device/testing/device-something/APKBUILD -> device-something
-            ret.add(file.split("/")[-2])
+        if filename != "APKBUILD":
+            # Walk up directories until we (eventually) find the package
+            # the file belongs to (could be in a subdirectory of a package)
+            while dirname and not os.path.exists(os.path.join(dirname, "APKBUILD")):
+                dirname = os.path.dirname(dirname)
+
+            # Unable to find APKBUILD the file belong to
+            if not dirname:
+                # ... maybe the package was deleted entirely?
+                if not os.path.exists(file):
+                    continue
+
+                # Weird, file does not belong to any package?
+                # Here we just warn, there is an extra check
+                # to make sure that files are organized properly.
+                print(f"WARNING: Changed file {file} does not belong to any package")
+                continue
+
+        elif not os.path.exists(file):
+            continue  # APKBUILD was deleted
+
+        ret.add(os.path.basename(dirname))
+
     return ret
 
 

.gitlab-ci/testcases/test_directory_structure.py

@@ -16,6 +16,7 @@ expected_directories = [
     "temp",
 ]
 
+
 # pmbootstrap allows placing APKBUILDs in arbitrarily nested directories.
 # This test makes sure all of them are in one of the expected locations.
 def test_directories():
@@ -24,6 +25,7 @@ def test_directories():
     assert apkbuilds == expected, "Found APKBUILD in unexpected directory. " \
         "Consider adding it to test_directory_structure.py!"
 
+
 # Make sure files are either:
 #  - in root directory (README.md)
 #  - hidden (.gitlab-ci/, device/.shared-patches/)
@@ -49,4 +51,4 @@ def test_files_belong_to_package():
             package_dir = dirpath
 
         assert not files or package_dir, "Found files that do not belong to any package: " \
-                f"{dirpath}/{files}"
+            f"{dirpath}/{files}"

.gitlab-ci/testcases/test_soname_bump.py

-#!/usr/bin/env python3
-# Copyright 2020 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-"""
-This file uses pmb.helper.pkgrel_bump to check if the aports need a pkgrel bump
-for any package, caused by a soname bump. Example: A new libressl/openssl
-version was released, which increased the soname version, and now all packages
-that link against it, need to be rebuilt.
-"""
-
-import os
-import pytest
-import sys
-
-import add_pmbootstrap_to_import_path
-import pmb.helpers.pkgrel_bump
-import pmb.helpers.logging
-import pmb.parse
-
-
-@pytest.fixture
-def args(request):
-    # Initialize args
-    sys.argv = ["pmbootstrap",
-                "--aports", os.path.dirname(__file__) + "/../..",
-                "--log", "$WORK/log_testsuite_pmaports.txt"
-                "chroot"]
-    args = pmb.parse.arguments()
-
-    # Initialize logging
-    pmb.helpers.logging.init(args)
-    request.addfinalizer(args.logfd.close)
-    return args
-
-
-@pytest.mark.pmaports_upstream_compat
-def test_soname_bump(args):
-    # Temporarily disabled, because the postmarketOS binary repository has
-    # armhf packages for various kde related packages depending on
-    # qt5-qtwebengine-dev, although qt5-qtwebengine-dev isn't available for
-    # armhf anymore. All related pmaports were disabled for armhf, however
-    # currently the binary repository does not delete binary packages yet,
-    # after the corresponding pmaport was deleted/disabled for a given arch.
-    # I'll work on this with high priority, so we can enable the test again.
-    # Related: https://gitlab.com/postmarketOS/build.postmarketos.org/issues/38
-    # - ollieparanoid
-    return True
-
-    if pmb.helpers.pkgrel_bump.auto(args, True):
-        raise RuntimeError("One or more packages need to be rebuilt, because"
-                           " a library they link against had an incompatible"
-                           " upgrade (soname bump). Run 'pmbootstrap"
-                           " pkgrel_bump --auto' to automatically increase the"
-                           " pkgrel in order to trigger a rebuild. If this"
-                           " test case failed during a pull request, the issue"
-                           " needs to be fixed on the 'master' branch first,"
-                           " then rebase your PR on 'master' afterwards.")

.gitlab-ci/testcases/test_upstream_compatibility.py

-#!/usr/bin/env python3
-# Copyright 2020 Oliver Smith
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import os
-import sys
-import glob
-import pytest
-
-import add_pmbootstrap_to_import_path
-import pmb.helpers.logging
-import pmb.parse.apkindex
-import pmb.parse
-
-
-@pytest.fixture
-def args(request):
-    # Initialize args
-    sys.argv = ["pmbootstrap",
-                "--aports", os.path.dirname(__file__) + "/../..",
-                "--log", "$WORK/log_testsuite_pmaports.txt"
-                "chroot"]
-    args = pmb.parse.arguments()
-
-    # Initialize logging
-    pmb.helpers.logging.init(args)
-    request.addfinalizer(args.logfd.close)
-    return args
-
-
-@pytest.mark.pmaports_upstream_compat
-def test_qt_versions(args):
-    """
-    Verify, that all postmarketOS qt5- package versions match with Alpine's
-    qt5-qtbase version.
-    """
-    # Upstream version
-    index = pmb.helpers.repo.alpine_apkindex_path(args, "community", "x86_64")
-    index_data = pmb.parse.apkindex.package(args, "qt5-qtbase",
-                                            indexes=[index])
-    pkgver_upstream = index_data["version"].split("-r")[0]
-
-    # Iterate over our packages
-    failed = []
-    for path in glob.glob(args.aports + "/*/qt5-*/APKBUILD"):
-        # Read the pkgver
-        apkbuild = pmb.parse.apkbuild(args, path)
-        pkgname = apkbuild["pkgname"]
-        pkgver = apkbuild["pkgver"]
-
-        # When we temporarily override packages from Alpine, we set the pkgver
-        # to 9999 and _pkgver contains the real version (see #994).
-        if pkgver == "9999":
-            pkgver = apkbuild["_pkgver"]
-
-        # We had to add a few qt5 git packages for unity8 (!27), obviously we
-        # can't compare the version there.
-        if "_git" in pkgver:
-            continue
-
-        # Compare
-        if pkgver == pkgver_upstream:
-            continue
-        failed.append(pkgname + ": " + pkgver + " != " +
-                      pkgver_upstream)
-
-    assert [] == failed
-
-
-@pytest.mark.pmaports_upstream_compat
-def test_aportgen_versions(args):
-    """
-    Verify that the packages generated by 'pmbootstrap aportgen' have
-    the same version (pkgver *and* pkgrel!) as the upstream packages
-    they are based on.
-    """
-    # Get Alpine's "main" repository APKINDEX path
-    index = pmb.helpers.repo.alpine_apkindex_path(args, "main", "x86_64")
-
-    # Alpine packages and patterns for our derivatives
-    map = {"binutils": "binutils-*",
-           "busybox": "busybox-static-*",
-           "gcc": "gcc-*",
-           "grub": "grub-efi-*",
-           "musl": "musl-*"}
-
-    # Iterate over Alpine packages
-    failed = []
-    generated = "# Automatically generated aport, do not edit!"
-    for pkgname, pattern in map.items():
-        # Upstream version
-        index_data = pmb.parse.apkindex.package(args, pkgname,
-                                                indexes=[index])
-        version_upstream = index_data["version"]
-
-        # Iterate over our packages
-        for path in glob.glob(args.aports + "/*/" + pattern + "/APKBUILD"):
-            # Skip non-aportgen APKBUILDs
-            with open(path) as handle:
-                if generated not in handle.read():
-                    continue
-
-            # Compare the version
-            print("Checking " + path)
-            apkbuild = pmb.parse.apkbuild(args, path)
-            version = apkbuild["pkgver"] + "-r" + apkbuild["pkgrel"]
-            if version != version_upstream:
-                failed.append(apkbuild["pkgname"] + ": " + version +
-                              " != " + version_upstream +
-                              " (from " + pkgname + ")")
-                continue
-
-    assert [] == failed

cross/musl-aarch64/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname="musl-aarch64"
 pkgver="1.1.24"
-pkgrel=2
+pkgrel=3
 arch="armhf armv7 x86_64 x86"
 subpackages="musl-dev-aarch64:package_dev"
 
@@ -50,5 +50,5 @@ package_dev() {
     done
 }
 
-sha512sums="505f261e8dcfbc80a33c6e6ec2e84f69163f342244add1c945d8bb7cfa84b8e53d8072af374c50d1f9a243be0d447124c91354b095652be198d0ec05d36d8289  musl-1.1.24-r2-aarch64.apk
-90743432c978bd3a576ede1067f875ca7836b99cf231aac9fd7d94aae8abd3c45e5723cf24bc2e88b7272aa5b3c490b3db16e5c5945a88b699779c9191652097  musl-dev-1.1.24-r2-aarch64.apk"
+sha512sums="aaa4e4e5c2cd1332a3452a97e72bdfde02fba6fa14ae300860b032b673d9ba8e172f2f7fe03fcc4b3847a2f2926459581637d3a1bd9d18551874e6bf1ee22bdc  musl-1.1.24-r3-aarch64.apk
+a5255fd83245ea4e1252efee715a2630ea695c9d6e3c0b2a618c613384a2176ac3ae63c3156150b161eb35c4a08dadd72273afedca5a4a1d01d01d1484ef0963  musl-dev-1.1.24-r3-aarch64.apk"

cross/musl-armhf/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname="musl-armhf"
 pkgver="1.1.24"
-pkgrel=2
+pkgrel=3
 arch="armv7 aarch64 x86_64 x86"
 subpackages="musl-dev-armhf:package_dev"
 
@@ -50,5 +50,5 @@ package_dev() {
     done
 }
 
-sha512sums="e466c73e7e473216bcbb359964875b2bb881530e0cddbbc69f18f153daccdcd8fc762374ebc92b07b5ecb551bf3c9387dcde4c3bcfaf4639f7dad70e1222a80f  musl-1.1.24-r2-armhf.apk
-f3c3687bb83b2b81805388c288a1d3a166d6cdcba1e16350eeb28309e1568d4d33f4645d03a9f0f320f303eb54b214159fab1aacd1e53eded65a7d084547424e  musl-dev-1.1.24-r2-armhf.apk"
+sha512sums="ad875edba1fab32cba1ada4dae1d1101fda252d194b05bdb4d49ea580a73a66cf90b27f1f0b9d8cfbe682d786b137b9018029e1ed09f499690da344c52fc4944  musl-1.1.24-r3-armhf.apk
+3a03db521d8129bc0a443ffbf182a363a8917d92ecf739cf0abcef8d33ec716eb3f6baa8c656f34a0bd87069f9a680e7659d4086e3a301fce4b35229ce38d73c  musl-dev-1.1.24-r3-armhf.apk"

cross/musl-armv7/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname="musl-armv7"
 pkgver="1.1.24"
-pkgrel=2
+pkgrel=3
 arch="armhf aarch64 x86_64 x86"
 subpackages="musl-dev-armv7:package_dev"
 
@@ -50,5 +50,5 @@ package_dev() {
     done
 }
 
-sha512sums="6f88060c82253a5cadbed171d5ac6e24fca9ea025bad6f2707fa4e7f2a292f59e88dd13a2772a84c9164dff013db4a299a10ea015df412ff2e0863ffafc01960  musl-1.1.24-r2-armv7.apk
-0a52cb8bccff8997f01d0dc49a76453135817c1f5e524446bb548c4ba87bed68265c8611f0fd1b8a5fa976f9939700c485cde28721ebd894b3b79b700f349555  musl-dev-1.1.24-r2-armv7.apk"
+sha512sums="9162fb161355b30cac2d65bc3d0231d44fc9013bb756eb4cd90c121bbc54646e423b02c4ca31174d183f3af8da52ed9362cdd0c5e346ae3c38efb71aec95ec3d  musl-1.1.24-r3-armv7.apk
+dca54ef48cdac2e20f596ceb308a347a7393aa9085566589fb35f4ed66e4fdb8ef151d024d30f6a84410ed71715248657e4e282e333fdfbc73437c75cfd0ecff  musl-dev-1.1.24-r3-armv7.apk"

device/testing/device-motorola-montana/APKBUILD

@@ -3,11 +3,12 @@
 # Contributor: Dolphin von Chips <DoIphinChips@protonmail.com>
 pkgname="device-motorola-montana"
 pkgdesc="Motorola Moto G5s"
-pkgver=0.2
+pkgver=0.3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 options="!check !archcheck"
 depends="postmarketos-base linux-motorola-montana mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
@@ -21,6 +22,11 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-motorola-montana-wcnss wcnss-wlan"
+	mkdir "$subpkgdir"
+}
 
 sha512sums="769b75c85f76f792a6e12ba0f02c63938b92c015c68beca8898579a227234073f2a746214b64c1909e7d1e6490ebacff4b72f86741db7e64268be9373342e7cf  deviceinfo
 97acac2557914cc234d75dd9869338e0eac13196649a661c59caa52b8953c4170a2fa2fbc9ee5518935c325d779b45d6c179c71474366b1200a4bd1e5172a882  initfs-hook.sh"

device/testing/device-motorola-peregrine/APKBUILD

@@ -3,10 +3,10 @@
 pkgname="device-motorola-peregrine"
 pkgdesc="Moto G 4G (2013)"
 pkgver=0.1
-pkgrel=9
+pkgrel=10
 url="https://postmarketos.org"
 license="MIT"
-arch="armhf"
+arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-motorola-peregrine mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
@@ -37,5 +37,5 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="b74adfa28e391b49b66fecb99d9c3c9b170e69542d6a449a8133564e87f7ce5426a4880b216daf113bad0d1072c3a5165b540096ce945d177487c1a2b57f178b  deviceinfo
+sha512sums="ff729614d8ef1175e55bcf5c5f177bea402af80e7403897a672fa0ddb5650f9b7ce50a7e62560241255d9d7d0a41240e77670cb1c1fd0551fbad601a535020b9  deviceinfo
 f86ef35730b89bcc8160c08db7a7fcd0970adf60c0b77af68bac397de49c0d1783e6b8db1762380c9bf874aff2d030c6f44ecb75c803d69e79ede11376409369  xorg.conf"

device/testing/device-motorola-peregrine/deviceinfo

@@ -8,7 +8,7 @@ deviceinfo_codename="motorola-peregrine"
 deviceinfo_year="2013"
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_keyboard="false"

device/testing/device-nokia-n900/APKBUILD

@@ -2,12 +2,12 @@
 # Contributor: Martijn Braam <martijn@brixit.nl>
 pkgname=device-nokia-n900
 pkgver=5
-pkgrel=6
+pkgrel=7
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
-depends="postmarketos-base linux-postmarketos-stable uboot-tools kbd kbd-bkeymaps ofono mesa-dri-swrast"
+depends="postmarketos-base linux-nokia-n900 uboot-tools kbd kbd-bkeymaps ofono mesa-dri-swrast"
 makedepends="devicepkg-dev uboot-tools kbd kbd-bkeymaps"
 install="$pkgname.post-install"
 subpackages="
@@ -147,7 +147,7 @@ nonfree_firmware() {
 }
 
 sha512sums="65317422ccbb263dd1eeb92b4a37357769f4e3e6a6f0ef812b1d4ac46fc5f00bef204e257945cca3e31b1123702c7ace0f129dd367849a27b18023b0e87a2d64  deviceinfo
-1558d02269b011e42e1d3969215b9dbd73658ffbf6ddb38c05f55915c0ff890306a2f56bb8155c825a430cad1e98f887475a40d9c2ae40b1892f964e1d395843  uboot-script.cmd
+01520977509df36248d0e44b3b2c18db0cefeb65e9ed5df96508eb0ed08304458a58ecd2bd21117771fe71e765b5f811c583909cad9a2c210de687a161e7234b  uboot-script.cmd
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules
 9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762  10-nokia-modem.rules

device/testing/device-nokia-n900/uboot-script.cmd

@@ -3,8 +3,8 @@ setenv mmcpart 1
 setenv mmctype ext2
 setenv setup_omap_atag 1
 setenv bootargs init=/init.sh rw console=tty0 console=tty02 PMOS_NO_OUTPUT_REDIRECT
-setenv mmckernfile /uImage-postmarketos-stable
-setenv mmcinitrdfile /uInitrd-postmarketos-stable
+setenv mmckernfile /uImage-nokia-n900
+setenv mmcinitrdfile /uInitrd-nokia-n900
 setenv mmcscriptfile
 echo Loading initramfs
 run initrdload

device/testing/device-pine64-pinephone/APKBUILD

@@ -3,7 +3,7 @@
 pkgname="device-pine64-pinephone"
 pkgdesc="PINE64 PinePhone"
 pkgver=0.2
-pkgrel=3
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -89,5 +89,5 @@ aa0b7191548e89ddfc6cf5b1f637c7ee7ab4c2025cbfc6328e7e482e5b179ea072779ca332a18094
 3cf0f2b0d463c1cf79156facfbddfa7e5bb9dffc54c364e0aa27e4f5e4778ec889febe8aecc819782db4f8423ac3cff2264c8e96c7e4f327519a4c403e087ce1  HiFi
 7071765039f282185d5a5f64912f41f96562785436018b4391f87e68bd9636addac496ebec239f7d82f7ef55401ac0cfe03ec1aebb454bd2eedf5b1251da758f  VoiceCall
 5a1a9c774253e8211cc54f4b3961c4bdc35427726d037b0ecad099915e856590e8267a4a47943ab753772d57261eef89924b407b305b1099a9c4ecd7b5f00b35  eg25.initd
-78f353cfe59657614ad5629435dc72a529b052986d646e29193645dcfd3663f5704542afd9a43f8b4ea65d1614ad32598a5434409ac524559ff66a9ab9b60856  setup-modem-audio.sh
-1b244cc6bfda4ff6c719c2dc077a2600376301d995607d15840994885b9044335d92d085282566a8baa0c2deb090ce958c586ea1e5950baf0e13686aef257b20  setup-modem-audio.initd"
+dc110f617efe28df3001630836c7df0cab20e74e99c4bb9d2c2f86367ae024dd30060e8c051c7be0e66e86f4656bef345189a6c13276808c4301d1a6deb8be7d  setup-modem-audio.sh
+dadfb8ceb7a82fd4a684a0fd4459bfdf0330fccc1d1781dd8549ee9ab5d571b97ee1e5b8dde66ec85e08db410e2d66e63f9da3d0c327ee80bd8303bf81d03eaf  setup-modem-audio.initd"

device/testing/device-pine64-pinephone/setup-modem-audio.initd

@@ -5,4 +5,5 @@ command_background=true
 
 depend() {
 	after eg25
+	before ofono
 }

device/testing/device-pine64-pinephone/setup-modem-audio.sh

 #!/bin/sh
 
-RET=$(echo "AT+QDAI=1,0,0,2,0,1,1,1" | atinout - /dev/EG25.AT -)
+# Current modem routing
+#
+#  1 - Digital PCM
+#  0 - I2S master
+#  0 - Primary mode (short sync)
+#  2 - 512kHz clock (512kHz / 16bit = 32k samples/s)
+#  0 - 16bit linear format
+#  1 - 16k sample/s
+#  1 - 1 slot
+#  1 - map to first slot (the only slot)
+#
+QDAI_CONFIG="1,0,0,2,0,1,1,1"
 
-if echo $RET | grep -q OK; then
+DEV=/dev/EG25.AT
+
+# Read current config
+RET=$(echo "AT+QDAI?" | atinout - $DEV -)
+
+if echo $RET | grep -q $QDAI_CONFIG
+then
+	echo "Modem audio already configured"
+	exit 0
+fi
+
+
+# Modem not configured, we need to send it the digital interface configuration,
+# then reboot it
+RET=$(echo "AT+QDAI=$QDAI_CONFIG" | atinout - $DEV -)
+
+if echo $RET | grep -q OK
+then
 	echo "Successfully configured modem audio"
 else
 	echo "Failed to set modem audio up: $RET"
 	exit 1
 fi
+
+# Reset module
+# 1 Set the mode to full functionality (vs 4: no RF, and 1: min functionality)
+# 1 Reset the modem before changing mode (only available with 1 above)
+#
+RET=$(echo "AT+CFUN=1,1" | atinout - $DEV -)
+
+if echo $RET | grep -q OK
+then
+	echo "Successfully reset the modem to apply audio configuration"
+else
+	echo "Failed to reset the modem to apply audio configuration: $RET"
+fi

device/testing/device-samsung-i9100/APKBUILD

@@ -2,10 +2,10 @@
 # Contributor: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=device-samsung-i9100
 pkgver=1
-pkgrel=26
+pkgrel=27
 pkgdesc="Samsung Galaxy SII"
 url="https://postmarketos.org"
-arch="armhf"
+arch="armv7"
 license="MIT"
 depends="postmarketos-base linux-samsung-i9100 libsamsung-ipc mesa-dri-swrast"
 makedepends="devicepkg-dev"
@@ -33,5 +33,5 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="254cb016e7a90da540214cb77b3801333f84c7fc488b30e32ffc477a0302b9685bd967d559fde11891cfe36d93a9ad0041a64dad6ad1080355f0a345b47c9ccc  deviceinfo
+sha512sums="906ec6fe4552fb6eb2d0c330637e4249ac4ef51f9fab53a47fb0dc288a56ca3aae4e6393a6f5c05ac6345748f79369c604fcac4355e017a558197a205ebddea9  deviceinfo
 089635daddd88eec35451bfe98dc3713035e3623c896dd21305b990ecf422e8fbb54e010cf347919bbb3a7385f639ab119280477fe0783df3228168d97d96fc6  90-android-touch-dev.rules"

device/testing/device-samsung-i9100/deviceinfo

@@ -10,7 +10,7 @@ deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
 deviceinfo_external_storage="true"
 deviceinfo_flash_method="heimdall-isorec"
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_keyboard="false"

device/testing/device-samsung-lt01wifi/APKBUILD

@@ -3,14 +3,17 @@
 pkgname="device-samsung-lt01wifi"
 pkgdesc="Samsung Galaxy Tab 3 8.0"
 pkgver=0.1
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
-arch="armhf"
+arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-samsung-lt01wifi mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
-source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo
+	modules-load.conf
+	modprobe.conf"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -18,7 +21,19 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
+
+	install -Dm644 "$srcdir"/modules-load.conf \
+		"$pkgdir"/etc/modules-load.d/00-$pkgname.conf
+	install -Dm644 "$srcdir"/modprobe.conf \
+		"$pkgdir"/etc/modprobe.d/dhd.conf
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-samsung-lt01wifi"
+	mkdir "$subpkgdir"
+}
 
-sha512sums="9e761d1403c28745b7e416bf80eb9025be45739c95091be0cbac2355cf915116efee37d5e5497e6658ae583a47518f879a623e4302f23c11f013d343bf00d2f2  deviceinfo"
+sha512sums="991e38af2ddbf67ca7e9045c8dcc3b0fbf6312dfeb8d83d612c7781f6e332dc92a4e0ef5a8d5822e4ae9de247c150ac9335942355a69e0e0d2a574dcff918919  deviceinfo
+af036fe35011db078379dbb2e8c16c86546f0a4fcb3d1bcee3502bb1ea5b38f3ec5a9fa8cd1ca8ed8b89592a7f572d6072781289845303e0bf85fc2de4ead9fb  modules-load.conf
+594d6059ba1b06bce65538d26ce80cf2ce840786605b86e993ffaef858837507c033c0f95b7bcd9914ae7ea3cd2a9e43e32ec879db7c908219ad62d38b4e426a  modprobe.conf"