microsoft-surface-rt: use systemd-boot

.ci/lib/check_changed_aports_versions.py

@@ -16,7 +16,8 @@ import pmb.parse
 import pmb.parse.version
 import pmb.helpers.logging
 
-def get_package_contents(args, package, revision, check=True):
+
+def get_package_version(args, package, revision, check=True):
     # Redirect stderr to /dev/null, so git doesn't complain about files not
     # existing in upstream branch for new packages
     stderr = None
@@ -39,15 +40,6 @@ def get_package_contents(args, package, revision, check=True):
             handle.write(apkbuild_content)
         parsed = pmb.parse.apkbuild(tempdir + "/APKBUILD", False, False)
 
-    return parsed
-
-
-def get_package_version(args, package, revision, check=True):
-    """ returns version in the format "{pkgver}-r{pkgrel}", or None if no 
-        matching package is found """
-    parsed = get_package_contents(args, package, revision, check)
-    if parsed is None:
-        return None
     return parsed["pkgver"] + "-r" + parsed["pkgrel"]
 
 
@@ -120,40 +112,6 @@ def check_versions(args, packages):
                 print(f"- {package}: {head} (HEAD) (new package)")
             continue
 
-        # Check pkgver follows expected format for device packages
-        pkgver = head.rpartition('-r')[0]
-        if package.startswith('device-') and not pkgver.isdigit():
-            print(f" - {package}: invalid pkgver \"{pkgver}\""
-                  "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-            error = True
-
-        # Additional checks for device packages
-        if package.startswith('device-'):
-            head_parsed = get_package_contents(args, package, "HEAD", False)
-            upstream_parsed = get_package_contents(args, package, commit, False)
-
-            # checksums did not change
-            if head_parsed["sha512sums"] == upstream_parsed["sha512sums"]:
-                # Check that pkgver did not change
-                if head_parsed["pkgver"] != upstream_parsed["pkgver"]:
-                    print(f" - {package}: pkgver should not change when package source checksums did not change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
-                # We do not check for a bumped pkgrel, because not everything
-                # needs it, e.g: pmb_recommends
-            # checksums changed
-            else:
-                # Check that pkgrel was reset to 0
-                if head_parsed["pkgrel"] != "0":
-                    print(f" - {package}: pkgrel should be 0 when package source checksums change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
-                # Check that pkgver was changed
-                if head_parsed["pkgver"] == upstream_parsed["pkgver"]:
-                    print(f" - {package}: pkgver should change when package source checksums change."
-                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
-                    error = True
-
         # Compare head and upstream versions
         result = pmb.parse.version.compare(head, upstream)
         if result != 1:

.ci/lib/check_devices_in_wiki.py

@@ -106,7 +106,7 @@ def main():
     # Ask to adjust the wiki
     if error:
         print("*** Wiki check failed!")
-        print("Thank you for porting postmarketOS to a new device! \\o/")
+        print("Thank you for porting postmarketOS to a new device! \o/")
         print("")
         print("Now it's time to add some documentation:")
         print("1) Create a device specific wiki page as described here:")

.ci/lib/common.py

@@ -59,11 +59,6 @@ def get_upstream_branch():
         channels.cfg from master to retrieve the upstream branch.
 
         :returns: branch name, e.g. "v20.05" """
-
-    # Prefer gitlab CI target branch name if it's set (i.e. running in gitlab CI)
-    if target_branch := os.environ.get("CI_MERGE_REQUEST_TARGET_BRANCH_NAME"):
-        return target_branch
-
     global cache
     if "upstream_branch" in cache:
         return cache["upstream_branch"]
@@ -135,28 +130,27 @@ def get_changed_packages_sanity_check(count):
         return
 
     branch = get_upstream_branch()
-    print(f"""
-ERROR: Too many packages have changed!
-
-This is a sanity check, so we don't end up building packages that
-have not been modified. CI won't run for more than three hours
-anyway.
-
-Your options:
-a) If you *did not* modify everything listed above, then rebase
-   your branch on the official postmarketOS/pmaports.git {branch}
-   branch. Feel free to ask in the chat for help if you need any.
-b) If you *did* modify all these packages, and you assume that
-   they will build within one hour: skip this sanity check by
-   adding '[ci:ignore-count]' to the commit message of the last
-   commit in the merge request (then force push).
-c) If you *did* modify all these packages, and you are sure that
-   they won't build in time, please add '[ci:skip-build]' to the
-   commit message (then force push). Make sure that all packages
-   build with 'pmbootstrap build --strict'!
-
-Thank you and sorry for the inconvenience.
-    """)
+    print()
+    print("ERROR: Too many packages have changed!")
+    print()
+    print("This is a sanity check, so we don't end up building packages that")
+    print("have not been modified. CI won't run for more than three hours")
+    print("anyway.")
+    print()
+    print("Your options:")
+    print("a) If you *did not* modify everything listed above, then rebase")
+    print(f"   your branch on the official postmarketOS/pmaports.git {branch}")
+    print("   branch. Feel free to ask in the chat for help if you need any.")
+    print("b) If you *did* modify all these packages, and you assume that")
+    print("   they will build within one hour: skip this sanity check by")
+    print("   adding '[ci:ignore-count]' to the commit message (then force")
+    print("   push).")
+    print("c) If you *did* modify all these packages, and you are sure that")
+    print("   they won't build in time, please add '[ci:skip-build]' to the")
+    print("   commit message (then force push). Make sure that all packages")
+    print("   build with 'pmbootstrap build --strict'!")
+    print()
+    print("Thank you and sorry for the inconvenience.")
 
     sys.exit(1)
 

.ci/ruff.sh

@@ -11,4 +11,4 @@ fi
 set -x
 
 # shellcheck disable=SC2046
-ruff check --ignore E501,F401,E722,W605 $(find .ci -name '*.py')
+ruff --ignore E501,F401,E722,W605 $(find .ci -name '*.py')

.ci/shellcheck.sh

@@ -23,6 +23,7 @@ sh_files="
 	./main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
 	./main/postmarketos-mkinitfs-hook-debug-shell/setup_usb_storage.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
+	./main/postmarketos-update-kernel/update-kernel.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
 	./main/msm-firmware-loader/*.post-install

.ci/testcases/add_pmbootstrap_to_import_path/__init__.py

@@ -34,7 +34,7 @@ def path_pmbootstrap():
             return directory
 
     # Symlink not set up properly
-    print("ERROR: unable to find path to pmbootstrap.py. Try setting 'PMBOOTSTRAP_CMD'.")
+    print("ERROR: 'pmbootstrap' is not a symlink to pmbootstrap.py")
     sys.exit(1)
 
 

.ci/testcases/test_device.py

@@ -61,6 +61,14 @@ def test_aports_device(args):
         if "!archcheck" not in apkbuild["options"]:
             raise RuntimeError("!archcheck missing in options= line: " + path)
 
+        if deviceinfo["flash_kernel_on_update"] == "true" \
+                and "postmarketos-update-kernel" not in apkbuild["depends"]:
+            raise RuntimeError(
+                "Deviceinfo indicates this device supports automatic kernel"
+                " flashing on update, but doesn't depend on"
+                " 'postmarketos-update-kernel'. Please add the missing"
+                " dependency.")
+
 
 def test_aports_device_kernel(args):
     """

.ci/testcases/test_directory_structure.py

@@ -6,10 +6,10 @@ import stat
 
 expected_directories = [
     "cross",
-    "device/archived",
     "device/community",
     "device/main",
     "device/testing",
+    "device/unmaintained",
     "main",
     "modem",
     "non-free",

.gitlab-ci.yml

@@ -2,34 +2,35 @@
 
 # global settings
 image: alpine:edge
-before_script: &global_before_scripts
-  - apk upgrade -U
 after_script:
   - .ci/lib/move_logs.sh $CI_PROJECT_DIR
 stages:
   - lint
   - build
 
-# This defines the rules for when a pipeline should run.
-workflow:
-  rules:
-    # Don't run branch pipeline if an MR is open (only the MR pipeline will run)
-    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
-      when: never
-    # Run for merge requests
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    # Run scheduled pipeline for autoupdate
-    - if: $CI_PIPELINE_SOURCE == "schedule"
+# defaults for "only"
+# We need to run the CI jobs in a "merge request specific context", if CI is
+# running in a merge request. Otherwise the environment variable that holds the
+# merge request ID is not available. This means, we must set the "only"
+# variable accordingly - and if we only do it for one job, all other jobs will
+# not get executed. So have the defaults here, and use them in all jobs that
+# should run on both the master branch, and in merge requests.
+# https://docs.gitlab.com/ee/ci/merge_request_pipelines/index.html#excluding-certain-jobs
+.only-default: &only-default
+  only:
+    - master
+    - merge_requests
+    - tags
 
 # device documentation
 wiki:
   stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - .ci/**/*
-        - .gitlab-ci.yml
-        - device/*/device-*/*
+  <<: *only-default
+  only:
+    refs:
+      - merge_requests
+    changes:
+      - device/*/device-*/*
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/wiki.sh
@@ -37,12 +38,16 @@ wiki:
 # testcases linting
 ruff:
   stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - .ci/*
-        - .ci/*/*
-        - .gitlab-ci.yml
+  <<: *only-default
+  only:
+    refs:
+      - merge_requests
+    changes:
+      - .ci/*
+      - .ci/*/*
+      - .gitlab-ci.yml
+  before_script:
+    - "echo 'https://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories"
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/ruff.sh
@@ -50,9 +55,8 @@ ruff:
 # shellcheck and various grep checks
 shellcheck-grep:
   stage: lint
+  <<: *only-default
   image: alpine:edge
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/shellcheck.sh
@@ -61,9 +65,8 @@ shellcheck-grep:
 
 editor-config:
   stage: lint
+  <<: *only-default
   image: alpine:edge
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/ec.sh
@@ -71,8 +74,7 @@ editor-config:
 # aports checks (generic)
 pytest-commits:
   stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+  <<: *only-default
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/pytest.sh
@@ -88,21 +90,23 @@ pytest-commits:
 # APKBUILD linting
 aport-lint:
   stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/apkbuild-lint.sh
+  only:
+    - merge_requests
   allow_failure: true
 
 # kernel kconfig check
 kernel-kconfig:
   stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - device/*/linux-*/config-*
-        - main/linux-*/config-*
+  only:
+    refs:
+      - master
+      - merge_requests
+    changes:
+      - device/*/linux-*/config-*
+      - main/linux-*/config-*
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/kconfig.sh
@@ -111,10 +115,9 @@ kernel-kconfig:
 # (Checks for "Allow commits from members who can merge to the target branch")
 mr-settings:
   stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+  only:
+    - merge_requests
   before_script:
-    - *global_before_scripts
     - apk -q add python3
   script:
     - wget -q "https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
@@ -123,10 +126,8 @@ mr-settings:
 # build changed aports
 .build:
   stage: build
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+  <<: *only-default
   before_script:
-    - *global_before_scripts
     - .ci/lib/gitlab_prepare_ci.sh
   after_script:
     - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true

.gitlab/issue_templates/Default.md

@@ -1,12 +1,6 @@
 <!--
 	Thank you for using postmarketOS! In order to speed up process of resolving your issue,
-	we would like you to fill in the following form.
-
-	*** NOTE FOR CONFIDENTIAL ISSUES: ***
-	A lot of people can read confidential pmaports issues! If you want to
-	submit something that only the postmarketOS Core Team can see, write to
-		team@postmarketos.org
-	instead of opening an issue here!
+	we would like you to fill in the following :
 -->
 ### Describe your issue
 #### What's the expected behaviour?
@@ -28,6 +22,7 @@
 -->
 * [ ] edge (`master` branch)
 * [ ] `v23.12`
+* [ ] `v23.06` (supported until 2024-01-18)
 
 * [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`
 

CODEOWNERS

@@ -2,12 +2,10 @@
 # Put groups like @sdm845-mainline into test_device.py:gitlab_groups.
 # Order lines alphabetically!
 
-device/*/*-amlogic-s905*/			@funderscore
+device/*/*-amlogic-s905*/			@vitali64yt
 device/*/*-arrow-db410c/			@Minecrell
 device/*/*-asus-me176c/				@Minecrell
-device/*/*-ayn-odin/				@jenneron
 device/*/*-bq-paella/				@Minecrell
-device/*/*-bq-tenshi/				@fossdd
 device/*/*-google-gru/				@jenneron
 device/*/*-google-kukui/			@jenneron @binarycraft
 device/*/*-google-oak/				@jenneron @adamthiede
@@ -16,13 +14,9 @@ device/*/*-google-veyron/			@jenneron
 device/*/*-google-x64cros/			@jenneron @JustSoup321 @alpernebbi
 device/*/*-htc-golfu/				@Newbyte
 device/*/*-htc-m8qlul/				@Newbyte
-device/*/*-kobo-clara/				@akemnade
 device/*/*-lenovo-21bx/				@craftyguy
 device/*/*-lenovo-a6000/			@jenneron @Minecrell
 device/*/*-lenovo-a6010/			@jenneron @Minecrell
-device/*/*-librecomputer-lafrite/		@funderscore
-device/*/*-librecomputer-lepotato/		@funderscore
-device/*/*-librecomputer-solitude/		@Newbyte @funderscore
 device/*/*-motorola-harpia/			@Minecrell
 device/*/*-nokia-n900/				@sicelo @Danct12
 device/*/*-pine64-pinebookpro/			@QC8086
@@ -41,11 +35,8 @@ device/*/*-samsung-espresso7/			@MightyM17 @antoni.aloytorrens
 device/*/*-samsung-grandmax/			@wonderfulShrineMaidenOfParadise
 device/*/*-samsung-gt510/			@TravMurav
 device/*/*-samsung-gt58/			@TravMurav
-device/*/*-samsung-j5/				@wonderfulShrineMaidenOfParadise
-device/*/*-samsung-j5x/				@wonderfulShrineMaidenOfParadise
 device/*/*-samsung-serranove/			@Minecrell
-device/*/*-tolino-shine2hd/			@akemnade
-device/*/*-videostrong-kii-pro/			@funderscore
+device/*/*-videostrong-kii-pro/			@vitali64yt
 device/*/*-wileyfox-crackling/			@TravMurav @Minecrell
 device/*/*-xiaomi-beryllium/			@joelselvaraj
 device/*/*-xiaomi-daisy/			@joelselvaraj @alikates
@@ -56,9 +47,7 @@ device/*/*-xiaomi-tissot/			@jiaxyga @barni2000
 device/*/*-xiaomi-vince/			@M0Rf30
 device/*/*-xiaomi-wt88047/			@Minecrell
 device/*/*-xiaomi-ysl/				@barni2000
-device/*/alsa-ucm-conf-cros/			@WeirdTreeThing
 device/*/device-fairphone-*/			@z3ntu
-device/*/device-generic-x86_64/			@craftyguy @ollieparanoid
 device/*/device-google-nyan-big/		@jenneron
 device/*/device-google-nyan-blaze/		@jenneron
 device/*/device-google-peach-pi/		@jenneron
@@ -68,19 +57,17 @@ device/*/device-huawei-plank/			@gtrxAC
 device/*/device-lg-judyln/			@Newbyte
 device/*/device-lg-judyp/			@jenneron
 device/*/device-microsoft-surface-rt/		@jenneron @jethrob
-device/*/device-nvidia-tegra-armv7/		@clamor-s @okias @mschwalm @nokun
+device/*/device-nvidia-tegra-armv7/		@clamor95 @okias @mschwalm @nokun
 device/*/device-odroid-xu4/			@Grimler
 device/*/device-oneplus-enchilada/		@calebccff
 device/*/device-oneplus-fajita/			@calebccff
 device/*/device-qemu-aarch64/			@Minecrell @ollieparanoid
 device/*/device-qemu-amd64/			@Minecrell @ollieparanoid
 device/*/device-qemu-riscv64/			@Minecrell @z3ntu
-device/*/device-qualcomm-sdm845/		@calebccff
 device/*/device-samsung-chagallwifi/		@Grimler
 device/*/device-samsung-coreprimevelte/		@legolivesmatter @balejk
 device/*/device-samsung-j5y17lte/	@andrisas
 device/*/device-samsung-klimtlte/		@Grimler
-device/*/device-samsung-lt01/			@knuxify
 device/*/device-samsung-m0/			@Newbyte
 device/*/device-samsung-manta/			@jenneron @alexmrqt
 device/*/device-shift-axolotl/			@amartinz @calebccff @dylanvanassche
@@ -88,21 +75,19 @@ device/*/firmware-google-veyron-brcm/		@jenneron
 device/*/firmware-odroid-xu4/			@Grimler
 device/*/firmware-oneplus-sdm845/		@calebccff
 device/*/firmware-powervr-gx6250/		@jenneron
-device/*/kobo-epdc-extractor/			@akemnade
 device/*/linux-google-nyan/			@jenneron
 device/*/linux-google-veyron/			@jenneron
 device/*/linux-huawei-plank/			@gtrxAC
 device/*/linux-postmarketos-allwinner/		@Arnavion @PsychoGame
-device/*/linux-postmarketos-amlogic/		@funderscore @exkc
+device/*/linux-postmarketos-amlogic/		@vitali64yt @exkc
 device/*/linux-postmarketos-exynos4/		@Newbyte @ThiagaoPlusPlus
 device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
-device/*/linux-postmarketos-grate/		@clamor-s @jenneron @jethrob
-device/*/linux-postmarketos-imx-ereader/	@akemnade
+device/*/linux-postmarketos-grate/		@clamor95 @jenneron @jethrob
 device/*/linux-postmarketos-mediatek-mt8173/	@jenneron @adamthiede
 device/*/linux-postmarketos-mediatek-mt8183/	@jenneron @binarycraft
 device/*/linux-postmarketos-omap/		@MightyM17 @Sicelo
 device/*/linux-postmarketos-qcom-msm8939/	@Newbyte
-device/*/linux-postmarketos-qcom-msm8953/	@M0Rf30 @Ultra-azu @barni2000
+device/*/linux-postmarketos-qcom-msm8953/	@M0Rf30 @Ultra-azu
 device/*/linux-postmarketos-qcom-msm8996/	@Tooniis
 device/*/linux-postmarketos-qcom-sc7180/	@jenneron
 device/*/linux-postmarketos-rockchip/		@QC8086
@@ -123,6 +108,7 @@ device/*/u-boot-librem5/			@craftyguy @alistair23 @Newbyte
 device/*/u-boot-pinebookpro/			@QC8086
 device/*/u-boot-pinephone/			@Arnavion @PsychoGame
 device/*/wl1251-cal/				@Danct12
-main/postmarketos-ui-plasma-mobile/		@PureTryOut
+main/postmarketos-ui-plasma-mobile/		@bshah
+main/postmarketos-update-depthcharge-kernel/	@jenneron
 main/shutdown-clear-rtc-wakealarm/		@Arnavion
 main/ttyescape/					@calebccff

channels.cfg

@@ -8,12 +8,6 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge
 
-[v24.06]
-description=Upcoming stable release (DO NOT USE)
-branch_pmaports=v24.06
-branch_aports=3.20-stable
-mirrordir_alpine=v3.20
-
 [v23.12]
 description=Latest release / Recommended for best stability
 branch_pmaports=v23.12

cross/busybox-static-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-aarch64
 pkgver=1.36.1
-pkgrel=26
+pkgrel=21
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-0f5f1eb32691016183d9a3011c5643f70a1cdc9f49b1ffefce732cff960cfea4d0db1670564fff5504654bb2f07857e62e5dd076fb40d2c361c441854e5d5e5c  busybox-static-1.36.1-r26-aarch64-edge.apk
+0a234d00087f85ba8b21d014c38535947ae087df94c18a174717452c91f732489d258394bf616fecae94259e1c932edcf8ea1dcf4aacf6eb803064e3b3587a78  busybox-static-1.36.1-r21-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armhf
 pkgver=1.36.1
-pkgrel=26
+pkgrel=21
 
 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-ad4db0c989c1a4773f75411c2749bcc8d25756d20396cdb6bfa59bd5ed14164928c602e9833101e584b28490971f6d43973a9c7de9c544693aef40dbe183cabc  busybox-static-1.36.1-r26-armhf-edge.apk
+0f8c600ff2fe1a176503e44924dfdd7520615b3be8e5e84b5fa869c543d43ee7a5307cdf7b8b46effbf8f393682566fa76a9368bcb228e4b44d800ef7c01b888  busybox-static-1.36.1-r21-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armv7
 pkgver=1.36.1
-pkgrel=26
+pkgrel=21
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-f6664d29ecb22e396133116210d792e101fa552b4f4d2295de19af460830bbb151a2d3c4a7b7bbe1596d7b3ed85042f10dae49d78ae4e6ac053ed565f9043c01  busybox-static-1.36.1-r26-armv7-edge.apk
+441ff2d84e385408671c34f891dbe245a3b3c16668f6c985786067fad093c0d218e85695c0604d3f8364b750ff7e7eb4ee00af089ed198d419300b2d4e3edf61  busybox-static-1.36.1-r21-armv7-edge.apk
 "

cross/grub-efi-x86/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=grub-efi-x86
 pkgver=2.12
-pkgrel=3
+pkgrel=2
 
 _arch="x86"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -22,5 +22,5 @@ package() {
 }
 
 sha512sums="
-4bd0750236a556ad833c27892a55624a324e8ec7cadb0b7287cabd3a9cdded836357ae959aea7ba828be8727b86c6ed4844a1572b68ad3ce3f3e6f913e43ae72  grub-efi-2.12-r3-x86-edge.apk
+2337e5db9d3502b56f1166f0648a15f2264d207e717dfbd0c8bbb9de4546dee069dbc2b55f2c7c48bfee062d7ca17b56e97b6eaa725af0479ab49e2cb5f178a3  grub-efi-2.12-r2-x86-edge.apk
 "

device/.shared-patches/linux/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

@@ -1,70 +0,0 @@
-From 3810f128e9ecf04cf07d243cd377fcb6046cfd73 Mon Sep 17 00:00:00 2001
-From: Newbyte <newbyte@postmarketos.org>
-Date: Tue, 30 Apr 2024 17:57:20 +0200
-Subject: [PATCH] ARM: 8933/1: replace Sun/Solaris style flag on section
-
-Taken from
-linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
-and adapted for the Exynos 4412 vendor sources.
----
- arch/arm/boot/bootp/init.S            | 2 +-
- arch/arm/boot/compressed/big-endian.S | 2 +-
- arch/arm/boot/compressed/head.S       | 2 +-
- arch/arm/mm/proc-v7.S                 | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S
-index 78b50807516..868eeeaaa46 100644
---- a/arch/arm/boot/bootp/init.S
-+++ b/arch/arm/boot/bootp/init.S
-@@ -16,7 +16,7 @@
-  *  size immediately following the kernel, we could build this into
-  *  a binary blob, and concatenate the zImage using the cat command.
-  */
--		.section .start,#alloc,#execinstr
-+		.section .start, "ax"
- 		.type	_start, #function
- 		.globl	_start
- 
-diff --git a/arch/arm/boot/compressed/big-endian.S b/arch/arm/boot/compressed/big-endian.S
-index 25ab26f1c6f..f22428e275f 100644
---- a/arch/arm/boot/compressed/big-endian.S
-+++ b/arch/arm/boot/compressed/big-endian.S
-@@ -5,7 +5,7 @@
-  *  Author: Nicolas Pitre
-  */
- 
--	.section ".start", #alloc, #execinstr
-+	.section ".start", "ax"
- 
- 	mrc	p15, 0, r0, c1, c0, 0	@ read control reg
- 	orr	r0, r0, #(1 << 7)	@ enable big endian mode
-diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
-index 63cfa2e9236..3cd67aa3855 100644
---- a/arch/arm/boot/compressed/head.S
-+++ b/arch/arm/boot/compressed/head.S
-@@ -112,7 +112,7 @@
- #endif
- 		.endm
- 
--		.section ".start", #alloc, #execinstr
-+		.section ".start", "ax"
- /*
-  * sort out different calling conventions
-  */
-diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
-index e1687990af9..a479702f198 100644
---- a/arch/arm/mm/proc-v7.S
-+++ b/arch/arm/mm/proc-v7.S
-@@ -519,7 +519,7 @@ __v7_setup_stack:
- 	string	cpu_elf_name, "v7"
- 	.align
- 
--	.section ".proc.info.init", #alloc, #execinstr
-+	.section ".proc.info.init", "ax"
- 
- 	/*
- 	 * Standard v7 proc info content
--- 
-2.44.0
-

device/.shared-patches/linux/linux3.0-fix-piggy.lzma.S.patch

@@ -1,22 +0,0 @@
-From c6b821b1281f7ce2b54aad3b0b2acd0e29039c8f Mon Sep 17 00:00:00 2001
-From: Stefan Hansson <newbyte@postmarketos.org>
-Date: Mon, 6 May 2024 10:59:58 +0200
-Subject: [PATCH] Fix lzma piggy
-
----
- arch/arm/boot/compressed/piggy.lzma.S | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S
-index d7e69cffbc0..cfea81ae8f4 100644
---- a/arch/arm/boot/compressed/piggy.lzma.S
-+++ b/arch/arm/boot/compressed/piggy.lzma.S
-@@ -1,4 +1,4 @@
--	.section .piggydata,#alloc
-+	.section .piggydata, "a"
- 	.globl	input_data
- input_data:
- 	.incbin	"arch/arm/boot/compressed/piggy.lzma"
--- 
-2.45.0
-

device/.shared-patches/linux/linux3.0-fix-piggy.lzo.S.patch

@@ -1,22 +0,0 @@
-From 6083916292864215fe4af6c0829186d5cc520f7f Mon Sep 17 00:00:00 2001
-From: Stefan Hansson <newbyte@postmarketos.org>
-Date: Mon, 6 May 2024 19:08:35 +0200
-Subject: [PATCH] Fix lzo piggy
-
----
- arch/arm/boot/compressed/piggy.lzo.S | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/compressed/piggy.lzo.S b/arch/arm/boot/compressed/piggy.lzo.S
-index a425ad95..236976d8 100644
---- a/arch/arm/boot/compressed/piggy.lzo.S
-+++ b/arch/arm/boot/compressed/piggy.lzo.S
-@@ -1,4 +1,4 @@
--	.section .piggydata,#alloc
-+	.section .piggydata, "a"
- 	.globl	input_data
- input_data:
- 	.incbin	"arch/arm/boot/compressed/piggy.lzo"
--- 
-2.45.0
-

device/archived/device-kobo-clara-downstream/APKBUILD

@@ -1,46 +0,0 @@
-# Archived: Downstream port, maybe useful for EPDC performance improvement
-# needs special userspace to show up anything
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-kobo-clara-downstream
-pkgdesc="Kobo Clara HD downstream"
-pkgver=0.1
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="armv7"
-options="!check !archcheck"
-depends="
-	postmarketos-base
-	u-boot-kobo-clara-downstream
-	u-boot-tools
-	linux-kobo-clara-downstream
-"
-makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-
-source="
-	deviceinfo
-	uboot-script-downstream.cmd
-"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-	mkimage -A arm -O linux -T script -n postmarketOS \
-		-d "$srcdir"/uboot-script-downstream.cmd "$srcdir/boot-downstream.scr"
-	install -Dm644 "$srcdir/boot-downstream.scr" "$pkgdir/boot/boot.scr"
-}
-
-nonfree_firmware() {
-	pkgdesc="Kobo Clara HD firmware"
-	depends="firmware-kobo-clara-downstream"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-84b9e5385b7fd77af6891b31d7e95ec424645f741d54168d3d38f6f703071d622829d9f7cf5a29136bf6eb9ec5b2a50a05efe76ddc3e047bb4a69e197fbfde24  deviceinfo
-4bfc2714a2670efc451860bd97d36ba12559e00aed41afdde1ac3e01b41458390358ac7f6bc96a6dee6be6a34f534da52d845b02df0566b25f4868774ef69b1d  uboot-script-downstream.cmd
-"

device/archived/device-kobo-clara-downstream/deviceinfo

@@ -1,28 +0,0 @@
-# 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 Clara HD"
-deviceinfo_manufacturer="Kobo"
-deviceinfo_codename="kobo-clara-downstream"
-deviceinfo_year="2018"
-deviceinfo_arch="armv7"
-deviceinfo_dtb="imx6sll-e60k02"
-
-# Device related
-deviceinfo_chassis="tablet"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_screen_width="1072"
-deviceinfo_screen_height="1448"
-
-# 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-clara/u-boot.imx:2,firmware/kobo-clara/hwcfg+header.bin:1023,firmware/kobo-clara/ntxfw-E60K00+header.bin:1029,u-boot/kobo-clara/u-boot-env.bin:1536"

device/archived/device-samsung-on7xelte-downstream/APKBUILD

@@ -1,59 +0,0 @@
-# Archived: Downstream port, only for testing. Use mainline port (samsung-on7xelte)!
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-on7xelte-downstream
-pkgdesc="Samsung Galaxy J7 Prime"
-pkgver=1
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	linux-samsung-on7xelte
-	mkbootimg
-	msm-fb-refresher
-	postmarketos-base
-	samsungipcd
-"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-lightdm"
-makedepends="devicepkg-dev"
-install="$pkgname.post-install"
-source="
-	deviceinfo
-	lightdm.conf
-	mount-efs.rc-init
-	samsungipcd.rc-conf
-"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-
-	# Mounting EFS Partition
-	install -Dm755 mount-efs.rc-init "$pkgdir"/etc/init.d/mount-efs
-
-	# Modem Configuration - samsungipcd
-	install -Dm644 samsungipcd.rc-conf "$pkgdir"/etc/conf.d/samsungipcd
-}
-
-nonfree_firmware() {
-	pkgdesc="Proprietary Firmware blobs"
-	depends="firmware-samsung-on7xelte"
-	mkdir "$subpkgdir"
-}
-
-lightdm() {
-	install_if="$pkgname=$pkgver-r$pkgrel lightdm"
-	install -Dm644 lightdm.conf \
-		"$subpkgdir"/etc/lightdm/lightdm.conf.d/00-on7xelte.conf
-}
-
-sha512sums="
-d342e7d79922d2e4a313e6c0ad20172e841886aa9517522460699da0dc66cd83cfeab986e468b0427ebcd64d54ffbc39cf3ba56c5d839b560e34cbe6e36526f1  deviceinfo
-baee319b6d2f49a15680b0f322ec3e398a071d73fbf7713d14f26a1d027f8950457a482ac3f019605af3dfcf25bbb33ebaa0ffde181f7f96d911d56251c81eef  lightdm.conf
-efbe3d6217854c0131e61f9f3722100d349cb0673f4923bc3d56dae30a6346b0c33e676a39fc4c080150f6ea9457bf268abf870eea916a7d5daae1a22642a2b8  mount-efs.rc-init
-3e5bb764529010d2b6b1f2759a7799f665d140aebcee2dd63433e68cd4282e09b5d3b34fb7c21e737595b406501e7f02ece4592651c60e4c2b9419de4aedb438  samsungipcd.rc-conf
-"

device/archived/device-samsung-on7xelte-downstream/deviceinfo

@@ -1,33 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy J7 Prime"
-deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-on7xelte-downstream"
-deviceinfo_year="2016"
-deviceinfo_arch="aarch64"
-
-# Device related
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_screen_width="1080"
-deviceinfo_screen_height="1920"
-
-# Bootloader related
-deviceinfo_flash_method="heimdall-bootimg"
-deviceinfo_kernel_cmdline="androidboot.selinux=permissive androidboot.selinux=permissive"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="true"
-deviceinfo_bootimg_mtk_mkimage="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_pagesize="2048"
-deviceinfo_flash_offset_base="0x10000000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x00000100"
-deviceinfo_flash_heimdall_partition_kernel="BOOT"
-deviceinfo_flash_heimdall_partition_rootfs="SYSTEM"

device/archived/firmware-samsung-on7xelte-downstream/APKBUILD

@@ -1,43 +0,0 @@
-# Archived: Only used by archived downstream kernel
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=firmware-samsung-on7xelte-downstream
-pkgver=1
-pkgrel=0
-pkgdesc="Samsung Galaxy J7 Prime Firmware"
-url="https://github.com/DevOtag-Open-Source/android_vendor_samsung_on7xelte"
-arch="aarch64"
-license="proprietary"
-options="!check !archcheck !tracedeps pmb:cross-native"
-
-_commit="51b221e521ff93e51c40366f0245d6815248f817"
-_repo="https://raw.githubusercontent.com/DevOtag-Open-Source/android_vendor_samsung_on7xelte/eleven/proprietary/"
-_prefix=$pkgname-$_commit
-
-_files_etc="bcmdhd_sta.bin nvram_net.txt"
-_files_vendor="mfc_fw.bin fimc_is_lib.bin bcm43438A1_V0068.0286.hcd setfile_4h5yc.bin setfile_imx258.bin"
-
-for _file in $_files_etc; do
-	source="$source $_prefix-$_file::$_repo/etc/wifi/$_file"
-done
-
-for _file in $_files_vendor; do
-	source="$source $_prefix-$_file::$_repo/vendor/firmware/$_file"
-done
-
-package() {
-	local file
-	for file in $_files_etc $_files_vendor; do
-		install -Dm644 "$srcdir/$_prefix-$file" \
-		"$pkgdir/lib/firmware/postmarketos/$file"
-	done
-
-}
-sha512sums="
-fa250eecbbea53e0a5dbe8317e9a40ee189d4f016122fedff93d299cd799b8f95761643ce4042709a83705189348cf5d5b5bcf74acbeb7d84dc30ec3a62ee6c5  firmware-samsung-on7xelte-downstream-51b221e521ff93e51c40366f0245d6815248f817-bcmdhd_sta.bin
-183fa0fc0bb87602154d23b6fcaf699f0556919b4a9625ff83df4ba2514beb79a1abcb4fb7d2d18e2d57bc726caea579715c377225c7efffb03a65fa5aa2ab56  firmware-samsung-on7xelte-downstream-51b221e521ff93e51c40366f0245d6815248f817-nvram_net.txt
-ef58a1c6bfebd7ef43cc16de834a8446cc373a3e304dac279c6d7f061bda80f96a9f5b9e2b6d21de7eb53f4abfddeb597306bbf2eed579b1441a247e29bf888e  firmware-samsung-on7xelte-downstream-51b221e521ff93e51c40366f0245d6815248f817-mfc_fw.bin
-2eacf2bac885578d1619978b33a9cf14357dda024705c7a88449b460aec08d94e499d5c5ff7f96862591dbf667729a3b0f772a3f00c0c06ebe07f9d227d89086  firmware-samsung-on7xelte-downstream-51b221e521ff93e51c40366f0245d6815248f817-fimc_is_lib.bin
-a86e5021f8c3e8fd4f568a412ae9052e70ada65cbf8cf46b7d6c27ec8ef6e925d0eeff843214451959e783b04a06803ed5bb39e064fbbaae7421e41dbb93d19e  firmware-samsung-on7xelte-downstream-51b221e521ff93e51c40366f0245d6815248f817-bcm43438A1_V0068.0286.hcd
-4da1d0b5cfd608a5d22d1b8b35c4b7bc6915a2da3a999d9d4c1a38404686c9aefb9508e90b4c84c7d88b6a715ff71b8de04c8959f7cc830c82cb45485ad152fc  firmware-samsung-on7xelte-downstream-51b221e521ff93e51c40366f0245d6815248f817-setfile_4h5yc.bin
-29d8601d4f77fe49a38ec974d7ad432f1815e55a7f9d011fcdaa45580653c395a7f89debdea7588f693a111043f9dee286948ed1e4fbb1b1b4807ec6799ba34f  firmware-samsung-on7xelte-downstream-51b221e521ff93e51c40366f0245d6815248f817-setfile_imx258.bin
-"

device/archived/linux-alcatel-idol347-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-alcatel-idol347-downstream/linux3.4-fix-piggy.gzip.S.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch

device/archived/linux-alcatel-idol347-downstream/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-bq-paella-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-bq-paella-downstream/linux3.4-fix-piggy.gzip.S.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch

device/archived/linux-bq-paella-downstream/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-htc-flounder-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-htc-flounder-downstream/linux3.4-fix-piggy.gzip.S.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch

device/archived/linux-htc-flounder-downstream/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-huawei-kiwi-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-huawei-kiwi-downstream/linux3.4-fix-piggy.gzip.S.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch

device/archived/linux-huawei-kiwi-downstream/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-samsung-a5lte-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-samsung-a5lte-downstream/linux3.4-fix-piggy.gzip.S.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch

device/archived/linux-samsung-a5lte-downstream/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-samsung-a5ulte-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-samsung-a5ulte-downstream/linux3.4-fix-piggy.gzip.S.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch

device/archived/linux-samsung-a5ulte-downstream/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-samsung-espresso10-downstream/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-samsung-espresso10-downstream/linux3.4-fix-piggy.gzip.S.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch

device/archived/linux-samsung-expressatt-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-samsung-janice-downstream/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-samsung-janice-downstream/linux3.0-fix-piggy.lzo.S.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.0-fix-piggy.lzo.S.patch

device/archived/linux-samsung-janice-downstream/linux3.4-fix-piggy.gzip.S.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch

device/archived/linux-samsung-klte-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-samsung-klte-downstream/linux3.4-fix-piggy.gzip.S.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch

device/archived/linux-samsung-lt01wifi-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

@@ -1,100 +0,0 @@
-From 3020e3a81b63e05891ef5d40f3acfbd00040ba17 Mon Sep 17 00:00:00 2001
-From: Nick Desaulniers <ndesaulniers@google.com>
-Date: Mon, 4 Nov 2019 19:31:45 +0100
-Subject: [PATCH] ARM: 8933/1: replace Sun/Solaris style flag on section
- directive
-
-It looks like a section directive was using "Solaris style" to declare
-the section flags. Replace this with the GNU style so that Clang's
-integrated assembler can assemble this directive.
-
-The modified instances were identified via:
-$ ag \.section | grep #
-
-Link: https://ftp.gnu.org/old-gnu/Manuals/gas-2.9.1/html_chapter/as_7.html#SEC119
-Link: https://github.com/ClangBuiltLinux/linux/issues/744
-Link: https://bugs.llvm.org/show_bug.cgi?id=43759
-Link: https://reviews.llvm.org/D69296
-
-Acked-by: Nicolas Pitre <nico@fluxnic.net>
-Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
-Reviewed-by: Stefan Agner <stefan@agner.ch>
-Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
-Suggested-by: Fangrui Song <maskray@google.com>
-Suggested-by: Jian Cai <jiancai@google.com>
-Suggested-by: Peter Smith <peter.smith@linaro.org>
-Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-[ partial backport to 3.4 ]
----
- arch/arm/boot/bootp/init.S            | 2 +-
- arch/arm/boot/compressed/big-endian.S | 2 +-
- arch/arm/boot/compressed/head.S       | 2 +-
- arch/arm/boot/compressed/piggy.lzma.S | 2 +-
- arch/arm/mm/proc-v7.S                 | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S
-index 78b508075161..868eeeaaa46e 100644
---- a/arch/arm/boot/bootp/init.S
-+++ b/arch/arm/boot/bootp/init.S
-@@ -16,7 +16,7 @@
-  *  size immediately following the kernel, we could build this into
-  *  a binary blob, and concatenate the zImage using the cat command.
-  */
--		.section .start,#alloc,#execinstr
-+		.section .start, "ax"
- 		.type	_start, #function
- 		.globl	_start
- 
-diff --git a/arch/arm/boot/compressed/big-endian.S b/arch/arm/boot/compressed/big-endian.S
-index 25ab26f1c6f0..f22428e275f8 100644
---- a/arch/arm/boot/compressed/big-endian.S
-+++ b/arch/arm/boot/compressed/big-endian.S
-@@ -5,7 +5,7 @@
-  *  Author: Nicolas Pitre
-  */
- 
--	.section ".start", #alloc, #execinstr
-+	.section ".start", "ax"
- 
- 	mrc	p15, 0, r0, c1, c0, 0	@ read control reg
- 	orr	r0, r0, #(1 << 7)	@ enable big endian mode
-diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
-index 77a716bdf4d3..b70606652d21 100644
---- a/arch/arm/boot/compressed/head.S
-+++ b/arch/arm/boot/compressed/head.S
-@@ -113,7 +113,7 @@
- #endif
- 		.endm
- 
--		.section ".start", #alloc, #execinstr
-+		.section ".start", "ax"
- /*
-  * sort out different calling conventions
-  */
-diff --git a/arch/arm/boot/compressed/piggy.lzma.S b/arch/arm/boot/compressed/piggy.lzma.S
-index d7e69cffbc0a..cfea81ae8f4b 100644
---- a/arch/arm/boot/compressed/piggy.lzma.S
-+++ b/arch/arm/boot/compressed/piggy.lzma.S
-@@ -1,4 +1,4 @@
--	.section .piggydata,#alloc
-+	.section .piggydata, "a"
- 	.globl	input_data
- input_data:
- 	.incbin	"arch/arm/boot/compressed/piggy.lzma"
-diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
-index 69363be2f241..321cb1c6a091 100644
---- a/arch/arm/mm/proc-v7.S
-+++ b/arch/arm/mm/proc-v7.S
-@@ -422,7 +422,7 @@ __v7_setup_stack:
- 	string	cpu_elf_name, "v7"
- 	.align
- 
--	.section ".proc.info.init", #alloc, #execinstr
-+	.section ".proc.info.init", "ax"
- 
- 	/*
- 	 * Standard v7 proc info content
--- 
-2.30.2
-

device/archived/linux-samsung-m0-downstream/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-samsung-m0-downstream/linux3.0-fix-piggy.lzma.S.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.0-fix-piggy.lzma.S.patch

device/archived/linux-samsung-m0-downstream/linux3.4-fix-piggy.gzip.S.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch

device/archived/linux-samsung-n7100-downstream/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.0-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-samsung-n7100-downstream/linux3.4-fix-piggy.gzip.S.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch

device/archived/linux-samsung-on7xelte-downstream/proc_S-remove-text-init-line.patch

@@ -1,25 +0,0 @@
-From 44b07494ad40ce82eaf7fc98c58d498b947f6772 Mon Sep 17 00:00:00 2001
-From: Eray Tutmaz <tarkanttmz261@gmail.com>
-Date: Thu, 19 Oct 2023 08:31:12 +0000
-Subject: [PATCH] Update file proc.S
-
----
- arch/arm64/mm/proc.S | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
-index 4e778b132..4179312e5 100644
---- a/arch/arm64/mm/proc.S
-+++ b/arch/arm64/mm/proc.S
-@@ -186,7 +186,7 @@ ENTRY(cpu_do_switch_mm)
- 	ret
- ENDPROC(cpu_do_switch_mm)
- 
--	.section ".text.init", #alloc, #execinstr
-+
- 
- /*
-  *	__cpu_setup
--- 
-GitLab
-

device/archived/linux-xiaomi-wt88047-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch

device/archived/linux-xiaomi-wt88047-downstream/linux3.4-fix-piggy.gzip.S.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch

device/archived/linux-xiaomi-wt88047-downstream/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

device/archived/u-boot-kobo-clara-downstream/APKBUILD

@@ -1,37 +0,0 @@
-# Archived: does weird things, not needed for mainline kernels
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=u-boot-kobo-clara-downstream
-pkgver=2016.03
-pkgrel=0
-pkgdesc="U-Boot for Kobo Clara HD"
-arch="armv7"
-_carch="arm"
-license="GPL-2.0"
-url="https://github.com/pmsourcedump/kobo_clara_uboot"
-options="!check"
-
-_repository="kobo_clara_uboot"
-_commit="5af329fef886e21b777426d7bf5c6162e2317de7"
-source="
-	$pkgname-$_commit.tar.gz::https://github.com/pmsourcedump/$_repository/archive/$_commit.tar.gz
-	u-boot-env.txt
-"
-
-builddir="$srcdir/$_repository-$_commit"
-
-build() {
-	make ARCH="$_carch" mx6sll_ntx_lpddr2_512m_config
-	make ARCH="$_carch"
-	tools/mkenvimage -p 0 -s 8192 -o u-boot-env.bin "$srcdir/u-boot-env.txt"
-}
-
-package() {
-	install -D -m644 "$builddir/u-boot.bin" "$pkgdir/usr/share/u-boot/kobo-clara/u-boot.bin"
-	install -D -m644 "$builddir/u-boot.imx" "$pkgdir/usr/share/u-boot/kobo-clara/u-boot.imx"
-	install -D -m644 "$builddir/u-boot-env.bin" "$pkgdir/usr/share/u-boot/kobo-clara/u-boot-env.bin"
-}
-
-sha512sums="
-1712f5a922b44a8b80e49e00969f0948cd62864adedfb419d9d2f6ccf765b432f8632787f7c6d1502ec0aa6afb7b27bf4193733c2345ff4a0378b43b5b10643a  u-boot-kobo-clara-downstream-5af329fef886e21b777426d7bf5c6162e2317de7.tar.gz
-43c006f8198ac61e5c73dd4a2d583c5ab1da76b76492be9bee385096bdf33e3a42c8058707e8c2f61342faae152ba57f5046909d9ed403f74589d6604f77eb0d  u-boot-env.txt
-"

device/community/alsa-ucm-conf-cros/APKBUILD

@@ -1,20 +0,0 @@
-# Maintainer: WeirdTreeThing <bradyn127@protonmail.com>
-pkgname=alsa-ucm-conf-cros
-pkgver=0.5
-pkgrel=0
-pkgdesc="ALSA UCM configuration for Chrome OS devices"
-url="https://github.com/WeirdTreeThing/alsa-ucm-conf-cros"
-arch="noarch"
-depends="alsa-ucm-conf"
-replaces="alsa-ucm-conf alsa-ucm-conf-google-kukui"
-license="BSD-3-Clause"
-options="!check"
-source="$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz"
-
-package() {
-	mkdir -p "$pkgdir"/usr/share/alsa/
-	cp -r ucm2 "$pkgdir"/usr/share/alsa
-}
-sha512sums="
-844f23b640bbdbcef83f9cc11444ee80bfc83095d7917f5c12c2e3b99f120fd014c74c91deae02ec0f2210115270e518977fdef77dca5a3ab5d8df53e5ec62b1  alsa-ucm-conf-cros-0.5.tar.gz
-"

device/community/alsa-ucm-conf-google-kukui/APKBUILD

@@ -0,0 +1,41 @@
+# Maintainer: WeirdTreeThing <bradyn127@protonmail.com>
+# Co-Maintainer: Jenneron <jenneron@protonmail.com>
+pkgname=alsa-ucm-conf-google-kukui
+pkgver=2
+pkgrel=0
+pkgdesc="ALSA Use Case Manager configuration for Google Kukui Chromebooks"
+url="https://alsa-project.org"
+arch="aarch64"
+license="BSD-3-Clause"
+source="
+	mt8183_da7219_HiFi.conf
+	mt8183_da7219_rt1015p.conf
+	mt8183_mt6358_HiFi.conf
+	mt8183_mt6358_ts3a227_max98357.conf
+"
+options="!check" # no tests
+depends="alsa-ucm-conf"
+replaces="alsa-ucm-conf"
+
+package() {
+	install -Dm644 mt8183_da7219_HiFi.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/conf.d/mt8183_da7219_r/HiFi.conf
+	install -Dm644 mt8183_da7219_rt1015p.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/conf.d/mt8183_da7219_r/mt8183_da7219_rt1015p.conf
+	install -Dm644 mt8183_mt6358_HiFi.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/conf.d/mt8183_mt6358_t/HiFi.conf
+	install -Dm644 mt8183_mt6358_ts3a227_max98357.conf \
+		"$pkgdir"/usr/share/alsa/ucm2/conf.d/mt8183_mt6358_t/mt8183_mt6358_ts3a227_max98357.conf
+
+	ln -s /usr/share/alsa/ucm2/conf.d/mt8183_da7219_r \
+		"$pkgdir"/usr/share/alsa/ucm2/mt8183_da7219_r
+	ln -s /usr/share/alsa/ucm2/conf.d/mt8183_mt6358_t \
+		"$pkgdir"/usr/share/alsa/ucm2/mt8183_mt6358_t
+}
+
+sha512sums="
+9755c2eaf4bc28a9f3734b6778550ebd77bbee8f6aa353642bc5a35d68e009a17b05d9b09f1c62fe592eb16a2d342e3d2abcda98f2c53142bd4905e4a883a88b  mt8183_da7219_HiFi.conf
+13ffff0471c29d4e624ba7089d8df811f6578bebc4a9da2e8e82e247430fd41dbc95204fdf1891cfb76f1d90303fcdb8501ecf47b8ca40c7429066bf2ff1379b  mt8183_da7219_rt1015p.conf
+3656cb0cc76994aab39bd0d0cfe283339bce0689448612f74a0d09a30b19516950132456945096a13bd5700d0e7f868c413e268ced810046ec70252ca8b07603  mt8183_mt6358_HiFi.conf
+171e9e3376e5bd56e133a5b19309f60f6326f052922064e6f95c53b4345ea12cc205adde7305a7bd840722a29b7fb393c71d2b39e60952b0979ecc2e5ec03efa  mt8183_mt6358_ts3a227_max98357.conf
+"

device/community/alsa-ucm-conf-google-kukui/mt8183_da7219_HiFi.conf

@@ -0,0 +1,90 @@
+SectionDevice."Speaker" {
+	Comment "Speaker"
+
+	Value {
+		PlaybackPCM "hw:${CardId},0"
+	}
+	EnableSequence [
+		cset "name='I2S3_CH1 DL1_CH1' 1"
+		cset "name='I2S3_CH2 DL1_CH2' 1"
+		cset "name='Speakers Switch' 1"
+	]
+	DisableSequence [
+		cset "name='I2S3_CH1 DL1_CH1' 0"
+		cset "name='I2S3_CH2 DL1_CH2' 0"
+		cset "name='Speakers Switch' 0"
+	]
+}
+
+SectionDevice."Headphones" {
+	Comment "Headphones"
+
+	Value {
+		PlaybackPCM "hw:${CardId},0"
+	}
+	EnableSequence [
+		cset "name='Playback Digital Switch' 1"
+		cset "name='Headphone Switch' 1"
+		cset "name='ST Mixer Out FilterL Out FilterL Switch' 1"
+		cset "name='Mixer Out FilterL DACL Switch' 1"
+		cset "name='ST Mixer Out FilterR Out FilterR Switch' 1"
+		cset "name='Mixer Out FilterR DACR Switch' 1"
+		cset "name='Out DACL Mux' DAIL"
+		cset "name='Out DACR Mux' DAIR"
+		cset "name='I2S3_CH1 DL1_CH1' 1"
+		cset "name='I2S3_CH2 DL1_CH2' 1"
+	]
+	DisableSequence [
+		cset "name='Playback Digital Switch' 0"
+		cset "name='Headphone Switch' 0"
+		cset "name='ST Mixer Out FilterL Out FilterL Switch' 0"
+		cset "name='Mixer Out FilterL DACL Switch' 0"
+		cset "name='ST Mixer Out FilterR Out FilterR Switch' 0"
+		cset "name='Mixer Out FilterR DACR Switch' 0"
+		cset "name='I2S3_CH1 DL1_CH1' 0"
+		cset "name='I2S3_CH2 DL1_CH2' 0"
+	]
+}
+
+SectionDevice."Mic" {
+	Comment "Internal Microphone"
+
+	Value {
+		CapturePCM "hw:${CardId},5"
+	}
+	EnableSequence [
+		cset "name='MTKAIF_DMIC' 1"
+		cset "name='Mt6358 Mic Type Mux' 2"
+		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+		cset "name='UL3_CH2 ADDA_UL_CH2' 1"
+	]
+	DisableSequence [
+		cset "name='MTKAIF_DMIC' 0"
+		cset "name='Mt6358 Mic Type Mux' 0"
+		cset "name='UL3_CH1 ADDA_UL_CH1' 0"
+		cset "name='UL3_CH2 ADDA_UL_CH2' 0"
+	]
+}
+
+SectionDevice."Headset" {
+	Comment "Headset Microphone"
+
+	Value {
+		CapturePCM "hw:${CardId},5"
+	}
+	EnableSequence [
+		cset "name='Capture Digital Switch' 1"
+		cset "name='Mixin Switch' 1"
+		cset "name='Mic Switch' 1"
+		cset "name='Mixer In Mic Switch' 1"
+		cset "name='Out DAIL Mux' ADC"
+		cset "name='UL3_CH1 I2S2_CH1' 1"
+	]
+	DisableSequence [
+		cset "name='Capture Digital Switch' 0"
+		cset "name='Mixin Switch' 0"
+		cset "name='Mic Switch' 0"
+		cset "name='Mixer In Mic Switch' 0"
+		cset "name='UL3_CH1 I2S2_CH1' 0"
+	]
+}

device/community/alsa-ucm-conf-google-kukui/mt8183_da7219_rt1015p.conf

@@ -0,0 +1,24 @@
+Syntax 6
+
+SectionUseCase."HiFi" {
+	File "HiFi.conf"
+	Comment "Default"
+}
+
+BootSequence [
+	# Speaker
+	cset "name='I2S3_CH1 DL1_CH1' 1"
+	cset "name='I2S3_CH2 DL1_CH2' 1"
+	cset "name='Speakers Switch' 1"
+
+	# Internal Mic
+	cset "name='MTKAIF_DMIC' 1"
+	cset "name='Mt6358 Mic Type Mux' 2"
+	cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+	cset "name='UL3_CH2 ADDA_UL_CH2' 1"
+
+	# Headset
+	cset "name='Headphone Volume' 56"
+	cset "name='Capture Digital Volume' 113"
+	cset "name='Mic Volume' 3"
+]

device/community/alsa-ucm-conf-google-kukui/mt8183_mt6358_HiFi.conf

@@ -0,0 +1,86 @@
+SectionDevice."Speaker" {
+	Comment "Speaker"
+
+	Value {
+		PlaybackPCM "hw:${CardId},0"
+	}
+	EnableSequence [
+		cset "name='I2S3_CH1 DL1_CH1' 1"
+		cset "name='I2S3_CH2 DL1_CH2' 1"
+	]
+	DisableSequence [
+		cset "name='I2S3_CH1 DL1_CH1' 0"
+		cset "name='I2S3_CH2 DL1_CH2' 0"
+	]
+}
+
+SectionDevice."Mic" {
+	Comment "Internal Microphone"
+
+	Value {
+		CapturePCM "hw:${CardId},5"
+	}
+	EnableSequence [
+		cset "name='MTKAIF_DMIC' 1"
+		cset "name='Mic Type Mux' 2"
+		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+		cset "name='UL3_CH2 ADDA_UL_CH2' 1"
+	]
+	DisableSequence [
+		cset "name='MTKAIF_DMIC' 0"
+		cset "name='UL3_CH1 ADDA_UL_CH1' 0"
+		cset "name='UL3_CH2 ADDA_UL_CH2' 0"
+	]
+}
+
+If.krane {
+	Condition {
+		Type String
+		Haystack "${sys:firmware/devicetree/base/compatible}"
+		Needle "google,krane"
+	}
+	False {
+		SectionDevice."Headphones" {
+			Comment "Headphones"
+
+			Value {
+				PlaybackPCM "hw:${CardId},0"
+			}
+			EnableSequence [
+				cset "name='ADDA_DL_CH1 DL1_CH1' 1"
+                		cset "name='ADDA_DL_CH2 DL1_CH2' 1"
+                		cset "name='HPL Mux' 2"
+                		cset "name='HPR Mux' 2"
+			]
+			DisableSequence [
+				cset "name='ADDA_DL_CH1 DL1_CH1' 0"
+                		cset "name='ADDA_DL_CH2 DL1_CH2' 0"
+                		cset "name='HPL Mux' 0"
+                		cset "name='HPR Mux' 0"
+			]
+		}
+
+		SectionDevice."Headset" {
+			Comment "Headset Microphone"
+
+			Value {
+				CapturePCM "hw:${CardId},5"
+			}
+			EnableSequence [
+				cset "name='PGA L Mux' 2"
+                		cset "name='ADC L Mux' 2"
+                		cset "name='Mic Type Mux' 1"
+                		cset "name='PGA Volume' 4"
+                		cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+			]
+			DisableSequence [
+				cset "name='PGA L Mux' 0"
+		                cset "name='ADC L Mux' 0"
+		                cset "name='Mic Type Mux' 0"
+                		cset "name='PGA Volume' 0"
+		                cset "name='UL3_CH1 ADDA_UL_CH1' 0"
+
+			]
+		}
+	}
+}

device/community/alsa-ucm-conf-google-kukui/mt8183_mt6358_ts3a227_max98357.conf

@@ -0,0 +1,31 @@
+Syntax 6
+
+SectionUseCase."HiFi" {
+	File "HiFi.conf"
+	Comment "Default"
+}
+
+BootSequence [
+	# Speakers
+	cset "name='I2S3_CH1 DL1_CH1' 1"
+	cset "name='I2S3_CH2 DL1_CH2' 1"
+
+	# Headphones
+	cset "name='Headphone Volume' 17"
+	cset "name='ADDA_DL_CH1 DL1_CH1' 0"
+	cset "name='ADDA_DL_CH2 DL1_CH2' 0"
+	cset "name='HPL Mux' 0"
+	cset "name='HPR Mux' 0"
+
+	# Internal Mic
+	cset "name='MTKAIF_DMIC' 1" 
+	cset "name='Mic Type Mux' 2"
+	cset "name='UL3_CH1 ADDA_UL_CH1' 1"
+	cset "name='UL3_CH2 ADDA_UL_CH2' 1"
+
+	# Headset Mic
+	cset "name='PGA L Mux' 0"
+	cset "name='ADC L Mux' 0"
+	cset "name='PGA Volume' 0"
+	cset "name='UL3_CH1 ADDA_UL_CH1' 0"
+]

device/community/device-fairphone-fp4/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
 pkgver=2
-pkgrel=3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,6 +15,7 @@ depends="
 	mesa-vulkan-freedreno
 	mkbootimg
 	postmarketos-base
+	postmarketos-update-kernel
 	qbootctl
 	qbootctl-openrc
 	swclock-offset
@@ -51,7 +52,6 @@ nonfree_firmware() {
 		firmware-fairphone-fp4-ipa
 		firmware-fairphone-fp4-modem
 		firmware-fairphone-fp4-wlan
-		firmware-qcom-adreno-a630
 		linux-firmware-ath10k
 		msm-modem
 		msm-modem-uim-selection

device/community/device-google-gru/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-google-gru
 pkgdesc="Google Gru Chromebooks"
 pkgver=5
-pkgrel=7
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,6 +15,7 @@ depends="
 	linux-postmarketos-rockchip
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 	soc-rockchip-rk3399
 "
 makedepends="devicepkg-dev"

device/community/device-google-kukui/APKBUILD

@@ -3,17 +3,18 @@
 pkgname=device-google-kukui
 pkgdesc="Google Kukui Chromebooks"
 pkgver=6
-pkgrel=6
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	alsa-ucm-conf-cros
+	alsa-ucm-conf-google-kukui
 	depthcharge-tools
 	linux-postmarketos-mediatek-mt8183>=6.1.28-r0
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 	soc-mediatek-mt8183
 "
 makedepends="devicepkg-dev"

device/community/device-google-oak/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-google-oak
 pkgdesc="Google Oak Chromebooks"
 pkgver=4
-pkgrel=6
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,6 +15,7 @@ depends="
 	linux-postmarketos-mediatek-mt8173
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 "
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"

device/community/device-google-peach-pit/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-google-peach-pit
 pkgdesc="Samsung Chromebook 2 (11.6 inch)"
 pkgver=6
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,6 +14,7 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 "
 makedepends="devicepkg-dev"
 source="

device/community/device-google-snow/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-google-snow
 pkgdesc="Samsung Chromebook"
 pkgver=6
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,6 +14,7 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 "
 makedepends="devicepkg-dev"
 source="

device/community/device-google-trogdor/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-google-trogdor
 pkgdesc="Google Trogdor Chromebooks"
 pkgver=1
-pkgrel=5
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,6 +15,7 @@ depends="
 	linux-postmarketos-qcom-sc7180
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 	soc-qcom-sc7180
 "
 makedepends="devicepkg-dev"

device/community/device-google-veyron/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-google-veyron
 pkgdesc="Google Veyron Chromebooks"
 pkgver=5
-pkgrel=6
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,6 +14,7 @@ depends="
 	linux-google-veyron
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 "
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 makedepends="devicepkg-dev"

device/community/device-google-x64cros/APKBUILD

@@ -5,16 +5,16 @@
 pkgname=device-google-x64cros
 pkgdesc="Google Chromebooks with x64 CPU"
 pkgver=7
-pkgrel=3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
 options="!check !archcheck"
 depends="
-	alsa-ucm-conf-cros
 	depthcharge-tools
 	postmarketos-base
 	postmarketos-cros-common
+	postmarketos-update-depthcharge-kernel
 	systemd-boot
 	"
 makedepends="devicepkg-dev"
@@ -25,7 +25,6 @@ subpackages="
 	"
 source="deviceinfo modules-initfs"
 _pmb_recommends="
-	linux-firmware-rtw88
 	oem-intel
 	oem-amd
 "

device/community/device-nokia-n900/APKBUILD

@@ -2,31 +2,20 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=24
-pkgrel=1
+pkgver=10.1
+pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
-depends="
-	alsa-utils
-	kbd
-	kbd-bkeymaps
-	linux-firmware-ti-connectivity
-	linux-postmarketos-omap
-	ofono
-	postmarketos-base
-	postmarketos-mvcfg
-	u-boot-tools
-	wl1251-cal
-	wl1251-cal-openrc
-"
+depends="postmarketos-base linux-postmarketos-omap u-boot-tools kbd kbd-bkeymaps ofono alsa-utils"
 makedepends="devicepkg-dev u-boot-tools kbd kbd-bkeymaps"
 install="$pkgname.pre-upgrade $pkgname.post-install"
 subpackages="
 	$pkgname-x11
 	$pkgname-xkeyboard-config:xkeyboard_config
 	$pkgname-i3wm
+	$pkgname-nonfree-firmware:nonfree_firmware
 "
 source="
 	10-initfs-keymap.files
@@ -56,11 +45,10 @@ source="
 	modem-load.conf
 	modem-opts.conf
 	modules.blocklist
+	n900-wlan-data.initd
 	pointercal
-	proxishot.sh
 	uboot-script.cmd
 	udev/10-nokia-modem.rules
-	udev/80-feedbackd-twl4030.rules
 	udev/90-touchscreen-dev.rules
 	upower.conf
 	x11-keymap
@@ -105,8 +93,13 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-touchscreen-dev.rules
 	install -D -m644 "$srcdir"/10-nokia-modem.rules \
 		"$pkgdir"/etc/udev/rules.d/10-nokia-modem.rules
-	install -Dm644 "$srcdir"/80-feedbackd-twl4030.rules \
-		"$pkgdir"/usr/lib/udev/rules.d/80-feedbackd-twl4030.rules
+
+	# ACPI
+	mkdir "$pkgdir"/etc/acpi
+	install -D -m755 "$srcdir"/acpi_handler.sh \
+		"$pkgdir"/etc/acpi/handler.sh
+	install -D -m644 "$srcdir"/acpi.map \
+		"$pkgdir"/etc/acpi.map
 
 	# Keymap
 	install -D -m644 "$srcdir"/keymaps/rx51_us.bmap.gz \
@@ -137,20 +130,13 @@ package() {
 
 x11() {
 	install_if="$pkgname=$pkgver-r$pkgrel xorg-server"
-	depends="xset xinput scrot"
-	mkdir "$pkgdir"/etc/acpi
-	install -D -m755 "$srcdir"/acpi_handler.sh \
-		"$pkgdir"/etc/acpi/handler.sh
-	install -D -m644 "$srcdir"/acpi.map \
-		"$pkgdir"/etc/acpi.map
+	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
-	install -Dm755 "$srcdir"/proxishot.sh \
-		"$pkgdir"/usr/bin/proxishot.sh
 }
 
 xkeyboard_config() {
@@ -162,7 +148,7 @@ xkeyboard_config() {
 
 i3wm() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-i3wm"
-	depends="unclutter-xfixes i3blocks rxvt-unicode upower brightnessctl"
+	depends="unclutter-xfixes i3blocks rxvt-unicode upower"
 	install -D -m644 "$srcdir"/i3wm.conf \
 		"$subpkgdir"/etc/skel/.config/i3/config
 	install -D -m644 "$srcdir"/i3blocks.conf \
@@ -188,11 +174,20 @@ upower() {
 		"$subpkgdir"/etc/UPower/UPower.conf
 }
 
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="linux-firmware-ti-connectivity wl1251-cal"
+	install="$subpkgname.post-install"
+	triggers="$subpkgname.trigger=/lib/firmware/ti-connectivity"
+
+	install -Dm755 "$srcdir/n900-wlan-data.initd" "$subpkgdir/etc/init.d/n900-wlan-data"
+}
+
 sha512sums="
 6b475c12eca8563be48c562a1cb4ad8ca6a05d70fc54b21288b2dd7435a80a6f53351aa870db96d5bbecf1b1c5cb00dfe35f5066e6d3fd0ad0369e66aeef5a21  10-initfs-keymap.files
 4656d3b3ced0a86e2d6315c89322899f646a689e9cb64609aa8ad5a676b23d93706d8a37f3be6f6b12c6b1e8501b7d26ecafecf27322333850513a6805c61910  10-initfs-keymap.sh
-2e6c324c2a0627fb37ee2feff249d6c828116a9c1a32d572481dddc12648c98b726eb3a475838398742f76a60e3f2249d7707502360473b8bf2e794bf22f57ce  acpi.map
-ff51909873160c2d4c6f0c0119b6d4a02751df29f571b8596b4bc8b04ce2541913c11a583b0e5dabd43f240752a8131da45db0ddff194860f4c11198599686a1  acpi_handler.sh
+b3612348af1465c6dc21ce30153fc7e2cce3ae7f9bf9ff34d5a560e173e174275c1701dd7c45337fa56caaadb252b9494bddf997a698d665d3a8c01cde6955c7  acpi.map
+ac2f8a50280f7d5f8c5ce3ab50d00f1a4c8c1415890347542c684b6e24874a23d57a8f48c62451c46466996decc58276d737bdb892f8b284881d3760948b09bb  acpi_handler.sh
 5b87071834313a389f83d29f86f6e3ea108d0921f17dc918be7a46de7e74c73a4418044ef600a0fbf72c8fad22b7730dcd5bfe3d6d01d76bf01556f8540f0b32  asound.state.headset
 67acc17a33bc75113300393b4a5bba15319014032407e774d079abf310368e75f4f697dbb4856ba2d2d8ea184b056bb33561f42918de3ee91ab6a77df89a133c  asound.state.speakers
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
@@ -200,7 +195,7 @@ e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b11
 2463008d270ed09342f15b51f24ea455bd884021f95397991b85616b6840a6608d91cd1fc43186094f5c3d1bd25e88c16aa9ead07b018aea3d93cd2359bba0b1  deviceinfo
 f48b8dd7297d03008f73e1ecd55b77ace535ecb03f9bdf021123b96fb5f4fb491ff4c532e226b835c8118fa8d505cc4c635a2b604a3e42a162746021552a551c  modules-initfs
 826a3790b49324c1e61c75b6c0ffc043a2a1d7c13a8c554fb5eae4977af47a1ca93d70ef8c783d712b953b70e18ae58fa4c6a49bf97263398a01a0c4f91ebc8f  i3blocks.conf
-506accabcf9fb3e2a270228ea53fdcb57f51092d6e7126a631af8eed697cd882cc805b19cf255422284bec12c928b58219d173a4a790d784db5335a059b6bb4f  i3wm.conf
+e06ae2ba1c8c8d3fd76c5d2fa6480561d5221c616d7ff50ed590e2cdbbc1dd0cb8232ee5cde43b79ec059876f49c1d1ae182bd016805a4e90b6331ce75bf4426  i3wm.conf
 0b80af9fd1f36e6bc06bdfdf48352897234ac7457210649016665da8570a5a64b8a0841b4fbeb64fd7054a5246a64718cf4412f8a53024ce39b28a80984972d8  protip_shell.sh
 6c6a70667f37807089adbb343c09d1f62d47b8e6c9c0a54f44790b822f8bff3dccae73341ef736b799fd6740bbd6e1f48e6e122c2e08520f71f6ad7434a47d2c  battery-bq27200
 d9ef88c714e9fce8822f63b7a9d7fc3e1ed472c8c876b44ba524d44efea322839f13ddd2fa652420608427ecf7279bfaac302c9b67667f32796ca21da332164d  calendar
@@ -212,15 +207,14 @@ dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058ed
 082a5166e38296b097e873b0b4aeaf007e594d3bf4470c74e91ee3efedcf28ad25cd55c23dd63e460339898ae08e77e111b0e1092fa5e661db90bb40732103a1  rx51_it.map
 6e4e8b10a41d0957968736f5d780f14c7070b03913d80859cb07180e9cec9a36bbc9c639748765e48962772640974f5491627520cc36bd3d6c9d01748f9ddaff  rx51_ptes.map
 e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba  rx51_us.map
-6cb3ad1253ceb682d5241e6661a4313cb88b16cbf855f45513b7320584cab062e6c6f472b4ba89ccf76c66493ea76dc3a7bed516b403e324a6fa5657621c7a09  lock.sh
+caf9f4c45d11c28e1a6681255fafe5a286b0c417737fac1ca0ee37d3f82fd65c1712f5180375d7813fa308dfdca91d96876b5ce5b05b55ac14cfc31303b1ea5f  lock.sh
 157b27feebcfddf800a1ffd8c6e369d2b58e5db25b1a44b4443dada8d9fe74abb91d036b9f0e97769bbafbdc72020b5637313682c6932fe7b0bddb9ebebbad42  modem-load.conf
 695feac7f69a0ec8c5e007cdb651adcc3492f1c6236e7fd183edec2a5e25cb957d3ace630ea5fdb87fd703e35ac368f1d097c2f881ecb52c9cfd433564db2a6c  modem-opts.conf
-862ebc7cd2d7a1b3d41b10701b8418308c89eb0732eb99c42ec1091d48e08db9421727f67a3272b7309549798d59afb1b8d7d2fa48d1447b208fcb2329472d4d  modules.blocklist
+72b1554929843990a7665fdf1e45f7ef304fc45d3fa3b1082dcb9dd6cb9d3e9f6799659a8e2fdbd24a809319654543d1c20a0528856002c3de319d5546e2af8b  modules.blocklist
+b50e7f37ffb1fa0bb782b117a4e8bcfdb722b6127c3e5d643e90cd901a1f4e65e77a0773ed418673c8195595347482be0c8096f5a723e840315ad61ccd043b66  n900-wlan-data.initd
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
-134f51d20decc0c63ab08010931a0b410b70d2f85bf6899f2ff137b1680f59f706a6287d01f5fbb41fa5309125df75a430d0783149bd1a6a1bca07d22f4f6a21  proxishot.sh
 239a54ae5c5effb53ccf4d658652c0462da57604b16b77a63627a17caa171caf82e3d1769f9c5afea8756415acbbf3b73db9b57715fce6c70ea3f29e5c6ac84a  uboot-script.cmd
 9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762  10-nokia-modem.rules
-03079030237440080e833dbfeff80327c1ad6a8129c6c730b401a3052cd00a986783ec3473a526b14ae73ba1f20653b4c7b2a6590839bfe6cc156bbbc3b7bb74  80-feedbackd-twl4030.rules
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules
 d46adf47194c02b434cb46751003e67ee008d60978458e69b1f59dc709a7135a70f542918c29e359ba8308bdeda58a21e8efa446d06625511af05403db90e455  upower.conf
 c7837e6688f09c7d650ac7479b8881d4bad709480a71a1dea8b5bba4f4215d6b48a3aebd3f58923bbd48813559478d4ef137dcc9838d321722e141f0aa6a6085  x11-keymap

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

@@ -1,12 +1,15 @@
 # FORMAT: "<EV_XXX>" <type> "<input.h name>" <keycode> <value> <script under /etc/acpi>
 # hint: "evtest /dev/input/eventX" is very helpful!
 
-"EV_SW" 0x05 "SW_CAMERA_LENS_COVER" 9 0 CAM_LID_OPEN
-"EV_SW" 0x05 "SW_CAMERA_LENS_COVER" 9 1 CAM_LID_CLOSE
+"EV_SW" 0x05 "SW_CAMERA_LENS_COVER" 9 1 CAM_LID_OPEN
+"EV_SW" 0x05 "SW_CAMERA_LENS_COVER" 9 0 CAM_LID_CLOSE
 
 "EV_SW" 0x05 "SW_KEYPAD_SLIDE" 10 1 KP_SLIDE_OPEN
 "EV_SW" 0x05 "SW_KEYPAD_SLIDE" 10 0 KP_SLIDE_CLOSE
 
+"EV_SW" 0x05 "SW_FRONT_PROXIMITY" 11 1 FRNT_PRXY_ON
+"EV_SW" 0x05 "SW_FRONT_PROXIMITY" 11 0 FRNT_PRXY_OFF
+
 "EV_KEY" 0x01 "KEY_SCREENLOCK" 152 0 SCRNLCK_UP
 "EV_KEY" 0x01 "KEY_SCREENLOCK" 152 1 SCRNLCK_DWN
 
@@ -16,9 +19,15 @@
 "EV_KEY" 0x01 "KEY_CAMERA_FOCUS" 528 0 CAM_FOCUS_UP
 "EV_KEY" 0x01 "KEY_CAMERA_FOCUS" 528 1 CAM_FOCUS_DWN
 
+"EV_KEY" 0x01 "KEY_POWER" 116 0 PWR_BTN_UP
+"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/community/device-nokia-n900/acpi_handler.sh

@@ -1,6 +1,5 @@
 #!/bin/ash
 
-user=$( getent passwd 10000 | cut -d: -f1 )
 cmd=$( echo $0 | awk '{i=split($0,a,"/"); print a[i]}' )
 
 function adjust_keypad_bl {
@@ -11,15 +10,13 @@ function adjust_keypad_bl {
 
 case $cmd in
 	KP_SLIDE_OPEN)
-		adjust_keypad_bl 63
-		su $user -c 'DISPLAY=:0.0 /usr/bin/xset dpms force on'
-		su $user -c 'DISPLAY=:0.0 /usr/bin/xinput enable "TSC2005 touchscreen"'
+		adjust_keypad_bl 255
 		;;
 	KP_SLIDE_CLOSE)
 		adjust_keypad_bl 0
 		;;
 	CAM_BTN_DWN)
-		USER_USER="$user" /usr/bin/proxishot.sh
+		echo "Not implemented yet"
 		;;
 	CAM_BTN_UP)
 		echo "Not implemented yet"
@@ -36,32 +33,58 @@ case $cmd in
 	CAM_LID_OPEN)
 		echo "Not implemented yet"
 		;;
+	FRNT_PRXY_OFF)
+		echo "Not implemented yet"
+		;;
+	FRNT_PRXY_ON)
+		echo "Not implemented yet"
+		;;
+	KP_SLIDE_CLOSE)
+		echo "Not implemented yet"
+		;;
+	KP_SLIDE_OPEN)
+		echo "Not implemented yet"
+		;;
 	SCRNLCK_DWN)
-		su $user -c "DISPLAY=:0 /usr/bin/lock.sh"
+		echo "Not implemented yet"
 		;;
 	SCRNLCK_UP)
 		echo "Not implemented yet"
 		;;
-	HEADPHONE_INSERT)
-		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"
-		;;
-	VIDEOOUT_INSERT)
-		echo "Not implemented yet"
-		;;
-	VIDEOOUT_REMOVE)
-		echo "Not implemented yet"
-		;;
+		HEADPHONE_INSERT)
+				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"
+				;;
+		PWR_BTN_UP)
+				echo "Not implemented yet"
+				;;
+		VIDEOOUT_INSERT)
+				echo "Not implemented yet"
+				;;
+		VIDEOOUT_REMOVE)
+				echo "Not implemented yet"
+				;;
+		VOL_DWN)
+				echo "Not implemented yet"
+				;;
+		VOL_UP)
+				echo "Not implemented yet"
+				;;
 	*)
 		echo "Unknown event"
 		exit 1
 		;;
 esac
+
+

device/community/device-nokia-n900/device-nokia-n900-nonfree-firmware.post-install

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rc-update add n900-wlan-data boot

device/community/device-nokia-n900/device-nokia-n900-nonfree-firmware.trigger

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+[ -f /lib/firmware/ti-connectivity/wl1251-nvs.bin ] && n900-update-wl1251
+
+exit 0

device/community/device-nokia-n900/i3wm/i3wm.conf

@@ -60,6 +60,9 @@ mode "command" {
 # Enter command mode
 bindsym Shift+space mode "command"
 
+# This is the slidey button on the side
+bindsym XF86ScreenSaver exec --no-startup-id lock.sh
+
 # Pressing the power button offers reboot, shutdown, or suspend choice
 bindsym XF86PowerOff exec --no-startup-id i3-nagbar \
         -m 'Choose Power Button Action:' \
@@ -67,13 +70,6 @@ bindsym XF86PowerOff exec --no-startup-id i3-nagbar \
         -B 'Suspend' 'loginctl suspend' \
         -B 'Shutdown' 'loginctl poweroff'
 
-bindsym XF86AudioRaiseVolume exec --no-startup-id amixer set PCM 5%+
-bindsym XF86AudioLowerVolume exec --no-startup-id amixer set PCM 5%-
-
-# Adjust display brightness using Shift + Volume buttons in 10% steps
-bindsym Shift+XF86AudioRaiseVolume exec --no-startup-id brightnessctl --quiet --class=backlight set +10%
-bindsym Shift+XF86AudioLowerVolume exec --no-startup-id brightnessctl --quiet --class=backlight set 10%-
-
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
@@ -91,7 +87,4 @@ bar {
 
 # Hide mouse cursor
 exec --no-startup-id unclutter-xfixes --fork
-# Do not handle gpio_key events as they are handled by acpid
-exec --no-startup-id xinput disable gpio_keys
-# Turn display off after 2 minutes of idle
-exec --no-startup-id xset dpms 0 0 120
+

device/community/device-nokia-n900/lock.sh

@@ -1,17 +1,14 @@
 #!/bin/sh
 
-display=off
-if xset q | grep -iq "monitor is on"; then
-	display=on
+FILE=~/.screenoff
+if [ -f $FILE ]; then
+	xinput set-prop 8 "Device Enabled" 1
+	xset dpms force on
+	rm "$FILE"
+else
+	xinput set-prop 8 "Device Enabled" 0
+	# Turn screen off twice (sometimes it does not work on first run)
+	xset dpms force off
+	xset dpms force off
+	touch "$FILE"
 fi
-
-case "$display" in
-	off)
-		xinput enable "TSC2005 touchscreen"
-		xset dpms force on
-		;;
-	on)
-		xinput disable "TSC2005 touchscreen"
-		xset dpms force off
-		;;
-esac

device/community/device-nokia-n900/modules.blocklist

@@ -7,6 +7,3 @@ blacklist omap3_isp
 blacklist hci_nokia
 blacklist hci_uart
 blacklist ehci_omap
-# do not autoload leds_gpio used by the debug leds, since it is now initialized
-# in ON state, interfering with the keyboard backlight
-blacklist leds_gpio

device/community/device-nokia-n900/n900-wlan-data.initd

@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+description="Update N900 WLAN calibration data"
+
+depend()
+{
+	before modules
+	after localmount
+}
+
+start()
+{
+	if [ ! -f /var/lib/n900_cal/done ]
+	then
+		n900-update-wl1251
+		mkdir -p /var/lib/n900_cal
+		touch /var/lib/n900_cal/done
+	fi
+
+	eend $?
+}

device/community/device-nokia-n900/proxishot.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-# Take a screenshot if the proximity sensor is covered.
-# NB: pass the user's username in USER_USER environment variable when calling
-# this script.
-/usr/bin/evtest --query /dev/input/by-path/platform-gpio_keys-event \
-	EV_SW SW_FRONT_PROXIMITY
-# return value of `10` means the sensor is in the set state, i.e.
-# proximity = near. see `man 1 evtest`
-if [ "$?" = "10" ]; then
-	su "$USER_USER" -c "/bin/mkdir -p ~/Screenshots"
-	su "$USER_USER" -c 'cd ~/Screenshots && DISPLAY=:0 /usr/bin/scrot "%Y-%m-%d_%H-%M-%S.png"'
-fi

device/community/device-nokia-n900/udev/80-feedbackd-twl4030.rules

@@ -1 +0,0 @@
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_INPUT}=="1", ATTRS{name}=="twl4030:vibrator", TAG+="uaccess", ENV{FEEDBACKD_TYPE}="vibra"

device/community/device-nvidia-tegra-armv7/APKBUILD

@@ -6,8 +6,8 @@
 
 pkgname=device-nvidia-tegra-armv7
 pkgdesc="NVIDIA Tegra ARMv7"
-pkgver=2
-pkgrel=0
+pkgver=1.2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"

device/community/device-odroid-xu4/APKBUILD

@@ -3,8 +3,8 @@
 
 pkgname=device-odroid-xu4
 pkgdesc="ODROID XU4"
-pkgver=1
-pkgrel=0
+pkgver=0.2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"

device/community/device-oneplus-enchilada/APKBUILD

@@ -3,8 +3,8 @@
 
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
-pkgver=14
-pkgrel=0
+pkgver=13
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,6 +13,7 @@ depends="
 	linux-postmarketos-qcom-sdm845
 	mkbootimg
 	postmarketos-base
+	postmarketos-update-kernel
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
 	soc-qcom-sdm845-qbootctl
@@ -21,7 +22,6 @@ makedepends="devicepkg-dev"
 source="
 	10-unl0kr.conf
 	deviceinfo
-	hexagonrpcd.confd
 	modules-initfs
 	q6voiced.conf
 	81-libssc-oneplus-enchilada.rules
@@ -43,17 +43,16 @@ nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
 	depends="
 		firmware-oneplus-sdm845>=9
+		firmware-oneplus-sdm845-initramfs
 		hexagonrpcd
 		soc-qcom-sdm845-nonfree-firmware
 		soc-qcom-sdm845-modem
 	"
-	replaces="hexagonrpcd-openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 	install -Dm644 "$srcdir"/81-libssc-oneplus-enchilada.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
-	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
 }
 
 pmtest() {
@@ -67,7 +66,6 @@ pmtest() {
 sha512sums="
 e957b7b0ed219eaa56be6c6b976b60886f73970703fdebf045800154ee652affee4e19654b3ac4244b29bcf6760ad3db6cb87143dc9c4673e905800d751103d1  10-unl0kr.conf
 83fc698ebeda6245abc2a653eeff97b3b996d06dd7731386a07d102937f9b005c7277e0dece05ff359d9ff109a1d9ed7791fc510b146354df179804aadb5642c  deviceinfo
-c8d3026e9f803ea823e35f83dab66fa8545e99af9655576476c194567113084d78200feab46f84983a2dad608ca55c0a4a66e36406c6d64023c0aec59307d146  hexagonrpcd.confd
 ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs
 fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-oneplus-enchilada.rules

device/community/device-oneplus-enchilada/hexagonrpcd.confd

@@ -1,2 +0,0 @@
-# Oneplus 6 specific hexagonrpcd firmware directory
-hexagonrpcd_fw_dir="/usr/share/qcom/sdm845/OnePlus/oneplus6"

device/community/device-oneplus-fajita/APKBUILD

@@ -3,8 +3,8 @@
 
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=14
-pkgrel=0
+pkgver=13
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,6 +13,7 @@ depends="
 	linux-postmarketos-qcom-sdm845
 	mkbootimg
 	postmarketos-base
+	postmarketos-update-kernel
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
 	soc-qcom-sdm845-qbootctl
@@ -21,7 +22,6 @@ makedepends="devicepkg-dev"
 source="
 	10-unl0kr.conf
 	deviceinfo
-	hexagonrpcd.confd
 	modules-initfs
 	q6voiced.conf
 	81-libssc-oneplus-fajita.rules
@@ -43,17 +43,16 @@ nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
 	depends="
 		firmware-oneplus-sdm845>=9
+		firmware-oneplus-sdm845-initramfs
 		hexagonrpcd
 		soc-qcom-sdm845-nonfree-firmware
 		soc-qcom-sdm845-modem
 	"
-	replaces="hexagonrpcd-openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 	install -Dm644 "$srcdir"/81-libssc-oneplus-fajita.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
-	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
 }
 
 pmtest() {
@@ -67,7 +66,6 @@ pmtest() {
 sha512sums="
 e957b7b0ed219eaa56be6c6b976b60886f73970703fdebf045800154ee652affee4e19654b3ac4244b29bcf6760ad3db6cb87143dc9c4673e905800d751103d1  10-unl0kr.conf
 07e3d79715befccd1e7393908c06f88ac8468d1ce6cb96138e3a04e6f8274889db169f5daf05b04b633bcc9e85d11ea5c2017b84bc0ae86a8fad80b05794d0d8  deviceinfo
-6b5308471fcbb938ac00d6e9a3f8e61073bda1d608f2edf1a2aba4b256dd3f76b1ccee0873dcaa8dc4a8db304d433360a56fe447d70f57ba068428b75ddea236  hexagonrpcd.confd
 ea8709aa214cffaefb1d486c0c47044537446faebff16efb3b015623f043f730b7121e401c676e43aa8868bd6c630fc8a2d7dbf5fb082490e9b5493e0405b66d  modules-initfs
 fe9871c325a38c0cadc9631870801ec15ab9f5b786ee854325b93eb3d23e7d8b1ac4f1075572ffcd225d8ec514dec09b986972ddff12a89260c0218af6de7887  q6voiced.conf
 f4961015c920c50182d35767de080f16ec348ff693a8cca91dd2593640cf19c31c1e6eac1e8a12a1d38946755eb21bdacad29c9e972adaec854500ab3a7ad3a0  81-libssc-oneplus-fajita.rules

device/community/device-oneplus-fajita/hexagonrpcd.confd

@@ -1,2 +0,0 @@
-# Oneplus 6T specific hexagonrpcd firmware directory
-hexagonrpcd_fw_dir="/usr/share/qcom/sdm845/OnePlus/oneplus6"

device/community/device-samsung-espresso10/APKBUILD

@@ -3,12 +3,12 @@
 pkgname=device-samsung-espresso10
 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch)"
 pkgver=1
-pkgrel=4
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-omap mkbootimg"
+depends="postmarketos-base postmarketos-update-kernel linux-postmarketos-omap mkbootimg"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"

device/community/device-samsung-espresso7/APKBUILD

@@ -4,12 +4,12 @@
 pkgname=device-samsung-espresso7
 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch)"
 pkgver=1
-pkgrel=4
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-omap mkbootimg"
+depends="postmarketos-base postmarketos-update-kernel linux-postmarketos-omap mkbootimg"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"

device/community/device-samsung-m0/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Newbyte <newbyte@disroot.org>
 pkgname=device-samsung-m0
 pkgdesc="Samsung Galaxy S III"
-pkgver=7
-pkgrel=1
+pkgver=6.3
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -13,6 +13,7 @@ depends="
 	linux-postmarketos-exynos4
 	mkbootimg
 	postmarketos-base
+	postmarketos-update-kernel
 	soc-samsung-exynos4412-haptics
 	"
 makedepends="devicepkg-dev"

device/community/device-samsung-manta/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-samsung-manta
 pkgdesc="Google Nexus 10"
 pkgver=7
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -13,6 +13,7 @@ depends="
 	linux-postmarketos-exynos5
 	mkbootimg
 	postmarketos-base
+	postmarketos-update-kernel
 "
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"

device/community/device-shift-axolotl/APKBUILD

@@ -4,8 +4,8 @@
 
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
-pkgver=15
-pkgrel=0
+pkgver=14
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,6 +15,7 @@ depends="
 	make-dynpart-mappings
 	mkbootimg
 	postmarketos-base
+	postmarketos-update-kernel
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
 	soc-qcom-sdm845-qbootctl
@@ -23,7 +24,6 @@ depends="
 makedepends="devicepkg-dev postmarketos-test"
 source="
 	deviceinfo
-	hexagonrpcd.confd
 	modules-initfs
 	q6voiced.conf
 	81-libssc-shift-axolotl.rules
@@ -45,17 +45,16 @@ nonfree_firmware() {
 	pkgdesc="Modem, GPU and WiFi Firmware, also needed for osk-sdl"
 	depends="
 		firmware-shift-sdm845>=20230815-r2
+		firmware-shift-sdm845-initramfs
 		hexagonrpcd
 		soc-qcom-sdm845-nonfree-firmware
 		soc-qcom-sdm845-modem
 	"
-	replaces="hexagonrpcd-openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 	install -Dm644 "$srcdir"/81-libssc-shift-axolotl.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
-	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
 }
 
 pmtest() {
@@ -68,7 +67,6 @@ pmtest() {
 
 sha512sums="
 e3f8a8d556a3c3134791693f2003aa64465b6971f7e353f547d6f1cbe3a0a0225a225e40ee4dbed951c0fa67f5a4636fd15953f6a3fe23d4f098fa1d39baa8f5  deviceinfo
-5966325963a3a62c919b5f39f7bc56e1785f192f50c40a6cc644a2fea0c9b8dd083e287ef43c59c2b9cab5c88d65266b0cd9cf1f5110924950bd250be5385622  hexagonrpcd.confd
 4dc84207c5ca84b33b74139c8b0c9ce5baa8bcb1068df9943c478c02abcf8daccb88e06af63f120a434a115e277008e899305bd5239d8669436cb269889040e9  modules-initfs
 2a3cbdad5aa91181d24a4e56e63986af6accf887c64fa4d1b6ddad1926e29050243c4b1e2fd892d38ca7c16e24dff8545a16552e5749ae31b6d01bf428468e51  q6voiced.conf
 3bd3a82b88a7aca4e2df2f5522cee7a98d017994f1dc1a965a7e386be9c17632b9cdbe013feb737dec12e99d74f54a9e4599144193bb57ec18e6d6a18c94cf1f  81-libssc-shift-axolotl.rules

device/community/device-shift-axolotl/hexagonrpcd.confd

@@ -1,2 +0,0 @@
-# SHIFT6mq specific hexagonrpcd firmware directory
-hexagonrpcd_fw_dir="/usr/share/qcom/sdm845/SHIFT/axolotl"

device/community/device-xiaomi-beryllium/81-libssc-xiaomi-beryllium.rules

@@ -1,3 +0,0 @@
-# iio-sensor-proxy with libssc: accelerometer mount matrix
-
-SUBSYSTEM=="misc", KERNEL=="fastrpc-*", ENV{ACCEL_MOUNT_MATRIX}+="-1, 0, 0; 0, -1, 0; 0, 0, -1"