device-pine64-pinephone: remove megapixels dependency

Megapixels served us well for a long time, but it hasn't actually worked
on the PinePhone since GTK 4 removed support for OpenGL ES 2.0 well
over half a year ago by now. It's not clear to me whether this will be
fixed somehow. Furthermore, on GNOME UIs and Cosmic we do install the
Snapshot camera app which does work on the PinePhone albeit with very
bad performance. Still, it is better than crashing on launch.

Signed-off-by: Stefan Hansson <newbyte@postmarketos.org>

.ci/build-jobs.yaml.j2

@@ -6,7 +6,7 @@ stages:
 variables:
   CI_TRON_TEMPLATE_PROJECT: &ci-tron-template-project postmarketOS/ci-common
   CI_TRON_JOB_TEMPLATE_PROJECT_URL: $CI_SERVER_URL/$CI_TRON_TEMPLATE_PROJECT
-  CI_TRON_JOB_TEMPLATE_COMMIT: &ci-tron-template-commit 1c70e34b7a610cda1d7f048f6b50ca9c10f52995
+  CI_TRON_JOB_TEMPLATE_COMMIT: &ci-tron-template-commit 08c304c8655e98d3e1219f193fbec223e58747a1
 
 include:
   - project: *ci-tron-template-project

.ci/commits.sh

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # Description: check pkgver/pkgrel bumps, amount of changed pkgs etc
 # Options: native
-# Use 'native' because it requires running pmbootstrap.
+# Use 'native' because it requires git commit history.
 # https://postmarketos.org/pmb-ci
 
 if [ "$(id -u)" = 0 ]; then
@@ -17,4 +17,4 @@ if [ "$(id -u)" = 0 ]; then
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi
 
-.ci/lib/check_changed_versions.py
+.ci/lib/check_changed_aports_versions.py

.ci/grep.sh

@@ -6,7 +6,7 @@ exit_code=0
 
 if [ "$(id -u)" = 0 ]; then
 	set -x
-	apk -q add git grep
+	apk -q add grep
 	exec su "${TESTUSER:-build}" -c "sh -e $0"
 fi
 
@@ -117,18 +117,4 @@ if grep -qr '# Maintainer:' -- *; then
 	exit_code=1
 fi
 
-if [ -n "$CI_MERGE_REQUEST_DIFF_BASE_SHA" ]; then
-	# Find all moved or new kernel APKBUILDs in main, community or testing
-	MOVED_OR_NEW_MAINLINE_KERNEL_PACKAGES=$(git show --pretty="" --name-only --diff-filter=AR "$CI_MERGE_REQUEST_DIFF_BASE_SHA"..HEAD | grep "device/\(main\|community\|testing\)/linux-.*/APKBUILD" || true)
-
-	if [ -n "$MOVED_OR_NEW_MAINLINE_KERNEL_PACKAGES" ]; then
-		if [ -n "$(grep -L LLVM=1 $MOVED_OR_NEW_MAINLINE_KERNEL_PACKAGES || true)" ]; then
-			echo "ERROR: An added or moved close-to-mainline kernel package is not being built with LLVM."
-			echo "See https://postmarketos.org/edge/2025/11/11/kernels-llvm/ for more details"
-			grep --color=always -L LLVM=1 $MOVED_OR_NEW_MAINLINE_KERNEL_PACKAGES
-			exit_code=1
-		fi
-	fi
-fi
-
 exit "$exit_code"

.ci/kconfig.sh

@@ -13,4 +13,4 @@ fi
 
 export PYTHONUNBUFFERED=1
 
-.ci/lib/kconfig.py
+.ci/lib/check_changed_kernels.py

.ci/lib/add_pmbootstrap_to_import_path

@@ -0,0 +1 @@
+../testcases/add_pmbootstrap_to_import_path

.ci/lib/apkbuild_linting.py

