main/postmarketos-base-ui-networkmanager: use a second usb-tethering connection (MR 4400)

This is a follow-up of IRC discuss.

I'm investigating on USB Tethering mode for Sxmo, and how to help our users to
enable this mode.

Pmos rely on a NetworkManager dispatcher script to deal with tethering. Atm it
manage its owned system network manager connection. It check it ipv4.method
value, and toggle the tethering.

This is a proposition to use multiple system connections, so that a user could
switch from one to another mode without editing the connections themselves.

.ci/lib/check_changed_aports_versions.py

@@ -16,8 +16,7 @@ import pmb.parse
 import pmb.parse.version
 import pmb.helpers.logging
 
-
-def get_package_version(args, package, revision, check=True):
+def get_package_contents(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
@@ -40,6 +39,15 @@ def get_package_version(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"]
 
 
@@ -112,6 +120,40 @@ 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,6 +59,11 @@ 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"]
@@ -130,27 +135,28 @@ def get_changed_packages_sanity_check(count):
         return
 
     branch = get_upstream_branch()
-    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.")
+    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.
+    """)
 
     sys.exit(1)
 

.ci/ruff.sh

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

.ci/shellcheck.sh

@@ -23,7 +23,6 @@ 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: 'pmbootstrap' is not a symlink to pmbootstrap.py")
+    print("ERROR: unable to find path to pmbootstrap.py. Try setting 'PMBOOTSTRAP_CMD'.")
     sys.exit(1)
 
 

.ci/testcases/test_device.py

@@ -61,14 +61,6 @@ 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,35 +2,34 @@
 
 # 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
 
-# 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
+# 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"
 
 # device documentation
 wiki:
   stage: lint
-  <<: *only-default
-  only:
-    refs:
-      - merge_requests
-    changes:
-      - device/*/device-*/*
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+      changes:
+        - .ci/**/*
+        - .gitlab-ci.yml
+        - device/*/device-*/*
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/wiki.sh
@@ -38,16 +37,12 @@ wiki:
 # testcases linting
 ruff:
   stage: lint
-  <<: *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"
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+      changes:
+        - .ci/*
+        - .ci/*/*
+        - .gitlab-ci.yml
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/ruff.sh
@@ -55,8 +50,9 @@ 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
@@ -65,8 +61,9 @@ 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
@@ -74,7 +71,8 @@ editor-config:
 # aports checks (generic)
 pytest-commits:
   stage: lint
-  <<: *only-default
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/pytest.sh
@@ -90,23 +88,21 @@ 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
-  only:
-    refs:
-      - master
-      - merge_requests
-    changes:
-      - device/*/linux-*/config-*
-      - main/linux-*/config-*
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
+      changes:
+        - device/*/linux-*/config-*
+        - main/linux-*/config-*
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/kconfig.sh
@@ -115,9 +111,10 @@ kernel-kconfig:
 # (Checks for "Allow commits from members who can merge to the target branch")
 mr-settings:
   stage: lint
-  only:
-    - merge_requests
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
   before_script:
+    - *global_before_scripts
     - apk -q add python3
   script:
     - wget -q "https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
@@ -126,8 +123,10 @@ mr-settings:
 # build changed aports
 .build:
   stage: build
-  <<: *only-default
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
   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,6 +1,12 @@
 <!--
 	Thank you for using postmarketOS! In order to speed up process of resolving your issue,
-	we would like you to fill in the following :
+	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!
 -->
 ### Describe your issue
 #### What's the expected behaviour?
@@ -22,7 +28,6 @@
 -->
 * [ ] 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,10 +2,12 @@
 # Put groups like @sdm845-mainline into test_device.py:gitlab_groups.
 # Order lines alphabetically!
 
-device/*/*-amlogic-s905*/			@vitali64yt
+device/*/*-amlogic-s905*/			@funderscore
 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
@@ -14,9 +16,13 @@ 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
@@ -35,8 +41,11 @@ 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/*/*-videostrong-kii-pro/			@vitali64yt
+device/*/*-tolino-shine2hd/			@akemnade
+device/*/*-videostrong-kii-pro/			@funderscore
 device/*/*-wileyfox-crackling/			@TravMurav @Minecrell
 device/*/*-xiaomi-beryllium/			@joelselvaraj
 device/*/*-xiaomi-daisy/			@joelselvaraj @alikates
@@ -47,7 +56,9 @@ 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
@@ -57,17 +68,19 @@ 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/		@clamor95 @okias @mschwalm @nokun
+device/*/device-nvidia-tegra-armv7/		@clamor-s @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
@@ -75,19 +88,21 @@ 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/		@vitali64yt @exkc
+device/*/linux-postmarketos-amlogic/		@funderscore @exkc
 device/*/linux-postmarketos-exynos4/		@Newbyte @ThiagaoPlusPlus
 device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
-device/*/linux-postmarketos-grate/		@clamor95 @jenneron @jethrob
+device/*/linux-postmarketos-grate/		@clamor-s @jenneron @jethrob
+device/*/linux-postmarketos-imx-ereader/	@akemnade
 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
+device/*/linux-postmarketos-qcom-msm8953/	@M0Rf30 @Ultra-azu @barni2000
 device/*/linux-postmarketos-qcom-msm8996/	@Tooniis
 device/*/linux-postmarketos-qcom-sc7180/	@jenneron
 device/*/linux-postmarketos-rockchip/		@QC8086
@@ -108,7 +123,6 @@ 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/		@bshah
-main/postmarketos-update-depthcharge-kernel/	@jenneron
+main/postmarketos-ui-plasma-mobile/		@PureTryOut
 main/shutdown-clear-rtc-wakealarm/		@Arnavion
 main/ttyescape/					@calebccff

channels.cfg

@@ -8,6 +8,12 @@ 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=21
+pkgrel=26
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-0a234d00087f85ba8b21d014c38535947ae087df94c18a174717452c91f732489d258394bf616fecae94259e1c932edcf8ea1dcf4aacf6eb803064e3b3587a78  busybox-static-1.36.1-r21-aarch64-edge.apk
+0f5f1eb32691016183d9a3011c5643f70a1cdc9f49b1ffefce732cff960cfea4d0db1670564fff5504654bb2f07857e62e5dd076fb40d2c361c441854e5d5e5c  busybox-static-1.36.1-r26-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

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

cross/busybox-static-armv7/APKBUILD

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

cross/grub-efi-x86/APKBUILD

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

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

@@ -0,0 +1,70 @@
+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

@@ -0,0 +1,22 @@
+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

@@ -0,0 +1,22 @@
+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-alcatel-idol347-downstream/APKBUILD

@@ -1,4 +1,4 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (alcatel-idol347)!
+# Archived: Downstream port, only for testing. Use mainline port (alcatel-idol347)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-alcatel-idol347-downstream
 pkgdesc="Alcatel OneTouch Idol 3 (4.7) (Downstream)"

device/archived/device-bq-paella-downstream/APKBUILD

@@ -1,4 +1,4 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (bq-paella)!
+# Archived: Downstream port, only for testing. Use mainline port (bq-paella)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-bq-paella-downstream
 pkgdesc="BQ Aquaris X5 (Downstream)"

device/archived/device-htc-flounder-downstream/APKBUILD

@@ -1,8 +1,8 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (htc-flounder)!
+# Archived: Downstream port, only for testing. Use mainline port (htc-flounder)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-htc-flounder-downstream
 pkgdesc="Google Nexus 9"
-pkgver=0.1
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="gpl-v3"

device/archived/device-huawei-kiwi-downstream/APKBUILD

@@ -1,4 +1,4 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (huawei-kiwi)!
+# Archived: Downstream port, only for testing. Use mainline port (huawei-kiwi)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-huawei-kiwi-downstream
 pkgdesc="Huawei Honor 5X (Downstream)"

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

@@ -0,0 +1,46 @@
+# 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

@@ -0,0 +1,28 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="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-motorola-ocean-downstream/APKBUILD

@@ -1,9 +1,9 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (motorola-ocean)!
+# Archived: Downstream port, only for testing. Use mainline port (motorola-ocean)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-ocean-downstream
 pkgdesc="Motorola Moto G7 Power"
-pkgver=0.1
-pkgrel=2
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"

device/archived/device-oneplus-cheeseburger-downstream/APKBUILD

@@ -1,9 +1,9 @@
-# Unmaintained: Downstream port, only for reference. Use mainline port (oneplus-cheeseburger)!
+# Archived: Downstream port, only for reference. Use mainline port (oneplus-cheeseburger)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oneplus-cheeseburger-downstream
 pkgdesc="OnePlus 5 (Downstream)"
 pkgver=3
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,7 +13,6 @@ depends="
 	msm-fb-refresher
 	mkbootimg
 	postmarketos-base
-	postmarketos-update-kernel
 "
 makedepends="devicepkg-dev"
 source="deviceinfo"

device/archived/device-oneplus-dumpling-downstream/APKBUILD

@@ -1,9 +1,9 @@
-# Unmaintained: Downstream port, only for reference. Use mainline port (oneplus-dumpling)!
+# Archived: Downstream port, only for reference. Use mainline port (oneplus-dumpling)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oneplus-dumpling-downstream
 pkgdesc="OnePlus 5T (Downstream)"
 pkgver=3
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,7 +13,6 @@ depends="
 	msm-fb-refresher
 	mkbootimg
 	postmarketos-base
-	postmarketos-update-kernel
 "
 makedepends="devicepkg-dev"
 source="deviceinfo"

device/archived/device-samsung-a5lte-downstream/APKBUILD

@@ -1,4 +1,4 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (samsung-a5lte)!
+# Archived: Downstream port, only for testing. Use mainline port (samsung-a5lte)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-a5lte-downstream
 pkgdesc="Samsung Galaxy A5 (SM-A500F)"

device/archived/device-samsung-a5ulte-downstream/APKBUILD

@@ -1,4 +1,4 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (samsung-a5ulte)!
+# Archived: Downstream port, only for testing. Use mainline port (samsung-a5ulte)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-a5ulte-downstream
 pkgdesc="Samsung Galaxy A5 (SM-A500FU)"

device/archived/device-samsung-coreprimevelte-downstream/APKBUILD

@@ -1,9 +1,9 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (samsung-coreprimevelte)!
-# This kernel is used only for bringing up new features, thus unmaintained
+# Archived: Downstream port, only for testing. Use mainline port (samsung-coreprimevelte)!
+# This kernel is used only for bringing up new features, thus archived
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-coreprimevelte-downstream
 pkgdesc="Samsung Galaxy Core Prime VE LTE downstream"
-pkgver=0.1
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"

device/archived/device-samsung-espresso10-downstream/APKBUILD

@@ -1,9 +1,9 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (samsung-espresso10/samsung-espresso7)!
+# Archived: Downstream port, only for testing. Use mainline port (samsung-espresso10/samsung-espresso7)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-espresso10-downstream
 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch)"
-pkgver=0.2
-pkgrel=1
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"

device/archived/device-samsung-expressatt-downstream/APKBUILD

@@ -1,14 +1,14 @@
-# Unmaintained: Downstream port
+# Archived: Downstream port
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-expressatt-downstream
 pkgdesc="Samsung Galaxy Express SGH-I437"
-pkgver=0.2
-pkgrel=0
+pkgver=1
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-samsung-expressatt mkbootimg"
+depends="postmarketos-base linux-samsung-expressatt-downstream mkbootimg"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 

device/archived/device-samsung-janice-downstream/APKBUILD

@@ -1,4 +1,4 @@
-# Unmaintained: Downstream port, only for reference. Use mainline port (samsung-janice)!
+# Archived: Downstream port, only for reference. Use mainline port (samsung-janice)!
 # Reference: <https://postmarketos.org/devicepkg>
 
 pkgname=device-samsung-janice-downstream

device/archived/device-samsung-klte-downstream/APKBUILD

@@ -1,9 +1,9 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (samsung-klte)!
+# Archived: Downstream port, only for testing. Use mainline port (samsung-klte)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-klte-downstream
 pkgdesc="Samsung Galaxy S5 (SM-G900F)"
 pkgver=1
-pkgrel=3
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"

device/archived/device-samsung-lt01wifi-downstream/APKBUILD

@@ -1,13 +1,14 @@
+# Archived: Downstream port, only for testing. Use mainline port (samsung-lt01)!
 # Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-samsung-lt01wifi
+pkgname=device-samsung-lt01wifi-downstream
 pkgdesc="Samsung Galaxy Tab 3 8.0"
-pkgver=0.1
-pkgrel=14
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-samsung-lt01wifi mkbootimg"
+depends="postmarketos-base linux-samsung-lt01wifi-downstream mkbootimg"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo
@@ -24,12 +25,12 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Wifi firmware"
-	depends="firmware-samsung-lt01wifi"
+	depends="firmware-samsung-lt01wifi-downstream"
 	mkdir "$subpkgdir"
 }
 
 sha512sums="
-6e527a8506854fa59d83514962cbed0d6404aa1cf547780d88a543a1e133a1366b3d8ab5b4362b84881b1902bebb661ecf1378935d5d73092c989de812f14e06  deviceinfo
+b6d8953f5717b81fd1cb6d34e0f5539480b348a52194bbd3e6d83c3ae9e77bc2d948b05303c93ecbd7121f7affd476a9522c32c1a55fd7cee4ae0ca1bc0b88a0  deviceinfo
 af036fe35011db078379dbb2e8c16c86546f0a4fcb3d1bcee3502bb1ea5b38f3ec5a9fa8cd1ca8ed8b89592a7f572d6072781289845303e0bf85fc2de4ead9fb  modules-load.conf
 594d6059ba1b06bce65538d26ce80cf2ce840786605b86e993ffaef858837507c033c0f95b7bcd9914ae7ea3cd2a9e43e32ec879db7c908219ad62d38b4e426a  modprobe.conf
 "

device/archived/device-samsung-lt01wifi-downstream/deviceinfo

@@ -4,7 +4,7 @@
 deviceinfo_format_version="0"
 deviceinfo_name="Samsung Galaxy Tab 3 8.0"
 deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-lt01wifi"
+deviceinfo_codename="samsung-lt01wifi-downstream"
 deviceinfo_year="2013"
 deviceinfo_arch="armv7"
 

device/archived/device-samsung-m0-downstream/APKBUILD

@@ -1,4 +1,4 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (samsung-m0/samsung-m3)!
+# Archived: Downstream port, only for testing. Use mainline port (samsung-m0/samsung-m3)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-m0-downstream
 pkgdesc="Samsung Galaxy S III"

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

@@ -0,0 +1,59 @@
+# 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

@@ -0,0 +1,33 @@
+# 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/device-shift-axolotl-downstream/APKBUILD

@@ -1,10 +1,10 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (shift-axolotl)!
-# This kernel is mostly used for bringing up new features on mainline, thus unmaintained
+# Archived: Downstream port, only for testing. Use mainline port (shift-axolotl)!
+# This kernel is mostly used for bringing up new features on mainline, thus archived
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-shift-axolotl-downstream
 pkgdesc="SHIFT6mq downstream"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +14,6 @@ depends="
 	mkbootimg
 	msm-fb-refresher
 	postmarketos-base
-	postmarketos-update-kernel
 "
 makedepends="devicepkg-dev"
 source="deviceinfo"

device/archived/device-xiaomi-cepheus-downstream/APKBUILD

@@ -1,9 +1,9 @@
-# Unmaintained: Downstream port, only for reference.
+# Archived: Downstream port, only for reference.
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-cepheus-downstream
 pkgdesc="Xiaomi Mi 9"
-pkgver=0.1
-pkgrel=3
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"

device/archived/device-xiaomi-lavender-downstream/APKBUILD

@@ -1,9 +1,9 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (xiaomi-lavender)!
-# This kernel is mostly used for bringing up new features on mainline, thus unmaintained
+# Archived: Downstream port, only for testing. Use mainline port (xiaomi-lavender)!
+# This kernel is mostly used for bringing up new features on mainline, thus archived
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-lavender-downstream
 pkgdesc="Xiaomi Redmi Note 7 downstream"
-pkgver=0.1
+pkgver=1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"

device/archived/device-xiaomi-wt88047-downstream/APKBUILD

@@ -1,4 +1,4 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (xiaomi-wt88047)!
+# Archived: Downstream port, only for testing. Use mainline port (xiaomi-wt88047)!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-wt88047-downstream
 pkgdesc="Xiaomi Redmi 2 (Downstream)"

device/archived/firmware-htc-flounder-downstream/APKBUILD

@@ -1,4 +1,4 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (htc-flounder)!
+# Archived: Downstream port, only for testing. Use mainline port (htc-flounder)!
 pkgname=firmware-htc-flounder-downstream
 pkgver=1.0
 pkgrel=0

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

@@ -1,4 +1,5 @@
-pkgname=firmware-kobo-clara
+# Archived: not needed by mainline kernel, describes only the hardware
+pkgname=firmware-kobo-clara-downstream
 pkgver=4.26.16704
 pkgrel=0
 pkgdesc="Kobo Clara firmware"

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

@@ -1,4 +1,4 @@
-# Unmaintained: Downstream port, only for reference. Use mainline port (samsung-janice)!
+# Archived: Downstream port, only for reference. Use mainline port (samsung-janice)!
 
 pkgname=firmware-samsung-janice-downstream
 pkgver=1

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

@@ -1,5 +1,6 @@
+# Archived: Only used by archived downstream kernel
 # Maintainer: knuxify <knuxify@gmail.com>
-pkgname=firmware-samsung-lt01wifi
+pkgname=firmware-samsung-lt01wifi-downstream
 pkgver=0.1
 pkgrel=0
 _commit="38ea48dbc6a683874aaf3376b63fc97ff3823459"
@@ -21,4 +22,6 @@ package() {
 		"$pkgdir"/lib/firmware/postmarketos/nvram_net.txt
 }
 
-sha512sums="33500dccd81d9f4ee8735f2f91e056913f0abb538248244512405f42156dd663b4337f97226fcadc1ed772c56590380cc7a6a8735a6fed46c62b8ac61424d684  firmware-samsung-lt01wifi-38ea48dbc6a683874aaf3376b63fc97ff3823459.tar.gz"
+sha512sums="
+33500dccd81d9f4ee8735f2f91e056913f0abb538248244512405f42156dd663b4337f97226fcadc1ed772c56590380cc7a6a8735a6fed46c62b8ac61424d684  firmware-samsung-lt01wifi-downstream-38ea48dbc6a683874aaf3376b63fc97ff3823459.tar.gz
+"

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

@@ -1,4 +1,4 @@
-# Unmaintained: Only used by unmaintained downstream kernel
+# Archived: Only used by archived downstream kernel
 pkgname=firmware-samsung-m0-downstream
 pkgver=3
 pkgrel=0

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

@@ -0,0 +1,43 @@
+# 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/APKBUILD

@@ -1,10 +1,10 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (alcatel-idol347)!
+# Archived: Downstream port, only for testing. Use mainline port (alcatel-idol347)!
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm/configs/idol347_defconfig
 
 pkgname=linux-alcatel-idol347-downstream
 pkgver=3.10.49
-pkgrel=1
+pkgrel=2
 pkgdesc="Alcatel Idol 3 4.7 downstream kernel fork"
 arch="armv7"
 _carch="arm"
@@ -38,6 +38,9 @@ source="
 	smb1360-dump-idol347.patch
 	smb1360-dump-$_smb_tag.c::https://raw.githubusercontent.com/msm8916-mainline/linux/$_smb_tag/drivers/power/supply/smb1360-dump.c
 	smb1360-like-mainline-idol347.patch
+	linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
+	linux3.4-fix-piggy.gzip.S.patch
+	linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
 "
 builddir="$srcdir/$_repository-$_commit"
 _outdir="out"
@@ -73,4 +76,7 @@ bab8a081879b5e4b0d8f280fda099fde5f47eab62e8eb3aa50c36475edafc2e6b70aba5b9eec56bc
 594017763bc82b29a24f18e3b3f9275eebbb720422ef1c1ea4d2d598baa1bb54761bc6f452d94b2079f7a6c6f6d0b7606684cca137a2b91a1c5fb94b2140e8fa  smb1360-dump-idol347.patch
 f61902474ab221a85a8910dcfbc48736e323a6bbc83896f778bb87d356464679c62ddf1c583e660a5c3c790dba420cce6cb9ca59b720234846dac7e80aa47368  smb1360-dump-v5.11.7-msm8916.c
 33fe78be59acf7df9f0043819b66f79dba1fe2cd43cddedc361c17bb29454e1a55a5cd4825e9e61e45e7415986caddb795c0aefbd2fe8c631ffae24f2042bac1  smb1360-like-mainline-idol347.patch
+9e3b067fa1b19ad02500c4fce1b6142051df3845c508e615788beb650c4f953683107ac2d80670c4e3df38f532e0e91060d2d13ec04c9ec985abd2dfa82e900b  linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
+080745ca4ecaa804ee1df26ea81975ca93b74372e0c08322a6c481e97807495ae6ceb6cc77653afa24f9f2df45da8ebf8e5de6b06037fbb08e0279877ce42188  linux3.4-fix-piggy.gzip.S.patch
+75545ccd0082a119b9ad95fcef3523c939a5c946f8f3a5c3dde15cee1502f6c1011050a0ad5359426f018bb7ceea1c97a28c7665941bc89f365c8d11065ce0f6  linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
 "

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

@@ -0,0 +1 @@
+../../.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

@@ -0,0 +1 @@
+../../.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

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