DONTMERGE: boot-deploy: feat/multiple-kernels

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
WIP: linux-next: keep old versions on upgrade
2024-11-17 05:11:14 +01:00 · 2024-11-17 05:07:11 +01:00 · 2024-11-17 04:59:40 +01:00 · 2024-11-17 03:09:44 +01:00
778 changed files with 4593 additions and 38394 deletions
@@ -10,9 +10,8 @@ fi

 git config --global --add safe.directory "$CI_PROJECT_DIR"
 git config --global user.name "postmarketOS CI"
-# The username for the bot associated with the access token
-# e.g. project_226_bot_bfa19b84bf7f559c8ff7438a01fd29b9
-git config --global user.email "$PMAPORTS_TOKEN_BOT@noreply.gitlab.postmarketos.org"
+# pmaports
+git config --global user.email "project_226_bot_a365eaa0c380d1bee0af03adf42ebea3@noreply.gitlab.postmarketos.org"

 # Configure SSH key for signing
 mkdir -p ~/.ssh
@@ -56,8 +56,34 @@ def get_upstream_branch():

        :returns: branch name, e.g. "v20.05" """

-    # HACK for master_staging_systemd branch
-    return "master_staging_systemd"
+    # 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"]
+
+    # Get channel (e.g. "stable") from pmaports.cfg
+    # https://postmarketos.org/pmaports.cfg
+    pmaports_dir = get_pmaports_dir()
+    pmaports_cfg = configparser.ConfigParser()
+    pmaports_cfg.read(f"{pmaports_dir}/pmaports.cfg")
+    channel = pmaports_cfg["pmaports"]["channel"]
+
+    # Get branch_pmaports (e.g. "v20.05") from channels.cfg
+    # https://postmarketos.org/channels.cfg
+    channels_cfg_str = run_git(["show", "upstream/master:channels.cfg"])
+    channels_cfg = configparser.ConfigParser()
+    channels_cfg.read_string(channels_cfg_str)
+    assert channel in channels_cfg, \
+        f"Channel '{channel}' from pmaports.cfg in your branch is unknown." \
+        " This appears to be an old branch, consider recreating your change" \
+        " on top of master."
+
+    ret = channels_cfg[channel]["branch_pmaports"]
+    cache["upstream_branch"] = ret
+    return ret


 def get_changed_files(removed=True):
@@ -21,6 +21,7 @@ sh_files="
 	./main/postmarketos-installkernel/installkernel-pmos
 	./main/postmarketos-initramfs/init.sh
 	./main/postmarketos-initramfs/init_functions.sh
+	./main/postmarketos-mkinitfs-hook-debug-shell/setup_usb_storage.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
@@ -47,7 +47,8 @@ def test_aports_device():
            if "postmarketos-base" == dependency or "postmarketos-base>" in dependency:
                depend_flag = True
        if not depend_flag:
-            raise RuntimeError(f"Missing 'postmarketos-base' in depends of {path}")
+            raise RuntimeError("Missing 'postmarketos-base' in depends of " +
+                               path)

        # Depends: Must not have specific packages
        for depend in apkbuild["depends"]:
@@ -60,7 +61,7 @@ def test_aports_device():
            raise RuntimeError("wrong architecture, please change to arch=\""
                               f"{deviceinfo.arch}\": {path}")
        if "!archcheck" not in apkbuild["options"]:
-            raise RuntimeError(f"!archcheck missing in options= line: {path}")
+            raise RuntimeError("!archcheck missing in options= line: " + path)


 def test_aports_device_kernel():
@@ -36,7 +36,7 @@ def test_deviceinfo():
    # Iterate over all devices
    last_exception = None
    count = 0
-    pattern = re.compile("^deviceinfo_[a-zA-Z0-9_]*=\".*\"(\\s*# .*)?$")
+    pattern = re.compile("^deviceinfo_[a-zA-Z0-9_]*=\".*\"$")

    for folder in pkgrepo_iglob("device/*/device-*"):
        device = folder.name.split("-", 1)[1]
@@ -63,8 +63,8 @@ def test_deviceinfo():
                # Check line against regex (can't use multiple lines etc.)
                if not pattern.match(line) or line.endswith("\\\""):
                    raise RuntimeError("Line looks invalid, maybe missing"
-                                       " quotes/multi-line string/malformed"
-                                       f" inline comment? {line}")
+                                       " quotes/multi-line string/comment next"
+                                       f" to line instead of above? {line}")

            # Successful deviceinfo parsing / obsolete options
            info = pmb.parse.deviceinfo(device)
@@ -10,7 +10,6 @@ expected_directories = [
    "device/community",
    "device/main",
    "device/testing",
-    "extra-repos/systemd",
    "main",
    "modem",
    "non-free",
@@ -23,9 +23,6 @@ def test_aports_kernel():
        apkbuild = pmb.parse.apkbuild(path)
        aport_name = os.path.basename(os.path.dirname(path))

-        if aport_name == "linux-pam":
-            continue  # This package isn't a linux kernel!
-
        if "pmb:cross-native" not in apkbuild["options"]:
            raise RuntimeError(f"{aport_name}: \"pmb:cross-native\" missing in"
                               " options= line")
@@ -12,8 +12,3 @@ indent_style = tab
 end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
-
-# Forked from Alpine
-[extra-repos/systemd/networkmanager/networkmanager.rules]
-indent_style = space
-indent_size = 4
@@ -65,7 +65,7 @@ is_symlink() {
 # available in git tree and checksums are correct.
 check_local_sources() {
 	local apkbuild="$1"
-	local startdir="$2"
+	local startdir="${apkbuild%/*}"
 	local status=0
 	local checksum_act checksum_exp content filename line sources

@@ -109,21 +109,11 @@ check_file_size() {
 	fi
 }

-cleanup() {
-  [ -f "$_staged" ] && rm "$_staged"
-}
-
-trap cleanup EXIT

 for apkbuild in $(changed_files '**/APKBUILD'); do
-	_staged="$(mktemp)"
-	git show ":$apkbuild" >"$_staged"
-	check_local_sources "$_staged" "${apkbuild%/*}"
-	cleanup
+	check_local_sources "$apkbuild"
 done

 for path in $(changed_files); do
 	check_file_size "$path"
 done
-
-trap - EXIT
@@ -109,6 +109,7 @@ kernel-kconfig:
      changes:
        - kconfigcheck.toml
        - device/*/linux-*/config-*
+        - main/linux-*/config-*
  script:
    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/kconfig.sh
@@ -147,6 +148,11 @@ build-x86_64:
  script:
    - .ci/build-x86_64.sh

+build-x86:
+  extends: .build
+  script:
+    - .ci/build-x86.sh
+
 build-aarch64:
  extends: .build
  script:
@@ -157,6 +163,16 @@ build-armv7:
  script:
    - .ci/build-armv7.sh

+build-armhf:
+  extends: .build
+  script:
+    - .ci/build-armhf.sh
+
+build-riscv64:
+  extends: .build
+  script:
+    - .ci/build-riscv64.sh
+
 auto-update:
  stage: autoupdate
  rules:
@@ -27,8 +27,7 @@
 	Replace space inside `[ ]` with `x` to fill the checkbox
 -->
 * [ ] edge (`master` branch)
-* [ ] `v24.12`
-* [ ] `v24.06` (supported until 2025-01-23)
+* [ ] `v24.06`

 * [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`

@@ -31,34 +31,25 @@ device/*/*-pine64-pinephonepro/			@PsychoGame
 device/*/*-pine64-rockpro64/			@PureTryOut
 device/*/*-purism-librem5/			@craftyguy @alistair23 @Newbyte
 device/*/*-qcom-msm8916/			@Minecrell @TravMurav
-device/*/*-qcom-msm8953/			@barni2000 @alikates @vipaoL @jiaxyga
 device/*/*-qcom-sdm670/				@flamingradian
 device/*/*-qcom-sdm845/				@sdm845-mainline
 device/*/*-qcom-sm6350/				@z3ntu
-device/*/*-qcom-sm8250/				@jianhua
 device/*/*-samsung-a3/				@Mis012 @TravMurav @Minecrell
 device/*/*-samsung-a5/				@Minecrell @minlexx
-device/*/*-samsung-a51/				@manoedinata
 device/*/*-samsung-e7/				@wonderfulShrineMaidenOfParadise
 device/*/*-samsung-espresso10/			@MightyM17
 device/*/*-samsung-espresso7/			@MightyM17 @antoni.aloytorrens
-device/*/*-samsung-fortuna/			@wonderfulShrineMaidenOfParadise
-device/*/*-samsung-fortunaltezt/		@bolilingmeng89006
 device/*/*-samsung-grandmax/			@wonderfulShrineMaidenOfParadise
 device/*/*-samsung-gt510/			@TravMurav
 device/*/*-samsung-gt58/			@TravMurav
-device/*/*-samsung-j3ltetw/		@bolilingmeng89006
-device/*/*-samsung-j4lte/			@manoedinata
 device/*/*-samsung-j5/				@wonderfulShrineMaidenOfParadise
 device/*/*-samsung-j5x/				@wonderfulShrineMaidenOfParadise
-device/*/*-samsung-rossa/			@wonderfulShrineMaidenOfParadise
 device/*/*-samsung-serranove/			@Minecrell
 device/*/*-tolino-shine2hd/			@akemnade
 device/*/*-videostrong-kii-pro/			@funderscore
 device/*/*-wileyfox-crackling/			@TravMurav @Minecrell
 device/*/*-xiaomi-beryllium/			@joelselvaraj
 device/*/*-xiaomi-daisy/			@joelselvaraj @alikates
-device/*/*-xiaomi-elish/			@jianhua
 device/*/*-xiaomi-markw/			@vipaoL
 device/*/*-xiaomi-mido/				@barni2000
 device/*/*-xiaomi-scorpio/			@Tooniis
@@ -102,7 +93,6 @@ device/*/device-shift-axolotl/			@amartinz @calebccff @dylanvanassche
 device/*/device-solidrun-cubox/			@longnoserob
 device/*/firmware-google-sargo/			@flamingradian
 device/*/firmware-google-veyron-brcm/		@jenneron
-device/*/firmware-motorola-osprey/		@Minecrell
 device/*/firmware-odroid-xu4/			@Grimler
 device/*/firmware-oneplus-sdm845/		@calebccff
 device/*/firmware-powervr-gx6250/		@jenneron
@@ -117,11 +107,10 @@ device/*/linux-postmarketos-exynos4/		@Newbyte @Grimler @knuxify
 device/*/linux-postmarketos-exynos5/		@jenneron @Grimler
 device/*/linux-postmarketos-grate/		@clamor-s @jenneron @jethrob
 device/*/linux-postmarketos-imx-ereader/	@akemnade
-device/*/linux-postmarketos-marvell/		@longnoserob @exkc
+device/*/linux-postmarketos-marvell-dove/	@longnoserob
 device/*/linux-postmarketos-mediatek-mt8173/	@jenneron @adamthiede
 device/*/linux-postmarketos-mediatek-mt8183/	@jenneron @binarycraft
 device/*/linux-postmarketos-omap/		@MightyM17 @Sicelo
-device/*/linux-postmarketos-qcom-laptop/	@craftyguy @calebccff
 device/*/linux-postmarketos-qcom-msm8939/	@Newbyte
 device/*/linux-postmarketos-qcom-msm8953/	@M0Rf30 @Ultra-azu @barni2000
 device/*/linux-postmarketos-qcom-msm8996/	@Tooniis
@@ -145,10 +134,10 @@ device/*/u-boot-librem5/			@craftyguy @alistair23 @Newbyte
 device/*/u-boot-pinebookpro/			@QC8086
 device/*/u-boot-pinephone/			@Arnavion @PsychoGame
 device/*/wl1251-cal/				@Danct12
-main/postmarketos*gnome*/			@pabloyoyoista @Newbyte @fossdd
+main/postmarketos*gnome*/			@pabloyoyoista @Newbyte
 main/postmarketos-initramfs/			@calebccff @craftyguy
 main/postmarketos-ui-i3wm/			@fossdd
-main/postmarketos-ui-phosh/			@pabloyoyoista @Newbyte @fossdd
+main/postmarketos-ui-phosh/			@pabloyoyoista @Newbyte
 main/postmarketos-ui-plasma-mobile/		@PureTryOut
 main/shutdown-clear-rtc-wakealarm/		@Arnavion
 main/ttyescape/					@calebccff
@@ -1,8 +1,4 @@
-# postmarketOS aports repository
-
-This repository contains the APKBUILD files for postmarketOS-specific packages, along with the required patches and scripts, if any.
-
-There are many more packages defined in the [Alpine Linux aports](https://gitlab.alpinelinux.org/alpine/aports/) on which these packages depend.
+# postmarketOS aports

 Helpful resources:
 * [How to create a package](https://wiki.postmarketos.org/wiki/Create_a_package)
@@ -8,14 +8,8 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge

-[v24.12]
-description=Latest release / Recommended for best stability
-branch_pmaports=v24.12
-branch_aports=3.21-stable
-mirrordir_alpine=v3.21
-
 [v24.06]
-description=Old release (supported until 2025-01-23)
+description=Latest release / Recommended for best stability
 branch_pmaports=v24.06
 branch_aports=3.20-stable
 mirrordir_alpine=v3.20
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-aarch64
 pkgver=1.37.0
-pkgrel=10
+pkgrel=7

 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-b71a091d7ae6ee459dd0c51409793214a2285ee83c2621e289e198187ed642222d6f842f08661a8c72f96c9a0dc7271d5a47ab6794e2551f185d68f515bde598  busybox-static-1.37.0-r10-aarch64-edge.apk
+9d0fd2ad11f7b2f9fbb3d5e71a2a7f113187648f61c269bee7b6b7ef0976d181d6a7588638382415b7eb2cc3934d0ef62080d4462acfc97c4c7b056003d333d4  busybox-static-1.37.0-r7-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armhf
 pkgver=1.37.0
-pkgrel=10
+pkgrel=7

 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-88abaead7eace4910199e0cc76bc16bce762d61b2e10e1bc2a631d38e56458f5cb95f98f09d09f346229f9c6c982d3b0b3f907315f54e0e92b83dcc3b839d8bf  busybox-static-1.37.0-r10-armhf-edge.apk
+c89807c048cd58a5994c8162685669d0e49752f7284adc427d017355bbfd43f5a686617be42abd2b470c15869225a03f31a6231ee4dbb03fc6b27d6c920b5208  busybox-static-1.37.0-r7-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armv7
 pkgver=1.37.0
-pkgrel=10
+pkgrel=7

 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-5bbeb8a0331f25569acc32d574290ec430f0a2a74190550b3913f3e7366082a76b9755c0d52bec57659a2bbd1af3f4fe5928ec988b283a2e731c902cd5e7aa85  busybox-static-1.37.0-r10-armv7-edge.apk
+56e0b396ced0a0afab2f5b50156b87707e3511a2e24c52c9688a20791fad20f11869b5b06bb6c7d407ffec3e4e06ea3100876e3d32efae678fc5a0fe6b57715a  busybox-static-1.37.0-r7-armv7-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-aarch64
 pkgver=1.2.5
-pkgrel=8
+pkgrel=5
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-9cdb30e50d99d377ef8ef3bc41fc6ecd0ae7bc744c6c29ba97afd1ff072271d78c9a36947cebdf944e907b5181bacf165345824234380511d4cc3b535c730673  musl-1.2.5-r8-aarch64-edge.apk
-5638f321b0e76bdb68d3e641ab5bcf4b0f66365aedfbec52b09fc9eafcaf210797c2cbd8166254c3633e3d597d8118838443d32e0af45d689467a237e1cf479e  musl-dev-1.2.5-r8-aarch64-edge.apk
+5b3c6f1f1d87164a8a72c9d90b6e35ccc256bb2f6e1a12e4a3ff04b6309fff6c438eef60b824e4993958c4348c122fb96ef8f59dc468e10ee5be69aa81e6f4bc  musl-1.2.5-r5-aarch64-edge.apk
+ebbd7300b2102f322633dbc01449b5d4f25374609193359bf5da97e3a6cf34f1288a69ed0638bd5505b4548fdeb1efa481c9cd3a031ae3a98759b36cbf2db46e  musl-dev-1.2.5-r5-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-armhf
 pkgver=1.2.5
-pkgrel=8
+pkgrel=5
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-18a970c5ef74e306ffa6031ae5f75a9cc3c52a9cd4c4706c94631696cf52d5af5024548d658176546c559c99dfad321e0ce87eddcc92a4aff40293e61313f921  musl-1.2.5-r8-armhf-edge.apk
-c8bcb213d113fde24ed72f67d46e19cc842fbae223aaa02b635d53ba4c7ea39869243b24dada8a248e8c93e1e9c8b35424be39bcfd25136d3b18250cab820638  musl-dev-1.2.5-r8-armhf-edge.apk
+302f14e5dc60b4c55f5f299be6cd158fe0955549e8b559afb5985c29a5c98432f82586732954c0dc3776104efc072b11ad9e4818842e6592df2e1931ba3590de  musl-1.2.5-r5-armhf-edge.apk
+71fc34ce05c5ed73136e77baa478986ec205f882f02602f54f772498451c70a254c89301e932c1e9d3b48a4b4513ca99f64b54de38bdd95966421c297e81ac5b  musl-dev-1.2.5-r5-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-armv7
 pkgver=1.2.5
-pkgrel=8
+pkgrel=5
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-4aad1e994572ae8b364e926c9213dbc2f6759fb9308290837cbcba31c4005a9dfc16fb2600953dd23e3f49b9a549865bc818e875d8dd8ef8f9075a114a7dca2d  musl-1.2.5-r8-armv7-edge.apk
-69359b6d47b94560657c7c97709ea2bcc3b31e4454bb247721d39d20daa1520178cca789f68126d4235f1e10ed1a7a7ce598b199323898d0c6b714342608ab0d  musl-dev-1.2.5-r8-armv7-edge.apk
+9e2af487860c1a232941a8c5e9833457af1f8c1bd45ce2105dcffcd39879363d4a14928c8670b6e5b8295c97a9fd121d880f8eee2f301df243e1e12dcae1cb69  musl-1.2.5-r5-armv7-edge.apk
+8de555df4077de3f12bb5a113d2baaa93f403bd829058dd94093e58a0a7cd7b868d76bdc3f5bc0e5953f2bffdac4360cdbbada3be72578a17c7b1118cb2330a0  musl-dev-1.2.5-r5-armv7-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-riscv64
 pkgver=1.2.5
-pkgrel=8
+pkgrel=5
 arch="x86_64"
 subpackages="musl-dev-riscv64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-41e2ab47c4ee0cd3fde7867be24eaff3f0346ae66b0e4a268b2638e243ba3e55db6782f9633d6ee08018eb608134908439c498e4c8a6cc43b6f607ed2af0f41b  musl-1.2.5-r8-riscv64-edge.apk
-f9f31edbd65a2c920c4936be66c6e822081ac13a1b08bf7fda7205105bb77fcd18484a73f42857ab947e88310b093c02cedc1b097490b4ba610ff9a78c60ab15  musl-dev-1.2.5-r8-riscv64-edge.apk
+4234a6980ea7bae2d275537f2c55e6ff1c480fc1ff838341d252ca71f6d098e1e91b60a8341744c91721d0850886f9155de330de7a71b037b9b87ac514582587  musl-1.2.5-r5-riscv64-edge.apk
+6d10394c2e778699645ed3a65a52bd1fead39aeea13371a83cacae4b301fd577b2cb8cd9779c285d1dafeebef99cbd09807b86013468fe74f45cac1498c400ff  musl-dev-1.2.5-r5-riscv64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-x86
 pkgver=1.2.5
-pkgrel=8
+pkgrel=5
 arch="x86_64"
 subpackages="musl-dev-x86:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-57242b717ccfa0dd5dae74f6b440b1258fc4900c30b569b7fa46930e38cc1ca1c28cbb9c24239c67909fd26644a82c87ef19a41ce3c5a47e0f4c2e749d24eb32  musl-1.2.5-r8-x86-edge.apk
-d3df9a8bb1a5b61cc84f805e0e1926dd52fae77929b5839ffe37c694a7a494728166aff52a37b3ce4fe24065c6886098bff91ddf9f365e636b3fd1dc0e0332ac  musl-dev-1.2.5-r8-x86-edge.apk
+5a556b306c4fe7969318c3af456dfa3b91f4a8563cf21d95154b27864d74baa68e99fc78302ac1b19f7aa3f72febb647959ef6c1c664798bbc8d411f8fe950f3  musl-1.2.5-r5-x86-edge.apk
+52b49e9789176f47d6c00e0cf5e4ec66a70f1977ae86d4f8cbc33631e0f5586c8d745536aa04fcd612ec4aee9bfca2cc2e5beea0e5108d81a6a8e015a58d1666  musl-dev-1.2.5-r5-x86-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=musl-x86_64
 pkgver=1.2.5
-pkgrel=8
+pkgrel=5
 arch="aarch64"
 subpackages="musl-dev-x86_64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-fa2d127eaf56c9bcd93e40ab8c2499123d534f65319232b76f12ffdd0798ed2f0218802cae0373f9255996fdfa194f04bb92d1e05c9b0a659fae4b7a533094eb  musl-1.2.5-r8-x86_64-edge.apk
-4fcd12befeaa57c3961e4291d37ed9a57043879af6de32f65db3b860616d0c1b76a545099c03350603fddebd8360beae552655ea6df9046712bda290c51d3e05  musl-dev-1.2.5-r8-x86_64-edge.apk
+73c14308a84b80ffefa83e48322869a99c9adede367155493bee7f19e2be0846908cf52f0068748d641df9e19566c2fd49feda56e7848432054674a81c10f85e  musl-1.2.5-r5-x86_64-edge.apk
+8521be7365f75c68752c1527d32bc7c83a9f6670f5aff97752d9708607aaca04bf6afbed437192736f9e1baa85c1ff8f40dc75ce010554ac5ffbc777b9f0a6ac  musl-dev-1.2.5-r5-x86_64-edge.apk
 "
@@ -1,51 +0,0 @@
-From 4cbffcd4f146ccceafccd9fa9d522640d1f0f519 Mon Sep 17 00:00:00 2001
-From: Oliver Smith <ollieparanoid@postmarketos.org>
-Date: Tue, 10 Dec 2024 08:33:54 +0100
-Subject: [PATCH] libfdt.i_shipped: use SWIG_AppendOutput
-
-Fix this build error with modern SWIG:
-
-  scripts/dtc/pylibfdt/libfdt_wrap.c: In function '_wrap_fdt_next_node':
-  scripts/dtc/pylibfdt/libfdt_wrap.c:5578:17: error: too few arguments to function 'SWIG_Python_AppendOutput'
-   5578 |     resultobj = SWIG_Python_AppendOutput(resultobj, val);
-
-Patch is based on:
-https://github.com/dgibson/dtc/pull/154
---
- scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped
-index 27c29ea260..3bbbfb3c9f 100644
--- a/scripts/dtc/pylibfdt/libfdt.i_shipped
-+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped
-@@ -1033,7 +1033,7 @@ typedef uint32_t fdt32_t;
- 			fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
- 		buff = PyByteArray_FromStringAndSize(
- 			(const char *)($1 + 1), fdt32_to_cpu($1->len));
-		resultobj = SWIG_Python_AppendOutput(resultobj, buff);
-+		resultobj = SWIG_AppendOutput(resultobj, buff);
- 	}
- }
- 
-@@ -1072,7 +1072,7 @@ typedef uint32_t fdt32_t;
- 
- %typemap(argout) int *depth {
-         PyObject *val = Py_BuildValue("i", *arg$argnum);
-        resultobj = SWIG_Python_AppendOutput(resultobj, val);
-+        resultobj = SWIG_AppendOutput(resultobj, val);
- }
- 
- %apply int *depth { int *depth };
-@@ -1088,7 +1088,7 @@ typedef uint32_t fdt32_t;
-            if (PyTuple_GET_SIZE(resultobj) == 0)
-               resultobj = val;
-            else
-              resultobj = SWIG_Python_AppendOutput(resultobj, val);
-+              resultobj = SWIG_AppendOutput(resultobj, val);
-         }
- }
- 
-- 
-2.47.1
-
@@ -1,6 +1,6 @@
 # Maintainer: Richard Acayan <mailingradian@gmail.com>
 pkgname=alsa-ucm-conf-qcom-sdm670
-pkgver=1.2.9_git20241211
+pkgver=1.2.9_git20241012
 pkgrel=0
 pkgdesc="ALSA UCM configuration for SDM670 devices"
 url="https://gitlab.com/sdm670-mainline/alsa-ucm-conf"
@@ -8,7 +8,7 @@ arch="aarch64"
 license="BSD-3-Clause"
 provides="alsa-ucm-conf"
 provider_priority=1
-_commit="80bbe11220dcb5db4f2b3e65f1e1783d4935f902"
+_commit="437f49545593a3e285feff1820bc1a282213af45"
 source="https://gitlab.com/sdm670-mainline/alsa-ucm-conf/-/archive/$_commit/alsa-ucm-conf-$_commit.tar.gz"
 options="!check"

@@ -19,5 +19,5 @@ package() {
 }

 sha512sums="
-489c9807e7667e2246426970009d2dbed0267d797764a8766f37375e6bf2d4d0035ab46d205acb9e96748d2257083ae816639cd559b292e2551ab7481a9040f9  alsa-ucm-conf-80bbe11220dcb5db4f2b3e65f1e1783d4935f902.tar.gz
+4e0edfaf6451bc0177e2115f21ef00504abf2b974e7f8eb8e5f4089f11ff6d2692ff07965946eb9086b1dce7016ab14bdc998bbf6f72ae9da00d83678ed5c956  alsa-ucm-conf-437f49545593a3e285feff1820bc1a282213af45.tar.gz
 "
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-arrow-db410c
 pkgdesc="Arrow DragonBoard 410c"
-pkgver=5
-pkgrel=0
+pkgver=4
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -32,6 +32,6 @@ nonfree_firmware() {
 }

 sha512sums="
-748f5953d059f6765b041910bc8d7654a9e92d54d1646d8b90a4cdf5a66087f9a1917c7d1bddba994d2cc65d5b2ce422d6fb4650f771819b9f3f9ff33342be99  deviceinfo
+b7431dcf918509458637442814d6f91f1532c75cd483be65d14dedd7af81f2f565187a190b3e3537474d00eec71cdb4ef6eb7fe3246ecde5a6c7b92593e71207  deviceinfo
 ccd6758cb4954eb0a96c7fb15e732e8147414f8edc498d9faf7d04ddef85d817733669ec1a6003e623e8392f3f6bb85f71160efe4e82f27e300d58aa6f5c8549  modules-initfs
 "
@@ -33,6 +33,3 @@ deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
 deviceinfo_flash_fastboot_partition_rootfs="rootfs"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-bq-paella
 pkgdesc="BQ Aquaris X5"
-pkgver=9
-pkgrel=0
+pkgver=8
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -38,6 +38,6 @@ nonfree_firmware() {
 }

 sha512sums="
-ec9416137ac7e49f564428bd92811ecc557567d3ee9b73061bab6da4d818fbecbbe70d179b91ef98576244bb6793e64b8add8d82a3a0398c5f542ba18978b58f  deviceinfo
+75e857f36f627d1ef209bfc79bac574b432ecb93a0e0de131675de43c43cef15e455284bab7b635376d21fd908e8cd21e6e918c6bd03c6e711179489f56e39a5  deviceinfo
 ebf6a40372329116a25df1407e671365bb2bf0613f61f0a572fc77890fb0a1760259ab35ed9f002ef2a5c6ee8836bc7bbeb50bf5ac3de14c11e6d96872ad3644  modules-initfs
 "
@@ -31,6 +31,3 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -4,8 +4,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
-pkgver=12
-pkgrel=1
+pkgver=11
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -18,7 +18,7 @@ depends="
 	linux-firmware-ath11k
 	linux-firmware-qca
 	linux-firmware-qcom
-	linux-postmarketos-qcom-laptop
+	linux-lenovo-21bx
 	postmarketos-base
 	qmi-utils
 	systemd-boot
@@ -64,7 +64,7 @@ usbguard() {

 sha512sums="
 9cb08de5748b0339005a910cc0475ad344dc6e912e477c5bd6b370784af6309719524f8fa7a39e7565586e47968a35c344ea853cddd716cc3e1e483efaae7ff0  deviceinfo
-5f4e6a80455c8a2ed879bfd457a89f81790824657ed4101e03b7ec288a274e63340f48e2ad5028cf83744263a4529584b1e94c36d10b98912e5b31804fa98ff0  firmware.files
+82f7719285434d8c7a5268ddc21d513bb3f3788eb3dd2df099e1c245add9d19719047b003a47edb077e095ebe09d9601b1312c001578e7dfa4ed61d72098ef74  firmware.files
 27705e998db262602b50004083fe160dbcde88e9fdcaeb43e3d1d79be0b7af371f84855bb93ba16ada3cf5fa8ff8da6ca159cda4b1de08fb54ac451c57169c57  modules-initfs
 52bbb9564ec713db5d46937701b121afe0c6c644fffe189a05766f491b4997b1bbc4c1f90229efb5764d795df8d40a57d4c840ee4b32d426e7a84520364b8bf5  pipewire.conf
 0d0412eb1f01af39000c39391f622640461305d83dae1a53aa7eef640cc17fd265cabca4e4e57dea053c47a4e50f9feb90f12ee5310d5b6425783e83efc5f9d8  usbguard.conf
@@ -4,7 +4,9 @@

 # Bluetooth
 /lib/firmware/qca/hpbtfw21.tlv
-/lib/firmware/qca/hpnv21.b8c
+# TODO: replace this if/when the fixed fw makes its way into linux-firmware-qca
+#/lib/firmware/qca/hpnv21.bin
+/lib/firmware/postmarketos/qca/hpnv21.bin

 # GPU
 /lib/firmware/qcom/a660_gmu.bin
@@ -3,8 +3,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-lenovo-a6000
 pkgdesc="Lenovo A6000"
-pkgver=9
-pkgrel=0
+pkgver=8
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -46,7 +46,7 @@ phosh() {
 }

 sha512sums="
-4d09fab52932eec68e861ece0e1b6be8091b4834d765e533c8af9eaa0598838d11c3297fd501717af2124739c17a91be923fbefb59459e9f8f2ecbf767421069  deviceinfo
+4939c4931addcfc05dbd5ede8083385e554c51c90ce5b375291fc57f245bfccc71054c9ae66c421bd5a39fe8f4449b58450246b667af0cda84399b5d65dc2173  deviceinfo
 d433b8376b6e89daf4eac2073cb33627bdcacdcd48b6d4990cc698627dcf3c951bb1874951bc4631ea6b89d22c6002b9d02b77ff24992106061fcecc22fa5f25  modules-initfs
 10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
 "
@@ -31,6 +31,3 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -3,8 +3,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-lenovo-a6010
 pkgdesc="Lenovo A6010"
-pkgver=9
-pkgrel=0
+pkgver=8
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -46,7 +46,7 @@ phosh() {
 }

 sha512sums="
-0b50a8f01bf0014f905e212ab8677a34c1b538b6ef3205895f16a7b40fa0c20b5db966f9358ffe25f1bf06283eac4ee166ee8d1e68aafe12069d22c9f87376b8  deviceinfo
+f367b90ebbf89896884d3cc34c559cc3d36b6e4187aeb52497c23b0cb133c25163751d0013aa37109a441c76339f13de829fc01ff9537dc9fcdf53ae0066bd24  deviceinfo
 258464e46872cf221f7ac367766f9b8ead5d5dccbd71f3df5a5555127a42448906247ff2519d1750eec53b3ed37ae96c2409369d7cb8e2fffeb202a8f69bba53  modules-initfs
 10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
 "
@@ -31,6 +31,3 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-motorola-harpia
 pkgdesc="Motorola Moto G4 Play"
-pkgver=10
-pkgrel=0
+pkgver=9
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -41,6 +41,6 @@ nonfree_firmware() {
 }

 sha512sums="
-001c54115e5a4d0444c098f009bfc40a756b4044a9c1026fad0f5b0316e9540cc35ccd517689fcd298cb6481c0697e3127d46c618093a644a915ea8eb68bac27  deviceinfo
+31eba51ab586af61d0ea0efb2e0f0a8533524254e864d59bc2142ba30c6b5745a46a00314fbf86a8b5bcfeee2d42b218c27d2e8aa5ed19f24e50468860999e56  deviceinfo
 525a3e20672a7dff26b885b99ee157e0ece33efa10db34c90aed45dc47d7f1c2e90d7082dc84f2724892f199b5adaca04d5864f0aa1d1e4b8ea695f840346d60  modules-initfs
 "
@@ -31,6 +31,3 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -2,8 +2,8 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=37
-pkgrel=0
+pkgver=30
+pkgrel=1
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@@ -28,6 +28,7 @@ subpackages="
 	$pkgname-xkeyboard-config:xkeyboard_config
 	$pkgname-i3wm
 	$pkgname-upower
+	$pkgname-sxmo
 	$pkgname-openrc
 "
 source="
@@ -38,8 +39,6 @@ source="
 	asound.state.headset
 	asound.state.speakers
 	backlight-enable.sh
-	bq27k-options.conf
-	bq27k-monitor.sh
 	device-nokia-n900.start
 	deviceinfo
 	modules-initfs
@@ -62,9 +61,10 @@ source="
 	modules.blocklist
 	pointercal
 	proxishot.sh
+	sxmo/deviceprofile.sh
+	sxmo/start_hook.sh
 	uboot-script.cmd
 	udev/10-nokia-modem.rules
-	udev/15-bq27k.rules
 	udev/80-feedbackd-twl4030.rules
 	udev/90-touchscreen-dev.rules
 	upower.conf
@@ -104,16 +104,12 @@ package() {
 		"$pkgdir"/usr/share/mkinitfs/hooks/10-initfs-keymap.sh
 	install -Dm755 "$srcdir"/$pkgname.start \
 		"$pkgdir"/etc/local.d/$pkgname.start
-	install -Dm755 "$srcdir"/bq27k-monitor.sh \
-		"$pkgdir"/usr/bin/bq27k-monitor

 	# Udev rules
 	install -D -m644 "$srcdir"/90-touchscreen-dev.rules \
 		"$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 -D -m644 "$srcdir"/15-bq27k.rules \
-		"$pkgdir"/usr/lib/udev/rules.d/15-bq27xxx-battery.rules
 	install -Dm644 "$srcdir"/80-feedbackd-twl4030.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/80-feedbackd-twl4030.rules

@@ -140,8 +136,6 @@ package() {
 		"$pkgdir"/etc/modprobe.d/nokia-modem.conf
 	install -D -m644 "$srcdir"/modules.blocklist \
 		"$pkgdir"/etc/modprobe.d/n900-module-blocklist.conf
-	install -D -m644 "$srcdir"/bq27k-options.conf \
-		"$pkgdir"/etc/modprobe.d/bq27xxx-battery.conf

 	postmarketos-mvcfg-package "$pkgdir" "$pkgname"
 }
@@ -162,8 +156,6 @@ x11() {
 		"$pkgdir"/usr/bin/lock.sh
 	install -Dm755 "$srcdir"/proxishot.sh \
 		"$pkgdir"/usr/bin/proxishot.sh
-	install -D -m644 "$srcdir"/xdefaults \
-		"$subpkgdir"/etc/skel/.Xdefaults
 }

 xkeyboard_config() {
@@ -190,6 +182,22 @@ i3wm() {
 		"$subpkgdir"/etc/skel/.config/i3blocks/wifi
 	install -D -m755 "$srcdir"/protip_shell.sh \
 		"$subpkgdir"/etc/skel/.protip_shell.sh
+	install -D -m644 "$srcdir"/xdefaults \
+		"$subpkgdir"/etc/skel/.Xdefaults
+}
+
+sxmo() {
+	install_if="$pkgname=$pkgver-r$pkgrel sxmo-utils"
+	replaces="sxmo-utils"
+	# Set !tracedeps, so abuild doesn't extend provides with e.g.:
+	# "cmd:sxmo_deviceprofile_nokia,omap3-n900.sh=1.16.3-r0"
+	# Otherwise this cannot be installed together with sxmo-utils:
+	# conflicts: sxmo-utils-1.16.3-r0[cmd:sxmo_deviceprofile_nokia,omap3-n900.sh=25-r0]
+	options="!tracedeps"
+	install -Dm755 "$srcdir"/deviceprofile.sh \
+		"$subpkgdir"/usr/bin/sxmo_deviceprofile_nokia,omap3-n900.sh
+	install -Dm755 "$srcdir"/start_hook.sh \
+		"$subpkgdir"/usr/share/sxmo/default_hooks/sxmo_hook_start.sh
 }

 upower() {
@@ -214,8 +222,6 @@ ff51909873160c2d4c6f0c0119b6d4a02751df29f571b8596b4bc8b04ce2541913c11a583b0e5dab
 5b87071834313a389f83d29f86f6e3ea108d0921f17dc918be7a46de7e74c73a4418044ef600a0fbf72c8fad22b7730dcd5bfe3d6d01d76bf01556f8540f0b32  asound.state.headset
 67acc17a33bc75113300393b4a5bba15319014032407e774d079abf310368e75f4f697dbb4856ba2d2d8ea184b056bb33561f42918de3ee91ab6a77df89a133c  asound.state.speakers
 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a  backlight-enable.sh
-344ec50cee2a4d864debad12810a83070ab8257f9f07dcfa9be3eea1d8b26f3ab4fbe322fe05a384152b40fc5e1481df51d191624c7062186dd70f95a0784ea8  bq27k-options.conf
-c5b8e03ca9f720a794f2593a3e938640cbd91ac44dd761079bbf4614a0d288a9d7b72de8ed2493c062dc9f37be580bea529f454d2335f55b7a9f4d14024b42a9  bq27k-monitor.sh
 e6bbac8de1a198ba716f44ade76606e1e0adcc574156b855ac41be5eb5308389d3277fd89cc34b119fbc33d9801ab9f79a6ff213392596bff40bc17e931c05ef  device-nokia-n900.start
 40aaeb44941a988ab8ec58d331bc6cd42c4a23c6b6e8fc302f9216a38b46baab38d0a0137606a5b7959a51326983c03d684615c5ba9c58b0e36314ec8c49cfbb  deviceinfo
 f48b8dd7297d03008f73e1ecd55b77ace535ecb03f9bdf021123b96fb5f4fb491ff4c532e226b835c8118fa8d505cc4c635a2b604a3e42a162746021552a551c  modules-initfs
@@ -232,19 +238,20 @@ dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058ed
 082a5166e38296b097e873b0b4aeaf007e594d3bf4470c74e91ee3efedcf28ad25cd55c23dd63e460339898ae08e77e111b0e1092fa5e661db90bb40732103a1  rx51_it.map
 6e4e8b10a41d0957968736f5d780f14c7070b03913d80859cb07180e9cec9a36bbc9c639748765e48962772640974f5491627520cc36bd3d6c9d01748f9ddaff  rx51_ptes.map
 e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f1789a66f7c948290016b048da9f1cf63aba9e11d7e7fd6873ba  rx51_us.map
-83374ba470dc6c34e11c62e91e90a96614d76ae7ce240dd830cb1b2f07f9a72c83e5b50e07e49885a72b9caf25fd586c4ea26452a73baf8bab1d2b4490a107ab  lock.sh
+6cb3ad1253ceb682d5241e6661a4313cb88b16cbf855f45513b7320584cab062e6c6f472b4ba89ccf76c66493ea76dc3a7bed516b403e324a6fa5657621c7a09  lock.sh
 157b27feebcfddf800a1ffd8c6e369d2b58e5db25b1a44b4443dada8d9fe74abb91d036b9f0e97769bbafbdc72020b5637313682c6932fe7b0bddb9ebebbad42  modem-load.conf
 695feac7f69a0ec8c5e007cdb651adcc3492f1c6236e7fd183edec2a5e25cb957d3ace630ea5fdb87fd703e35ac368f1d097c2f881ecb52c9cfd433564db2a6c  modem-opts.conf
 862ebc7cd2d7a1b3d41b10701b8418308c89eb0732eb99c42ec1091d48e08db9421727f67a3272b7309549798d59afb1b8d7d2fa48d1447b208fcb2329472d4d  modules.blocklist
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
 134f51d20decc0c63ab08010931a0b410b70d2f85bf6899f2ff137b1680f59f706a6287d01f5fbb41fa5309125df75a430d0783149bd1a6a1bca07d22f4f6a21  proxishot.sh
+fc21e3b7e045055c080a7f7ffb0cd4140b63a02690e92c8370dbccbef506fe271ee9584ac9f14725b8bc9fd6e74e7fafde589d2360f44491c614837472d8ad53  deviceprofile.sh
+5dab895c34599bf233635463271ea8308d434c97789efe931eec24870c3b4688fe48ca3b7cdc66e5c1a705940d042b9f18f26420b60f22e1cfad1854e97f8687  start_hook.sh
 42f916d87dd305111028992a1107bf6fe108bebbd782ae8edd065e76505db2b3a75e57515970c3e40cb0d1b7e83097a1bba92785be13df7c3fd80959a8d9c5c1  uboot-script.cmd
-465b9a0d2b46d0981c64b47cb1f656c2456a90b91b1751a2efad10af38a96030dd99108b1fd76ce31bf1ea0f236d55bed38b114d6bd712f09f8968de034c946c  10-nokia-modem.rules
-1acc441b9f83dc91fd65fa3f89b8205bfd72a465286bc181b4e7e92dd4b8c0bc5c20a18dab46ff3ee8ae70940efd7d767b3dfb920edb4c74377bd418b838693d  15-bq27k.rules
+9e72035c88632d12895534e5aa5746f2c130c7dcdafa8702748d62b71ed0e1b5911b6e1f07f9b9e39b6072bbb662f66aead585baa1dcacb7d8c8953ca89b6762  10-nokia-modem.rules
 03079030237440080e833dbfeff80327c1ad6a8129c6c730b401a3052cd00a986783ec3473a526b14ae73ba1f20653b4c7b2a6590839bfe6cc156bbbc3b7bb74  80-feedbackd-twl4030.rules
 c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527  90-touchscreen-dev.rules
-9b99feee42dd6bdd122769994c786d3127c41e0aa3321f19c82a9d3845cf07b522908621a31cbddd9599fe18c5c37127d9b4be4255cd7fa8e0e8983bf73eb41b  upower.conf
+d46adf47194c02b434cb46751003e67ee008d60978458e69b1f59dc709a7135a70f542918c29e359ba8308bdeda58a21e8efa446d06625511af05403db90e455  upower.conf
 c7837e6688f09c7d650ac7479b8881d4bad709480a71a1dea8b5bba4f4215d6b48a3aebd3f58923bbd48813559478d4ef137dcc9838d321722e141f0aa6a6085  x11-keymap
-183dfdd545ba05e216209b1abe45e4af4e0ee16b2e73cff0e7ea7b9524ee35a1cf85213a77f32a1a94287aee6546885dbd71c6de1f4f1a1e2961e638ff27cdf6  xdefaults
+19694204f2f370a4132762ac1888eaf5736939bba2f12ec2bccd18dde0645cdb621dda3a0772d2ef6d26a65d14e39a628e0d23321fe3064777ad2b76ce45ed2d  xdefaults
 a91f98daa60efa2beb2ff6b405097f92edca5f1bbb9e7675499139be52ca2570712f8f06f9032ef29f636f99c8f8da8b992f746eab6424aac04260c16158bcc2  xorg.conf
 "
@@ -1,16 +0,0 @@
-#!/bin/sh
-set -e
-echo "Capacity: $POWER_SUPPLY_CAPACITY; Voltage: $POWER_SUPPLY_VOLTAGE_NOW; Level: $POWER_SUPPLY_CAPACITY_LEVEL" >> /tmp/bq27k.log
-if [ "$POWER_SUPPLY_CAPACITY_LEVEL" = "Low" ] || [ "$POWER_SUPPLY_CAPACITY_LEVEL" = "Critical" ]; then
-	if [ "$POWER_SUPPLY_STATUS" != "Charging" ]; then
-		/sbin/poweroff
-	fi
-fi
-# Adjust polling rate based on reported voltage. As voltage drops to near
-# critical levels, poll more frequently, in order to catch status changes
-# early
-if [ "$POWER_SUPPLY_VOLTAGE_NOW" -le 3350000 ]; then
-	echo 5 > /sys/module/bq27xxx_battery/parameters/poll_interval
-elif [ "$POWER_SUPPLY_VOLTAGE_NOW" -ge 3500000 ]; then
-	echo 45 > /sys/module/bq27xxx_battery/parameters/poll_interval
-fi
@@ -1 +0,0 @@
-options bq27xxx-battery poll_interval=30
@@ -1,13 +1,16 @@
 #!/bin/sh

-touch_state=$(xinput list-props "TSC2005 touchscreen" | grep "Device Enabled" | tr -d "\t" | cut -d ":" -f 2)
+display=off
+if xset q | grep -iq "monitor is on"; then
+	display=on
+fi

-case "$touch_state" in
-	0)
+case "$display" in
+	off)
 		xinput enable "TSC2005 touchscreen"
 		xset dpms force on
 		;;
-	1)
+	on)
 		xinput disable "TSC2005 touchscreen"
 		xset dpms force off
 		;;
@@ -0,0 +1,20 @@
+#!/bin/sh
+# SPDX-License-Identifier: AGPL-3.0-only
+# Copyright 2022 Sxmo Contributors
+
+export WLR_RENDERER=pixman
+export SXMO_LYSTI_LEDS=1
+export SXMO_POWER_BUTTON="0:0:twl_pwrbutton"
+export SXMO_TOUCHSCREEN_ID="TSC2005 touchscreen"
+export SXMO_SWAY_SCALE="1.5"
+#on N900 these two are swaped
+export SXMO_BEMENU_LANDSCAPE_LINES="10"
+export SXMO_BEMENU_PORTRAIT_LINES="8"
+export SXMO_DMENU_LANDSCAPE_LINES="10"
+export SXMO_DMENU_PORTRAIT_LINES="6"
+export SXMO_ROTATE_DIRECTION="left"
+export SXMO_KEYBOARD_SLIDER_EVENT_DEVICE="/dev/input/by-path/platform-gpio_keys-event"
+export SXMO_KEYBOARD_SLIDER_CLOSE_EVENT="*code 10 (SW_KEYPAD_SLIDE), value 0*"
+export SXMO_KEYBOARD_SLIDER_OPEN_EVENT="*code 10 (SW_KEYPAD_SLIDE), value 1*"
+# modem is only supported via ofono, not modemmanager
+export SXMO_NO_MODEM=1
@@ -0,0 +1,130 @@
+#!/bin/sh
+# SPDX-License-Identifier: AGPL-3.0-only
+# Copyright 2022 Sxmo Contributors
+
+# include common definitions
+# shellcheck source=scripts/core/sxmo_common.sh
+. sxmo_common.sh
+
+# Create xdg user directories, such as ~/Pictures
+xdg-user-dirs-update
+
+sxmo_jobs.sh start daemon_manager superd
+
+# let time to superd to start correctly
+while ! superctl status > /dev/null 2>&1; do
+	sleep 0.5
+done
+
+# Not dangerous if "locker" isn't an available state
+sxmo_state.sh set locker
+
+if [ -n "$SXMO_ROTATE_START" ]; then
+	sxmo_rotate.sh
+fi
+
+# Load our sound daemons
+
+if [ -z "$SXMO_NO_AUDIO" ]; then
+	if [ "$(command -v pulseaudio)" ]; then
+		superctl start pulseaudio
+	elif [ "$(command -v pipewire)" ]; then
+		# pipewire-pulse will start pipewire
+		superctl start pipewire-pulse
+		superctl start wireplumber
+	fi
+
+	# monitor for headphone for statusbar
+	superctl start sxmo_soundmonitor
+fi
+
+# Periodically update some status bar components
+sxmo_hook_statusbar.sh all
+sxmo_jobs.sh start statusbar_periodics sxmo_run_aligned.sh 60 \
+	sxmo_hook_statusbar.sh periodics
+
+# mako/dunst are required for warnings.
+# load some other little things here too.
+case "$SXMO_WM" in
+	sway)
+		superctl start mako
+		superctl start sxmo_wob
+		superctl start sxmo_menumode_toggler
+		superctl start bonsaid
+		swaymsg output '*' bg "$SXMO_BG_IMG" fill
+		;;
+	dwm)
+		superctl start dunst
+		superctl start sxmo_xob
+
+		# Auto hide cursor with touchscreen, Show it with a mouse
+		if command -v "unclutter-xfixes" > /dev/null; then
+			set -- unclutter-xfixes
+		else
+			set -- unclutter
+		fi
+		superctl start "$1"
+
+		superctl start autocutsel
+		superctl start autocutsel-primary
+		superctl start sxmo-x11-status
+		superctl start bonsaid
+		[ -n "$SXMO_MONITOR" ] && xrandr --output "$SXMO_MONITOR" --primary
+		feh --bg-fill "$SXMO_BG_IMG"
+		;;
+esac
+
+# Turn on auto-suspend
+if sxmo_wakelock.sh isenabled; then
+	sxmo_wakelock.sh lock sxmo_not_suspendable infinite
+	superctl start sxmo_autosuspend
+fi
+
+# To setup initial unlock state
+sxmo_state.sh set unlock
+
+# Turn on lisgd
+if [ ! -e "$XDG_CACHE_HOME"/sxmo/sxmo.nogesture ]; then
+	superctl start sxmo_hook_lisgd
+fi
+
+if [ -z "$SXMO_NO_MODEM" ] && command -v ModemManager > /dev/null; then
+	# Turn on the dbus-monitors for modem-related tasks
+	superctl start sxmo_modemmonitor
+
+	# place a wakelock for 120s to allow the modem to fully warm up (eg25 +
+	# elogind/systemd would do this for us, but we don't use those.)
+	sxmo_wakelock.sh lock sxmo_modem_warming_up 120s
+fi
+
+# Monitor the battery
+superctl start sxmo_battery_monitor
+
+# It watch network changes and update the status bar icon by example
+superctl start sxmo_networkmonitor
+
+# The daemon that display notifications popup messages
+superctl start sxmo_notificationmonitor
+
+# Play a funky startup tune if you want (disabled by default)
+#mpv --quiet --no-video ~/welcome.ogg &
+
+# mmsd and vvmd
+if [ -z "$SXMO_NO_MODEM" ]; then
+	if [ -f "${SXMO_MMS_BASE_DIR:-"$HOME"/.mms/modemmanager}/mms" ]; then
+		superctl start mmsd-tng
+	fi
+
+	if [ -f "${SXMO_VVM_BASE_DIR:-"$HOME"/.vvm/modemmanager}/vvm" ]; then
+		superctl start vvmd
+	fi
+fi
+
+# add some warnings if things are not setup correctly
+if ! command -v "sxmo_deviceprofile_$SXMO_DEVICE_NAME.sh";  then
+	sxmo_notify_user.sh --urgency=critical \
+		"No deviceprofile found $SXMO_DEVICE_NAME. See: https://sxmo.org/deviceprofile"
+fi
+
+sxmo_migrate.sh state || sxmo_notify_user.sh --urgency=critical \
+	"Config needs migration" "$? file(s) in your sxmo configuration are out of date and disabled - using defaults until you migrate (run sxmo_migrate.sh)"
@@ -1,2 +1,6 @@
 # Export GPIOs for nokia-modem
 DRIVER=="nokia-modem", RUN+="/bin/ln -sf /sys/bus/hsi/devices/n900-modem /dev/cmt"
+
+# Tag modem device for ofono
+SUBSYSTEMS=="hsi", ENV{OFONO_DRIVER}="n900", ENV{OFONO_ISI_ADDRESS}="108"
+KERNEL=="phonet*", ENV{OFONO_DRIVER}="n900", ENV{OFONO_ISI_ADDRESS}="108"
@@ -1 +0,0 @@
-KERNEL=="bq27200-0", SUBSYSTEM=="power_supply", ACTION=="change", RUN+="/usr/bin/bq27k-monitor"
@@ -59,12 +59,12 @@ UsePercentageForPolicy=true
 # will be used.
 #
 # Defaults:
-# PercentageLow=20.0
-# PercentageCritical=5.0
-# PercentageAction=2.0
-PercentageLow=20.0
-PercentageCritical=5.0
-PercentageAction=2.0
+# PercentageLow=20
+# PercentageCritical=5
+# PercentageAction=2
+PercentageLow=20
+PercentageCritical=10
+PercentageAction=2

 # When UsePercentageForPolicy is false, the time remaining in seconds at
 # which UPower will consider the battery low, critical, or take action for
@@ -81,13 +81,6 @@ TimeLow=1200
 TimeCritical=300
 TimeAction=120

-# Enable the risky CriticalPowerAction-Suspend
-# This option is not recommended, but it is here for users who
-# want to enable the riscky CriticalPowerAction, such as "Suspend"
-# to fulfil their needs.
-# Default is false
-AllowRiskyCriticalPowerAction=true
-
 # The action to take when "TimeAction" or "PercentageAction" above has been
 # reached for the batteries (UPS or laptop batteries) supplying the computer
 #
@@ -95,10 +88,7 @@ AllowRiskyCriticalPowerAction=true
 # PowerOff
 # Hibernate
 # HybridSleep
-# Suspend (AllowRiskyCriticalPowerAction should be true to use this option but risky)
-# Ignore (AllowRiskyCriticalPowerAction should be true to use this option but risky)
 #
-# If Suspend isn't available or AllowRiskyCriticalPowerAction=false, HybridSleep will be used
 # If HybridSleep isn't available, Hibernate will be used
 # If Hibernate isn't available, PowerOff will be used
-CriticalPowerAction=Ignore
+CriticalPowerAction=HybridSleep
@@ -1,3 +1,4 @@
 URxvt*foreground: White
 URxvt*background: Black
-URxvt*font: xft:Droid Sans Mono:style=Regular:pixelsize=15:antialias=true:hinting=true
+URxvt*font: xft:DejaVu Sans Mono:style=Book:pixelsize=15:antialias=true:hinting=true
+URxvt*boldFont: xft:DejaVu Sans Mono:style=Bold:pixelsize=15:antialias=true:hinting=true
@@ -3,7 +3,7 @@
 pkgname=device-pine64-pinephonepro
 pkgdesc="PINE64 PinePhone Pro"
 pkgver=4
-pkgrel=3
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -1 +1 @@
-../../community/device-pine64-pinephone/sway-pinephone-keyboard.conf
+../../main/device-pine64-pinephone/sway-pinephone-keyboard.conf
@@ -1 +1 @@
-../../community/device-pine64-pinephone/x11-pinephone-keyboard.conf
+../../main/device-pine64-pinephone/x11-pinephone-keyboard.conf
@@ -1,5 +0,0 @@
-SUBSYSTEM=="input", ENV{DEVNAME}=="/dev/input/event1", \
-ATTRS{name}=="Goodix Capacitive TouchScreen", \
-ENV{WL_CALIBRATION}="4.00 0.00 0.00 0.00 1.80 0.00", \
-ENV{LIBINPUT_CALIBRATION_MATRIX}="4.00 0.00 0 0.00 1.80 0", \
-ENV{ID_INPUT}="1", ENV{ID_INPUT_TOUCHSCREEN}="1"
@@ -1,52 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Barnabas Czeman <trabarni@gmail.com>
-# Co-Maintainer: Alejandro Tafalla <alikates@dnyon.com>
-# Co-Maintainer: Victor Pavlov (vipaoL) <vipaolmail@gmail.com>
-# Co-Maintainer: Danila Tikhonov (JIaxyga) <danila@mainlining.org>
-
-pkgname=device-qcom-msm8953
-pkgdesc="Generic device package for various Qualcomm MSM8953/SDM450/SDM632-based devices"
-pkgver=5
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	firmware-qcom-adreno-a530
-	firmware-qcom-msm8953
-	linux-postmarketos-qcom-msm8953
-	lk2nd-msm8953
-	mkbootimg
-	msm-firmware-loader
-	postmarketos-base
-	qbootctl
-	soc-qcom-msm8953
-	soc-qcom-msm8953-modem
-"
-makedepends="devicepkg-dev"
-subpackages="device-xiaomi-daisy-fake-goodix:xiaomi_daisy_fake_goodix"
-source="
-	deviceinfo
-	modules-initfs
-	90-device-xiaomi-daisy.rules
-"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-xiaomi_daisy_fake_goodix() {
-	pkgdesc="Calibration data for replacement goodix touch controllers"
-	install -Dm644 90-device-xiaomi-daisy.rules -t "$subpkgdir/etc/udev/rules.d/"
-}
-
-sha512sums="
-7a0f4358d041c9bdb24c1018d13d390b111d823316d7d4b94f7c41aada97d9d94162ef7610226332ec3122e04108d7e08f8a844769b262caefbe97e92df1b39d  deviceinfo
-70917147c1c49f9419ff8be2a03e38c24ad7730091c53a2182797dde85fd8c2073f71187e8e583774974a1509b634433725543547e528364f41d85e63b2ace85  modules-initfs
-a2608b01b7b6e2dade694af355ff4f0f26cad49cf54bc332c77eb75d19fdc985f7f996fedb72753de447be0391deabf5fcea52406791d1e6e0d165703b63f145  90-device-xiaomi-daisy.rules
-"
@@ -4,8 +4,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-a3
 pkgdesc="Samsung Galaxy A3 (2015)"
-pkgver=13
-pkgrel=0
+pkgver=12
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -57,7 +57,7 @@ phosh() {
 }

 sha512sums="
-382a8a6aa87e9b78acbe50adacb9c8b0e765ae9a14dfade648b83fac8b6b3fce5798fd16ec3a877a3b56ade2daef4adce643c86e63ef180ae0ab552dfa0da001  deviceinfo
+b0bf0480159db976c1ba827d65cf68400dad255ff0f2627fd9ff74673993d605b8a1059fac1e7f11e4d565e2072dcf1760e61e04f816880bafc722a4b725fc31  deviceinfo
 3754688b2a61c204f37944d700b6fc273f68a01e25d444a3c3f2dd2531d8538650a2e571657e18e7a96a2db96b19f2f738d6f465bde477efd66ab31a78edfb91  modules-initfs
 e8f734a2f8d154813dbb493f0d58af50a7f624ffed41967a81493b975a6211efc6d30743b23825562cfd126791cbdd3348bfbed32eeece9b8acec0a37c3c51b6  phoc.ini
 "
@@ -38,6 +38,3 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -3,8 +3,8 @@
 # Co-Maintainer: Alexey Min <alexey.min@gmail.com>
 pkgname=device-samsung-a5
 pkgdesc="Samsung Galaxy A5 (2015)"
-pkgver=12
-pkgrel=0
+pkgver=11
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -42,6 +42,6 @@ nonfree_firmware() {
 }

 sha512sums="
-113af5e20f5a42870b2796e71b6533a1f330fefacbec7dd659648f9148391a8ba9a1dde4a3f8732740ff25c8334a6dbfb4352a4a82e76da45d9ce5a597fc3199  deviceinfo
+2fc9ed97981cc439046475eef8eb6d358bfde571242b14763cf4223c076cbda9ee861221e6978056e65a09020bfaeeb7734e22782701a2bcb134ef113467dc9a  deviceinfo
 13ba472485d757332b46a21fe771ae2779d0c5f1e997b6e51a4c0acce902256f0a2c724828251acf0150d7de919b691053de59041fea0b983569a004dcb75256  modules-initfs
 "
@@ -38,6 +38,3 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -1,9 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Raymond Hackley <wonderfulShrineMaidenOfParadise@postmarketos.org>
+# Maintainer: Raymond Hackley <raymondhackley@protonmail.com>
 pkgname=device-samsung-e7
 pkgdesc="Samsung Galaxy E7"
-pkgver=3
-pkgrel=0
+pkgver=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -37,6 +37,6 @@ nonfree_firmware() {
 }

 sha512sums="
-6fe8a7c014c14380016f8629072fdeb2bfc495cda22abd89e48e58188925518b97611bf8fa7659f2cc4feab61967a01e148ddcfe3622c57674c70733aec95b1e  deviceinfo
+a07a79468307db2a23ef0daead5c49d588e64a42b2806a5051eb422e693cb176cf16092f384aacd08d53e34be828725766d75f94d2b88cac2c31932051bd2ebc  deviceinfo
 659b6cdc0e9be756cfae34031d407175356edc331a8d4f51fb70b0beea4f8067c5ded39e158054c02811df0964d967d3a790bfef99675ca2587ef867d02db8db  modules-initfs
 "
@@ -36,6 +36,3 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-espresso10
 pkgdesc="Samsung Galaxy Tab 2 (10.1 inch)"
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -28,5 +28,5 @@ nonfree_firmware() {
 }

 sha512sums="
-9f86b20563a6444f73639162f71b614fb106244203b968bd83a6cefe4d821e6d220cad8d38784cbd8d1eaa18b9a5fadde40850c460a32c462bdd0845999c2f5a  deviceinfo
+29a4c46717d12e054ceeb94bb220111aea2a2f6c29522b9d100ae5337579a1ca5f772756ccfb329d47c5e9a745fa9ee91815d4b74cac6fc863adb92743518707  deviceinfo
 "
@@ -30,5 +30,3 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_heimdall_partition_rootfs="FACTORYFS"
-
-deviceinfo_create_initfs_extra="true"
@@ -3,8 +3,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-espresso7
 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch)"
-pkgver=2
-pkgrel=0
+pkgver=1
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -31,5 +31,5 @@ nonfree_firmware() {
 }

 sha512sums="
-ecd759dd68f65f09e250e219dd80978de4375a6371f52c592d140151e36171c5230192d60cad221790ec2362edb345962432c381f1a87ef7ccfe107e542ab263  deviceinfo
+91e9188aad38540444db4261416bb9e79b11ca64d10821b2148b4fd49c17be49391de75d878618c04a09016c437b2e26897f78c25564b53b4aca35eaebae0899  deviceinfo
 "
@@ -30,5 +30,3 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_heimdall_partition_rootfs="FACTORYFS"
-
-deviceinfo_create_initfs_extra="true"
@@ -1,9 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Raymond Hackley <wonderfulShrineMaidenOfParadise@postmarketos.org>
+# Maintainer: Raymond Hackley <raymondhackley@protonmail.com>
 pkgname=device-samsung-grandmax
 pkgdesc="Samsung Galaxy Grand Max"
-pkgver=3
-pkgrel=0
+pkgver=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -37,6 +37,6 @@ nonfree_firmware() {
 }

 sha512sums="
-a632d55dd34cfe3c5e88f063335d44a7ad04d93caca641f788415e361757e37f13ec48e51e268ef3e6af27704eb4e1a0ce5b8307c7800544b469582eb5083995  deviceinfo
+a7f7c5ef87b8bc6d6f8c732098342e8a91742a67978eb107e20cc839c5dedb8ce497bf1a9df143fe447e74936cfc6dfeecb4b25427c43278f0020ba1065dee2e  deviceinfo
 24b1b199ca26d902807038faa20b44d6060c039900df5c7aa263cdb22b35930e726c2bfd86e32b1f1dd6fa8ab3b57a6c8ff430ce9aae2dd04c04565ea56c8a43  modules-initfs
 "
@@ -36,6 +36,3 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -2,8 +2,8 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-samsung-gt510
 pkgdesc="Samsung Galaxy Tab A 9.7 (2015)"
-pkgver=7
-pkgrel=0
+pkgver=6
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -51,7 +51,7 @@ phosh() {
 }

 sha512sums="
-2eaf2d4c34e655c9e2a48592435e1d204072b4cc918c735c75fb9fa5cf9cbe58f1701ac9530894d7162ff99aed944fe806748c7f882b0963cfb9bbdc13239e08  deviceinfo
+4a64cf8f1800a6a8de3ca4c61a40189377ce354e4ef2a8fdfe48002c7fd255d66b1bbb9112e9ba2a247847ac6e2e3147c94eb349c155cc3ead004153653e5d44  deviceinfo
 77e32266772a201ba42d91586dce32bd93ff81f1a49c5f5b157847e3107d0b2c9a2f0478b383416ca37ddfb820fe6c9147abe8ccd7e07ad704c3c4c9d4683f3a  modules-initfs
 6aedd5eeac4d21356678f5399f3f0946392c9a7477ac21d39b8e761133dc8ed67adb4966647314f71d5263483ab68cad92847dacff95ffa45eabfc33c9f405b5  pointercal
 ed612b090c1ee512fc257368082fe0c88ca6c98a9d673ece68593739c7a41b4f9dca5d9360de6f84d206f297feba480a9f1982301132e08a14a5ff920a2675a6  phoc.ini
@@ -36,6 +36,3 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -2,8 +2,8 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-samsung-gt58
 pkgdesc="Samsung Galaxy Tab A 8.0 (2015)"
-pkgver=7
-pkgrel=0
+pkgver=6
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -47,7 +47,7 @@ phosh() {
 }

 sha512sums="
-3597027a39462451a80eb781d17382a0fb4618eeaf61392af6998c94a68c52a85ec1df8bc2ac6a30b71e53c38ab52b640052c97b66e2e8eeb4e55c95858ce308  deviceinfo
+2e7363625b58da2fe036fc70538207a490d5b93a99c3d0c2835fab3114fe09b5e90a3b7583b8f62d8eea7af7910f963d0aa994483045d570f062449cc939fb13  deviceinfo
 8071b89c832619c74d3bb50d638653aeaab99fee209cde425a7e8425d46d424bad9e8ab76d2d7360bd4c7ff093a712d51c3ca1b6086e1f70812224bbb115b04f  modules-initfs
 ed612b090c1ee512fc257368082fe0c88ca6c98a9d673ece68593739c7a41b4f9dca5d9360de6f84d206f297feba480a9f1982301132e08a14a5ff920a2675a6  phoc.ini
 "
@@ -38,6 +38,3 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -3,7 +3,7 @@
 pkgname=device-samsung-m0
 pkgdesc="Samsung Galaxy S III"
 pkgver=8
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -13,7 +13,6 @@ depends="
 	linux-postmarketos-exynos4
 	mkbootimg
 	postmarketos-base
-	soc-samsung-exynos4412-cameraflash
 	soc-samsung-exynos4412-haptics
 	"
 makedepends="devicepkg-dev"
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-serranove
 pkgdesc="Samsung Galaxy S4 Mini Value Edition"
-pkgver=15
-pkgrel=0
+pkgver=13
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -53,7 +53,7 @@ phosh() {
 }

 sha512sums="
-46f7fd128002a8c348c64ad33fa5dd22623c08f393f43f73c73686ed506c64435f5a51b39ab45de9b9055389bd50c55a4d1496e6d5672ed6aafe58814e7bcbf0  deviceinfo
+6c28cc461becf05428282016c6d0e1982e0d5e08484245877bd8674b667d2f1f6bb7db8a696a1493f3bf36511e2c84835b28435b3c395b10424edc51f33d512a  deviceinfo
 0c92ace5c522d039d356e8914c0e0237e11fc38dd05390ba7a89532be659707d2b499ae77b263c5984345caac11fd007bd6d1e279d3426126bc276a0bcd9348b  modules-initfs
 1bc90a1a67309b43435039332b2a1d7e606408c6429b3cb8991a57f53dd4de36fbe471481b6481fbdb098c3819344e8093dd8eab0d34eb3c091ab6d8abd5c087  phoc.ini
 "
@@ -18,7 +18,10 @@ deviceinfo_external_storage="true"
 deviceinfo_screen_width="540"
 deviceinfo_screen_height="960"
 deviceinfo_getty="ttyMSM0;115200"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
+
+# The panel on this device displays everything horizontally flipped for some reason (WTF Samsung?).
+# Make it look normal by instructing the kernel to flip the screen using video=540x960,reflect_x.
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 video=540x960,reflect_x"

 # Bootloader related
 deviceinfo_flash_method="fastboot"
@@ -36,6 +39,3 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x04e8"
 # Galaxy (MTP)
 deviceinfo_usb_idProduct="0x6860"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -3,8 +3,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-wileyfox-crackling
 pkgdesc="Wileyfox Swift"
-pkgver=9
-pkgrel=0
+pkgver=8
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -45,7 +45,7 @@ nonfree_firmware() {
 }

 sha512sums="
-9d3ed4562e48c6ec484a4a6faf7a836c48c18fabf5ccbbe718b80df168a8b8706a962f1b2bd76bc1adbbb5bf5043be32678850884c5baf779684de414619896b  deviceinfo
+fb5ff1648128331dff061026e8c783a26f66dea4530de6ad3a27620e1aa0fc516e8c0b2f04fe3f6e9e5ce882b77b415d93981532c546129949caec802cdda883  deviceinfo
 31f926acffed502edca7d6a26c97c197970b842122df42a1ea5c63f2707b4375465eae77a754f5d58f556f55e1f5f421af21a92ca6165a3a4bacf55c5fbf7faf  modules-initfs
 a845e860cf43e58818bbffda62a9514e9a24527e14c485dd10944587b29dbf5864a1d3ec17d219c342512fac4bd6c25f5f0f4efb8883b8f383a79846759318ee  10-crackling-proximity.rules
 "
@@ -31,6 +31,3 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-daisy
 pkgdesc="Xiaomi Mi A2 Lite"
-pkgver=13
+pkgver=12
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -43,7 +43,7 @@ fake_goodix() {
 }

 sha512sums="
-83b468ba3250896f9ade6cbc0c9defeb4fec4f9f3513c0bfdf2530197547a668e3940351430c0dbf1ca93e195b30208a47f92a44c31db64d0332dcb3db3bb3a5  deviceinfo
+a958e29c8ba4c079ee64a9882fe14ad03e7751ba4c2416a4bda07b0ee4e0342d5d6e3d43c95b05f47dabe06ff5be759401287da3c58ef0ecb31c8cba515cd560  deviceinfo
 7202f0a55dfe43348940412fc38e59c855594b070db8742419feadb2299086d5810107201a228b7137b7cc7a97c94afac95d81c0cd65c52f31dbcb619b0a4279  modules-initfs
 a2608b01b7b6e2dade694af355ff4f0f26cad49cf54bc332c77eb75d19fdc985f7f996fedb72753de447be0391deabf5fcea52406791d1e6e0d165703b63f145  90-device-xiaomi-daisy.rules
 "
@@ -34,6 +34,3 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -1,7 +0,0 @@
-nt36523_ts
-panel-novatek-nt36523
-qcom_common
-qcom_pil_info
-qcom_q6v5
-qcom_q6v5_pas
-spi-geni-qcom
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-markw
 pkgdesc="Xiaomi Redmi 4 Prime"
-pkgver=8
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -31,6 +31,6 @@ package() {
 }

 sha512sums="
-a31f4e9612407662e3f0de56ed892073449d3d39452026f8f73d3e300ea01636a966970c7c93ec748c468876d232a54c18e6fe2ec0e967093b166db60705f764  deviceinfo
+d5ecef8983110624e0cd69feed5f105204f8323e718435b19ffafa37cbe73d1c37a4d1d1cfb53d338dfeffa91ade137b3cf7c7b9f48408002c04260bbd3b5e65  deviceinfo
 0cba88d7ede62dc7c47feefb27d10e58e4c93498bec97cd274a1d10c4f16dff06c5472ed555170e0392a57c9269cc50bf550523f41bf1ba6c600af533302574b  modules-initfs
 "
@@ -33,5 +33,3 @@ deviceinfo_flash_sparse="true"
 # osk-sdl
 deviceinfo_mesa_driver="msm"

-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -1,7 +1,7 @@
 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=device-xiaomi-mido
 pkgdesc="Xiaomi Redmi Note 4X"
-pkgver=9
+pkgver=8
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -30,6 +30,6 @@ package() {
 }

 sha512sums="
-cf450799dbb70f9ce40f6eb431493b3675e8ad1ae19048b2b62f0b2fc53897ebcbe578b57c29132450e26afe2b3739546eb31191e94d9e6b2aa028ef5878ec9f  deviceinfo
+3424c103cc2878480527f57d75e122cfc5c95ffa66bf7133067dd691e664fee14ba43a626f70c5b2ffb70cd24a08b026e0571e99e390c0a485a3491e28883cda  deviceinfo
 9f534c76689728c3fa699ac8c854ca82815d5158a3675a70ef879ddbf140460977187dc3c1a799dadd0ab53d5a08b6275a1594a7b976eda983f3e78b2738a8be  modules-initfs
 "
@@ -32,5 +32,4 @@ deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"

-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
+
@@ -4,7 +4,7 @@

 pkgname=device-xiaomi-tissot
 pkgdesc="Xiaomi Mi A1"
-pkgver=9
+pkgver=8
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -34,6 +34,6 @@ package() {
 }

 sha512sums="
-a20e73d01823cfa5a5796c4a3725ab7a594bd8ae8cb46c3d2326d5f15fd19086b37dac1f5d5e19b222215d3275df585537ef26f15bfced2dd007975d14eb4968  deviceinfo
+4ea529e8822f268773e043dec4af4c419803e3220bc0bc85def1c07ee480efd5f33b2f8f74007aaf7d608926048c49d4dfc1d529f6501cebf5aba0f183ac9cd0  deviceinfo
 4284d7c184f364d81a06de962808cb240b713cda11381ddcec5acdfbb4d4962922b64b2f2675ab463961c0510352211ec439a6b9e4ebdc47bf73980133e9626a  modules-initfs
 "
@@ -38,6 +38,3 @@ deviceinfo_flash_kernel_on_update="false"

 # osk-sdl
 deviceinfo_mesa_driver="msm"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-vince
 pkgdesc="Xiaomi Redmi 5 Plus"
-pkgver=15
+pkgver=14
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -34,6 +34,6 @@ package() {
 }

 sha512sums="
-bc0db9190fdef9859e7dedc0439f350ce8716a59efa5a182e12985c2435e2f1a624ddb85d1d3b89c60d452e813c90a8a9eb888db5a83422d6d225363c84e5072  deviceinfo
+902eea9986467553e129c11a387919f21aed496d09475e6fd3b8fa44b036c79f2705b9ccda9caa0e2954b62cc5bafe761bdf734de871463020926c7263032e44  deviceinfo
 69cfc8db6ea497576085e1b5861c766b5c6cfbd493e4d66aa0bfa29a0e80eeaeb8a465c4841c6a7959796f5a2325e621d60f2c35ccb0741d7934ab310abe807f  modules-initfs
 "
@@ -38,6 +38,3 @@ deviceinfo_flash_sparse="true"

 # osk-sdl
 deviceinfo_mesa_driver="msm"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-xiaomi-wt88047
 pkgdesc="Xiaomi Redmi 2"
-pkgver=10
-pkgrel=0
+pkgver=9
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -38,6 +38,6 @@ nonfree_firmware() {
 }

 sha512sums="
-0cdcff4e49c0c4413759e12dba07810fa7d7cb2647b9b378dc26d6f5b62ba51e5c9ac3e198a6e29464c943ef0b1dedf071e0476da04a3d05f167a621b106259d  deviceinfo
+088daf52e6273289e279ee5c39d170bcde6b163eed39a11f3b25c6504347d304cd09745b3eb568b56eb03b67231e6948d1a75df19fb0e24dc535dcc8ce2c2e8c  deviceinfo
 7f6892125a15fdfcfca140571073150df25a5c355eae8ae632a56a00cd9e5fc7168d435680ca83eb8a8d9ae63aef6af478f42e92815f175d26ec592941de61e6  modules-initfs
 "
@@ -36,6 +36,3 @@ deviceinfo_flash_sparse="true"
 deviceinfo_usb_idVendor="0x2717"
 # Mi/Redmi series (MTP)
 deviceinfo_usb_idProduct="0xFF40"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-ysl
 pkgdesc="Xiaomi Redmi S2/Y2"
-pkgver=6
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -31,6 +31,6 @@ package() {
 }

 sha512sums="
-2348d7622b6638a3c2beb6a5ba9eee3375614e2a63f5e1474740d9cf4c822c9963b6fbbec17354c4a3d14eeaeec5644f75f939e80d551adeb1b2455280406220  deviceinfo
+a985591e27192acc03a3218ae7e419aa557b6219139058f3269ff5c3bb5f695c2af1af8157c55331d4238d9fb179c0492db660e7212a100bd3c5c31e37d623fe  deviceinfo
 b5e4f6dec04a9a7d7231a62d8b60e17a9a5265768eb80050225c0f57b8188ec108d8b7155ccb70ba95201906b653d19ef33a0ff04072da040b0242d7032b103d  modules-initfs
 "
@@ -31,6 +31,3 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse="true"
-
-# lk2nd does not support GPT for subpartitions/SD cards yet
-deviceinfo_partition_type="msdos"
@@ -2,7 +2,7 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 # Co-Maintainer: jane400 <jane400@postmarketos.org>
 pkgname=firmware-lenovo-21bx
-pkgver=2
+pkgver=1
 pkgrel=0
 # these are renamed when new versions are released by lenovo
 _vid_filename=n3hdr20w # "Qualcomm Graphics Driver" v30.0.3851.4800
@@ -15,11 +15,12 @@ options="!check !strip !archcheck !tracedeps pmb:cross-native"
 makedepends="innoextract"
 source="
 	https://download.lenovo.com/pccbbs/mobiles/$_vid_filename.exe
-	hpnv21.b8c-$pkgver-$pkgrel::https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qca/hpnv21.b8c?id=77a11ffc5a0aaaadc870793d02f6c6781ee9f598
+	https://download.lenovo.com/pccbbs/mobiles/$_bt_filename.exe
 	"

 build() {
 	innoextract -I drivers/qcvss8280.mbn "$srcdir/$_vid_filename.exe"
+	innoextract -I hpnv21.b8c "$srcdir/$_bt_filename.exe"
 }

 package() {
@@ -27,10 +28,11 @@ package() {
 	_name_upper="$(echo "$_vid_filename" | tr [:lower:] [:upper:])"
 	install -Dm644 "$srcdir"/code\$GetExtractPath\$/"$_name_upper"/drivers/qcvss8280.mbn \
 		-t "$pkgdir"/lib/firmware/qcom/sc8280xp/LENOVO/21BX/
-	install -Dm644 "$srcdir/hpnv21.b8c-$pkgver-$pkgrel" \
-		"$pkgdir"/lib/firmware/qca/hpnv21.b8c
+	# bluetooth, renamed to "replace" fw from linux-firmware-qca
+	install -Dm644 "$srcdir"/code\$GetExtractPath\$/bluetooth_hsp/hpnv21.b8c \
+		"$pkgdir"/lib/firmware/postmarketos/qca/hpnv21.bin
 }
 sha512sums="
 d569333b6819024d2142f0330688a0ed3c9f3dfd5d75ab1488d42412f7c8bdb6b83d43b7fa5543fb03a071e23d28d37f86e40272d61c7a14992c4663fc1aa1e6  n3hdr20w.exe
-21ed990e9df480e920267f8b41e68bc34a687d566f8776df65be720de468e9bf0a900d1636264f8aed8d5b2cc541a79b81af1bf06a1eee544f2d74dbb5292162  hpnv21.b8c-2-0
+1a412daf6baa6cef76ccb7e169944a9bdf129154e8168f8cdcc9e7084ca86942d5d735bcf359cfe17f5a41f45145fdaa613bb7e6953bddf41104564ff74a317e  n3hww14w.exe
 "
@@ -1,7 +1,6 @@
-# Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=firmware-motorola-osprey
 pkgver=4
-pkgrel=2
+pkgrel=1
 pkgdesc="Firmware for Motorola Moto G 2015"
 url="https://github.com/pmsourcedump/firmware-motorola-osprey"
 subpackages="$pkgname-wcnss $pkgname-wcnss-nv:wcnss_nv $pkgname-venus"
@@ -1,5 +1,5 @@
 pkgname=firmware-qcom-adreno
-pkgver=20241110
+pkgver=20220509
 pkgrel=0
 pkgdesc="Qualcomm Adreno GPU firmware from linux-firmware"
 url="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/"
@@ -15,7 +15,7 @@ builddir="$srcdir/linux-firmware-$pkgver"
 replaces="linux-firmware-qcom"
 _fwdir="/lib/firmware/qcom"

-_gpus="a300 a330 a420 a530 a630 a650 a660 gen70500"
+_gpus="a300 a330 a420 a530 a630 a650 a660"
 for gpu in $_gpus; do
 	subpackages="$subpackages $pkgname-$gpu:_gpu"
 done
@@ -37,5 +37,5 @@ _gpu() {
 }

 sha512sums="
-b4ae2abe6eecc5e8fdc796ae75394d936fee7f7b5ed7803c51eccdbfba1f883ac567a43adc9e7c3a4e4934bf1794e37cd93478468599b542ef1327a8221f648a  linux-firmware-20241110.tar.gz
+0591a35a14a6994ac60571a8e47c00ec013afbfedd4b3326cfe1971b9bd9a07ca7622b17177b3fb57a6c244d2caae12318fcbfac5da5f78a2c085285c9d85cf6  linux-firmware-20220509.tar.gz
 "
@@ -1,8 +0,0 @@
-/lib/firmware/qcom/sm8250/xiaomi/elish/adsp.mbn
-/lib/firmware/qcom/sm8250/xiaomi/elish/adspr.jsn
-/lib/firmware/qcom/sm8250/xiaomi/elish/adspua.jsn
-/lib/firmware/qcom/sm8250/xiaomi/elish/cdsp.mbn
-/lib/firmware/qcom/sm8250/xiaomi/elish/cdspr.jsn
-/lib/firmware/qcom/sm8250/xiaomi/elish/slpi.mbn
-/lib/firmware/qcom/sm8250/xiaomi/elish/slpir.jsn
-/lib/firmware/qcom/sm8250/xiaomi/elish/slpius.jsn
Author	SHA1	Message	Date
Caleb Connolly	5cb1d710e1	DONTMERGE: boot-deploy: feat/multiple-kernels Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-11-17 05:11:14 +01:00
Caleb Connolly	7cda3728d8	WIP: linux-next: keep old versions on upgrade Add pre and post-upgrade scripts which keep the old kernel, modules, dtbs, and release file. This allows for the kernel package to be upgraded while preserving the old version, so if the upgrade causes a regression the user can switch back. This will need to be heavily refactored, documented and made generic. Most likely the upgrade scripts will be moved to some -dev package and the kernel package APKBUILD will simply source a script to create the pre/post-upgrade scripts. For this to work, the kernel release directory (/usr/share/kernel/something/) has to follow the format <flavour>-<pkgver>-r<pkgrel> since the scripts rely on this to map the package version to the kernel suffix. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-11-17 05:07:11 +01:00
Caleb Connolly	dd9811a545	postmarketos-mkinitfs: run for each kernel release Rather than running mkinitfs once (and assume there is only one kernel version installed) run it for each release. This depends on https://gitlab.postmarketos.org/postmarketOS/postmarketos-mkinitfs/-/merge_requests/59 as well as https://gitlab.postmarketos.org/postmarketOS/boot-deploy/-/merge_requests/74 Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-11-17 04:59:40 +01:00
Caleb Connolly	505b29b104	linux-next: use _outdir Recent changes to the kernels build infrastructure (currently just in next?) break some unintentional assumptions in pmbootstrap build --envkernel. Specifically, that we used to mount the .output directory as the "src" directory and rely on the fact that the kernel lets you run make from here. But this doesn't work anymore because the Makefile points to an absolute path on the host. For now this is half fix half workaround. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-11-17 03:09:44 +01:00
				`@@ -1 +0,0 @@`
				`KERNEL=="bq27200-0", SUBSYSTEM=="power_supply", ACTION=="change", RUN+="/usr/bin/bq27k-monitor"`