@@ -14,7 +14,7 @@ custom_valid_options = [
     "pmb:cross-native",
     "pmb:cross-native2",
     "pmb:drm",
-    "pmb:generic-kernel",
+    "pmb:gpu-accel",  # deprecated
     "pmb:strict",
     "pmb:systemd",
     "pmb:systemd-never",
@@ -42,7 +42,7 @@ if __name__ == "__main__":
     custom_valid_options += kconfigcheck_categories
     os.environ["CUSTOM_VALID_OPTIONS"] = " ".join(custom_valid_options)
 
-    apkbuilds = {file for file in common.get_changed_files()
+    apkbuilds = {file for file in common.get_changed_files(removed=False)
                  if os.path.basename(file) == "APKBUILD"}
     if len(apkbuilds) < 1:
         print("No APKBUILDs to lint")

.ci/lib/build_changed_aports.py

@@ -9,6 +9,7 @@ import pathlib
 import common
 
 # pmbootstrap
+import add_pmbootstrap_to_import_path
 import pmb.core
 import pmb.parse
 import pmb.parse._apkbuild

.ci/lib/build_changed_aports.sh

@@ -1,7 +1,6 @@
 #!/bin/sh -e
 # Description: build modified packages for this architecture
 # Options: native slow
-# Use 'native' because it requires running pmbootstrap.
 # https://postmarketos.org/pmb-ci
 
 if [ "$(id -u)" = 0 ]; then

.ci/lib/check_changed_aports_versions.py

@@ -12,6 +12,7 @@ import subprocess
 import common
 
 # pmbootstrap
+import add_pmbootstrap_to_import_path  # noqa
 import pmb.parse
 import pmb.parse.version
 import pmb.helpers.logging

.ci/lib/common.py

@@ -108,7 +108,7 @@ def get_base_commit() -> str:
     return commit
 
 
-def get_changed_files(removed=False):
+def get_changed_files(removed=True):
     """ Get all changed files and print them, as well as the branch and the
         commit that was used for the diff.
         :param removed: also return removed files (default: True)
@@ -133,7 +133,7 @@ def get_changed_files(removed=False):
 
 def get_changed_packages(skip_archived: bool = False):
     ret = set()
-    for file in get_changed_files(removed=True):
+    for file in get_changed_files():
         dirname, filename = os.path.split(file)
 
         # Skip files:

.ci/lib/deviceinfo_linting.py

@@ -11,9 +11,8 @@ if __name__ == "__main__":
     if common.commit_message_has_string("[ci:skip-dint]"):
         print("WARNING: not linting deviceinfo files ([ci:skip-dint])")
         exit(0)
-    # only lint deviceinfo files in the devices repo
-    deviceinfo_files = {file for file in common.get_changed_files()
-                        if os.path.basename(file) == "deviceinfo" and file.startswith("device/")}
+    deviceinfo_files = {file for file in common.get_changed_files(removed=False)
+                        if os.path.basename(file) == "deviceinfo"}
 
     try:
         subprocess.run(["dint", "check", *deviceinfo_files], text=True, check=True)

.ci/lib/generate_build_jobs.py

@@ -73,7 +73,7 @@ class Device:
 
     @property
     def testing_dependencies(self) -> set[str]:
-        # TODO: Source this from the APKBUILD
+        # TODO: Source this from the APKGBUILD
         return {"postmarketos-mkinitfs-hook-ci"}
 
     @cached_property
@@ -168,7 +168,6 @@ if __name__ == "__main__":
 
     # Get the list of supported devices
     supported_devices = Device.supported_devices()
-    print(f"Supported devices: {[d for d in supported_devices.values()]}")
 
     archs = ArchTagSet()
     devices_under_test = set()
@@ -183,6 +182,8 @@ if __name__ == "__main__":
 
         if path.name != "APKBUILD":
             continue
+        elif not path.exists():
+            continue  # APKBUILD was deleted
         apkbuild = pmb.parse.apkbuild(path)
         packages_modified.add(apkbuild['pkgname'])
         archs.update(apkbuild["arch"])

.ci/lib/verify_checksums.py

@@ -8,6 +8,7 @@ import sys
 import common
 
 # pmbootstrap
+import add_pmbootstrap_to_import_path
 import pmb.core
 from pmb.core.context import get_context
 

.ci/pytest.sh

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # Description: lint with various python tests
 # Options: native
-# Use 'native' because it requires running pmbootstrap.
+# Use 'native' because it requires pmbootstrap.
 # https://postmarketos.org/pmb-ci
 
 if [ "$(id -u)" = 0 ]; then
@@ -27,6 +27,6 @@ pmbootstrap config aports "$pmaports"
 pmbootstrap -q shutdown
 
 # Needed to import "common"
-export PYTHONPATH="$PYTHONPATH:.ci/lib"
+export PYTHONPATH=".ci/lib"
 # Run testcases
 pytest -vv --tb=native "$pmaports/.ci/testcases" "$@"

.ci/ruff.sh

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

.ci/testcases/add_pmbootstrap_to_import_path/__init__.py

@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+# Copyright 2021 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import shutil
+import sys
+import os
+import importlib
+import importlib.util
+from site import getsitepackages
+
+
+def path_pmbootstrap():
+    """ Find the pmbootstrap installation folder, so we can import the Python
+        code from there.
+        returns: pmbootstrap installation folder
+    """
+    # This variable is set by pmbootstrap 1.52 and later
+    # If it's undefined, try to find 'pmbootstrap' in path
+    bin = os.environ.get("PMBOOTSTRAP_CMD") or shutil.which("pmbootstrap")
+
+    if not bin:
+        print("ERROR: 'pmbootstrap' not found in $PATH")
+        sys.exit(1)
+
+    # Resolve the symlink and verify the folder
+    directory = os.path.dirname(os.path.realpath(bin))
+    if os.path.exists(directory + "/pmb/__init__.py"):
+        return directory
+
+    directories = getsitepackages()
+    for directory in directories:
+        if os.path.exists(directory + "/pmb/__init__.py"):
+            return directory
+
+    # Symlink not set up properly
+    print("ERROR: unable to find path to pmbootstrap.py. Try setting 'PMBOOTSTRAP_CMD'.")
+    sys.exit(1)
+
+
+# Check if pmb module can be imported
+if importlib.util.find_spec("pmb") is None:
+    # Add pmbootstrap dir to import path
+    sys.path.append(os.path.realpath(path_pmbootstrap()))

.ci/testcases/conftest.py

@@ -3,11 +3,14 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from pathlib import Path
+import add_pmbootstrap_to_import_path
 import pmb.parse
 from pmb.helpers.args import init as init_args
 from pmb.types import PmbArgs
 import pmb.config
+from pmb.core.pkgrepo import pkgrepo_default_path
 import pytest
+import sys
 import os
 
 @pytest.fixture(scope="session", autouse=True)

.ci/testcases/test_device.py

@@ -2,10 +2,16 @@
 # Copyright 2024 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+import fnmatch
+import glob
+import os
+import pytest
+import sys
 
+import add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild
-from pmb.core.pkgrepo import pkgrepo_default_path, pkgrepo_iglob
+from pmb.core.pkgrepo import pkgrepo_default_path, pkgrepo_iglob, pkgrepo_relative_path
 from pmb.core.arch import Arch
 
 # Don't complain if these nicknames are the only maintainers of an APKBUILD,

.ci/testcases/test_deviceinfo.py

@@ -2,8 +2,13 @@
 # Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+import glob
+import os
+import pytest
 import re
+import sys
 
+import add_pmbootstrap_to_import_path
 import pmb.parse
 from pmb.core.pkgrepo import pkgrepo_iglob
 

.ci/testcases/test_firmware.py

@@ -2,10 +2,12 @@
 # Copyright 2021 Johannes Marbach
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+import glob
 import os
 
+import add_pmbootstrap_to_import_path
 import pmb.parse
-from pmb.core.pkgrepo import pkgrepo_iglob
+from pmb.core.pkgrepo import pkgrepo_default_path, pkgrepo_iglob
 
 
 def test_aports_firmware():

.ci/testcases/test_framework_versions.py

@@ -6,8 +6,13 @@
     version in all packages. We scan all packages, categorize them by URL
     and then compare the versions of all packages in each category. """
 
+import glob
 import logging
+import os
+import pytest
+import sys
 
+import add_pmbootstrap_to_import_path
 import pmb.config
 import pmb.parse
 from pmb.core.pkgrepo import pkgrepo_iter_package_dirs

.ci/testcases/test_kernel.py

@@ -2,9 +2,14 @@
 # Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+import glob
+import pytest
+import sys
 import os
 import re
+from pathlib import Path
 
+import add_pmbootstrap_to_import_path
 import pmb.parse
 from pmb.core.pkgrepo import pkgrepo_iglob, pkgrepo_relative_path
 

.ci/testcases/test_provides.py

@@ -1,9 +1,14 @@
 #!/usr/bin/env python3
 # Copyright 2023 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
+import glob
 import logging
+import os
+import pytest
+import sys
 import re
 
+import add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild
 from pmb.core.pkgrepo import pkgrepo_iter_package_dirs, pkgrepo_relative_path

.ci/testcases/test_source.py

@@ -6,7 +6,10 @@
 import glob
 import logging
 import os
+import pytest
+import sys
 
+import add_pmbootstrap_to_import_path
 import pmb.parse
 import pmb.parse._apkbuild
 import pmb.parse.apkindex

.ci/testcases/test_ui.py

@@ -14,7 +14,7 @@ def test_aports_ui():
     """
     pmaports_cfg = pmb.config.pmaports.read_config()
     for arch in pmaports_cfg["supported_arches"].split(","):
-        for path in common.get_changed_files():
+        for path in common.get_changed_files(removed=False):
             path = Path(path)
 
             if path.name != "APKBUILD":

.gitlab-ci.yml

@@ -16,9 +16,6 @@ variables:
   # seems like a reasonable balance. If this is too low, git merge-base (from ci/
   # common.py) can fail
   GIT_DEPTH: 100
-  # So that anything that runs install_pmbootstrap and tries to import pmb module
-  # can find it.
-  PYTHONPATH: "/tmp/pmbootstrap"
 
 # This defines the rules for when a pipeline should run.
 workflow:
@@ -88,7 +85,7 @@ pytest-commits:
   script:
     - .ci/lib/gitlab_prepare_ci.sh
     - .ci/pytest.sh
-    - .ci/check-changed-versions.sh
+    - .ci/commits.sh
   artifacts:
     when: on_failure
     paths:
@@ -181,7 +178,7 @@ generate-build-jobs:
     # HACK: Make the pmb library happy to use the currently-cloned pmaports repo
     - mkdir -p /root/.local/var/pmbootstrap/cache_git/ && ln -s $PWD /root/.local/var/pmbootstrap/cache_git/pmaports
 
-    - .ci/lib/generate_build_jobs.py
+    - PYTHONPATH=/tmp/pmbootstrap/ .ci/lib/generate_build_jobs.py
 
   artifacts:
     paths:

.gitlab/issue_templates/Default.md

@@ -28,6 +28,7 @@
 -->
 * [ ] edge (`master` branch)
 * [ ] `v25.12`
+* [ ] `v25.06` (supported until 2026-01-23)
 
 * [ ] I confirm that the issue still is present after running `sudo apk upgrade -a`
 

channels.cfg

@@ -15,7 +15,7 @@ branch_aports=3.23-stable
 mirrordir_alpine=v3.23
 
 [v25.06]
-description=Old release (unsupported)
+description=Old release (supported until 2026-01-23)
 branch_pmaports=v25.06
 branch_aports=3.22-stable
 mirrordir_alpine=v3.22

device/.gitlab-ci/packages/single-runner-defined-in-ci-common-qcom-devicepkg-bootimg.yml.j2

@@ -14,11 +14,6 @@ test-{{ device.name }}:
     - .device-boot-flow-separate-artifacts
     - .test-{{ device.name }}
 
-  # NOTE: set the job to manually started and allow failure until HW CI is
-  # stable
-  allow_failure: true
-  when: manual
-
   variables:
     # Let CI-tron construct the bootimg accepted by U-boot in a standard
     # Qualcomm way

device/archived/device-alcatel-idol347-downstream/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-alcatel-idol347-downstream
 pkgdesc="Alcatel OneTouch Idol 3 (4.7) (Downstream)"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -10,7 +10,7 @@ arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-alcatel-idol347-downstream mkbootimg msm-fb-refresher"
 makedepends="devicepkg-dev"
-source="deviceinfo kernel-cmdline.conf"
+source="deviceinfo"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -21,6 +21,5 @@ package() {
 }
 
 sha512sums="
-f2e7527ef3b498147c311df678cfed15d2ca3049ebba87b93dbfcfc1d05237daf8f7d0943c24347d4d5ea4283dd03f412cf11575735f0d7724c7f49066e52e8c  deviceinfo
-928047af135afd6a3e76791628148eb7e5c8fe55465786655e47662b6baf07d251940357e278614b05de58898c03632dfcc7761f62c39765206b0cb70d054e9d  kernel-cmdline.conf
+118b62d7ad6d9b62f0d63a1749005321fdf73417f95e8d70e761b6755f7c4e0164b2b476c8e1aad93dc42cd4df24384f660e21af6c62a9f8eda4d3e3bd8298e6  deviceinfo
 "

device/archived/device-alcatel-idol347-downstream/deviceinfo

@@ -16,6 +16,7 @@ deviceinfo_screen_height="1280"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 earlyprintk androidboot.bootloader=L1BGC0C0BG00"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_base="0x80000000"

device/archived/device-alcatel-idol347-downstream/kernel-cmdline.conf

@@ -1,9 +0,0 @@
-console=ttyHSL0,115200,n8
-androidboot.console=ttyHSL0
-androidboot.hardware=qcom
-msm_rtb.filter=0x237
-ehci-hcd.park=3
-androidboot.bootdevice=7824900.sdhci
-lpm_levels.sleep_disabled=1
-earlyprintk
-androidboot.bootloader=L1BGC0C0BG00

device/archived/device-amazon-suez/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="Hadi Charara <hadicharara@ymail.com>"
 pkgname=device-amazon-suez
 pkgdesc="Amazon Fire HD 10"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,7 +11,7 @@ arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base linux-amazon-suez mkbootimg"
 makedepends="devicepkg-dev"
-source="deviceinfo kernel-cmdline.conf"
+source="deviceinfo"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -23,6 +23,5 @@ package() {
 
 
 sha512sums="
-2b75dba63b6522bafa78ec359bc5fe3f519520caedbca188e1510e75f26555ad964f9f9ee6e3128570f989e70081317d2ab64bfb9af0db1f3f3cdbf38c70a047  deviceinfo
-d89b08ef9888faae6cb96a378421669e6119023307a3b5a109e18b7f9e2c70e1f8b240ba8f9b9d22d319fa28e416565d06074d34382f482c9b037b7ab3f4861c  kernel-cmdline.conf
+91b9a695bbf1bf322a072041bf02adc5b9d182fd381b27b5847f82d6b55189abec68281952072b7368491fc549e4f557a82db96942fc1d4b7977e256e0f38f83  deviceinfo
 "

device/archived/device-amazon-suez/deviceinfo

@@ -16,6 +16,7 @@ deviceinfo_screen_height="1920"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_base="0x40078000"

device/archived/device-amazon-suez/kernel-cmdline.conf

@@ -1 +0,0 @@
-bootopt=64S3,32N2,64N2

device/archived/device-asus-sparrow-downstream/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-asus-sparrow-downstream
 pkgdesc="ASUS ZenWatch 2 (Downstream)"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -15,7 +15,7 @@ depends="
 	postmarketos-base
 "
 makedepends="devicepkg-dev"
-source="deviceinfo kernel-cmdline.conf"
+source="deviceinfo"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -26,6 +26,5 @@ package() {
 }
 
 sha512sums="
-2a51794b31e52f92a4d50e34f82656331338d646128f547d8e14c4e40c1e40f15f147270ab634a312742dcce3b4e5894a33e87b0e485c8046641285ecf9a5cb1  deviceinfo
-4b7f1842dbbd6ec2990d7ea259de3f801a33e38a82f747549249cedcb64aa37935e9452a5f50f6d0cc6ce38a1db8e9d6f77440a7c52f61cd353ea75b7f3e395a  kernel-cmdline.conf
+64ad025793dbaca01bde6eefc446ab4f1f5a21b300cce8daba1851926c08f1bbac668fffebe8e5c492499205bae15b410bdc2741f366039bf20054f12c98f0bb  deviceinfo
 "

device/archived/device-asus-sparrow-downstream/deviceinfo

@@ -17,6 +17,7 @@ deviceinfo_screen_height="320"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=sparrow user_debug=31 maxcpus=4 msm_rtb.filter=0x3F"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"

device/archived/device-asus-sparrow-downstream/kernel-cmdline.conf

@@ -1,6 +0,0 @@
-console=ttyHSL0,115200,n8
-androidboot.console=ttyHSL0
-androidboot.hardware=sparrow
-user_debug=31
-maxcpus=4
-msm_rtb.filter=0x3F

device/archived/device-asus-x00td-downstream/APKBUILD

@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-asus-x00td-downstream
 pkgdesc="Asus Zenfone Max Pro M1 downstream"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="postmarketos.org"
 arch="aarch64"
@@ -11,7 +11,7 @@ license="MIT"
 options="!check !archcheck"
 depends="linux-asus-x00td-downstream mkbootimg msm-fb-refresher postmarketos-base"
 makedepends="devicepkg-dev"
-source="deviceinfo kernel-cmdline.conf"
+source="deviceinfo"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -22,6 +22,5 @@ package() {
 }
 
 sha512sums="
-49572afe646d88e31e53b548912e588447e87de04834592210b191902e23401b3af5d968f6b90fb5c0ab29994605c6a95bdaeae85cd4a225a9e0a385c34986ad  deviceinfo
-4b2ea9d473de336b68db736b2b2ae44e8f952a948c016fbbceb205512f73548b85cb00a488f600f1346e92dc839d2ee2419fbd5bf56f9cba9df843419b69ec74  kernel-cmdline.conf
+aacace112d10033fc2a0e1fa5705e2734961a6282833da0277e2fec6662eb4142eb797979b648466d5f1fa31c4d296c3b7f74df473dfbb9927cd3fb34b2491dd  deviceinfo
 "

device/archived/device-asus-x00td-downstream/deviceinfo

@@ -18,6 +18,7 @@ deviceinfo_screen_height="2160"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_flash_fastboot_partition_vbmeta="vbmeta"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 earlycon=msm_serial_dm,0xc170000 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=1 firmware_class.path=/vendor/firmware_mnt/image loop.max_part=7 buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_base="0x00000000"

device/archived/device-asus-x00td-downstream/kernel-cmdline.conf

@@ -1,15 +0,0 @@
-console=ttyMSM0,115200,n8
-androidboot.console=ttyMSM0
-earlycon=msm_serial_dm,0xc170000
-androidboot.hardware=qcom
-user_debug=31
-msm_rtb.filter=0x37
-ehci-hcd.park=3
-lpm_levels.sleep_disabled=1
-sched_enable_hmp=1
-sched_enable_power_aware=1
-service_locator.enable=1
-swiotlb=1
-firmware_class.path=/vendor/firmware_mnt/image
-loop.max_part=7
-buildvariant=userdebug

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

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-bq-paella-downstream
 pkgdesc="BQ Aquaris X5 (Downstream)"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -10,7 +10,7 @@ arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-bq-paella-downstream mkbootimg msm-fb-refresher"
 makedepends="devicepkg-dev"
-source="deviceinfo kernel-cmdline.conf"
+source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
@@ -29,6 +29,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-b27ff683c57ee055aa076defb268dc2a49f186dbaa2f5c023803402a9e5a2d82a8c8e2c83dbdd63f990cac2b01a146ef07491d050772bfef9d3ec0e37fed8f80  deviceinfo
-7d218a308a421869faf6017a09cb9ed0a5fa56fb813c8ce582b6b85f4aaf5e1104761c86fdd7afa4ef0717c17bd18e2f9037661887bcac069af4d43431d8d129  kernel-cmdline.conf
+2759dceedaca6672489410f092db2b47d451cab7cb7706e942412eb957a1c2861d723a3938c79e1543be01e3d584c62408be9675b9533f5cc49ce50287b2d16f  deviceinfo
 "

device/archived/device-bq-paella-downstream/deviceinfo

@@ -17,6 +17,7 @@ deviceinfo_dev_touchscreen="/dev/input/event9"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 earlyprintk androidboot.bqdevice=picmt buildvariant=user"
 deviceinfo_generate_bootimg="true"
 deviceinfo_flash_offset_base="0x80000000"
 deviceinfo_flash_offset_kernel="0x00008000"

device/archived/device-bq-paella-downstream/kernel-cmdline.conf

@@ -1,10 +0,0 @@
-console=ttyHSL0,115200,n8
-androidboot.console=ttyHSL0
-androidboot.hardware=qcom
-msm_rtb.filter=0x237
-ehci-hcd.park=3
-androidboot.bootdevice=7824900.sdhci
-lpm_levels.sleep_disabled=1
-earlyprintk
-androidboot.bqdevice=picmt
-buildvariant=user

device/archived/device-bq-piccolo/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-bq-piccolo
 pkgdesc="BQ Aquaris M5"
-pkgver=10
+pkgver=9
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -11,7 +11,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8939 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
-source="deviceinfo kernel-cmdline.conf modules-initfs"
+source="deviceinfo modules-initfs"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
@@ -30,7 +30,6 @@ nonfree_firmware() {
 }
 
 sha512sums="
-3a04cb52841a214d58bba6cc639de636bfbad3c376608e94063e45cf6659031ef3e1f303e5553ea19d2062de41eea91240ece462f662ee8b31534ba4ac80a95a  deviceinfo
-37e1e5f8839b624ab3eb850a24ed4daeb61a651257a1fb593f49cb869323e5d1b339c831a18eb26a9d7bd0a618ea9eb2bb9bf3882133af5f2606a878e6d39c67  kernel-cmdline.conf
+c5a40a6e8ccc6f079b558b47943454f1b8dacc71e32e027f3e32b6d8576a55a23586aecd90e33dc05799030a6a4be2b7e3ec79c7e14d6ea78432c5cc885df904  deviceinfo
 d7ba0b86dc573d0d57591399ec71c76169730b169546d1692910c3e04913100f8bfa534100dab8d5ad302d2a539fb64b040a6fb26979f41c8e7b76b596427afd  modules-initfs
 "

device/archived/device-bq-piccolo/deviceinfo

@@ -20,6 +20,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_flash_offset_base="0x80000000"

device/archived/device-bq-piccolo/kernel-cmdline.conf

@@ -1,2 +0,0 @@
-earlycon
-console=ttyMSM0,115200

device/archived/device-bq-tenshi/APKBUILD

@@ -4,7 +4,7 @@
 maintainer="Achill Gilgenast <achill@achill.org>"
 pkgname=device-bq-tenshi
 pkgdesc="BQ Aquaris U Plus"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -18,7 +18,6 @@ depends="
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
-	kernel-cmdline.conf
 "
 
 build() {
@@ -30,6 +29,5 @@ package() {
 }
 
 sha512sums="
-908c5002338a2aa70874ef2057d6bf917af9aabfd163af42c5507c266e9b5f6546933b3a893fbba42b63e71c9bd76a323f40253939732d0158b1824a112e47c6  deviceinfo
-cb07af75b15e2394d94df459d26b399371f18d24489763855388b1155dce4f6d17070716d8581fec178cd7848a7caea3431aad56e83b70e9f27287c4bccda2f2  kernel-cmdline.conf
+7e41e1c6de6c8a11b872b393c638b6c0253d7a1ac4dabef551ff8453228b1166bb1c29447a568b0f31ff347e252c17aa6c696bf01b74a0e931e0e81950090e83  deviceinfo
 "

device/archived/device-bq-tenshi/deviceinfo

@@ -15,6 +15,7 @@ deviceinfo_external_storage="true"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom user_debug=30 msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 earlycon=msm_hsl_uart,0x78B0000 buildvariant=user buildvariant=eng"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_pagesize="2048"

device/archived/device-bq-tenshi/kernel-cmdline.conf

@@ -1,11 +0,0 @@
-console=ttyHSL0,115200,n8
-androidboot.console=ttyHSL0
-androidboot.hardware=qcom
-user_debug=30
-msm_rtb.filter=0x237
-ehci-hcd.park=3
-androidboot.bootdevice=7824900.sdhci
-lpm_levels.sleep_disabled=1
-earlycon=msm_hsl_uart,0x78B0000
-buildvariant=user
-buildvariant=eng

device/archived/device-clockworkpi-uconsole-radxa-cm5/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="Antoine Martin (ayakael) <dev@ayakael.net>"
 pkgname=device-clockworkpi-uconsole-radxa-cm5
 pkgdesc="Clockwork Tech ClockworkPi uConsole Radxa CM5"
-pkgver=6
+pkgver=5
 _commit=2e8040ec92f85e3d43caf3e44557cb0659db4531
 _dtso_commit=c2204834e1d7d0acfd64e1b7874d432bc142f1a4
 pkgrel=0
@@ -33,7 +33,6 @@ source="
 	radxa-cm5-uconsole-$_dtso_commit.tar.gz::https://github.com/dev-null2019/radxa-cm5-uconsole/archive/$_dtso_commit.tar.gz
 
 	deviceinfo
-	kernel-cmdline.conf
 	modules-initfs
 	modules-load.conf
 	modprobe.conf
@@ -136,8 +135,7 @@ openrc() {
 sha512sums="
 a9c48c3470d5641113e351456d6cfa1e2283e6577cf54eea9a2d49ba4f6269e46cba16039584b34e07c7d8006f6dec112e970148f155f2c3ff0670521568a5a7  clockworkradxa-linux-2e8040ec92f85e3d43caf3e44557cb0659db4531.tar.gz
 a15eb74d9db9114022e96ba04542d18350cf6d637c5efa49f4a5a65c33c5fd20a7997095a049a561fb7aac767a299f367489c5a342138a5259cc32ebb6152384  radxa-cm5-uconsole-c2204834e1d7d0acfd64e1b7874d432bc142f1a4.tar.gz
-0afdcebb4b42ab9d489bfeb32912f03de0ee30875eba760112b24def4bb04185eca5f827c737da4824081940ec998c2c26a99e9105267e90e9d852b0afa76539  deviceinfo
-fa6332b91b62572528b1f919370382d67f521b0a65c3c9f416df67545ebae7b01f31729340a42e656b5589cdbde676ec8fe0eb9537a34e02ec20f5309bf43b12  kernel-cmdline.conf
+8552698a2bfbfab71e2b00be9397ab2117aba646a5d4afd5a7e8f53a93bb1736ed81c260a6c863130c7f4cd8eb9a56518885ac4de01a6f67afa1b42d501a91a3  deviceinfo
 85d573bfd51ac4aa502336452b0384af77b6ec095f5c4760e8f287b8452b3ccb4521051bc01c53fa0856440d52231f535f3f0258d62ad578161ad464344413e9  modules-initfs
 642cdb1b4ac02b8c3ab7b72f4eeef615ac4911b42bcd845b54305f0ff64c07b86f4a807a97d395cb6c0cd0a5f5eed15e68d9e4ccb69db8e38fb65c8be4acaeeb  modules-load.conf
 a5324ed5118168b846d359dc2c8e76ccdc624003d157a28e4c9728ddedd9b52c6deb95af9c3a9d94faf52413f2f830dc45ec6c0093458d27149ef17de5dceef5  modprobe.conf

device/archived/device-clockworkpi-uconsole-radxa-cm5/deviceinfo

@@ -20,6 +20,7 @@ deviceinfo_getty="ttyFIQ0;1500000"
 # Bootloader related
 deviceinfo_boot_filesystem="fat32"
 deviceinfo_dtb="rockchip/rk3588s-radxa-cm5-uconsole"
+deviceinfo_kernel_cmdline="console=tty1 console=ttyFIQ0,1500000n8 PMOS_FORCE_PARTITION_RESIZE earlycon consoleblank=0 coherent_pool=2M irqchip.gicv3_pseudo_nmi=0 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory swapaccount=1"
 deviceinfo_sd_embed_firmware="u-boot/radxa-cm5/rpi-cm4-io/idbloader.img:64,u-boot/radxa-cm5/rpi-cm4-io/u-boot.itb:16384"
 deviceinfo_sd_embed_firmware_step_size="512"
 deviceinfo_boot_part_start="32768"

device/archived/device-clockworkpi-uconsole-radxa-cm5/kernel-cmdline.conf

@@ -1,11 +0,0 @@
-console=tty1
-console=ttyFIQ0,1500000n8
-pmos.force-partition-resize
-earlycon
-consoleblank=0
-coherent_pool=2M
-irqchip.gicv3_pseudo_nmi=0
-cgroup_enable=cpuset
-cgroup_memory=1
-cgroup_enable=memory
-swapaccount=1

device/archived/device-fairphone-fp2-downstream/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-fairphone-fp2-downstream
 pkgdesc="Fairphone 2 (Downstream)"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -25,7 +25,6 @@ depends="
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
-	kernel-cmdline.conf
 	FP2.conf
 	hifi
 "
@@ -43,8 +42,7 @@ package() {
 }
 
 sha512sums="
-45103f8387940b8703c7fa2a2f340718aed9cd32335a13ef4fbae45ba5c357ab76ea9c15ea0d9000dc8bd83997588b93c128c8f2f2ddd712f786253a12ded271  deviceinfo
-09008fec33cc8c692d4e5fca1f2f4635985ad9b1d92085df3e15f2ee2555c8f7b78615298f9935cee03e3ba598a5326baf890333fa661f5b1833b4fb2d1a4328  kernel-cmdline.conf
+e9ca33701c6f42213ad91a9bce6f07a57dea2833098a12da361352ef1ca0663843709caaf0c7ded8bdc00d71ec90a678c327082ee573aa65e0815f37fcfb7fc2  deviceinfo
 55360b1ba4ddadea341c9edb13c32ba5f19aabf75ab28602f30cfb79b9df8834f115ef979c70569f23ec1293b1fcd408baf320d87803293ce7106bdc73a26c9f  FP2.conf
 b834461c6866bb0c473dd089dd5da641dd42a00f610aad6503117aa50fe6e200db9ad0a264bb609f12350d59faee1f772907bacd75439f702ea7d52f6f85e2b1  hifi
 "

device/archived/device-fairphone-fp2-downstream/deviceinfo

@@ -17,6 +17,7 @@ deviceinfo_getty="ttyHSL0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x3b7 ehci-hcd.park=3 androidboot.bootdevice=msm_sdcc.1"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="true"

device/archived/device-fairphone-fp2-downstream/kernel-cmdline.conf

@@ -1,6 +0,0 @@
-console=ttyHSL0,115200,n8
-androidboot.hardware=qcom
-user_debug=31
-msm_rtb.filter=0x3b7
-ehci-hcd.park=3
-androidboot.bootdevice=msm_sdcc.1

device/archived/device-google-crosshatch-downstream/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-google-crosshatch-downstream
 pkgdesc="Google Pixel 3 XL (Downstream)"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -14,7 +14,7 @@ depends="
 	postmarketos-base
 	"
 makedepends="devicepkg-dev"
-source="deviceinfo kernel-cmdline.conf"
+source="deviceinfo"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -25,6 +25,5 @@ package() {
 }
 
 sha512sums="
-cc909a06b9015b4aa0d19c04c3cce3b886d78c125712f0ab4956049b464c6cceb9b4b8e141d78951dfce5782c6663e2a27e074a82f6058a84bb0775f14366b27  deviceinfo
-c2762af3b8268599d2edf37f1dca6284e85e7fd6222a701c7699b9baedb3312bad766100a6bafcd2b2660f04241429b19d5f641f2b0a3915dd4cb079d52b0680  kernel-cmdline.conf
+941eb2010c0fc853cab893b40207f309cc2cd566aaeeb1b32c1731b74fd9c69b63e87fc303ee175a81a76627e2634ea1ced985d0e1003d865d0439de3f776ba5  deviceinfo
 "

device/archived/device-google-crosshatch-downstream/deviceinfo

@@ -16,6 +16,7 @@ deviceinfo_screen_height="2960"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200n8 printk.devkmsg=on msm_rtb.filter=0x237 ehci-hcd.park=3 service_locator.enable=1 cgroup.memory=nokmem lpm_levels.sleep_disabled=1 usbcore.autosuspend=7 buildvariant=user"
 deviceinfo_generate_bootimg="true"
 deviceinfo_flash_offset_base="0x00000000"
 deviceinfo_flash_offset_kernel="0x00008000"

device/archived/device-google-crosshatch-downstream/kernel-cmdline.conf

@@ -1,9 +0,0 @@
-console=ttyMSM0,115200n8
-printk.devkmsg=on
-msm_rtb.filter=0x237
-ehci-hcd.park=3
-service_locator.enable=1
-cgroup.memory=nokmem
-lpm_levels.sleep_disabled=1
-usbcore.autosuspend=7
-buildvariant=user

device/archived/device-hisense-m470bsa/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-hisense-m470bsa
 pkgdesc="Hisense Sero 7 Pro"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -10,7 +10,7 @@ arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-hisense-m470bsa mkbootimg"
 makedepends="devicepkg-dev"
-source="deviceinfo kernel-cmdline.conf modules-load.conf pointercal"
+source="deviceinfo modules-load.conf pointercal"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 
@@ -31,8 +31,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-12d3230b8185f466e6679e84c86d8cf9029989565f3f80c8666a54fbb1fc201fd731e940a3451d76ad1c81e34ec18f6ea9e4fc26f65bc7cee6071b1f5304f1a4  deviceinfo
-c2ddf5b681d5f26cf9887f83d2202ff1f1ab415479d5d627966759ba19376a6d368e3fce2ebae02d2cbcf7abf06155ce774643cb0c6dd3b7af3a5748ea36ae8f  kernel-cmdline.conf
+131c99e89e66ae8a10d933574e8fc0b326caec84c260496cac92738c3fa81f32d083dbdc58116804d53c68562c967fdc0b1ffb25d74bb076369d5a3b0f7dee74  deviceinfo
 6a53747e22b530dcd52ca523017edf422b36bcd6616d7b0df0ba23f50de0f91dff63913ec6aab5051eebc131879c235cfb724aacefc90a10b94a1790985144ec  modules-load.conf
 8fcb7330a660995bb1aabf3fd2f3a3536fed79e9369bda115874151e84651839c59d134ac3ca0919eff0770ac51c934b252e7d544a26c076614f7f1d10bfd016  pointercal
 "

device/archived/device-hisense-m470bsa/deviceinfo

@@ -18,6 +18,7 @@ deviceinfo_dev_touchscreen_calibration="/etc/pointercal"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="androidboot.selinux=enforcing"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_kernel="0x00008000"

device/archived/device-hisense-m470bsa/kernel-cmdline.conf

@@ -1 +0,0 @@
-androidboot.selinux=enforcing

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

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-htc-flounder-downstream
 pkgdesc="Google Nexus 9"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="gpl-v3"
@@ -11,7 +11,7 @@ options="!check !archcheck"
 depends="postmarketos-base linux-htc-flounder-downstream mkbootimg"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo kernel-cmdline.conf"
+source="deviceinfo"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -26,6 +26,5 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 sha512sums="
-0625d17eec68504244885a0f746f23c4877cb96acbeb8e198b3aa9f93c5c061c8b2ccdb5ed8b42dc2e2d082a1eed2fa4917a3397aef9688b1ffe68a719b5511d  deviceinfo
-1cf6aa0cadb5032ed15ae0f0bbf4ff5d8848e01e10b87e803db82efa3a86edf0a97e01bef376178fc3414791a88a8a0dbde823aa515937edfe762ad375266eea  kernel-cmdline.conf
+459f06b48d516c09ee8a1d03e6a2058354bcbf2b137040b58b77e29d29838c4e1586ccf972989dddbc4035c1d171c328d16e3a2ff4e26ae07f9d804a5aa58924  deviceinfo
 "

device/archived/device-htc-flounder-downstream/deviceinfo

@@ -17,6 +17,7 @@ deviceinfo_dev_touchscreen="/dev/input/event2"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="no_console_suspend=1 tegra_wdt.enable_on_probe=1 tegra_wdt.heartbeat=120 androidboot.hardware=flounder androidboot.selinux=permissive selinux=0"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_kernel="0x00008000"

device/archived/device-htc-flounder-downstream/kernel-cmdline.conf

@@ -1,6 +0,0 @@
-no_console_suspend=1
-tegra_wdt.enable_on_probe=1
-tegra_wdt.heartbeat=120
-androidboot.hardware=flounder
-androidboot.selinux=permissive
-selinux=0

device/archived/device-htc-m8-downstream/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-htc-m8-downstream
 pkgdesc="HTC One M8 (Downstream)"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -18,7 +18,6 @@ depends="
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
-	kernel-cmdline.conf
 	initfs-hook.sh
 	90-android-touch-dev.rules
 "
@@ -34,8 +33,7 @@ package() {
 }
 
 sha512sums="
-60949a859a93ca4be67f5d02fca10aa2a8a329e2b1839219934a9ea33d4d9b1ab9641d46a00dedef3d8030f4fe8f3b601cc00956f1d4958de4c1468e7e6fb008  deviceinfo
-ccf2a8dacec72732919f2bb6135b0a682bb54acc209f00287a36283c49341467b59dc2a4aad4ba43ead4874a5807ecb41b16578092d1a1069d3fd320b6d9b8a6  kernel-cmdline.conf
+f46238ef93ae77fed95f04bd325d3dab562190842089939116850d2898c8e62c30b5a80ffceb7c2da431b106f6f7b53892027a1e046ba68c534da89eade9531c  deviceinfo
 765abaad5fda0dfda5e62e1e48414d3eea822198f39d0792171a04d73f86f6273a6e562afab430cbfcdd084412568a0ad03d012e9c40c5564f5cd1b9c0f181eb  initfs-hook.sh
 f0f69ab3b5b3fed11ec5049f37c71c4e9dcf87dc1f238199a3917dd61957d46783a8798d63d400cc5d3983987e750e3fec6d7117561ad5005f28131ae4821d66  90-android-touch-dev.rules
 "

device/archived/device-htc-m8-downstream/deviceinfo

@@ -16,6 +16,7 @@ deviceinfo_create_initfs_extra="true"
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_flash_fastboot_partition_rootfs="system"
+deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 ehci-hcd.park=3 zcache androidboot.selinux=permissive"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
 deviceinfo_flash_offset_base="0x00000000"

device/archived/device-htc-m8-downstream/kernel-cmdline.conf

@@ -1,6 +0,0 @@
-console=ttyHSL0,115200,n8
-androidboot.hardware=qcom
-user_debug=31
-ehci-hcd.park=3
-zcache
-androidboot.selinux=permissive

device/archived/device-htc-memul-downstream/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-htc-memul-downstream
 pkgdesc="HTC One Mini 2 (Downstream)"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -17,7 +17,6 @@ depends="
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
-	kernel-cmdline.conf
 	initfs-hook.sh
 	"
 
@@ -30,7 +29,6 @@ package() {
 }
 
 sha512sums="
-32174076a7217183625741cc4a53ac0bbe1dbf9fd35528b1b2787aff237aae10c6ac0846756b80c21ceac1bbc0d664f4a6cbd33483e959f7fc2973f8b319c2ca  deviceinfo
-5699b02db81ffbe7f464186f33c6d08571e65fda1d290f5029147f530ced737ed1720c9a5e806d7e211781cf46f66684352acf493900b3bb0643db30fbe111bb  kernel-cmdline.conf
+e0f730aeb956d9e6ff0c7cbc420351f66386473c7779ea6aba7429407597878e4f30bdbbb2f56052155030d7d5b7b36ba4572f41340b2e2fa626404985814de1  deviceinfo
 765abaad5fda0dfda5e62e1e48414d3eea822198f39d0792171a04d73f86f6273a6e562afab430cbfcdd084412568a0ad03d012e9c40c5564f5cd1b9c0f181eb  initfs-hook.sh
 "

device/archived/device-htc-memul-downstream/deviceinfo

@@ -17,6 +17,7 @@ deviceinfo_dev_touchscreen="/dev/input/event6"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=none androidboot.hardware=qcom user_debug=31 ehci-hcd.park=3 zcache buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="true"

device/archived/device-htc-memul-downstream/kernel-cmdline.conf

@@ -1,6 +0,0 @@
-console=none
-androidboot.hardware=qcom
-user_debug=31
-ehci-hcd.park=3
-zcache
-buildvariant=userdebug

device/archived/device-huawei-alice/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-huawei-alice
 pkgdesc="Huawei P8 Lite"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -10,7 +10,7 @@ arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base linux-huawei-alice mkbootimg msm-fb-refresher postmarketos-base-downstream"
 makedepends="devicepkg-dev"
-source="deviceinfo kernel-cmdline.conf"
+source="deviceinfo"
 
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
@@ -29,6 +29,5 @@ package() {
 }
 
 sha512sums="
-b10e17152371dde14c394f51658c7a1fab6c0306e3270bec56487f325836ca51e9e3fc0627170dacdbb4348d8c12ed34fd7dfd5f5d250caf3a238b6fee6308ea  deviceinfo
-51f03864080afd57a9d8e990c15f92f27ed8159d642d2c7e575a3e91f34a866388154ddd04f4e506ba9f078e56c9f19ad2abc2def71d7d4a1d5b5b43269db03d  kernel-cmdline.conf
+0f3c10a89b310664b66b991c8934896f618af87ce800cd8a5aa6762058ba4f6c553d52bf8f86d6ccd38d61350edff41ceffd48b87138dcf803d6fb49ba0508a1  deviceinfo
 "

device/archived/device-huawei-alice/deviceinfo

@@ -16,6 +16,7 @@ deviceinfo_screen_height="1280"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=tty1 enforcing=0 hisi_dma_print=0 vmalloc=384M maxcpus=8 coherent_pool=512K no_irq_affinity ate_enable=true androidboot.selinux=permissive buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_base="0x07478000"

device/archived/device-huawei-alice/kernel-cmdline.conf

@@ -1,10 +0,0 @@
-console=tty1
-enforcing=0
-hisi_dma_print=0
-vmalloc=384M
-maxcpus=8
-coherent_pool=512K
-no_irq_affinity
-ate_enable=true
-androidboot.selinux=permissive
-buildvariant=userdebug

device/archived/device-huawei-angler-downstream/APKBUILD

@@ -1,7 +1,7 @@
 # Archived: Downstream port, only for testing. Use mainline port!
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-huawei-angler-downstream
-pkgver=3
+pkgver=2
 pkgrel=0
 pkgdesc="Huawei Nexus 6P (Downstream)"
 url="https://postmarketos.org"
@@ -19,7 +19,6 @@ source="
 	90-android-touch-dev.rules
 	bcmdhd.cal
 	deviceinfo
-	kernel-cmdline.conf
 "
 
 # Note: bcmdhd.cal is from https://github.com/LineageOS/android_device_huawei_angler/blob/752aaf664ab079f4ce9cbdeae6978f615d39b783/bcmdhd.cal
@@ -42,6 +41,5 @@ package() {
 sha512sums="
 262f9f3e28cbb28d236cf6edce4919766baabb18e5b0cf35d672d306efeaf12fd66ffba57e6d9bef0eee90203dc98f95aab17145e4c12383055afb58b922ae58  90-android-touch-dev.rules
 61fe1f91d7b0b570b77fcca76503373cbac2515ca3dcc2f2543b910dfaeb1e935a11975f824f6a72001df4e63329356a6aff2d016e9b4f5d8f7b739fee065c4e  bcmdhd.cal
-dabdcb045c65ec477a01d0c1c1cb2d24d0a7feebcacba5e666b82ad12bbde1d3752c660cc49e0ed4283c9634571781ed718e7fe4ea4990c0c1d90eb6c0a8aa26  deviceinfo
-8b09f1c662be6c43069de23dcafdacd57a9a9a6f21dc51f79454647b5844695f3389c0efed0b0e216437fd1af48134ef16e0d8eba02e5dd80af6794b75dc1e16  kernel-cmdline.conf
+a642b851495f68bfdd9788e911623bc0c655e0e3869cdcb03e40686e36a2b17d4c2a9c3402f30c26272ef579cb53fc12f9477caa8f4c73a39079ee78e6d965a0  deviceinfo
 "

device/archived/device-huawei-angler-downstream/deviceinfo

@@ -25,3 +25,4 @@ deviceinfo_flash_offset_second="0x00000000"
 deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="4096"
 
+deviceinfo_kernel_cmdline="androidboot.hardware=angler androidboot.console=ttyHSL0 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 boot_cpus=0-3"

device/archived/device-huawei-angler-downstream/kernel-cmdline.conf

@@ -1,6 +0,0 @@
-androidboot.hardware=angler
-androidboot.console=ttyHSL0
-msm_rtb.filter=0x37
-ehci-hcd.park=3
-lpm_levels.sleep_disabled=1
-boot_cpus=0-3

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

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-huawei-kiwi-downstream
 pkgdesc="Huawei Honor 5X (Downstream)"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -10,7 +10,7 @@ arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base linux-huawei-kiwi-downstream mkbootimg msm-fb-refresher"
 makedepends="devicepkg-dev"
-source="deviceinfo kernel-cmdline.conf"
+source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
@@ -28,6 +28,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-fa560fcd95067230b09856709684d20bbac78fe3953f6e2e064a8831dd31430c69be3a66a9585c81c0b5726395adf268ed08e59c591edb6cdd39dedf693c08be  deviceinfo
-232042dfbd16031d4f859cf45f8105054bf395d5121b661390b15623eb25dfda750545811c74c635c7f79129588ed6f0ccfd92e360550f8bd1c4c0784bf27e5e  kernel-cmdline.conf
+12ad849642a8548a5d17c24ee4a5a2c0b2d7d2c2f15528e4fff52ce03b17cdc9c898dcc5dc20949b9cc6157613dbc2b180ede47a532b30b621c75002e2a33711  deviceinfo
 "

device/archived/device-huawei-kiwi-downstream/deviceinfo

@@ -16,6 +16,7 @@ deviceinfo_screen_height="1920"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="androidboot.hardware=qcom ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
 deviceinfo_flash_offset_base="0x80000000"

device/archived/device-huawei-kiwi-downstream/kernel-cmdline.conf

@@ -1,5 +0,0 @@
-androidboot.hardware=qcom
-ehci-hcd.park=3
-androidboot.bootdevice=7824900.sdhci
-lpm_levels.sleep_disabled=1
-buildvariant=userdebug

device/archived/device-huawei-plank/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="gtrxAC <gtrxac2@gmail.com>"
 pkgname=device-huawei-plank
 pkgdesc="Huawei Honor 7"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -15,7 +15,7 @@ depends="
 	postmarketos-base
 "
 makedepends="devicepkg-dev"
-source="deviceinfo kernel-cmdline.conf"
+source="deviceinfo"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -26,6 +26,5 @@ package() {
 }
 
 sha512sums="
-b4aab47dea2a8b682fa1a61ae3ad4cf9d9f876cb2db85beefe18ab079f37b41957de7f5fd974133e26a93d883a6055d1ccd5cd3fdefcac4201a424c3d169b68b  deviceinfo
-96aef56c34b780c1fc52bddfe19680485cf02aa6af17d9cd8b74980912887bac7693f757309ade7a72c365241e4ba7a041096cf3c8708c67d5ef55b370f45652  kernel-cmdline.conf
+92ebb3f14228b9163a20c712ee86c3d0b384601bfaa8f50d464ab1a307555c567a5bee12868aa51f4001b5d68e33288008de33324a21962d30d3e20c540c16a6  deviceinfo
 "

device/archived/device-huawei-plank/deviceinfo

@@ -17,6 +17,7 @@ deviceinfo_screen_height="1920"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="androidboot.hardware=hi3635 androidboot.selinux=permissive no_console_suspend=1 mem=3072M coherent_pool=512K mmcparts=mmcblk0:p1(vrl),p2(vrl_backup),p6(modemnvm_factory),p9(splash),p10(modemnvm_backup),p11(modemnvm_img),p12(modemnvm_system),p14(3rdmodemnvm),p15(3rdmodemnvmback),p17(modem_om),p20(modemnvm_update),p30(modem),p31(modem_dsp),p32(dfx),p33(3rdmodem) cpuidle_sysfs_switch=1"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_pagesize="2048"

device/archived/device-huawei-plank/kernel-cmdline.conf

@@ -1,7 +0,0 @@
-androidboot.hardware=hi3635
-androidboot.selinux=permissive
-no_console_suspend=1
-mem=3072M
-coherent_pool=512K
-mmcparts=mmcblk0:p1(vrl),p2(vrl_backup),p6(modemnvm_factory),p9(splash),p10(modemnvm_backup),p11(modemnvm_img),p12(modemnvm_system),p14(3rdmodemnvm),p15(3rdmodemnvmback),p17(modem_om),p20(modemnvm_update),p30(modem),p31(modem_dsp),p32(dfx),p33(3rdmodem)
-cpuidle_sysfs_switch=1

device/archived/device-huawei-sturgeon-downstream/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-huawei-sturgeon-downstream
 pkgdesc="Huawei Watch"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -20,7 +20,6 @@ depends="
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
-	kernel-cmdline.conf
 	networkmanager.conf
 "
 
@@ -33,7 +32,6 @@ package() {
 }
 
 sha512sums="
-0c1644bece252c0343d50aa6a16616009901e1e48862133e8399ef79b0f6c118563550f990c0d93d79db42c24eaabbde55257d0e4240f8d004e5b54154d5547c  deviceinfo
-15307969581076bbd48997d947fc74a79d331de83d13a6b327c6f0db6f9b35f91a47486838d83f6d21634a267d5ac7d8d7c0e9a08b0198be240a519973f8618a  kernel-cmdline.conf
+949e469b75898e00af1f22ede5ee52602c521308058fb9ac46041d4cae7f86036cf34c4e7a208ee6c3978d6985c9e10540276cb8803737f93a62cce444c95b90  deviceinfo
 a19923f30ac1d328a85ab1162e44442da28dd1ae45529fb73e21d8004594487f61c8f5372e5bbaadfefd27fe27c8a22ce430b81891ac1965e5704bbfec108b82  networkmanager.conf
 "

device/archived/device-huawei-sturgeon-downstream/deviceinfo

@@ -17,6 +17,7 @@ deviceinfo_screen_height="400"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="androidboot.hardware=sturgeon user_debug=31 maxcpus=4 msm_rtb.filter=0x3F pm_levels.sleep_disabled=1 selinux=0"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"

device/archived/device-huawei-sturgeon-downstream/kernel-cmdline.conf

@@ -1,6 +0,0 @@
-androidboot.hardware=sturgeon
-user_debug=31
-maxcpus=4
-msm_rtb.filter=0x3F
-pm_levels.sleep_disabled=1
-selinux=0

device/archived/device-klipad-rel/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-klipad-rel
 pkgdesc="KLIPAD Klipad Tablet"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -14,7 +14,7 @@ depends="
 	mkbootimg
 "
 makedepends="devicepkg-dev"
-source="deviceinfo kernel-cmdline.conf"
+source="deviceinfo"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -25,6 +25,5 @@ package() {
 }
 
 sha512sums="
-854abfb82a35cc9c5fdef905827794b0b18a31e53b0ce49db6938cfe7746e907453313fba319879fff79b543353c1a4420a059b56fc565017a9de1f1e2fa5b65  deviceinfo
-8add76f3b67dfca9c451fdda99b7594b453dbe2ae9e8a1ddbad07285d8d8f92ad03162fa5e9797043d7a4d63d41bd0283512d7af844258bf1916c12d5982a230  kernel-cmdline.conf
+6d51632faf832e1ad00a60609a749008e0ada21237517c6d87c2ac88b4fb683f3ded8995e718329e4d83bac8fc84833ddefa1a68ef71becd16259e9efb28893f  deviceinfo
 "

device/archived/device-klipad-rel/deviceinfo

@@ -18,6 +18,7 @@ deviceinfo_screen_height="600"
 # Bootloader related
 
 # pmbootstrap bootimg_analyze
+deviceinfo_kernel_cmdline="buildvariant=user"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_flash_offset_kernel="0x00008000"

device/archived/device-klipad-rel/kernel-cmdline.conf

@@ -1 +0,0 @@
-buildvariant=user

device/archived/device-lenovo-kuntao/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-kuntao
 pkgdesc="Lenovo P2"
-pkgver=6
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -19,7 +19,7 @@ depends="
 	soc-qcom-msm8953-modem
 "
 makedepends="devicepkg-dev"
-source="deviceinfo kernel-cmdline.conf modules-initfs"
+source="deviceinfo modules-initfs"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -30,7 +30,6 @@ package() {
 }
 
 sha512sums="
-192a36d6cfb1deb7b32437f617a40e2d7eb635b1f26d2ab97854270513f9e044bdfb7a94270fd7be9148c733259411ff4a25c2cefdc26d8f23f5c8a648e89160  deviceinfo
-7025641401411a9dc58a99b420a9ae3a764dfb9af0381b0dcc407330d18781889baab3a00667a24fe6caea92298a1ec8b9bd79b6eb588e2be6b2b611d8d77935  kernel-cmdline.conf
+af9c0294698e7d439dfd3b2967c0f70d3b3106172138e2cb7dde06cec8d258842b3794c0cb290f27e97218588440987b1f23c7c9600a829b91b4597f3db1e891  deviceinfo
 2ce6911ef54351f46819b3323e361ce60297b30f94e81a77e2d20b1bc294e51e3a0fa859ad8e257fa3fdef404a47dd3b64c247222cb7ca73f03cb4dcd083d1f8  modules-initfs
 "

device/archived/device-lenovo-kuntao/deviceinfo

@@ -21,6 +21,7 @@ deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=earlycon console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_bootimg_qcdt="false"

device/archived/device-lenovo-kuntao/kernel-cmdline.conf

@@ -1,2 +0,0 @@
-console=earlycon
-console=ttyMSM0,115200

device/archived/device-lg-bullhead-downstream/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-bullhead-downstream
 pkgdesc="Google Nexus 5X"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -15,7 +15,7 @@ depends="
 	postmarketos-base
 "
 makedepends="devicepkg-dev"
-source="deviceinfo kernel-cmdline.conf"
+source="deviceinfo"
 options="!check !archcheck"
 
 build() {
@@ -27,6 +27,5 @@ package() {
 }
 
 sha512sums="
-57002a0ea6a64eb67ece5d05a819d36805a1ff539f53d83e5af3ffd2a23b9c67ae72d034a53bee40e62fc00e6ec56263df509a2ca78a8edf2b953854d7927463  deviceinfo
-c1c1d614b2ae7af332e98160c6bbc9bda280171284a059a0a270bcacc8d928febef1db9d208909d9af4e5efaff48461c003a4bb0fedf1ab72e76fba8f8057034  kernel-cmdline.conf
+fa2bc401b16b6ece4aecf227249d36c1789ca896b2832761f5ec6d23c50cbd08d5ddbb3c103eb7110a075bba329537d9c44b9bad76877be27d62ae3aa5a83c49  deviceinfo
 "

device/archived/device-lg-bullhead-downstream/deviceinfo

@@ -27,3 +27,4 @@ deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_sparse="true"
 
+deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.hardware=bullhead boot_cpus=0-3 maxcpus=4 lpm_levels.sleep_disabled=1 msm_poweroff.download_mode=0 buildvariant=userdebug"

device/archived/device-lg-bullhead-downstream/kernel-cmdline.conf

@@ -1,7 +0,0 @@
-console=ttyHSL0,115200,n8
-androidboot.hardware=bullhead
-boot_cpus=0-3
-maxcpus=4
-lpm_levels.sleep_disabled=1
-msm_poweroff.download_mode=0
-buildvariant=userdebug

device/archived/device-lg-d802/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-d802
 pkgdesc="LG G2"
-pkgver=4
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -10,7 +10,7 @@ arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-lg-d802 mkbootimg"
 makedepends="devicepkg-dev"
-source="deviceinfo kernel-cmdline.conf"
+source="deviceinfo"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -21,6 +21,5 @@ package() {
 }
 
 sha512sums="
-170d490437c666ea6e6ead02c25b3c16cb0c9e6b9dbc802797254c2c5f9fab3ad0d2628f6f9fa5616e140bcda93a802dbfdb8203016b1abafc624ad0cc7d23c8  deviceinfo
-1af4fa5857be3f4656c7efb446148060fdb225436d291a4b96a9df801a511651d42a5e213e5df43e7b901ad8d83da0d2a1f8c1740366b8b67a9174d7cfd0b166  kernel-cmdline.conf
+c224c447e38ed1ae80fd18bbb61f1faaaec4383283e039d4b206be1661754e377a1135cf7c552b1b427c7aaa5bd1212fb801a3f05bd7de2a482813a314b98751  deviceinfo
 "

device/archived/device-lg-d802/deviceinfo

@@ -17,6 +17,7 @@ deviceinfo_screen_height="1920"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="androidboot.hardware=g2 buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="true"
 deviceinfo_flash_offset_base="0x00000000"

device/archived/device-lg-d802/kernel-cmdline.conf

@@ -1,2 +0,0 @@
-androidboot.hardware=g2
-buildvariant=userdebug

device/archived/device-lg-h815-downstream/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-h815-downstream
 pkgdesc="LG G4 (h815) (Downstream)"
-pkgver=3
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -14,7 +14,7 @@ depends="
 	postmarketos-base
 "
 makedepends="devicepkg-dev"
-source="deviceinfo kernel-cmdline.conf"
+source="deviceinfo"
 options="!check !archcheck"
 
 build() {
@@ -26,6 +26,5 @@ package() {
 }
 
 sha512sums="
-ddcd8ece51e516c8516530640e74f18477963bd9619ef4d8b12d6f5120596d1dec015217127f3271624ccf1f8f61689e331664046d09d594bd0dfb111007f4e7  deviceinfo
-e7a8379644e7a75a0f61314cf36804ffc30bf29b6de444eb2b3e6721fd79fff1ad49356565bced8a3d13c36df4141e51d9599c8e79dc77f5c7eceb1aa84c6ba3  kernel-cmdline.conf
+d55b9831a95366f51efae3a29e936c226bb5a6875a62633705ed5d1400a1272e20d11fce8b67c022fa6ba6e9fe4b1533ec2778f09e1afbe3f0128e8944b355e9  deviceinfo
 "