run apk simulate

fix build
fix ci
2024-05-08 16:28:00 +02:00 · 2024-05-08 13:39:58 +02:00 · 2024-05-08 13:28:54 +02:00 · 2024-05-08 12:59:00 +02:00 · 2024-05-07 10:56:11 -07:00 · 2024-05-07 20:43:45 +09:00
298 changed files with 773 additions and 15925 deletions
@@ -15,9 +15,6 @@ import pmb.helpers.pmaports

 def build_strict(packages, arch):
    common.run_pmbootstrap(["build_init"])
-    common.run_pmbootstrap(["config", "mirrors_postmarketos",
-                            "http://mirror.postmarketos.org/postmarketos/staging/systemd/"])
-    common.run_pmbootstrap(["config", "systemd", "always"])
    common.run_pmbootstrap(["--details-to-stdout", "--no-ccache", "build",
                            "--strict", "--force",
                            "--arch", arch, ] + list(packages))
@@ -60,8 +60,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):
@@ -20,6 +20,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/20-debug-shell.sh
 	./main/postmarketos-mkinitfs-hook-debug-shell/setup_usb_storage.sh
 	./main/postmarketos-mkinitfs-hook-netboot/netboot.sh
 	./main/ttyescape/*.post-install
@@ -10,7 +10,6 @@ expected_directories = [
    "device/main",
    "device/testing",
    "device/unmaintained",
-    "extra-repos/systemd",
    "main",
    "modem",
    "non-free",
@@ -20,9 +20,6 @@ def test_aports_kernel(args):
        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
@@ -141,6 +141,11 @@ build-x86_64:
  script:
    - .ci/build-x86_64.sh

+build-x86:
+  extends: .build
+  script:
+    - .ci/build-x86.sh
+
 build-aarch64:
  extends: .build
  script:
@@ -150,3 +155,13 @@ build-armv7:
  extends: .build
  script:
    - .ci/build-armv7.sh
+
+build-armhf:
+  extends: .build
+  script:
+    - .ci/build-armhf.sh
+
+build-riscv64:
+  extends: .build
+  script:
+    - .ci/build-riscv64.sh
@@ -116,6 +116,8 @@ device/*/u-boot-librem5/			@craftyguy @alistair23 @Newbyte
 device/*/u-boot-pinebookpro/			@QC8086
 device/*/u-boot-pinephone/			@Arnavion @PsychoGame
 device/*/wl1251-cal/				@Danct12
+main/gnome-software-plugin-pmos/	@andrisas
 main/postmarketos-ui-plasma-mobile/		@bshah
+main/postmarketos-upgrader-dbus/	@andrisas
 main/shutdown-clear-rtc-wakealarm/		@Arnavion
 main/ttyescape/					@calebccff
@@ -9,42 +9,49 @@ branch_aports=master
 mirrordir_alpine=edge

 [v23.12]
+announcement=https://postmarketos.org/blog/2023/12/18/v23.12-release/
 description=Latest release / Recommended for best stability
 branch_pmaports=v23.12
 branch_aports=3.19-stable
 mirrordir_alpine=v3.19

 [v23.06]
+announcement=https://postmarketos.org/blog/2023/06/07/v23.06-release/
 description=Old release (unsupported)
 branch_pmaports=v23.06
 branch_aports=3.18-stable
 mirrordir_alpine=v3.18

 [v22.12]
+announcement=https://postmarketos.org/blog/2022/12/18/v22.12-release/
 description=Old release (unsupported)
 branch_pmaports=v22.12
 branch_aports=3.17-stable
 mirrordir_alpine=v3.17

 [v22.06]
+announcement=https://postmarketos.org/blog/2022/06/12/v22.06-release/
 description=Old release (unsupported)
 branch_pmaports=v22.06
 branch_aports=3.16-stable
 mirrordir_alpine=v3.16

 [v21.12]
+announcement=https://postmarketos.org/blog/2021/12/29/v21.12-release/
 description=Old release (unsupported)
 branch_pmaports=v21.12
 branch_aports=3.15-stable
 mirrordir_alpine=v3.15

 [v21.06]
+announcement=https://postmarketos.org/blog/2021/07/04/v21.06-release/
 description=Old release (unsupported)
 branch_pmaports=v21.06
 branch_aports=3.14-stable
 mirrordir_alpine=v3.14

 [v21.03]
+announcement=https://postmarketos.org/blog/2021/03/31/v21.03-release/
 description=Old release (unsupported)
 branch_pmaports=v21.03
 branch_aports=3.13-stable
@@ -3,7 +3,7 @@
 pkgname=device-google-peach-pit
 pkgdesc="Samsung Chromebook 2 (11.6 inch)"
 pkgver=6
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,7 +14,6 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-initramfs-minimal
 "
 makedepends="devicepkg-dev"
 source="
@@ -3,7 +3,7 @@
 pkgname=device-google-snow
 pkgdesc="Samsung Chromebook"
 pkgver=6
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,7 +14,6 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-initramfs-minimal
 "
 makedepends="devicepkg-dev"
 source="
@@ -1,7 +1,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-google-veyron
 pkgver=6.1.39
-pkgrel=1
+pkgrel=2
 pkgdesc="Mainline kernel for Google Veyron devices"
 arch="armv7"
 _carch="arm"
@@ -68,7 +68,7 @@ package() {

 sha512sums="
 20d468ae89b57dda82d7c7b814c3d8b1b510e1623775b09a8a0b0a8a0431461e0a1d2df2bfa01f3102932c8eef91405546898b50ec3e6f30015098bb39722b41  linux-6.1.39.tar.xz
-d98eae420c1807588564b31f6f9146a3cfc03d6b726d8f79e55554f3bc51abc085c19c5322dbdfc5024a02f4a4396e4b2dff296fc73ba1cd1af472cfc4acb671  config-google-veyron.armv7
+612a00c4000142a3e2f262e3b44e17cef6f1a585184db808062b14f860636bf0bcb653fec59d482d5d658e63e337d6668ccb55a8abe7545fb40f44e158dc585e  config-google-veyron.armv7
 2912c675c1e07f7e91e2edcaa82738643907ed46614e4b871565930ff4ffece468d47db7905c2c081f936c020ea78db4a9d9f33b76c110125a0e68a1bd57f9fd  veyron.better_clock_selection_logic_and_dts_rate_list.patch
 b16da0e0b1da9f074a773300e954aa5e0da6c2113e20c0b594a7a4875e9addb10efcf5be694467fb00cd8d7c2e3cc83e6d7aac618047775dc0bb354245cf7c35  veyron.dts_allow_dedicating_npll_to_vop.patch
 b7bda162526abdb61c0223f1aac31893526d3d1d21d79ebd3e707be8d9b5dc464f6b4fa20b74444c44fda987352728433913f6f50b9b860c2621d11ae2306e1b  veyron.dts_do_dedicate_npll_to_vop.patch
@@ -165,7 +165,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
 # CONFIG_CGROUP_RDMA is not set
@@ -3,7 +3,7 @@ pkgname=linux-pine64-pinephonepro
 pkgver=6.6.0
 _pkgver=6.6
 _tagdate=20231104-22589
-pkgrel=1
+pkgrel=2
 pkgdesc="Mainline kernel for the pinephone pro"
 arch="aarch64"
 _flavor="${pkgname#linux-}"
@@ -72,5 +72,5 @@ package() {

 sha512sums="
 d59c410ecc1a824b7b9a38f36b224693812003320220a3464a648084152023ed8be48d0448eb8054cd2b1d42befd5e8958d3ad243e50138e1c9d0269ac2917ea  linux-ppp-6.6-20231104-22589.tar.gz
-c4379739957e56031b54b1d7641248a2b8d0f0cc923de4271842ba521753a6f8d391f84447fb597b3cfc1f6684c188b6d36e911ac659349c1b6a77a635d00d3f  config-pine64-pinephonepro.aarch64
+5fc12d916cd9027dd8c4dc80c8773c499bcbf23dbef4303ee39a8644cfdad1e70da82c94ad992ee91864dbdc23a44dfd9f86459d12b511b206ff659e599c5727  config-pine64-pinephonepro.aarch64
 "
@@ -188,7 +188,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -4,7 +4,7 @@

 pkgname=linux-postmarketos-exynos4
 pkgver=6.7.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Mainline kernel fork for Samsung Exynos4 devices"
 arch="armv7"
 _carch="arm"
@@ -81,7 +81,7 @@ package() {

 sha512sums="
 705cd617d135900cb25c8b6da7177d507e6a179b521e04aeae18080995514cbd69381a21f942ebf4d8cee427e3c60d53e6a06ed918ddcaacc243ca585ef61c11  linux-postmarketos-exynos4-v6.7.6-exynos4.tar.bz2
-ee4cec8100ebe1d85bd18ba0ba5bdf9746f1fb7a7cb6dff0d8f6782d03f51e5d87f0d05a388ff641c276db7857e729ceb900bf33061d079e97cf6e7b43dd5027  config-postmarketos-exynos4.armv7
+c1ce78565a909eea2281d17e81c879c39e02149563ff12f661359e02eca37225a5a58d7c43021ab3d0a78bdadc46cf1c54ef655a4167cc96d80874a72e847904  config-postmarketos-exynos4.armv7
 aaff0332b90e1f9f62de1128cace934717336e54ab09de46477369fa808302482d97334e43a85ee8597c1bcab64d3484750103559fea2ce8cd51776156bf7591  initramfs.list
 09f1f214a24300696809727a7b04378887c06ca6f40803ca51a12bf2176a360b2eb8632139d6a0722094e05cb2038bdb04018a1e3d33fc2697674552ade03bee  init
 aea665e80dee318ec3be23d3f28b88e87eb551d2756e14d896781a0861a4387920f6969990eb171e8c7d6f86c36cef63a89337d63bfee7e44b9de7a8efb36c73  tab3-limit-memory.patch
@@ -164,7 +164,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -5,7 +5,7 @@

 pkgname=linux-postmarketos-exynos5
 pkgver=6.1.56
-pkgrel=3
+pkgrel=4
 pkgdesc="Mainline kernel fork for Samsung Exynos5 devices"
 arch="armv7"
 _carch="arm"
@@ -70,5 +70,5 @@ package() {

 sha512sums="
 28a5ad9ef1983acf20abde6643725d6ccbab9da4c11bd151ade2613fe22b9c3886f3aa00cfe18efd2945b96907ec315646d27c01717c4ad36b0ae809d9593b87  linux-postmarketos-exynos5-v6.1.56-exynos5-lts.tar.bz2
-ba0bad0df61f12312622946365dab1e319486fbe6c0af5dd26629bc35df5c91d148c2aec9b15aef5857d23ab758cc4f6ed7ed5753f159ed8c7d0f564a2a9a5dc  config-postmarketos-exynos5.armv7
+c70fb391795dec423927bf9175fb43eb067902cf6eca7db6aaa7dfa1d164ff6a0c0776ddd69663a68952a6ff71b0f6023d1f61f8e328de4c09ca5538bc2ee55f  config-postmarketos-exynos5.armv7
 "
@@ -173,7 +173,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_RDMA=y
@@ -4,7 +4,7 @@

 pkgname=linux-postmarketos-grate
 pkgver=6.6.22
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux kernel with experimental patches for Tegra"
 arch="armv7"
 url="https://gitlab.com/grate-driver/linux"
@@ -49,5 +49,5 @@ package() {

 sha512sums="
 db25898c5c4103e12ace113de7f7eba91b41f94a4dae270c9424341e8f796a98dee8676d1d02b229b0c4b11cc79b31454a13f9f2b7b1277b5ca9bb7328d54a39  linux-postmarketos-grate-v6.6.22-lts.tar.bz2
-e65e2cbf8cb98b571e75c1eb6232b7af27218d5a81691bb15a31d14fef4177b18209415256799c84eef0edba27249b81ea4d42b095898ce68247e1e4101a739f  config-postmarketos-grate.armv7
+651bcf10d50f5ff0f20de03384a5a0e6318e0d2b8ad527e9a19e7e119ce06c5188bb772fbafc4f6d6c97188d24639eba8bcfd1dd10c2d6a6a24414f7d9aa0576  config-postmarketos-grate.armv7
 "
@@ -161,7 +161,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -2,7 +2,7 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
 pkgver=6.8.7
-pkgrel=0
+pkgrel=1
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
 _carch="arm64"
@@ -69,7 +69,7 @@ package() {

 sha512sums="
 2d580d354029832e0d93401c9ef016b5dc0bcd5b5b06ccadf6fa79eb033d5af0ba29e1beca8f7a2e79bbe966d29dfd39246c8b63c8df20b756e1d484cbc8cec1  linux-6.8.7.tar.xz
-66483855d22952d9fcfe5dea0315a7d99c924b303d834fb28d62254422ea4a34f39b16e01443e21d6e7f3c77b3807f9d23ce5ea443e238a2d4a12773a46aef11  config-postmarketos-mediatek-mt8173.aarch64
+cb83322851f274c9a8ac83a9ae23d6ab3d10ef3c7df1947def2e560848881c89e43cd5ba17309b937f6eeb30c9078b9880ba38cd478152a86f927a7276e242d7  config-postmarketos-mediatek-mt8173.aarch64
 4b499c1fbf53631cffd6fa7299643dc744e0e2187f71804664b02f05296162b42e3f76aa0d8c688cecb43a8bcd41ec92991c98287951292260237b828dcca710  fix-mmc1-speed.patch
 c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849  fix-mmc-order.patch
 caf48ac0f77661153ee94c7de4931baca135a69a97e93f01ad8f276b4a9944e077d7214c117450943cca07990c773661f79718cb0c2ff7c5789c93d37afb26de  fix-spi-nor-max-frequency.patch
@@ -180,7 +180,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -2,7 +2,7 @@
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8183
 pkgver=6.6.25
-pkgrel=0
+pkgrel=1
 pkgdesc="Mainline kernel for mediatek mt8183"
 arch="aarch64"
 _flavor="${pkgname#linux-}"
@@ -103,5 +103,5 @@ e9a128a8ddd98c6c8957ba45186afa2ea8ebeac83d4f2db3ff9ee8a5dd8027af90868c334a7b456b
 d74da1231181835bec82015da1b3f5b08a1fe9c3c35dd712e285891094d94d9427ceac75d32f74be3a635e17d93ad82b37adf97db8176efc91aed17535023fc2  mt8183-fix-bluetooth.patch
 9e64ef057ecd9bb23b0b0e830007c50ea9c481f64f460d063e9f64735d70d5a4bcf87d9148aa5cc90963ccd5860fe4a9e6f25556a902332b95ef48537d6ee045  Revert-ASoC-mediatek-mt8183-da7219-max98357-Map-miss.patch
 9b8707de42635734031495da055c5860addeb656051540f1a14404b10aa8b501168d8b0e274b37bce989db3bc050e9beef722189556f6d782b92cc907731488d  mt8183-kukui-jacuzzi-fennel14-rt1015p-sound.patch
-93cb166f30714f8ce813367f454110f5da4414ea26c86d0f072187b52ddb7e42e877c590a6aa5e6c07a597a49c631af84ac6843b47203474872211b92cd1524a  config-postmarketos-mediatek-mt8183.aarch64
+b99d226ad93ee3d09ffedf028bccf2d0561709e3c8f55e1c2db77eb83ae14e4bf81c545e3c016e811f4f66e6216def18893a1a347940e6db4fe3bc1a1ecc36cd  config-postmarketos-mediatek-mt8183.aarch64
 "
@@ -177,7 +177,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -4,7 +4,7 @@

 pkgname=linux-postmarketos-omap
 pkgver=6.8.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Mainline kernel fork for OMAP devices"
 arch="armv7"
 url="https://kernel.org/"
@@ -77,7 +77,7 @@ package() {

 sha512sums="
 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068  linux-6.8.tar.xz
-52ab8d791c55845742e075573644c320bbcc2ea127d6290da0ca0f03dc646f8771dde5ef8271d35c4aa76a92bff49178183b41d02ba29a2fa248634a793229fc  config-postmarketos-omap.armv7
+f43db080d4a5aabeedec761c2f55cf6530b9fe1338524d520c83d34780e9a4597fa7fe9101d3ba5447aaad81560dbadb6ab8514680eef9013470f1a85ce3e40e  config-postmarketos-omap.armv7
 fe4307a6af41913a7e5d59288b563865116797d3272e0570faff4532e198831e764e0067f53afdd39e57665196ae44f05d554bbd7d55d556d4b2d3c9d2efd41f  0001-Add-TWL6032-dtsi.patch
 2c13c46b4db0d4a75c3aae3a46041fe43f841dc4ab3c7b08cd9db22a73c8355701d85c8c1e979aba93002b96d63ad3f1f8e46c15ecdde4391ea677b71dd17b45  0002-arm-dts-Add-common-dtsi-for-espresso.patch
 4efda42604f5a6d5f9d4ceb9f87aaa5ad81d9299b3cd8ae930aafa895df5041ff5ee2cf441bbf7fdd002a52df378ee08c0bde85657e5d2086404b9f08b3a742d  0003-arm-dts-Add-espresso7-support.patch
@@ -172,7 +172,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -8,7 +8,7 @@ pkgver=6.6
 # When making kernel config changes please also submit a PR to
 # https://github.com/msm8916-mainline/linux/blob/master/kernel/configs/pmos.config
 # since the kernel config is regenerated on upgrades and all changes will be lost!
-pkgrel=3
+pkgrel=4
 pkgdesc="Mainline kernel fork for Qualcomm MSM8909/MSM8916/MSM8939 devices"
 arch="aarch64 armv7"
 url="https://github.com/msm8916-mainline/linux"
@@ -92,6 +92,6 @@ package() {

 sha512sums="
 5fbbdf333412667e0a0e38dcc7e83f640bd5a1e0b07e1c7786ff3e18f17b9cdec088936263d68986b3869ee305cfcecdf22970134ca8fb8d2a2769874a5a4676  linux-postmarketos-qcom-msm8916-v6.6-msm8916.tar.gz
-b3457e63ea4be7b856b2fe1947cbd07ec196dda9d9c99fc2dbda1968161fcdad19e83a3285a735276be8111e22bcef59d59e89322de87cfd8999bc133e64d4cd  config-postmarketos-qcom-msm8916.aarch64
-ab89af02ad93998e2b8388ae0edd6cd1816d4403b57cc05c45b9f23b0efeeeb17a041bcbc00960d77758aab22d4914d1daba21f3607fd676291ca0999b157613  config-postmarketos-qcom-msm8916.armv7
+90b4fd8af0b33829da42caaba35d47618ba070df820a9f4b2ad614355fb1b6564f1026343b36f1e8c4d443dadd37ebdff96365de18d5c89802393b0f85aa176e  config-postmarketos-qcom-msm8916.aarch64
+4e6fe13b5d6b0560e8c8638393266c6b8bf23259476e34491b06909d4d82c5e7f639adf9249a90fca681034678b069ff747a2583a238a2b679e6fb989a36fcf0  config-postmarketos-qcom-msm8916.armv7
 "
@@ -186,7 +186,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -176,7 +176,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -5,7 +5,7 @@
 _flavor="postmarketos-qcom-msm8953"
 pkgname=linux-$_flavor
 pkgver=6.8.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Close to mainline linux kernel for Qualcomm Snapdragon MSM8953"
 arch="aarch64"
 _carch="arm64"
@@ -61,5 +61,5 @@ package() {

 sha512sums="
 8681cb70498797b4e53fa6a083355cf8a5e862733b5d8e89fcb0040691db15ec8af166c367f549e4191c7268336ccb18a0e24a07dfd899b764f2c93bfb8b70d8  linux-postmarketos-qcom-msm8953-v6.8.2-r0.tar.gz
-11a1fee4eb92ae00b458b425bd9769ddeff5eec0309a652fd36bf784b2fabe33e4ab1793a0d6512c92164c9560fda3371333ed641f1b4ce025396a143de64a9e  config-postmarketos-qcom-msm8953.aarch64
+502f2956c6babafb4169dcdf4f90d5e4c5ea3a25965e52170077cbb367f77ac306ab700052c892a5b3b7caee183828ffb4ab7cf6beaa91a67f5d90de30e07f2f  config-postmarketos-qcom-msm8953.aarch64
 "
@@ -175,7 +175,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -4,7 +4,7 @@
 _flavor="postmarketos-qcom-msm8996"
 pkgname=linux-$_flavor
 pkgver=6.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8996 devices"
 arch="aarch64"
 _carch="arm64"
@@ -52,5 +52,5 @@ package() {
 }
 sha512sums="
 3d842c6fa3e1f93875f9c8d4f51e66b267bbd6b0eabccc25b461cbc0616a632ee6f1f2001b77bef2aff6aa36a788277ab9fc930fcd6e71732e5cbffec2dcb269  linux-v6.3.1-msm8996.tar.gz
-e54f2ca8f33b540282d38326b0f9cb5c8c5b06c272c1bfbfaca24d1bab872c547427f993263729b8505c1ce276311c43c012cda265bebedf934cced511e51174  config-postmarketos-qcom-msm8996.aarch64
+09e805805db0f9179da71bfe9ac20d3e81c71fd8f70a3fc81e333dd0f35c7796c5a56586d1537ee8225c5f171f7c903183e92361093c80896aad97ceefa07746  config-postmarketos-qcom-msm8996.aarch64
 "
@@ -177,7 +177,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -1,7 +1,7 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-qcom-sc7180
 pkgver=6.1.39
-pkgrel=5
+pkgrel=6
 pkgdesc="Mainline kernel fork for Qualcomm Snapdragon 7c devices"
 arch="aarch64"
 _carch="arm64"
@@ -99,5 +99,5 @@ fe389611f991ba9de9e4662b2ed35a6790bbc18bb99fdc12eb281e5a4d5559ada3952a4024145007
 19441571468c89576da2087bfcfb8eaca253c67b41bd201ba123dafa33e5e6f424c9719b8fddf61cfce4d27f1b138718f200931eafc5edab5cb4da5b225ba410  0015-arm64-dts-qcom-acer-aspire1-Correct-audio-codec-defi.patch
 d6ecbd07481bf9852d330f1fbe004e0f70a45251956a37b730e4cbb3b7e3c03b34c9979749ab8857d39171382e87159cc54125fad7a0a02a33d4b502892fce9a  0016-arm64-dts-qcom-acer-aspire1-Add-sound.patch
 43cc38c2074a474a4386ab070bcc7b966527a607bc0adb345ce6d13f79b7714e46747ed2624831ae6ed48cf3b4ef387e4cc84247c3b7d13e69a7d1e64f7efe6f  0017-HACK-arm64-dts-qcom-acer-aspire1-Enable-DisplayPort-.patch
-74fd51e78486791cce3bd1cf8efafa8484d7fde4e58adeef23614f6f35e26d612bb81f6cbf43bd7f5c826dd8e7b1b250e5badb0bd05de592fef882c4fb6054e8  config-postmarketos-qcom-sc7180.aarch64
+7c3ba7a612c58472d75d30658c143065c1e508484b83ff1594001243ca066881c5d9b50210174637261831cab5c770320fcf6d8cd03a5e9fd0fdc7cdefd8abff  config-postmarketos-qcom-sc7180.aarch64
 "
@@ -178,7 +178,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
 # CONFIG_CGROUP_RDMA is not set
@@ -6,7 +6,7 @@
 _flavor="postmarketos-qcom-sdm845"
 pkgname=linux-$_flavor
 pkgver=6.9_rc4
-pkgrel=0
+pkgrel=1
 pkgdesc="Mainline Kernel fork for SDM845 devices"
 arch="aarch64"
 _carch="arm64"
@@ -64,8 +64,6 @@ package() {

 	mkdir -p "$pkgdir"/boot/dtbs/qcom
 	cp -r "$pkgdir"/boot/dtbs-tmp/qcom/sdm8* "$pkgdir"/boot/dtbs/qcom
-	cp -r "$pkgdir"/boot/dtbs-tmp/qcom/sm* "$pkgdir"/boot/dtbs/qcom
-	cp -r "$pkgdir"/boot/dtbs-tmp/qcom/qcm* "$pkgdir"/boot/dtbs/qcom
 	rm -rf "$pkgdir"/boot/dtbs-tmp

 	rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source
@@ -76,7 +74,7 @@ package() {

 sha512sums="
 83225cedc55ba80d6170ea2ccc24ddf210be83388c926cf8376beed4431109c7682c31ed55548e7dbe416b8dc3267c144c288b297a73725096e3e3b70d988f8c  linux-sdm845-6.9-rc4.tar.gz
-89e3db1296135d75db567b9b76a1434d8e22bb172bfcdc2fc713807c245a1e1ba55321cbf1334f1ad6391fa892af8e92eca9947f5d7d162124e2413b80a88195  config-postmarketos-qcom-sdm845.aarch64
+a473fcbd144349ef1d43e67643ff09a5cd0c610f3949696c954291b4978063d4029f89d8a84583e38f85234c6fdf4bf71dd153d1f6425367b21f2dadde5f052c  config-postmarketos-qcom-sdm845.aarch64
 e0ae8b9da09cd2552244cfbcd6a63272c766d082306573a679497ab0bd30a44dfa0023503a7628b7ea87238a62da13704de5e2a57952310c7866b770e5c474ad  0001-arm64-dts-qcom-sdm845-xiaomi-polaris-Enable-ath10k-h.patch
 d7c857500348a1420ccd1a255c667704e54ee88f5c563bcb92885aaa5a9b5dc5a87d12ab782822de523d01c63b277ff60b57cc5307a0663bf42ad7b69da3d1c5  0002-drm-panel-Enable-prepare_prev_first-flag-for-NT35596.patch
 "
@@ -188,7 +188,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -3,7 +3,7 @@
 _flavor="postmarketos-qcom-sm6350"
 pkgname=linux-$_flavor
 pkgver=6.8.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Mainline Kernel fork for SM6350/SM7225 devices"
 arch="aarch64"
 _carch="arm64"
@@ -55,5 +55,5 @@ package() {

 sha512sums="
 d1ad03e14f6968550ee13cc96b546ff20edb8bbbb81701ef117f3a64429f591fc90131fcde5b241b82159d409d9819a2d7eff0ceaf90a22eed65d9a39e9955f6  linux-v6.8.1-sm6350.tar.gz
-88c8993c27136dbe5a83bf59d74d6694ccd5a3d2b637f59d2ed33f649540e873f7928be459b30df77c88af0f4b84940f83f0f80eb3a6ccbad1dfb830d65ba680  config-postmarketos-qcom-sm6350.aarch64
+7fe6364177be5a9f4004f7695c59fb337d16bdd4f9c212e947932571947b06995adadebf21fafe46917966fe4943e68b1906a0e6c730d9680bdb36efea67684a  config-postmarketos-qcom-sm6350.aarch64
 "
@@ -169,7 +169,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -11,7 +11,7 @@

 pkgname=linux-postmarketos-rockchip
 pkgver=6.2
-pkgrel=13
+pkgrel=14
 pkgdesc="Mainline kernel for rockchip devices"
 arch="aarch64"
 _carch="arm64"
@@ -82,5 +82,5 @@ package() {

 sha512sums="
 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd  linux-6.2.tar.xz
-7a8b7cea1a021ed32780d8b59946a19d07e99ecd01efc79eea99bc4fead3f99779d4d7588a2fdebb9946eef21ead263d0e96770fe6a32c08af86dbdac18740ce  config-postmarketos-rockchip.aarch64
+d937ee7e88a6a549398f8ba002590d07386f86bbce67df20325eafd1a0df9e927e8cc6e6a940c021586acb63b3e7c21ea0cbee79820b6059076f7ef3e5f72e41  config-postmarketos-rockchip.aarch64
 "
@@ -170,7 +170,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_RDMA=y
@@ -0,0 +1,92 @@
+From 86a6b358ce743c851a15ec9f3ae00a01adb585db Mon Sep 17 00:00:00 2001
+From: Arnav Singh <me@arnavion.dev>
+Date: Mon, 6 May 2024 13:41:05 -0700
+Subject: [PATCH] Define orientation and rotation for PinePhone cameras.
+
+libcamera etc need them.
+
+---
+
+arm64: dts: sun50i: Define orientation and rotation for PinePhone rear camera.
+
+This enables libcamera to detect the correct orientation from
+the device tree and propagate it further to e.g. Pipewire.
+
+Signed-off-by: Arnav Singh <me@arnavion.dev>
+
+---
+
+media: i2c: gc2145: Parse and register properties
+
+In order to propagate V4L2_CID_CAMERA_SENSOR_ROTATION and
+V4L2_CID_CAMERA_ORIENTATION values from the DT to userspace.
+
+Signed-off-by: Robert Mader <robert.mader@collabora.com>
+
+---
+
+arm64: dts: sun50i: Define orientation and rotation for PinePhone front camera.
+
+This enables libcamera to detect the correct orientation from
+the device tree and propagate it further to e.g. Pipewire.
+
+Signed-off-by: Arnav Singh <me@arnavion.dev>
+---
+ arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 6 ++++++
+ drivers/media/i2c/gc2145.c                              | 9 +++++++++
+ 2 files changed, 15 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+index 5b0b5a5f97ff..b75880345fbb 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+@@ -597,6 +597,9 @@ gc2145: front-camera@3c {
+ 		reset-gpios = <&pio 4 16 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>; /* PE16 */
+ 		enable-gpios = <&pio 4 17 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>; /* PE17 */
+ 
+		orientation = <0>;
+		rotation = <90>;
+
+ 		port {
+ 			gc2145_ep: endpoint {
+ 				remote-endpoint = <&csi_gc2145_ep>;
+@@ -621,6 +624,9 @@ ov5640: rear-camera@4c {
+ 		reset-gpios = <&pio 3 3 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>; /* PD3 */
+ 		powerdown-gpios = <&pio 2 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; /* PC0 */
+ 
+		orientation = <1>;
+		rotation = <270>;
+
+ 		port {
+ 			ov5640_ep: endpoint {
+ 				remote-endpoint = <&csi_ov5640_ep>;
+diff --git a/drivers/media/i2c/gc2145.c b/drivers/media/i2c/gc2145.c
+index 507734b9de7d..8b12d60e38c2 100644
+--- a/drivers/media/i2c/gc2145.c
+++ b/drivers/media/i2c/gc2145.c
+@@ -1272,6 +1272,7 @@ static int gc2145_init_controls(struct gc2145_dev *sensor)
+ 	const struct v4l2_ctrl_ops *ops = &gc2145_ctrl_ops;
+ 	struct gc2145_ctrls *ctrls = &sensor->ctrls;
+ 	struct v4l2_ctrl_handler *hdl = &ctrls->handler;
+	struct v4l2_fwnode_device_properties props;
+ 	//u8 wb_max = 0;
+ 	//u64 wb_mask = 0;
+ 	//unsigned int i;
+@@ -1324,6 +1325,14 @@ static int gc2145_init_controls(struct gc2145_dev *sensor)
+ 	ctrls->vflip = v4l2_ctrl_new_std(hdl, ops,
+ 					 V4L2_CID_VFLIP, 0, 1, 1, 0);
+ 
+	ret = v4l2_fwnode_device_parse(&sensor->i2c_client->dev, &props);
+	if (ret)
+		goto free_ctrls;
+
+	ret = v4l2_ctrl_new_fwnode_properties(hdl, &gc2145_ctrl_ops,
+					      &props);
+	if (ret)
+		goto free_ctrls;
+ 
+ 	/* Test patterns */
+ 	ctrls->test_pattern =
+-- 
+2.44.0
+
@@ -4,7 +4,7 @@ _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
 pkgver=6.7.9_git20240306
-pkgrel=1
+pkgrel=3
 _tag="orange-pi-6.7-20240306-2359"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
@@ -47,6 +47,7 @@ source="$pkgname-$_tag.tar.gz::https://codeberg.org/megi/linux/archive/$_tag.tar
 	0013-Revert-usb-quirks-Add-USB_QUIRK_RESET-for-Quectel-EG25G-Modem.patch
 	0014-usb-serial-option-add-reset-resume-callback-for-WWAN.patch
 	0015-ARM-dts-allwinner-sun5i-a13-pocketbook-614-plus-Add-.patch
+	0016-Define-orientation-and-rotation-for-PinePhone-camera.patch
 	"
 builddir="$srcdir/linux"

@@ -85,8 +86,8 @@ package() {

 sha512sums="
 96f0ccb0b5f702ff8784f860ea7cce9a2aba3d041b84f9195772da4a70b8e8f904b9bd0af90e3cbcb5a322d25858d247e2dba6902a351fe75bdf9ba25d2c8a81  linux-postmarketos-allwinner-orange-pi-6.7-20240306-2359.tar.gz
-64e2c964eb7716e406db29d7251c74aa2bc3eb810e31a6cebbcb476d9080603634c0718f17d63a27fce6678b90aad55add853f3a7a4abd219cd42a14bc9124c5  config-postmarketos-allwinner.aarch64
-9802cabd6b6db39ba49fe7b5b3a18735ccfe53d0160fb3732706b11a2b44f51aeed3c8e88cadfdb75552ff0e7c473979ff05da63c4f7c5cb22a65db1059e9e61  config-postmarketos-allwinner.armv7
+d4f55a4a48148994da01e81e0428f5e2dad05398178096e538a372b2a68aaef1f7b8a9d11c0d8022666cc766940f8f53b9bfc975bad18e61b011ff2c4ad74ef8  config-postmarketos-allwinner.aarch64
+e6ea97d9ef24fa23f6ada7e6bd6cbe52992780e743b7a8156729e55483c079c52f718b97e5e00cde834dad400ae6b0a76382a831772cfb6a6ea854b1bd57c9a4  config-postmarketos-allwinner.armv7
 126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367  0001-dts-add-dontbeevil-pinephone-devkit.patch
 99edeccdee7beae5dc7337d78ba92de2f3d724b7648ede30ab040a66bdac0e38a6595e212e26011d608ccb8a92ffa9e393965f936dfead65ffe9b7eb31dfa345  0002-dts-add-pinetab-dev-old-display-panel.patch
 82c0203b02c671934d62e52311827ac1cc5b358e0843715ea2235117e4b47d6de63b29fdfc7c1adfc550cc7eb363c384de8276be1ca17da6e48916020124022d  0003-dts-pinetab-add-missing-bma223-ohci1.patch
@@ -102,4 +103,5 @@ b7c084bb32cfc18defcec77966f1944fd3b33bb48769a4c0e257709d0f3898c5e0ca2a50c39a5d45
 c766911f76d36b997582533707d7d7a089ed1272e49a79dbe75f7c1eafef0ba3f1417d6c66f25e12e56124e0cd4bb9f443d400236e252ef1c43d53def9392a87  0013-Revert-usb-quirks-Add-USB_QUIRK_RESET-for-Quectel-EG25G-Modem.patch
 382e6e8785235788101459ae47c940ec85831007c61e3f14c4e3a43abfa21b95cdaa6bdd1b7fdd6fd26944f4c629d41b9ab776e89d9a18778fbc9f6a7785444b  0014-usb-serial-option-add-reset-resume-callback-for-WWAN.patch
 81801c25733299fe4a45154ce27ab70a80f19a00dcb7c6c67d0e6ba6bd369dbfa1b43e09b066ddaec9144e0e3f956baf2fed26d1c52f23faad33101662728e53  0015-ARM-dts-allwinner-sun5i-a13-pocketbook-614-plus-Add-.patch
+203bcca90a3b7aa061c90dc222618d0fde4a45f4d194660c96f20794e11f85dd738d27a586ac53c08715e3a029fe11dd74f121dbbca9a63a78c9ebe3a01e06db  0016-Define-orientation-and-rotation-for-PinePhone-camera.patch
 "
@@ -185,7 +185,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -179,7 +179,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -4,7 +4,7 @@
 # Co-Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=linux-purism-librem5
 pkgver=6.6.22
-pkgrel=1
+pkgrel=2
 # NOTE: Don't forget to rebase the config! See prepare() for instructions.
 _purismrel=1
 # <kernel ver>.<purism kernel release>
@@ -84,5 +84,5 @@ package() {

 sha512sums="
 5cbf171b714be51d41eeab852e6623d5b21f18bd5ab0387a649d1792574c3ce827a3b84ed7b04bec349f430c4a44e5a3946fa410991300a618234b5150297e2e  linux-purism-librem5-6.6.22pureos1.tar.gz
-fedec4eb9316f1a35072f8c15ced57685d68d38901cb6ae171b0f2d6a5c6b78773ae3aa0ff05445ed4012fadf2489ee97fe0972d8b7e5a07188eb65a5a360995  config-purism-librem5.aarch64
+63f340f0fa2bd2c32c15d775150286a8d9dbeee3ca29f59670cd54bd438aa60cca0b7aecceb5789bf5ab91564e328a11f4845fdfb2913a1e56043ce839a79cb8  config-purism-librem5.aarch64
 "
@@ -187,7 +187,7 @@ CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
-CONFIG_RT_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -3,7 +3,7 @@
 pkgname=device-google-peach-pi
 pkgdesc="Samsung Chromebook 2 (13.3 inch)"
 pkgver=6
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -14,7 +14,6 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-initramfs-minimal
 "
 makedepends="devicepkg-dev"
 source="
@@ -2,7 +2,7 @@
 pkgname=device-google-spring
 pkgdesc="HP Chromebook 11 G1"
 pkgver=2
-pkgrel=2
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -13,7 +13,6 @@ depends="
 	linux-postmarketos-exynos5
 	postmarketos-base
 	postmarketos-cros-common
-	postmarketos-initramfs-minimal
 "
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
@@ -0,0 +1,33 @@
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-kobo-nia
+pkgdesc="Kobo Nia"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	linux-kobo-clara-mainline
+	kobo-epdc-extractor
+	postmarketos-base
+	u-boot-kobo-nia
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	modules-initfs
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+2b9fc664aca8686e215ffde3deeca3b2d9d167d9d0fd9109333fae7ae3a1beb6759bed6d2bb3d9aa822ac50477505158db710317e756ecd7295356f622972d19  deviceinfo
+4f38f2805647406ff8114833aed585048f1d1412844c645b7fc9813acba7d4149db400ec942d293aee8f090f8369c295bad4d418c28563a33b41340102ff0263  modules-initfs
+"
@@ -0,0 +1,29 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Kobo Nia"
+deviceinfo_manufacturer="Kobo"
+deviceinfo_codename="kobo-nia"
+deviceinfo_year="2020"
+deviceinfo_arch="armv7"
+deviceinfo_dtb="imx6ull-kobo-nia"
+deviceinfo_kernel_cmdline="console=ttymxc0,115200"
+deviceinfo_generate_extlinux_config="true"
+
+# Device related
+deviceinfo_chassis="tablet"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1024"
+deviceinfo_screen_height="758"
+
+# Bootloader related
+deviceinfo_flash_method="none"
+deviceinfo_boot_part_start="49152"
+deviceinfo_getty="ttymxc0;115200"
+deviceinfo_no_framebuffer="true"
+
+deviceinfo_sd_embed_firmware_step_size="512"
+deviceinfo_sd_embed_firmware="u-boot/kobo-nia/u-boot.imx:2"
@@ -0,0 +1,4 @@
+sy7636-core
+sy7636-regulator
+sy7636-hwmon
+mxc_epdc_drm
@@ -2,7 +2,7 @@
 pkgname=device-samsung-klte
 pkgdesc="Samsung Galaxy S5 (G900F/G9006/G9008/G9009W)"
 pkgver=7
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -11,7 +11,6 @@ depends="
 	lk2nd-msm8974
 	mkbootimg
 	postmarketos-base
-	postmarketos-initramfs-minimal
 	swclock-offset
 "
 makedepends="devicepkg-dev"
@@ -1,36 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Caleb Connolly <caleb@postmarketos.org>
-pkgname=device-shift-otter
-pkgdesc="SHIFT SHIFTphone 8"
-pkgver=1
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	firmware-qcom-adreno-a660
-	linux-postmarketos-qcom-sdm845
-	make-dynpart-mappings
-	mkbootimg
-	postmarketos-base
-	soc-qcom-sc7280
-	soc-qcom-sc7280-qbootctl
-"
-makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	modules-initfs
-	"
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-sha512sums="
-b06f25dc2ea717aae558beb943eaf48fa99c19966dbe82071914ee15ae4e77cfa997da67915cb48ef26cb9ff63a9f719bb1bc5f295ef61659afce1b8b6351e87  deviceinfo
-3332d49c084e8f942a8528cd779fc0d3f673bc064ca9282eeab60f04deb901772d7315239b093cb2104fe9fcc0568c078e5d1f4d4ea05a55480994417d49ac00  modules-initfs
-"
@@ -1,38 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="SHIFT SHIFTphone 8"
-deviceinfo_manufacturer="SHIFT"
-deviceinfo_codename="shift-otter"
-deviceinfo_year="2024"
-deviceinfo_dtb="qcom/qcm6490-shift-otter"
-deviceinfo_append_dtb="true"
-deviceinfo_arch="aarch64"
-deviceinfo_flash_kernel_on_update="true"
-
-# Device related
-deviceinfo_gpu_accelerated="true"
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_getty="ttyMSM0;115200"
-
-# Bootloader related
-deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="PMOS_NOSPLASH"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_mtk_mkimage="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_pagesize="4096"
-deviceinfo_flash_offset_base="0x00000000"
-deviceinfo_flash_offset_dtb="0x01f00000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00000000"
-deviceinfo_flash_offset_tags="0x00000100"
-deviceinfo_header_version="2"
-deviceinfo_rootfs_image_sector_size="4096"
-deviceinfo_flash_sparse="true"
@@ -1,8 +0,0 @@
-fsa4480
-msm
-panel-shift-sh8804b
-qcom_glink_smem
-pmic_glink
-ucsi_glink
-gpi
-focaltech_ts
@@ -2,7 +2,7 @@
 # Kernel config based on: arch/arm/configs/kobo_defconfig

 pkgname=linux-kobo-clara-mainline
-pkgver=6.8.7
+pkgver=6.8.8
 pkgrel=0
 pkgdesc="Kobo Clara HD kernel fork, close to mainline"
 arch="armv7"
@@ -28,7 +28,7 @@ makedepends="

 # Source
 _repository="linux"
-_commit="3af283cc39dd57f3571778f579f3789def1f9175"
+_commit="170464e5eb77c63c77ee7c81002a37ac033097ab"
 _rtl8189fs_repository="rtl8189ES_linux"
 _rtl8189fs_commit="5d523593f41c0b8d723c6aa86b217ee1d0965786"
 _config="config-$_flavor.$arch"
@@ -68,7 +68,7 @@ package() {
 }

 sha512sums="
-7867a4239d7bbe57e03be3d2f419bf237faa901927186e5b050d403928329b3d3aa0882dadcd6aad6f181326aded6c68b0f2cd49828c36af01f41baacd3028c4  linux-kobo-clara-mainline-3af283cc39dd57f3571778f579f3789def1f9175.tar.gz
+f036c72807965c403bcbc8fc29b6b2ae782927bac8c3cebf126accf8ad70abf2daf0dafd04553992402ecd6ec8e144ee6b361258f6a033a235393c9eec49bd79  linux-kobo-clara-mainline-170464e5eb77c63c77ee7c81002a37ac033097ab.tar.gz
 8356d9b0c31de0914248f8e0531c0e3de0c9893fc6e0fdac013771b4f916a10f16cee69c354dc4f0fa8341d16155da5d710569e52f738073a5d3e436bec10334  rtl8189ES_linux-5d523593f41c0b8d723c6aa86b217ee1d0965786.tar.gz
-07280e05e86006c589095551602784d8325b2c84139d3caf40fab930ac95343a4d7f7a987f758bc9554ca726e7ddf8af6f6dcd243079b2ba84125fa321be7b89  config-kobo-clara-mainline.armv7
+5c9cd531ea45bda2232b5e72fa7b9e9ae7b25a4782b412ba5216b85d12dc11fca8c8903dee592bfe35aec3c954c742f156b1bf1796ef06877b31f0e0ece43a04  config-kobo-clara-mainline.armv7
 "
@@ -2052,7 +2052,7 @@ CONFIG_TOUCHSCREEN_CYTTSP5=y
 # CONFIG_TOUCHSCREEN_ILITEK is not set
 # CONFIG_TOUCHSCREEN_S6SY761 is not set
 # CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_EKTF2127 is not set
+CONFIG_TOUCHSCREEN_EKTF2127=m
 # CONFIG_TOUCHSCREEN_ELAN is not set
 # CONFIG_TOUCHSCREEN_ELO is not set
 # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
@@ -2686,8 +2686,8 @@ CONFIG_SENSORS_IIO_HWMON=y
 # CONFIG_SENSORS_INA2XX is not set
 # CONFIG_SENSORS_INA238 is not set
 # CONFIG_SENSORS_INA3221 is not set
-# CONFIG_SENSORS_SY7636 is not set
-# CONFIG_SENSORS_JD9930 is not set
+CONFIG_SENSORS_SY7636=m
+CONFIG_SENSORS_JD9930=m
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_TMP102 is not set
@@ -2806,7 +2806,7 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
 # CONFIG_MFD_88PM860X is not set
-# CONFIG_MFD_JD9930 is not set
+CONFIG_MFD_JD9930=m
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77541 is not set
 # CONFIG_MFD_MAX77620 is not set
@@ -2855,7 +2855,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TPS65086 is not set
 # CONFIG_MFD_TPS65090 is not set
 CONFIG_MFD_TPS6518X=m
-# CONFIG_MFD_SY7636 is not set
+CONFIG_MFD_SY7636=m
 # CONFIG_MFD_TPS65217 is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TI_LP87565 is not set
@@ -2915,6 +2915,7 @@ CONFIG_REGULATOR_BD71828=y
 CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_ISL9305 is not set
 # CONFIG_REGULATOR_ISL6271A is not set
+CONFIG_REGULATOR_JD9930=m
 # CONFIG_REGULATOR_LP3971 is not set
 # CONFIG_REGULATOR_LP3972 is not set
 # CONFIG_REGULATOR_LP872X is not set
@@ -2972,6 +2973,7 @@ CONFIG_REGULATOR_ROHM=y
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
 CONFIG_REGULATOR_TPS6518X=m
+CONFIG_REGULATOR_SY7636=m
 # CONFIG_REGULATOR_TPS65132 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 # CONFIG_REGULATOR_VCTRL is not set
@@ -1,9 +1,9 @@
 # Maintainer: Konrad Dybcio <konradybcio@kernel.org>
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=linux-lenovo-21bx
-pkgver=6.9_rc6
-pkgrel=1
-_commit="45be9698f7ddf9d3f0596ef1081b7f2d359931b0"
+pkgver=6.9_rc7
+pkgrel=0
+_commit="ff8e9aabc1df7fb1658025df41a5ff8fe2e278f2"
 pkgdesc="Lenovo ThinkPad X13s kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -64,6 +64,6 @@ package() {
 }

 sha512sums="
-d2daa2b71f6577c4577174129b538eaba3bc75b13868df171a4125694447a892d485b979f2ee45ba7b9021f22c36856949c8653a8817d19a16089701932a7b26  linux-lenovo-21bx-45be9698f7ddf9d3f0596ef1081b7f2d359931b0.tar.gz
+71208d0ba34827f9edb89327a17c28a763f83d49f6d6d7858d133ebfbd80fd700f13c97f595deb088ded9eaac6d2b34518684aa351edd71c7a4631713a61913e  linux-lenovo-21bx-ff8e9aabc1df7fb1658025df41a5ff8fe2e278f2.tar.gz
 8b3e8172a7924c9e4aa2f1466ceb82d6764b654113080425c0f1017f79e951be61de57097a2e3175a879c5111235770b307664154d47b605a23fba56df761ef4  config-lenovo-21bx.aarch64
 "
@@ -3,7 +3,7 @@

 pkgname=linux-motorola-titan
 pkgver=3.4.113
-pkgrel=16
+pkgrel=17
 pkgdesc="Motorola Moto G 2014 kernel fork"
 arch="armv7"
 _carch="arm"
@@ -11,7 +11,7 @@ _flavor="motorola-titan"
 url="https://kernel.org"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps pmb:cross-native"
-makedepends="bash bc bison devicepkg-dev flex openssl-dev perl dtbtool gcc6"
+makedepends="bash bc bison devicepkg-dev flex openssl-dev perl dtbtool gcc6 xz coreutils"

 # Compiler: this kernel was only tested with GCC6. Feel free to make a merge
 # request if you find out that it is booting working with newer GCCs as
@@ -34,6 +34,7 @@ source="
 	02_mdss_fb_refresh_rate.patch
 	06_fix_mdss_fb_rgba_mode.patch
 	multiple-fixes-gcc-5.patch
+	linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
 "
 builddir="$srcdir/$_repository-$_commit"
 _outdir="out"
@@ -57,10 +58,13 @@ package() {
 	install -Dm644 "$_outdir/arch/$_carch/boot"/dt.img "$pkgdir"/boot/dt.img
 }

-sha512sums="5e55db19f198fadf0f914c2726c034eeaf9a1f4ad5823a7e8a4e9be2664eb0279c91fb2f1c6a9292be2ac523e367551475ff40569676775a03a709ae50a3d0ec  linux-motorola-titan-22bc4ed7f4149f95c84634e6c1baccbbd16c5cc5.tar.gz
-28d6547432f66606a954a56ec1af0892ed16d5489a0d19dd33638cfc909f4ae7d034c0371d6f1bab3a10b5e928683e02e844facf18bfa8088bb641543b3a402e  config-motorola-titan.armv7
+sha512sums="
+5e55db19f198fadf0f914c2726c034eeaf9a1f4ad5823a7e8a4e9be2664eb0279c91fb2f1c6a9292be2ac523e367551475ff40569676775a03a709ae50a3d0ec  linux-motorola-titan-22bc4ed7f4149f95c84634e6c1baccbbd16c5cc5.tar.gz
+61fedeb976031889daddca58401f531c9eaa79964a5abfa91ed54c96e429cc8c0acb427e2b6c3c262bbc65c2ba8426a192ff7df56e717d22050c1293b116165e  config-motorola-titan.armv7
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
 a8c955bf718f155011e980f3d0948be98e1fee5649f418299a4851780543019daf7afa406aa7b0829375645107e4e6fbf241026b0cabe2b2ac895a47df83d2d8  02_mdss_fb_refresh_rate.patch
 5f0c30fc48fd0c8f9ca4e3d929dd15e982565e91b2e9e6b81df88c78c7fb646d3e99dfd6c9e02873caa1ca1e9cd6a7c03b97640fb80781cc78f5725122b65507  06_fix_mdss_fb_rgba_mode.patch
-4c13711fdcdce3ac0c4d30b79da7a331a9f32d46ad0b9572419b82d58db6eed76f728a340848d66a6378702749c56247439abb26fc1df0d3f5cfd1ef5b53acf9  multiple-fixes-gcc-5.patch"
+4c13711fdcdce3ac0c4d30b79da7a331a9f32d46ad0b9572419b82d58db6eed76f728a340848d66a6378702749c56247439abb26fc1df0d3f5cfd1ef5b53acf9  multiple-fixes-gcc-5.patch
+9e3b067fa1b19ad02500c4fce1b6142051df3845c508e615788beb650c4f953683107ac2d80670c4e3df38f532e0e91060d2d13ec04c9ec985abd2dfa82e900b  linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
+"
@@ -49,8 +49,8 @@ CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_LZMA is not set
+CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
@@ -0,0 +1 @@
+../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
@@ -0,0 +1,40 @@
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=u-boot-kobo-nia
+pkgver=2023.10
+pkgrel=0
+pkgdesc="U-Boot for Kobo Nia"
+arch="armv7"
+_carch="arm"
+license="GPL-2.0"
+url="https://github.com/akemnade/u-boot-fslc"
+makedepends="bash bc dtc bison flex openssl-dev"
+options="!check !tracedeps pmb:cross-native"
+
+install="$pkgname.post-upgrade"
+_repository="u-boot-fslc"
+_commit="4518da106aae1a8ce97d8ca41c248b79fcec63ed"
+source="
+	$pkgname-$_commit.tar.gz::https://github.com/akemnade/$_repository/archive/$_commit.tar.gz
+"
+
+builddir="$srcdir/$_repository-$_commit"
+
+build() {
+	make ARCH="$_carch" mx6ullnia_defconfig
+	make ARCH="$_carch" DEVICE_TREE=imx6ull-kobo-nia
+	scripts/config --set-str BOOTCOMMAND "run distro_bootcmd ; fastboot 0"
+	scripts/config -e ENV_IS_IN_EXT4
+	scripts/config -d ENV_IS_IN_MMC
+	scripts/config --set-str ENV_EXT4_INTERFACE "mmc"
+	scripts/config --set-str ENV_EXT4_DEVICE_AND_PART "0:1"
+	scripts/config --set-str ENV_EXT4_FILE "/uboot.env"
+	make ARCH="$_carch"
+}
+
+package() {
+	install -Dm644 "$builddir/u-boot-dtb.imx" "$pkgdir/usr/share/u-boot/kobo-nia/u-boot.imx"
+}
+
+sha512sums="
+664c2780aad4ae86e411fe71a8d0e0cf98ca7ef98c3daed9e20b4e88e930bb3f0ca2073052d0481338505c29e7641c0fa54efb320398acf7f659c57193fcd7e7  u-boot-kobo-nia-4518da106aae1a8ce97d8ca41c248b79fcec63ed.tar.gz
+"
@@ -0,0 +1,6 @@
+#!/bin/sh
+DEV=`mount | sed -n -E 's:.*(/dev/mmcblk[0-9])p[0-9] on /boot .*:\1:p'`
+if [ -n "$DEV" ] ; then
+	dd if=/usr/share/u-boot/kobo-nia/u-boot.imx bs=512 seek=2 of="$DEV"
+fi
+
@@ -1,32 +0,0 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (xiaomi-tissot)!
-# Reference: <https://postmarketos.org/devicepkg>
-pkgname=device-xiaomi-tissot-downstream
-pkgdesc="Xiaomi Mi A1"
-pkgver=1
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="postmarketos-base linux-xiaomi-tissot-downstream mkbootimg msm-fb-refresher"
-makedepends="devicepkg-dev"
-source="deviceinfo"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="Firmware for xiaomi-tissot"
-	depends="linux-firmware-qcom firmware-xiaomi-tissot"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-e4d20e1dfbafcbc0faf8e4456124f2d152b206685430a61ddbcbf61cbc668a30bd9db3f7a18eb62777c08c575d5b91a34e765ba70d3468267d5d090008885199  deviceinfo
-"
@@ -1,30 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Xiaomi Mi A1"
-deviceinfo_manufacturer="Xiaomi"
-deviceinfo_codename="xiaomi-tissot-downstream"
-deviceinfo_year="2017"
-deviceinfo_arch="aarch64"
-
-# Device related
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_screen_width="1080"
-deviceinfo_screen_height="1920"
-deviceinfo_dev_touchscreen="/dev/input/event1"
-
-# Bootloader related
-deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 androidboot.bootdevice=7824900.sdhci earlycon=msm_hsl_uart,0x78af000 androidboot.selinux=permissive buildvariant=eng"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_flash_offset_base="0x80000000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x00000100"
-deviceinfo_flash_pagesize="2048"
-deviceinfo_flash_sparse="true"
@@ -6,7 +6,7 @@

 pkgname=linux-samsung-klte-downstream
 pkgver=3.4.113
-pkgrel=1
+pkgrel=2
 pkgdesc="Samsung Galaxy S5 downstream kernel fork"
 arch="armv7"
 _carch="arm"
@@ -44,6 +44,8 @@ source="
 	0012-Backport-asm-generic-add-memfd_create-system-call-to-unistd.h.patch
 	0013-Backport-ARM-wire-up-memfd_create-syscall.patch
 	gcc10-extern_YYLOC_global_declaration.patch
+	linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
+	linux3.4-fix-piggy.gzip.S.patch
 "

 builddir="$srcdir/$_repository-$_commit"
@@ -92,4 +94,6 @@ c62d67a5fb28082e86a585b4c64891525db640ce694445f0fb19e67fb8dcd9ccbfbcb6fba8692964
 cbf6e4bdf53b02f897923d0f6eea5320acc6760c3f3ed762e69928ced7e3b6f2a5355df4a2fccf560f010a4a1968e7ae1a3f62c2db299857d6bcc9715d932822  0012-Backport-asm-generic-add-memfd_create-system-call-to-unistd.h.patch
 2f256f6ec9fa7b240dd1f9417622bfd5a8ca4a9ea12cd2ef171540e1425d4171122c0597fe12af913ef60979ef9a3dce8a6c1c523c91020cb9481560901cc92b  0013-Backport-ARM-wire-up-memfd_create-syscall.patch
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
+9e3b067fa1b19ad02500c4fce1b6142051df3845c508e615788beb650c4f953683107ac2d80670c4e3df38f532e0e91060d2d13ec04c9ec985abd2dfa82e900b  linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
+080745ca4ecaa804ee1df26ea81975ca93b74372e0c08322a6c481e97807495ae6ceb6cc77653afa24f9f2df45da8ebf8e5de6b06037fbb08e0279877ce42188  linux3.4-fix-piggy.gzip.S.patch
 "
@@ -0,0 +1 @@
+../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
@@ -0,0 +1 @@
+../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch
@@ -1,71 +0,0 @@
-From 3edce56c8a8c58bfd21c99bdef0cf410a07497d9 Mon Sep 17 00:00:00 2001
-From: Wiktor Tkaczynski <wiktor.tkaczynski@gmail.com>
-Date: Fri, 7 Aug 2020 18:05:06 +0200
-Subject: [PATCH 1/8] use relative includes for btfs_slim
-
---
- drivers/bluetooth/btfm_slim.c         | 4 ++--
- drivers/bluetooth/btfm_slim_codec.c   | 2 +-
- drivers/bluetooth/btfm_slim_wcn3990.c | 4 ++--
- drivers/bluetooth/btfm_slim_wcn3990.h | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/bluetooth/btfm_slim.c b/drivers/bluetooth/btfm_slim.c
-index 92ea0135..baab63ae 100644
--- a/drivers/bluetooth/btfm_slim.c
-+++ b/drivers/bluetooth/btfm_slim.c
-@@ -23,8 +23,8 @@
- #include <sound/soc.h>
- #include <sound/soc-dapm.h>
- #include <sound/tlv.h>
-#include <btfm_slim.h>
-#include <btfm_slim_wcn3990.h>
-+#include "btfm_slim.h"
-+#include "btfm_slim_wcn3990.h"
- #include <linux/bluetooth-power.h>
- 
- int btfm_slim_write(struct btfmslim *btfmslim,
-diff --git a/drivers/bluetooth/btfm_slim_codec.c b/drivers/bluetooth/btfm_slim_codec.c
-index 4c6986a5..35c1c74f 100644
--- a/drivers/bluetooth/btfm_slim_codec.c
-+++ b/drivers/bluetooth/btfm_slim_codec.c
-@@ -24,7 +24,7 @@
- #include <sound/soc.h>
- #include <sound/soc-dapm.h>
- #include <sound/tlv.h>
-#include <btfm_slim.h>
-+#include "btfm_slim.h"
- 
- static int bt_soc_enable_status;
- int btfm_feedback_ch_setting;
-diff --git a/drivers/bluetooth/btfm_slim_wcn3990.c b/drivers/bluetooth/btfm_slim_wcn3990.c
-index 66151893..511c0b64 100644
--- a/drivers/bluetooth/btfm_slim_wcn3990.c
-+++ b/drivers/bluetooth/btfm_slim_wcn3990.c
-@@ -10,8 +10,8 @@
-  * GNU General Public License for more details.
-  */
- #include <linux/slimbus/slimbus.h>
-#include <btfm_slim.h>
-#include <btfm_slim_wcn3990.h>
-+#include "btfm_slim.h"
-+#include "btfm_slim_wcn3990.h"
- 
- /* WCN3990 Port assignment */
- struct btfmslim_ch wcn3990_rxport[] = {
-diff --git a/drivers/bluetooth/btfm_slim_wcn3990.h b/drivers/bluetooth/btfm_slim_wcn3990.h
-index b2723ff9..f2660071 100644
--- a/drivers/bluetooth/btfm_slim_wcn3990.h
-+++ b/drivers/bluetooth/btfm_slim_wcn3990.h
-@@ -12,7 +12,7 @@
- #ifndef BTFM_SLIM_WCN3990_H
- #define BTFM_SLIM_WCN3990_H
- //#ifdef CONFIG_BTFM_SLIM_WCN3990
-#include <btfm_slim.h>
-+#include "btfm_slim.h"
- 
- /* Registers Address */
- #define CHRK_SB_COMP_TEST			0x00000000
-- 
-2.25.1
-
@@ -1,25 +0,0 @@
-From 38e5f48ffaee072167cb4a9b058d4ae9b4fdbf87 Mon Sep 17 00:00:00 2001
-From: Wiktor Tkaczynski <wiktor.tkaczynski@gmail.com>
-Date: Fri, 7 Aug 2020 18:05:13 +0200
-Subject: [PATCH 2/8] use relative include for including msm_camera
-
---
- drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c b/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c
-index 1d743091..fc5d2300 100644
--- a/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c
-+++ b/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c
-@@ -25,7 +25,7 @@
- #include <linux/sizes.h>
- #include <soc/qcom/scm.h>
- #include <soc/qcom/secure_buffer.h>
-#include <msm_camera_tz_util.h>
-+#include "msm_camera_tz_util.h"
- #include "cam_smmu_api.h"
- 
- #define SCRATCH_ALLOC_START SZ_128K
-- 
-2.25.1
-
@@ -1,25 +0,0 @@
-From 72a5f6b588fabed3aba18608fe72e484ea8abedb Mon Sep 17 00:00:00 2001
-From: Wiktor Tkaczynski <wiktor.tkaczynski@gmail.com>
-Date: Fri, 7 Aug 2020 18:05:16 +0200
-Subject: [PATCH 3/8] use relative include for u_ncm
-
---
- drivers/usb/gadget/configfs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
-index 14c18f3a..b7ecaeb5 100644
--- a/drivers/usb/gadget/configfs.c
-+++ b/drivers/usb/gadget/configfs.c
-@@ -15,7 +15,7 @@
- #include <linux/usb/ch9.h>
- 
- #ifdef CONFIG_USB_F_NCM
-#include <function/u_ncm.h>
-+#include "function/u_ncm.h"
- #endif
- 
- #ifdef CONFIG_USB_CONFIGFS_F_ACC
-- 
-2.25.1
-
@@ -1,25 +0,0 @@
-From bff024edca5024d3bb713e996d52c8078188f1c1 Mon Sep 17 00:00:00 2001
-From: Wiktor Tkaczynski <wiktor.tkaczynski@gmail.com>
-Date: Fri, 7 Aug 2020 18:05:17 +0200
-Subject: [PATCH 4/8] use relative include for kgsl_device
-
---
- drivers/gpu/msm/kgsl_events.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/msm/kgsl_events.c b/drivers/gpu/msm/kgsl_events.c
-index 759a9660..2effdc34 100644
--- a/drivers/gpu/msm/kgsl_events.c
-+++ b/drivers/gpu/msm/kgsl_events.c
-@@ -15,7 +15,7 @@
- #include <linux/list.h>
- #include <linux/workqueue.h>
- #include <linux/debugfs.h>
-#include <kgsl_device.h>
-+#include "kgsl_device.h"
- 
- #include "kgsl_debugfs.h"
- #include "kgsl_trace.h"
-- 
-2.25.1
-
@@ -1,25 +0,0 @@
-From 5034f2bef0d102015c1596047b01bb44bdbfe61e Mon Sep 17 00:00:00 2001
-From: Wiktor Tkaczynski <wiktor.tkaczynski@gmail.com>
-Date: Fri, 7 Aug 2020 18:05:19 +0200
-Subject: [PATCH 5/8] narrow down include path for msm_isp
-
---
- include/trace/events/msm_cam.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/trace/events/msm_cam.h b/include/trace/events/msm_cam.h
-index 3fc1a299..bff8aab0 100644
--- a/include/trace/events/msm_cam.h
-+++ b/include/trace/events/msm_cam.h
-@@ -16,7 +16,7 @@
- #if !defined(_TRACE_MSM_VFE_H) || defined(TRACE_HEADER_MULTI_READ)
- #define _TRACE_MSM_VFE_H
- 
-#include "msm_isp.h"
-+#include "../../../drivers/media/platform/msm/camera_v2/isp/msm_isp.h"
- #include <linux/types.h>
- #include <linux/tracepoint.h>
- 
-- 
-2.25.1
-
@@ -1,27 +0,0 @@
-From 6b232f491ec4fea1ab8fada665177dc027e1ab13 Mon Sep 17 00:00:00 2001
-From: Wiktor Tkaczynski <wiktor.tkaczynski@gmail.com>
-Date: Fri, 7 Aug 2020 18:05:21 +0200
-Subject: [PATCH 6/8] narrow down include path for msm_camera
-
---
- drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h
-index 753e85a3..5d10b8b0 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h
-+++ b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h
-@@ -31,8 +31,8 @@
- #include <media/msm_cam_sensor.h>
- #include <media/v4l2-subdev.h>
- #include <media/v4l2-ioctl.h>
-#include "msm_camera_i2c.h"
-#include "msm_camera_dt_util.h"
-+#include "io/msm_camera_i2c.h"
-+#include "io/msm_camera_dt_util.h"
- #include "msm_sd.h"
- 
- #define DEFINE_MSM_MUTEX(mutexname) \
-- 
-2.25.1
-
@@ -1,63 +0,0 @@
-From 26877eb5a3d90fee5171024370a93135a062dda5 Mon Sep 17 00:00:00 2001
-From: Wiktor Tkaczynski <wiktor.tkaczynski@gmail.com>
-Date: Fri, 7 Aug 2020 18:05:23 +0200
-Subject: [PATCH 7/8] narrow down trace include paths
-
---
- drivers/gpu/msm/adreno_trace.h                         | 2 +-
- drivers/gpu/msm/kgsl_trace.h                           | 2 +-
- drivers/platform/msm/ipa/ipa_clients/rndis_ipa_trace.h | 2 +-
- drivers/platform/msm/ipa/ipa_v2/ipa_trace.h            | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpu/msm/adreno_trace.h b/drivers/gpu/msm/adreno_trace.h
-index de028fad..7774ca9e 100644
--- a/drivers/gpu/msm/adreno_trace.h
-+++ b/drivers/gpu/msm/adreno_trace.h
-@@ -17,7 +17,7 @@
- #undef TRACE_SYSTEM
- #define TRACE_SYSTEM kgsl
- #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH .
-+#define TRACE_INCLUDE_PATH ../../drivers/gpu/msm
- #undef TRACE_INCLUDE_FILE
- #define TRACE_INCLUDE_FILE adreno_trace
- 
-diff --git a/drivers/gpu/msm/kgsl_trace.h b/drivers/gpu/msm/kgsl_trace.h
-index c7690a14..919fd045 100644
--- a/drivers/gpu/msm/kgsl_trace.h
-+++ b/drivers/gpu/msm/kgsl_trace.h
-@@ -17,7 +17,7 @@
- #undef TRACE_SYSTEM
- #define TRACE_SYSTEM kgsl
- #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH .
-+#define TRACE_INCLUDE_PATH ../../drivers/gpu/msm
- #undef TRACE_INCLUDE_FILE
- #define TRACE_INCLUDE_FILE kgsl_trace
- 
-diff --git a/drivers/platform/msm/ipa/ipa_clients/rndis_ipa_trace.h b/drivers/platform/msm/ipa/ipa_clients/rndis_ipa_trace.h
-index bf66c1e2..3719740b 100644
--- a/drivers/platform/msm/ipa/ipa_clients/rndis_ipa_trace.h
-+++ b/drivers/platform/msm/ipa/ipa_clients/rndis_ipa_trace.h
-@@ -77,5 +77,5 @@ TRACE_EVENT(
- 
- /* This part must be outside protection */
- #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH .
-+#define TRACE_INCLUDE_PATH ../../drivers/platform/msm/ipa/ipa_clients
- #include <trace/define_trace.h>
-diff --git a/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h b/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
-index a03a49a3..ab32a1cc 100644
--- a/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
-+++ b/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
-@@ -148,5 +148,5 @@ TRACE_EVENT(
- 
- /* This part must be outside protection */
- #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH .
-+#define TRACE_INCLUDE_PATH ../../drivers/platform/msm/ipa/ipa_v2
- #include <trace/define_trace.h>
-- 
-2.25.1
-
@@ -1,80 +0,0 @@
-From b91a8942f1d391fcc050188d2334b288f1e7b642 Mon Sep 17 00:00:00 2001
-From: Alexey Min <alexey.min@gmail.com>
-Date: Wed, 11 Sep 2019 21:51:40 +0300
-Subject: [PATCH 8/8] Add config option to fix bootloader cmdline args
-
-Android bootloader passes some arguments in kernel command
-line, that make booting custom OSes harder:
-
- * skip_initramfs
- * root=PARTUUID=...
- * init=/init
-
-Those parameters override default boot partition to hardcoded,
-set init binary to /init, disable booting from initramfs.
-
-If enabled, those parameters will be erased from bootloader's
-command line, and custom OS can boot the way it likes.
-
-Signed-off-by: Alexey Min <alexey.min@gmail.com>
---
- arch/arm64/Kconfig | 17 +++++++++++++++++
- drivers/of/fdt.c   | 14 ++++++++++++++
- 2 files changed, 31 insertions(+)
-
-diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 29035f3a..87d86b98 100644
--- a/arch/arm64/Kconfig
-+++ b/arch/arm64/Kconfig
-@@ -1134,6 +1134,23 @@ config CMDLINE_FORCE
- 	  command-line options your boot loader passes to the kernel.
- endchoice
- 
-+config CMDLINE_DROP_DANGEROUS_ANDROID_OPTIONS
-+	bool "Drop certain dangerous options from cmdline"
-+	default n
-+	help
-+	  Android bootloader passes some arguments in kernel command
-+	  line, that make booting custom OSes harder:
-+	  
-+	    * skip_initramfs
-+	    * root=PARTUUID=...
-+	    * init=/init
-+	  
-+	  Those parameters override default boot partition to hardcoded,
-+	  set init binary to /init, disable booting from initramfs.
-+	  
-+	  If enabled, those parameters will be erased from bootloader's
-+	  command line, and custom OS can boot the way it likes.
-+
- config EFI_STUB
- 	bool
- 
-diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
-index 744f6250..f5d720c3 100644
--- a/drivers/of/fdt.c
-+++ b/drivers/of/fdt.c
-@@ -1128,6 +1128,20 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
- 
- 	pr_debug("Command line is: %s\n", (char*)data);
- 
-+#ifdef CONFIG_CMDLINE_DROP_DANGEROUS_ANDROID_OPTIONS
-+	pr_err("Replacing dangerous cmdline options...");
-+	cmdline = strstr((const char *)data, "skip_initramfs");
-+	if (cmdline)
-+		*cmdline = '_';
-+	cmdline = strstr((const char *)data, "root=");
-+	if (cmdline)
-+		*cmdline = '_';
-+	cmdline = strstr((const char *)data, "init=");
-+	if (cmdline)
-+		*cmdline = '_';
-+	pr_err("Command line now is: %s\n", (char*)data);
-+#endif
-+
- 	/* break now */
- 	return 1;
- }
-- 
-2.25.1
-
@@ -1,66 +0,0 @@
-# Unmaintained: Downstream port, only for testing. Use mainline port (xiaomi-tissot)!
-# Reference: <https://postmarketos.org/vendorkernel>
-# Kernel config based on: arch/arm64/configs/tissot_defconfig
-
-pkgname=linux-xiaomi-tissot-downstream
-pkgver=4.9.188
-pkgrel=0
-pkgdesc="Xiaomi A1 kernel fork"
-arch="aarch64"
-_carch="arm64"
-_flavor="xiaomi-tissot"
-url="https://kernel.org"
-license="GPL-2.0-only"
-options="!strip !check !tracedeps pmb:cross-native"
-makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev openssl-dev"
-
-# Source
-_repository="android_kernel_xiaomi_msm8953"
-_commit="b9d144f1c1eb3b959f3cc1c1d8eef87b4383a238"
-_config="config-$_flavor.$arch"
-source="
-	$pkgname-$_commit.tar.gz::https://github.com/LineageOS/$_repository/archive/$_commit.tar.gz
-	$_config
-	0001-use-relative-includes-for-btfs_slim.patch
-	0002-use-relative-include-for-including-msm_camera.patch
-	0003-use-relative-include-for-u_ncm.patch
-	0004-use-relative-include-for-kgsl_device.patch
-	0005-narrow-down-include-path-for-msm_isp.patch
-	0006-narrow-down-include-path-for-msm_camera.patch
-	0007-narrow-down-trace-include-paths.patch
-	0008-Add-config-option-to-fix-bootloader-cmdline-args.patch
-	fix-xorg-mdss-update-fb-info.patch
-	linux4.2-gcc10-extern_YYLOC_global_declaration.patch
-"
-builddir="$srcdir/$_repository-$_commit"
-_outdir="out"
-
-prepare() {
-	default_prepare
-	. downstreamkernel_prepare
-}
-
-build() {
-	unset LDFLAGS
-	make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
-}
-
-package() {
-	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
-}
-
-sha512sums="
-4d1b8b87369af2eac7f0856f07514d1b3f7caab4234da21fc49d2b3c8d1677e758586933a114f34ec31a8d46d0dbef225bc3d140c5996464f4ea5ffab8c8454b  linux-xiaomi-tissot-downstream-b9d144f1c1eb3b959f3cc1c1d8eef87b4383a238.tar.gz
-134c3a05af45d67bb4b97105b91f9d8d864c2bf09e204391c509949e4df088ca8a308dd48a452c278d9071f35374ac31e1a9f1d0ab4954765862daccff860a57  config-xiaomi-tissot.aarch64
-8a17e5b943383f87f26fd548087c6a38886f768f207825b30cab193ed7af6b32abb12775964669d5a143f43dc772dc4265f5de3c3c7f6ec0296b18d2c68e0344  0001-use-relative-includes-for-btfs_slim.patch
-3645cc9e4c14442409e842de7f508352a8549a1189fa36931d8835b998b1a6fa1e8b7ddf20cad5597713639a6b708e1318dcadf3d8e07c67d6b3b2f3f412c33d  0002-use-relative-include-for-including-msm_camera.patch
-fdf3b03b706234d1b71f5031f6c857e2773bb0b08157945f17d9724303f0878173d994bea610869d7c814706927c24502017ecfeefe02bd9e0e24595ecec1c79  0003-use-relative-include-for-u_ncm.patch
-c9f5e6de01ce31bdf0c599a5a8569d901d35d767c3965183f706670cc5c4823cf60af90ea9867e3a632f73a26c774c4a50b84b1e2d5bc0c21d0fece4292fb194  0004-use-relative-include-for-kgsl_device.patch
-d2da0e6d6945e7396d2cb7e30e64806be2473f0fb67e0117a0b9dc5204a105873828bd8d0c6cfbec26881deb31184db3f42d19e8700ac9226822fcf6d2eec6e3  0005-narrow-down-include-path-for-msm_isp.patch
-34d588925668b730aad131ec6b899d0f06538fffeb4a913ed0d1765e2caea417a8711a98c4a06bb100e98c0dd3ab43b762dc3a36a288b664af337ff1803eeeb6  0006-narrow-down-include-path-for-msm_camera.patch
-0ee10f54d0a66d4ee4b32599847e977262a3d906093efd34216b91aa12b9f7b46bcd28fffa8b054931eb77c82496d474eee9c5d28c59fc33f8903e6c536189e2  0007-narrow-down-trace-include-paths.patch
-cf5c7f3df4bb62617f0d6e3ece29fe2f316fd8d6d38ca352706cb207947ded2bfe7a6b65f9480843204610d6dffe52e6b11df24d3d0cae7812de56bc41081b20  0008-Add-config-option-to-fix-bootloader-cmdline-args.patch
-4f73a06557207733707ca08c9991e04734e56386f3ce8e9cc5b640f4b47e1ae607ae3ea14a7003cb98a04f9df943e22c1baf316d520724237533c2c337cc56f2  fix-xorg-mdss-update-fb-info.patch
-eaf2e61fcb508cdd239b8fed209d2a09ecac77287f6b46d003918fdf1c6fa2ee63f7390f3ff7c49029b8ed6cbcdd81c7e9a4b1ece9f5060b6fc84e322bd47f41  linux4.2-gcc10-extern_YYLOC_global_declaration.patch
-"
@@ -1,118 +0,0 @@
-From d47aab08a1bdb726976bd657411fcae58c40d038 Mon Sep 17 00:00:00 2001
-From: Ion Agorria <ion@agorria.com>
-Date: Thu, 24 Jan 2019 18:52:58 +0100
-Subject: [PATCH] mdss: update fb mode at mdss_panelinfo_to_fb_var to fix Xorg
-
-When mdss_panelinfo_to_fb_var is called at
-screen unblank it updates the values in fb_info->var,
-meanwhile the fb_info->mode and modelist remain with old
-values set at registering the fb causing mismatch when
-Xorg attempts to set mode.
---
- drivers/video/fbdev/msm/mdss_fb.c          | 25 ++++++++++++++++------
- drivers/video/fbdev/msm/mdss_fb.h          |  3 +--
- drivers/video/fbdev/msm/mdss_mdp_overlay.c |  2 +-
- 3 files changed, 20 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c
-index dcb068813e88..c64ff1cd75c7 100644
--- a/drivers/video/fbdev/msm/mdss_fb.c
-+++ b/drivers/video/fbdev/msm/mdss_fb.c
-@@ -1923,7 +1923,7 @@ static void mdss_panel_validate_debugfs_info(struct msm_fb_data_type *mfd)
- 		if (is_panel_split(mfd) && pdata->next)
- 			mdss_fb_validate_split(pdata->panel_info.xres,
- 					pdata->next->panel_info.xres, mfd);
-		mdss_panelinfo_to_fb_var(panel_info, var);
-+		mdss_panelinfo_to_fb_var(mfd);
- 		if (mdss_fb_send_panel_event(mfd, MDSS_EVENT_CHECK_PARAMS,
- 							panel_info))
- 			pr_err("Failed to send panel event CHECK_PARAMS\n");
-@@ -2053,7 +2053,7 @@ static int mdss_fb_blank_unblank(struct msm_fb_data_type *mfd)
- 		 * programmed in the controller.
- 		 * Update this info in the upstream structs.
- 		 */
-		mdss_panelinfo_to_fb_var(panel_info, var);
-+		mdss_panelinfo_to_fb_var(mfd);
- 
- 		/* Start the work thread to signal idle time */
- 		if (mfd->idle_time)
-@@ -2787,7 +2787,7 @@ static int mdss_fb_register(struct msm_fb_data_type *mfd)
- 		return ret;
- 	}
- 
-	mdss_panelinfo_to_fb_var(panel_info, var);
-+	mdss_panelinfo_to_fb_var(mfd);
- 
- 	fix->type = panel_info->is_3d_panel;
- 	if (mfd->mdp.fb_stride)
-@@ -3512,7 +3512,7 @@ static void mdss_fb_update_resolution(struct msm_fb_data_type *mfd,
- 	}
- 	var->xres_virtual = var->xres;
- 	var->yres_virtual = pinfo->yres * mfd->fb_page;
-	mdss_panelinfo_to_fb_var(pinfo, var);
-+	mdss_panelinfo_to_fb_var(mfd);
- }
- 
- int mdss_fb_atomic_commit(struct fb_info *info,
-@@ -3743,9 +3743,14 @@ static void mdss_fb_var_to_panelinfo(struct fb_var_screeninfo *var,
- 		pinfo->mipi.dsi_pclk_rate = pinfo->clk_rate;
- }
- 
-void mdss_panelinfo_to_fb_var(struct mdss_panel_info *pinfo,
-						struct fb_var_screeninfo *var)
-+void mdss_panelinfo_to_fb_var(struct msm_fb_data_type *mfd)
- {
-+	if (!mfd)
-+		return -EINVAL;
-+
-+	struct mdss_panel_info *pinfo = mfd->panel_info;
-+	struct fb_info *fbi = mfd->fbi;
-+	struct fb_var_screeninfo *var = &fbi->var;
- 	u32 frame_rate;
- 
- 	var->xres = mdss_fb_get_panel_xres(pinfo);
-@@ -3780,7 +3785,13 @@ void mdss_panelinfo_to_fb_var(struct mdss_panel_info *pinfo,
- 	if (pinfo->physical_height)
- 		var->height = pinfo->physical_height;
- 
-	pr_debug("ScreenInfo: res=%dx%d [%d, %d] [%d, %d]\n",
-+	//Hack to update current fbi->mode according to fbi->var when var is updated from panel info
-+	if (fbi->mode) {
-+		printk("Updating mdss fb mode from fb var\n");
-+		fb_var_to_videomode(fbi->mode, var);
-+	}
-+
-+	printk("ScreenInfo: res=%dx%d [%d, %d] [%d, %d]\n",
- 		var->xres, var->yres, var->left_margin,
- 		var->right_margin, var->upper_margin,
- 		var->lower_margin);
-diff --git a/drivers/video/fbdev/msm/mdss_fb.h b/drivers/video/fbdev/msm/mdss_fb.h
-index b068d96044d0..1a55482d99ce 100644
--- a/drivers/video/fbdev/msm/mdss_fb.h
-+++ b/drivers/video/fbdev/msm/mdss_fb.h
-@@ -479,8 +479,7 @@ int mdss_fb_async_position_update(struct fb_info *info,
- 
- u32 mdss_fb_get_mode_switch(struct msm_fb_data_type *mfd);
- void mdss_fb_report_panel_dead(struct msm_fb_data_type *mfd);
-void mdss_panelinfo_to_fb_var(struct mdss_panel_info *pinfo,
-						struct fb_var_screeninfo *var);
-+void mdss_panelinfo_to_fb_var(struct msm_fb_data_type *mfd);
- void mdss_fb_calc_fps(struct msm_fb_data_type *mfd);
- void mdss_fb_idle_pc(struct msm_fb_data_type *mfd);
- #endif /* MDSS_FB_H */
-diff --git a/drivers/video/fbdev/msm/mdss_mdp_overlay.c b/drivers/video/fbdev/msm/mdss_mdp_overlay.c
-index 7c8a273ce538..606200e5f2a9 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_overlay.c
-+++ b/drivers/video/fbdev/msm/mdss_mdp_overlay.c
-@@ -3846,7 +3846,7 @@ int mdss_mdp_dfps_update_params(struct msm_fb_data_type *mfd,
- 	 * data, so any further call to get the screen
- 	 * info has the updated timings.
- 	 */
-	mdss_panelinfo_to_fb_var(&pdata->panel_info, var);
-+	mdss_panelinfo_to_fb_var(mfd);
- 
- 	MDSS_XLOG(dfps);
- 	mutex_unlock(&mdp5_data->dfps_lock);
-- 
-2.28.0
-
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux4.2-gcc10-extern_YYLOC_global_declaration.patch
@@ -1,103 +0,0 @@
-# Forked from Alpine to add systemd-service support
-
-pkgname=abuild
-pkgver=99993.12.0
-_pkgver=3.12.0
-_commit="d45c6dbee9171fa9dc25b2d6b298469619fbedb6"
-_ver=${_pkgver%_git*}
-pkgrel=1
-pkgdesc="Script to build Alpine Packages"
-url="https://git.alpinelinux.org/cgit/abuild/"
-arch="all"
-license="GPL-2.0-only"
-depends="fakeroot scanelf openssl>3 apk-tools>=2.0.7-r1 libc-utils
-	attr tar pkgconf patch lzip curl libcap-getcap"
-makedepends="openssl-dev>3 zlib-dev pkgconfig scdoc"
-checkdepends="kyua git"
-install="$pkgname.pre-install $pkgname.pre-upgrade"
-subpackages="
-	apkbuild-cpan:cpan:noarch
-	apkbuild-gem-resolver:gems:noarch
-	apkbuild-pypi:pypi:noarch
-	abuild-rootbld:_rootbld:noarch
-	$pkgname-doc
-	"
-options="suid !check" # tests are SLOW in qemu
-pkggroups="abuild"
-source="https://gitlab.com/calebccff/abuild/-/archive/$_commit/abuild-$_commit.tar.gz"
-builddir="$srcdir"/abuild-"$_commit"
-
-build() {
-	make VERSION="$_pkgver-r$pkgrel"
-}
-
-check() {
-	make check
-}
-
-package() {
-	make install VERSION="$_pkgver-r$pkgrel" DESTDIR="$pkgdir"
-
-	install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
-
-	case "$CARCH" in
-	x86*|ppc64le)
-		# binutils only supports it here
-		cat >>"$pkgdir"/usr/share/abuild/default.conf <<-EOF
-
-		# binutils ld.bfd supports this on this architecture; default to it
-		export RUSTFLAGS="\$RUSTFLAGS -Clink-arg=-Wl,-z,pack-relative-relocs"
-		export LDFLAGS="\$LDFLAGS -Wl,-z,pack-relative-relocs"
-		EOF
-	esac
-
-	case "$CARCH" in
-	x86_64)
-		# https://lists.alpinelinux.org/~alpine/devel/%3C1628515011.zujvcn248v.none%40localhost%3E
-		# note that this is x86-exclusive. on other architectures, this is pretty much always bad
-		# https://github.com/rust-lang/rust/pull/106380
-		cat >>"$pkgdir"/usr/share/abuild/default.conf <<-EOF
-
-		# -fno-plt has very slight improvements to general code size and speed on x86-only,
-		# for the common system dynamic linking case
-		export CFLAGS="\$CFLAGS -fno-plt"
-		export CXXFLAGS="\$CXXFLAGS -fno-plt"
-		EOF
-		;;
-	esac
-
-	install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles
-}
-
-cpan() {
-	pkgdesc="Script to generate perl APKBUILD from CPAN"
-	depends="perl perl-libwww perl-json perl-module-build perl-module-build-tiny
-		perl-lwp-protocol-https"
-
-	amove usr/bin/apkbuild-cpan
-}
-
-gems() {
-	pkgdesc="APKBUILD dependency resolver for RubyGems"
-	depends="ruby ruby-augeas"
-
-	amove usr/bin/apkbuild-gem-resolver
-}
-
-pypi() {
-	pkgdesc="Script to generate python3 APKBUILD from PYPI"
-	depends="perl perl-libwww perl-json perl-module-build-tiny perl-lwp-protocol-https
-	perl-ipc-system-simple"
-
-	amove usr/bin/apkbuild-pypi
-}
-
-_rootbld() {
-	pkgdesc="Build packages in chroot"
-	depends="abuild bubblewrap cmd:envsubst git"
-	mkdir -p "$subpkgdir"
-}
-
-sha512sums="
-3959c47c8ada26a23f647b4af4258e6ff1a8c7b6b4821cafe655da953933f12fed8c5753a8ec2cde6abd1e3e9b67dccaa74acc0633827d581d532905af9fb1e4  abuild-d45c6dbee9171fa9dc25b2d6b298469619fbedb6.tar.gz
-"
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-addgroup -S abuild 2>/dev/null
-
-exit 0
@@ -1 +0,0 @@
-abuild.pre-install
@@ -1,59 +0,0 @@
-# Forked from Alpine to build with systemd support
-# this provides the ability to activate user sessions
-# from dbus by invoking logind
-
-pkgname=accountsservice
-pkgver=99923.13.9
-_pkgver=23.13.9
-pkgrel=0
-pkgdesc="D-Bus interface for user account query and manipulation"
-url="https://www.freedesktop.org/software/accountsservice/"
-arch="all"
-license="GPL-3.0-or-later"
-depends_dev="gobject-introspection-dev"
-makedepends="
-	$depends_dev
-	dbus-dev
-	systemd-dev
-	glib-dev
-	meson
-	polkit-dev
-	vala
-	"
-subpackages="$pkgname-dev $pkgname-lang lib$pkgname:libs"
-source="https://www.freedesktop.org/software/accountsservice/accountsservice-$_pkgver.tar.xz
-	musl-fgetspent_r.patch
-	musl-wtmp.patch
-	opt-tests.patch
-	"
-# mocklibc fails to build with implicits
-options="!check"
-builddir="$srcdir/accountsservice-$_pkgver"
-
-build() {
-	abuild-meson \
-		-Db_lto=true \
-		-Dsystemdsystemunitdir=/usr/lib/systemd/system \
-		-Dintrospection=true \
-		-Ddocbook=false \
-		-Dgtk_doc=false \
-		-Dadmin_group=wheel \
-		-Dtests="$(want_check && echo true || echo false)" \
-		. output
-	meson compile -C output
-}
-
-check() {
-	meson test --print-errorlogs --no-rebuild -C output
-}
-
-package() {
-	DESTDIR="$pkgdir" meson install --no-rebuild -C output
-}
-
-sha512sums="
-c6eb543ce2e07b61bbdfa454e388949bc688517be0536b14f30c66383ed105b15d3fab8b6c62b1eaa08f67d9bdc29b928729d9f7c704f47de4decf0de8e12f89  accountsservice-23.13.9.tar.xz
-469392beca8f5941eafaa193c4fcb0472770ee4183ce520416a1b5d6abafe0e201990eb74d06bfbd9e20af08e55aff5f0031f267083f6c6879f0fe4e5028103c  musl-fgetspent_r.patch
-6d81caed730473d5c94d575c580a236b4267b374bf50588860922a7ecbeef0b2a1d50124fa3ae195c4f26abe8c3bd6df2aea6d27a0ce23e99acef9fff3eb9652  musl-wtmp.patch
-cc5ea18d885ccc5a85f5f4191d3157f3953878af289a9cabc373afea67726042144d66fd9f8d08dac7090fc23037ab98adb4101e8378a16ab2eb04043c88378f  opt-tests.patch
-"
@@ -1,34 +0,0 @@
-diff --git a/src/daemon.c b/src/daemon.c
-index 312394a..e7b3c58 100644
--- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -140,6 +140,28 @@ error_get_type (void)
- #define MAX_LOCAL_USERS 50
- #endif
- 
-+#ifndef __GLIBC__
-+ /* Musl libc does not support fgetspent_r(), write own
-+  * wrapper
-+  */
-+static int fgetspent_r(FILE *fp, struct spwd *spbuf, char *buf, size_t buflen, struct spwd **spbufp) {
-+       struct spwd *shadow_entry = fgetspent(fp);
-+       if(!shadow_entry)
-+               return -1;
-+       size_t namplen = strlen(shadow_entry->sp_namp);
-+       size_t pwdplen = strlen(shadow_entry->sp_pwdp);
-+
-+       if(namplen + pwdplen + 2 > buflen)
-+               return -1;
-+
-+       *spbufp = memcpy(spbuf, shadow_entry, sizeof(struct spwd));
-+       spbuf->sp_namp = strncpy(buf, shadow_entry->sp_namp, namplen + 1);
-+       spbuf->sp_pwdp = strncpy(buf + namplen + 1, shadow_entry->sp_pwdp, pwdplen + 1);
-+
-+       return 0;
-+}
-+#endif
-+
- static struct passwd *
- entry_generator_fgetpwent (Daemon       *daemon,
-                            GHashTable   *users,
-
@@ -1,15 +0,0 @@
-the assert expects a working /var/log/wtmp at build time
-diff --git a/meson.build b/meson.build
-index 4a509e7..f995d28 100644
--- a/meson.build
-+++ b/meson.build
-@@ -103,8 +103,7 @@ elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
- 
-   config_h.set('PATH_WTMP', '_PATH_WTMPX')
- else
-  path_wtmp = '/var/log/utx.log'
-  assert(run_command('test', '-e', path_wtmp, check: false).returncode() == 0, 'Do not know which filename to watch for wtmp changes')
-+  path_wtmp = '/var/log/wtmp'
-   config_h.set_quoted('PATH_WTMP', path_wtmp)
- endif
- 
@@ -1,24 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 4a509e7..5119fab 100644
--- a/meson.build
-+++ b/meson.build
-@@ -232,7 +232,9 @@ if get_option('gtk_doc')
-   subdir('doc/libaccountsservice')
- endif
- 
-subdir('tests')
-+if get_option('tests')
-+  subdir('tests')
-+endif
- 
- configure_file(
-   output: 'config.h',
-diff --git a/meson_options.txt b/meson_options.txt
-index b34a0fa..56872c7 100644
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -13,3 +13,4 @@ option('vapi', type: 'boolean', value: true, description : 'Enable Vala bindings
- 
- option('docbook', type: 'boolean', value: false, description: 'build documentation (requires xmlto)')
- option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
-+option('tests', type: 'boolean', value: true, description: 'tests')
@@ -1,37 +0,0 @@
-# Forked from Alpine to remove openrc dependency
-
-pkgname=alpine-base
-pkgver=9999
-pkgrel=0
-pkgdesc="Meta package for minimal alpine base"
-url="https://alpinelinux.org"
-arch="noarch"
-license="MIT"
-depends="
-	alpine-baselayout
-	alpine-release
-	apk-tools
-	busybox
-	busybox-suid
-	libc-utils
-"
-
-# can't include systemd here, as we wan't to upgrade from alpine's base to our systemd-base while building
-subpackages="alpine-release:release"
-replaces="alpine-baselayout"
-options="pmb:strict !check"
-source="rc-update"
-
-package() {
-	install -Dm755 rc-update "$pkgdir"/usr/bin/rc-update
-}
-
-release() {
-	depends="alpine-keys"
-	pkgdesc="Alpine release data"
-
-	mkdir -p "$subpkgdir"
-}
-sha512sums="
-18227112a559e2b90c9a3cf4eb16762595370130c88cb7b7d1a0fda2ba894918802dd084f7c505f8eb379f078d4c2ed2e384f03d16ff25075acdb31ab0186813  rc-update
-"
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# Dummy to make post-install scripts work
-# Will fail in chroot for sysV compat services
-# FIXME: FIXME: FIXME: FIXME: FIXME:
-
-# Get the last argument to rc-update, it's
-instruction="enable"
-for service; do
-    case "$service" in
-        "rc-update")
-            ;;
-        "-q")
-            ;;
-        "add")
-            instruction="enable"
-            ;;
-        "del")
-            instruction="disable"
-            ;;
-        *)
-            break
-            ;;
-    esac
-done
-
-case "$service" in
-    "networkmanager")
-        service="NetworkManager"
-        ;;
-    "modemmanager")
-        service="ModemManager"
-        ;;
-esac
-
-# The service files might be missing due to how apk orders the install
-# so we record them all to let systemd-services.trigger enable them
-# at the end of installation
-if ! systemctl $instruction $service; then
-    echo "$instruction $service" >> /run/rc-update.failed
-fi
@@ -1,101 +0,0 @@
-# Forked from Alpine to support usr-merge:
-# https://gitlab.alpinelinux.org/alpine/apk-tools/-/merge_requests/155
-
-pkgname=apk-tools
-pkgver=9992.14
-_pkgver=2.14.0
-pkgrel=6
-pkgdesc="Alpine Package Keeper - package manager for alpine"
-arch="all"
-url="https://gitlab.alpinelinux.org/alpine/apk-tools"
-license="GPL-2.0-only"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-static $pkgname-doc $pkgname-zsh-completion"
-# Musl 1.2 introduced new ABI for time64 => upgrading apk-tools
-# while staying on musl <1.2 causes missing symbols
-# starting with musl 1.2.3_git (pre 1.2.3), we added DT_RELR
-# it is possible for old systems to upgrade, and apk-tools would upgrade first,
-# which would upgrade to a binary that cannot run until musl is upgraded.
-# forcing this constraint makes apk upgrade musl as part of the 'critical' transaction,
-# and update musl first.
-depends="musl>=1.2.3_git20230424"
-makedepends_build="openssl>3 lua5.3 lua5.3-lzlib scdoc"
-makedepends_host="zlib-dev openssl-dev zlib-static openssl-libs-static linux-headers"
-makedepends="$makedepends_build $makedepends_host lua-dev"
-_lua="no"
-if [ "$CBUILD" = "$CHOST" ]; then
-	_lua="lua5.3"
-	subpackages="$subpackages $_lua-apk:luaapk"
-	makedepends="$makedepends $_lua-dev"
-
-	# ca-certificates-bundle needed for https certificate validation
-	depends="$depends ca-certificates-bundle"
-fi
-
-_commit="3ffd8c224c5e87328bd237dad6a63bb75fb10255"
-source="https://gitlab.com/calebccff/apk-tools/-/archive/$_commit/apk-tools-$_commit.tar.gz
-	_apk
-	"
-builddir="$srcdir/$pkgname-$_commit"
-
-# secfixes:
-#   2.12.6-r0:
-#     - CVE-2021-36159
-#   2.12.5-r0:
-#     - CVE-2021-30139
-
-prepare() {
-	default_prepare
-	sed -i -e 's:-Werror::' Make.rules
-	echo "FULL_VERSION=$_pkgver-r$pkgrel" > config.mk
-}
-
-build() {
-	make LUA="$_lua"
-	make static LUA="$_lua"
-}
-
-check() {
-	make check LUA="$_lua"
-}
-
-package() {
-	make DESTDIR="$pkgdir" LUA="$_lua" install
-	install -d "$pkgdir"/var/lib/apk \
-		"$pkgdir"/lib/apk/exec \
-		"$pkgdir"/etc/apk/keys \
-		"$pkgdir"/etc/apk/protected_paths.d
-
-	install -Dm644 "$srcdir"/_apk "$pkgdir"/usr/share/zsh/site-functions/_apk
-	rm -r "$pkgdir"/usr/share/doc
-}
-
-static() {
-	pkgdesc="Alpine Package Keeper - static binary"
-	install -Dm755 "$builddir"/src/apk.static \
-		"$subpkgdir"/sbin/apk.static
-
-	# lets sign the static binary so it can be vefified from distros
-	# that does not have apk-tools
-	local abuild_conf=${ABUILD_CONF:-"/etc/abuild.conf"}
-	local abuild_home=${ABUILD_USERDIR:-"$HOME/.abuild"}
-	local abuild_userconf=${ABUILD_USERCONF:-"$abuild_home/abuild.conf"}
-	[ -f "$abuild_userconf" ] && . "$abuild_userconf"
-	local privkey="$PACKAGER_PRIVKEY"
-	local pubkey=${PACKAGER_PUBKEY:-"$privkey.pub"}
-	local keyname=${pubkey##*/}
-	${CROSS_COMPILE}strip "$subpkgdir"/sbin/apk.static
-	openssl dgst -sha1 -sign "$privkey" \
-		-out "$subpkgdir"/sbin/apk.static.SIGN.RSA.$keyname \
-		"$subpkgdir"/sbin/apk.static
-}
-
-luaapk() {
-	pkgdesc="Lua module for apk-tools"
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/
-}
-
-sha512sums="
-5028790865c4a1e8b231bceb2d28e06f870cbdd6e0bb8ef5d203420dfb137142ead08002659af16c103d867f8501eb00624d7860c20df490f95dd2ec24226153  apk-tools-3ffd8c224c5e87328bd237dad6a63bb75fb10255.tar.gz
-7870676720f5007eee9482786e02246f8e3474afb90e76c9c83aebe914747a8e007b5d2eed6441933f4922024b3f0664db270f21981ad6c2db877a110b0cd79e  _apk
-"
@@ -1,268 +0,0 @@
-#compdef apk
-
-function _apk {
-
-	local -a global_opts=(
-		"(-h --help)"{-h,--help}"[Print help information]"
-		"(-i --interactive)"{-i,--interactive}"[Ask confirmation before performing certain operations]"
-		"(-p --root)"{-p,--root}"[Manage file system at ROOT]"
-		"(-q --quiet)"{-q,--quiet}"[Print less information]"
-		"(-U --update-cache)"{-U,--update-cache}"[Alias for '--cache-max-age 1']"
-		"(-v --verbose)"{-v,--verbose}"[Print more information]"
-		"(-V --version)"{-V,--version}"[Print program version and exit]"
-		"(-X --repository)"{-X,--repository}"[Specify additional package repository]:repository:_host"
-		"--allow-untrusted[Install packages with untrusted signature or no signature]"
-		"--arch[Temporarily override architecture]:arch:(armhf mips64 s390x x86_64 x86 aarch64 ppc64le armv7 riscv64)"
-		"--cache-dir[Temporarily override the cache directory]:directory:_dir_list"
-		"--cache-max-age[Maximum age for index in cache before it's refreshed]:minutes"
-		"--force-binary-stdout[Continue even if binary data will be printed to the terminal]"
-		"--force-broken-world[Continue even if world cannot be satisfied]"
-		"--force-non-repository[Continue even if packages may be lost on reboot]"
-		"--force-old-apk[Continue even if packages use unsupported features]"
-		"--force-overwrite[Overwrite files in other packages]"
-		"--force-refresh[Do not use cached files]"
-		"--keys-dir[Override directory of trusted keys]:directory:_dir_list"
-		"--no-cache[Do not use any local cache path]"
-		"--no-network[Do not use the network]"
-		"--no-progress[Disable progress bar even for TTYs]"
-		"--print-arch[Print default arch and exit]"
-		"--progress[Show progress]"
-		"--progress-fd[Write progress to the specified file descriptor]:file descriptor"
-		"--purge[Delete modified configuration files or uninstalled packages from cache]"
-		"--repositories-file[Override system repositories]:repository file:_files"
-		"--wait[Wait to get an exclusive repository lock before failing]:seconds"
-	)
-
-	local -a commit_opts=(
-		"(-s --simulate)"{-s,--simulate}"[Simulate the requested operation without making any changes]"
-		"--clean-protected[Do not create .apk-new files in configuration directories]"
-		"--overlay-from-stdin[Read list of overlay files from stdin]"
-		"--no-scripts[Do not execute any scripts]"
-		"--no-commit-hooks[Skip pre/post hook scripts]"
-		"--initramfs-diskless-boot[Enables selected force options, disables commit hooks and more]"
-	)
-
-	local -a latest_opt=("(-l --latest)"{-l,--latest}"[Always choose the latest package by version]")
-	local -a upgrade_opt=("(-u --upgrade)"{-u,--upgrade}"[Upgrade packages and it's dependencies]")
-
-	local context state state_descr line
-	typeset -A opt_args
-	local curcontext="$curcontext"
-	local ret=1
-
-	function _ccache_apk_world { [[ "$1" -ot /etc/apk/world ]] }
-	function _ccache_apk_avail {
-		for i in /var/cache/apk/APKINDEX.*; do
-			[[ "$1" -ot "$i" ]] && return
-		done
-	}
-
-	function _apk_available_pkgs {
-		local -a _apk_available_packs
-		zstyle ":completion:${curcontext}:" cache-policy _ccache_apk_avail
-		local IFS=$'\n'
-		if _cache_invalid apk_index_packages_available || ! _retrieve_cache apk_index_packages_available; then
-			_apk_available_packs=(${${$(/sbin/apk list -a 2>/dev/null)%% *}%-*-r[[:digit:]]*})
-			_store_cache apk_index_packages_available _apk_available_packs
-		fi
-		_describe 'available packages' _apk_available_packs
-	}
-
-	function _apk_installed_pkgs {
-		local -a _apk_installed_packs
-		zstyle ":completion:${curcontext}:" cache-policy _ccache_apk_world
-		local IFS=$'\n'
-		if _cache_invalid apk_index_packages_installed || ! _retrieve_cache apk_index_packages_installed; then
-			_apk_installed_packs=(${${$(/sbin/apk list -I 2>/dev/null)%% *}%-*-r[[:digit:]]*})
-			_store_cache apk_index_packages_installed _apk_installed_packs
-		fi
-		_describe 'installed packages' _apk_installed_packs
-	}
-
-	function _apk_packages {
-		_alternative 'repo:available packages:_apk_available_pkgs' 'localpkgs:local packages:_files -g "*.apk"'
-	}
-
-	function _apk_cache {
-		local -a cache_subcmds=(
-			"clean:Remove package files which are no longer necessary"
-			"download:Fetch package files from the repositories and store them in the cache"
-			"sync:Clean and Download"
-		)
-		_describe 'subcommand' cache_subcmds
-	}
-
-	function _apk_subcmds {
-		local -a cmds=(
-			"add:Add packages to world and commit changes"
-			"del:Remove packages from world and commit changes"
-			"fix:Fix, reinstall or upgrade packages without modifying world"
-			"update:Update repository indexes"
-			"upgrade:Install upgrades available from repositories"
-			"cache:Manage the local package cache"
-			"info:Give detailed information about packages or repositories"
-			"list:List packages matching a pattern or other criteria"
-			"dot:Render dependencies as graphviz graphs"
-			"policy:Show repository policy for packages"
-			"search:Search for packages by name or description"
-			"index:Create repository index file from packages"
-			"fetch:Download packages from global repositories to a local directory"
-			"manifest:Show checksums of package contents"
-			"verify:Verify package integrity and signature"
-			"audit:Audit system for changes"
-			"stats:Show statistics about repositories and installations"
-			"version:Compare package versions or perform tests on version strings"
-		)
-		_describe 'subcommand' cmds
-	}
-
-	local -a completion_spec=($global_opts ':subcommand:_apk_subcmds')
-
-	case ${${words:#-*}[2]} in
-	(add)
-		completion_spec+=(
-			$commit_opts \
-			$latest_opt \
-			$upgrade_opt \
-			"--initdb[Initialize a new package database]" \
-			"(-t --virtual)"{-t,--virtual}"[Create virtual package with given dependencies]" \
-			"--no-chown[Do not change file owner or group]" \
-			"*:package:_apk_packages"
-		)
-	;;
-	(del)
-		completion_spec+=(
-			$commit_opts \
-			"(-r --rdepends)"{-r,--rdepends}"[Recursively delete all top-level reverse dependencies]" \
-			"*:installed package:_apk_installed_pkgs"
-		)
-	;;
-	(fix)
-		completion_spec+=(
-			$commit_opts \
-			"(-d --depends)"{-d,--depends}"[Fix dependencies of specified packages]" \
-			"(-r --reinstall)"{-r,--reinstall}"[Reinstall packages]" \
-			"(-u --upgrade)"{-u,--upgrade}"[Upgrade if an upgrade is available and does not break dependencies]" \
-			"(-x --xattr)"{-x,--xattr}"[Fix packages with broken xattrs]" \
-			"--directory-permissions[Reset all directory permissions]" \
-			"*:package:_apk_packages"
-		)
-	;;
-	(update) completion_spec+=($commit_opts);;
-	(upgrade)
-		completion_spec+=(
-			$commit_opts \
-			$latest_opt \
-			"(-a --available)"{-a,--available}"[Reset all packages to versions available from current repositories]" \
-			"--ignore[Upgrade all other packages than the ones listed]" \
-			"--no-self-upgrade[Do not do an early upgrade of the 'apk-tools' package]" \
-			"--prune[Remove packages which are no longer available from any configured repository]" \
-			"--self-upgrade-only[Only perform a self-upgrade of the 'apk-tools' package]" \
-			"*:package:_apk_packages"
-		)
-	;;
-	(cache)
-		completion_spec+=(
-			$latest_opt \
-			$upgrade_opt \
-			'2:subcommand:_apk_cache'
-		)
-	;;
-	(info)
-		completion_spec+=(
-			"(-a --all)"{-a,--all}"[List all information known about the package]" \
-			"(-d --description)"{-d,--descripton}"[Print the package description]" \
-			"(-e --installed)"{-e,--installed}"[Check package installed status]" \
-			"(-L --contents)"{-L,--contents}"[List files included in the package]" \
-			"(-P --provides)"{-P,--provides}"[List what the package provides]" \
-			"(-r --rdepends)"{-r,--rdepends}"[List reverse dependencies of the package]" \
-			"(-R --depends)"{-R,--depends}"[List the dependencies of the package]" \
-			"(-s --size)"{-s,--size}"[Print the package's installed size]" \
-			"(-w --webpage)"{-w,--webpage}"[Print the URL for the package's upstream webpage]" \
-			"(-W --who-owns)"{-W,--who-owns}"[Print the package which owns the specified file]:file:_files" \
-			"(-i --install-if)"{-i,--install-if}"[List the package's install_if rule]" \
-			"--license[Print the package SPDX license identifier]" \
-			"--replaces[List the other packages for which this package is marked as a replacement]" \
-			"(-I --rinstall-if)"{-I,--rinstall-if}"[List other packages whose install_if rules refer to this package]" \
-			"--triggers[Print active triggers for the package]" \
-			"*:package:_apk_packages"
-		)
-	;;
-	(list)
-		completion_spec+=(
-			"(-I --installed)"{-I,--installed}"[Consider only installed packages]" \
-			"(-O --orphaned)"{-O,--orphaned}"[Consider only orphaned packages]" \
-			"(-a --available)"{-a,--available}"[Consider only available packages]" \
-			"(-u --upgradable --upgradeable)"{-u,--upgradable,--upgradeable}"[Consider only upgradable packages]" \
-			"(-o --origin)"{-o,--origin}"[List packages by origin]" \
-			"(-d --depends)"{-d,--depends}"[List packages by dependency]" \
-			"(-P --providers)"{-P,--providers}"[List packages by provider]" \
-			"*:pattern"
-		)
-	;;
-	(dot)
-		completion_spec+=(
-			"--errors[Consider only packages with errors]" \
-			"--installed[Consider only installed packages]"
-		)
-	;;
-	(index)
-		completion_spec+=(
-			"(-d --description)"{-d,--description}"[Add a description to the index]:description" \
-			"(-o --output)"{-o,--output}"[Output generated index to file]:output:_files" \
-			"(-x --index)"{-x,--index}"[Read an existing index to speed up the creation of the new index]" \
-			"--no-warnings[Disable warnings about missing dependencies]" \
-			"--rewrite-arch[Set all package's architecture to arch]:arch:(armhf mips64 s390x x86_64 x86 aarch64 ppc64le armv7 riscv64)" \
-			"*:package:_apk_packages"
-		)
-	;;
-	(fetch)
-		completion_spec+=(
-			"(-l --link)"{-l,--link}"[Create hard links if possible]" \
-			"(-o --output)"{-o,--output}"[Where to write the downloaded files]:directory:_dir_list" \
-			"(-r --recursive)"{-r,--recursive}"[Fetch packages and all of their dependencies]" \
-			"(-s --stdout)"{-s,--stdout}"[Dump the .apk file(s) to stdout]" \
-			"--simulate[Simulate the requested operation without making any changes]" \
-			"--url[Print the full URL for downloaded packages]" \
-			"*:package:_apk_packages"
-		)
-	;;
-	(manifest) completion_spec+=("*:package:_apk_packages");;
-	(verify) completion_spec+=("*:package:_apk_packages");;
-	(audit)
-		completion_spec+=(
-			"--backup[Audit configuration files only (default)]" \
-			"--check-permissions[Check file permissions too]" \
-			"--packages[Print only the packages with changed files]" \
-			"--system[Audit all system files]" \
-			"(-r --recursive)"{-r,--recursive}"[Descent into directories and audit them as well]" \
-			"*:files:_files"
-		)
-	;;
-	(version)
-		completion_spec+=(
-			"(-a --all)"{-a,--all}"[Consider packages from all repository tags]" \
-			"(-c --check)"{-c,--check}"[Check versions for validity]:*: " \
-			"(-I --indexes)"{-I,--indexes}"[Print the version and description for each repository's index]:*: " \
-			"(-l --limit)"{-l,--limit}"[Limit to packages with output matching given operand]:operand:('>' '=' '<' '>=' '<=')" \
-			"(-t --test)"{-t,--test}"[Compare two version strings]:*: " \
-			"*:package:_apk_packages"
-		)
-	;;
-	(policy) completion_spec+=("*:package:_apk_packages");;
-	(search)
-		completion_spec+=(
-			"(-a --all)"{-a,--all}"[Print all matching package versions]" \
-			"(-d --description)"{-d,--description}"[Search in description as well]" \
-			"(-e -x --exact)"{-e,-x,--exact}"[Match package names exactly]" \
-			"--has-origin[Match by package origin]" \
-			"(-o --origin)"{-o,--origin}"[Print base package name]" \
-			"(-r --rdepends)"{-r,--rdepends}"[Print reverse dependencies]" \
-			"*:package:_apk_packages"
-		)
-	;;
-	esac
-
-	_arguments -C -s $completion_spec && ret=0
-	return ret
-}
@@ -1,109 +0,0 @@
-# Forked from Alpine to enable systemd
-
-pkgname=dbus
-pkgver=9991.14.10
-_pkgver=1.14.10
-pkgrel=1
-pkgdesc="Freedesktop.org message bus system"
-url="https://www.freedesktop.org/Software/dbus"
-arch="all"
-license="AFL-2.1 OR GPL-2.0-or-later"
-depends_dev="util-linux-dev"
-makedepends="
-	$depends_dev
-	expat-dev
-	glib-dev
-	libsm-dev
-	libx11-dev
-	meson
-	systemd-dev
-	xmlto
-	libcap-getcap
-	"
-pkggroups="messagebus"
-provider_priority=1
-install="$pkgname.pre-install $pkgname.post-install"
-triggers="$pkgname.trigger=/usr/share/dbus-1/system.d"
-options="!check" # Borked in pmbootstrap...
-subpackages="
-	$pkgname-daemon-launch-helper:launchhelper
-	$pkgname-dev
-	$pkgname-doc
-	$pkgname-libs
-	$pkgname-x11
-	$pkgname-service
-	"
-source="https://dbus.freedesktop.org/releases/dbus/dbus-$_pkgver.tar.xz"
-builddir="$srcdir/dbus-$_pkgver"
-
-# secfixes:
-#   1.14.4-r0:
-#     - CVE-2022-42010
-#     - CVE-2022-42011
-#     - CVE-2022-42012
-#   1.12.18-r0:
-#     - CVE-2020-12049
-#   1.12.16-r0:
-#     - CVE-2019-12749
-
-build() {
-	CFLAGS="$CFLAGS -flto=auto" \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--localstatedir=/var \
-		--sysconfdir=/etc \
-		--with-system-pid-file=/run/dbus/dbus.pid \
-		--enable-checks \
-		--disable-assertions \
-		--enable-systemd \
-		--enable-inotify \
-		--enable-libaudit \
-		--enable-user-session \
-		--disable-static
-
-	make
-}
-
-check() {
-	make check
-}
-
-package() {
-	depends="$pkgname-libs=$pkgver-r$pkgrel"
-
-	make DESTDIR="$pkgdir" install
-
-	# can't  install tmpfs
-	rm -r "$pkgdir"/var/run
-}
-
-libs() {
-	pkgdesc="D-BUS access libraries"
-	depends="systemd-libs"
-
-	amove usr/lib/lib*.so.*
-}
-
-x11() {
-	pkgdesc="X11 add-ons for D-BUS"
-	depends="$pkgname=$pkgver-r$pkgrel"
-
-	amove usr/bin/dbus-launch
-}
-
-launchhelper() {
-	pkgdesc="DBus SUID launch helper for autospawning"
-	install_if="$pkgname=$pkgver-r$pkgrel"
-
-	amove usr/libexec/dbus-daemon-launch-helper
-}
-
-dev() {
-	default_dev
-}
-
-sha512sums="
-775b708326059692937acb69d4ce1a89e69878501166655b5d1b1628ac31b50dd53d979d93c84e57f95e90b15e25aa33893e51a7421d3537e9c2f02b1b91bfae  dbus-1.14.10.tar.xz
-"
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Don't populate this, we want systemd-firstboot to do it instead.
-exec dbus-uuidgen --ensure=/etc/machine-id
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S messagebus 2>/dev/null
-adduser -S -D -H -h /dev/null -s /sbin/nologin -G messagebus -g messagebus messagebus 2>/dev/null
-
-exit 0
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-dbus-send --system --type=method_call --dest=org.freedesktop.DBus / \
-	org.freedesktop.DBUS.ReloadConfig >/dev/null 2>&1 || :
@@ -1,71 +0,0 @@
-From a12b01f4f71d7ca1ed528ea11f99520c10b0d93c Mon Sep 17 00:00:00 2001
-From: Newbyte <newbie13xd@gmail.com>
-Date: Tue, 14 Mar 2023 19:37:17 +0100
-Subject: [PATCH 1/2] DOWNSTREAM: use /bin/touch instead of /usr/bin/touch
-
-as that's the path here in Alpine.
---
- data/61-gdm.rules.in | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
-index a4f841bdf..481c5b4dd 100644
--- a/data/61-gdm.rules.in
-+++ b/data/61-gdm.rules.in
-@@ -2,13 +2,13 @@ SUBSYSTEM!="pci", GOTO="gdm_pci_device_end"
- ACTION!="bind", ACTION!="add", GOTO="gdm_pci_device_end"
- 
- # cirrus
-ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
-+ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
- # virtio
-ATTR{vendor}=="0x1af4", ATTR{device}=="0x1050", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
-+ATTR{vendor}=="0x1af4", ATTR{device}=="0x1050", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
- # qxl
-ATTR{vendor}=="0x1b36", ATTR{device}=="0x0100", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
-+ATTR{vendor}=="0x1b36", ATTR{device}=="0x0100", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
- # vga
-ATTR{vendor}=="0x1234", ATTR{device}=="0x1111", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
-+ATTR{vendor}=="0x1234", ATTR{device}=="0x1111", RUN+="/bin/touch /run/udev/gdm-machine-has-virtual-gpu", ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}="1", GOTO="gdm_pci_device_end"
- 
- # disable Wayland on Hi1710 chipsets
- ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", GOTO="gdm_disable_wayland"
-@@ -36,7 +36,7 @@ SUBSYSTEM!="drm", GOTO="gdm_nomodeset_end"
- # but keep it enabled for simple framebuffer drivers
- DRIVERS=="simple-framebuffer", GOTO="gdm_nomodeset_end"
- IMPORT{parent}="GDM_MACHINE_HAS_VIRTUAL_GPU"
-ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hardware-gpu"
-+ENV{GDM_MACHINE_HAS_VIRTUAL_GPU}!="1", RUN+="/bin/touch /run/udev/gdm-machine-has-hardware-gpu"
- IMPORT{cmdline}="nomodeset", GOTO="gdm_disable_wayland"
- LABEL="gdm_nomodeset_end"
- 
-@@ -46,7 +46,7 @@ LABEL="gdm_nomodeset_end"
- KERNEL!="nvidia", GOTO="gdm_nvidia_end"
- SUBSYSTEM!="module", GOTO="gdm_nvidia_end"
- ACTION!="add", GOTO="gdm_nvidia_end"
-RUN+="/usr/bin/touch /run/udev/gdm-machine-has-vendor-nvidia-driver"
-+RUN+="/bin/touch /run/udev/gdm-machine-has-vendor-nvidia-driver"
- 
- # Check if suspend/resume services necessary for working wayland support is available
- TEST{0711}!="/usr/bin/nvidia-sleep.sh", GOTO="gdm_disable_wayland"
-@@ -68,7 +68,7 @@ LABEL="gdm_nvidia_end"
- KERNEL!="card[0-9]-eDP-*", GOTO="gdm_laptop_check_end"
- SUBSYSTEM!="drm", GOTO="gdm_laptop_check_end"
- ACTION!="add", GOTO="gdm_laptop_check_end"
-RUN+="/usr/bin/touch /run/udev/gdm-machine-is-laptop"
-+RUN+="/bin/touch /run/udev/gdm-machine-is-laptop"
- GOTO="gdm_hybrid_nvidia_laptop_check"
- LABEL="gdm_laptop_check_end"
- 
-@@ -79,7 +79,7 @@ SUBSYSTEM!="drm", GOTO="gdm_hybrid_graphics_check_end"
- ACTION!="add", GOTO="gdm_hybrid_graphics_check_end"
- IMPORT{program}="/bin/sh -c \"echo GDM_NUMBER_OF_GRAPHICS_CARDS=`ls -1d /sys/class/drm/card[0-9] | wc -l`\""
- ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}=="1", RUN+="/usr/bin/rm -f /run/udev/gdm-machine-has-hybrid-graphics"
-ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/usr/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
-+ENV{GDM_NUMBER_OF_GRAPHICS_CARDS}!="1", RUN+="/bin/touch /run/udev/gdm-machine-has-hybrid-graphics"
- LABEL="gdm_hybrid_graphics_check_end"
- 
- # If this is a hybrid graphics laptop with vendor nvidia driver, disable wayland
-- 
-2.39.2
-
@@ -1,45 +0,0 @@
-diff --git a/data/pam-openembedded/gdm-autologin.pam b/data/pam-openembedded/gdm-autologin.pam
-index a9f4354..3e0708b 100644
--- a/data/pam-openembedded/gdm-autologin.pam
-+++ b/data/pam-openembedded/gdm-autologin.pam
-@@ -1,5 +1,5 @@
- #%PAM-1.0
-auth       required    pam_permit.so
-account    include     common-account
-password   include     common-auth
-session    include     common-session
-+auth       required    pam_rootok.so
-+account    include     base-account
-+password   include     base-auth
-+session    include     base-session
-diff --git a/data/pam-openembedded/gdm-launch-environment.pam b/data/pam-openembedded/gdm-launch-environment.pam
-index a9f4354..6f095e7 100644
--- a/data/pam-openembedded/gdm-launch-environment.pam
-+++ b/data/pam-openembedded/gdm-launch-environment.pam
-@@ -1,5 +1,5 @@
- #%PAM-1.0
-auth       required    pam_permit.so
-account    include     common-account
-password   include     common-auth
-session    include     common-session
-+auth       required    pam_rootok.so
-+account    include     base-account
-+password   include     base-auth
-+session    include     base-session
-diff --git a/data/pam-openembedded/gdm-password.pam b/data/pam-openembedded/gdm-password.pam
-index 758464d..dd324f8 100644
--- a/data/pam-openembedded/gdm-password.pam
-+++ b/data/pam-openembedded/gdm-password.pam
-@@ -1,5 +1,8 @@
- #%PAM-1.0
-auth       include     common-auth
-account    include     common-account
-password   include     common-password
-session    include     common-session
-+auth       include     base-auth
-+auth       optional    pam_gnome_keyring.so
-+account    include     base-account
-+password   include     base-password
-+password   optional    pam_gnome_keyring.so use_authtok
-+session    include     base-session
-+session    optional    pam_gnome_keyring.so auto_start
@@ -1,83 +0,0 @@
-# Forked from Alpine for systemd support
-
-pkgname=gdm
-pkgver=9999
-_pkgver=45.0.1
-pkgrel=0
-pkgdesc="GNOME display manager"
-url="https://wiki.gnome.org/Projects/GDM"
-# blocked by gnome-shell
-arch="all !armhf !s390x"
-license="GPL-2.0-or-later"
-depends="
-	dbus
-	gnome-session
-	gnome-settings-daemon
-	gnome-shell
-	gsettings-desktop-schemas
-	linux-pam>=1.4
-	xrdb
-	xwayland
-	"
-makedepends="
-	accountsservice-dev
-	dconf
-	eudev-dev
-	gettext
-	glib-dev
-	gtk+3.0-dev
-	itstool
-	libcanberra-dev
-	libgudev-dev
-	libsm-dev
-	libx11-dev
-	libxau-dev
-	libxcb-dev
-	libxdmcp-dev
-	linux-pam-dev
-	meson
-	systemd-dev
-	"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-service"
-options="!check" # Causes circular dep with gnome-shell
-source="https://download.gnome.org/sources/gdm/${_pkgver%%.*}/gdm-$_pkgver.tar.xz
-	0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch
-	0003-pam-rename-common-to-base.patch
-	Xsession
-	"
-install="gdm.pre-install"
-builddir="$srcdir/gdm-$_pkgver"
-
-build() {
-	abuild-meson \
-		-Db_lto=true \
-		-Ddefault-pam-config=openembedded \
-		-Dgdm-xsession=false \
-		-Dpam-mod-dir=/usr/lib/security \
-		-Dselinux=disabled \
-		-Dlibaudit=disabled \
-		-Dsystemdsystemunitdir=/usr/lib/systemd/system \
-		-Dsystemduserunitdir=/usr/lib/systemd/user \
-		. output
-	meson compile -C output
-}
-
-package() {
-	DESTDIR="$pkgdir" meson install --no-rebuild -C output
-
-#	install -Dm644 /dev/stdin usr/lib/sysusers.d/gdm.conf <<END
-#g gdm 120 -
-#u gdm 120 "Gnome Display Manager" /var/lib/gdm
-#END
-
-	#sed -i "s/pam_systemd\.so/pam_elogind.so/" "$pkgdir"/etc/pam.d/*
-
-	install -m755 -D "$srcdir/Xsession" "$pkgdir"/etc/gdm
-}
-
-sha512sums="
-f0c667dd5df034087e284c2ec1131b55a85cd9e832c15c2aff1637e1e36d4d62a7d86528a2e524bb2782ca7d7cc7cb9c34a9ce9bba688ad222af409e2eb69abe  gdm-45.0.1.tar.xz
-f91ad0ccae448649e4a7c707b83c796988968a698718db0aedbf2b7c2b9aec0d0cfb12fb4bb7f5de99d3cf337bf4528608625d701872bad8bdc98f8020f0ea95  0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch
-eef64cbc347a2ce894a84f7d1d7612af71b6731492ab67f78a17c9ab37db9cfa0f9d6e8415e58821404eb15336eedd263ca14bfc542b808b62bf684b1594e0fe  0003-pam-rename-common-to-base.patch
-f836cf0acdf148f2ae09ac28251b5126ce597f08254c43b1ec77596f75e1a3229926116c13f98554625be763e8d28415b27bd679b0a5de9f86bdca7857054c82  Xsession
-"
Author	SHA1	Message	Date
Andras Sebok	64ac8a9ebc	run apk simulate	2024-05-08 16:28:00 +02:00
Andras Sebok	3707868020	fix build	2024-05-08 13:39:58 +02:00
Andras Sebok	adb67f4428	fix ci	2024-05-08 13:28:54 +02:00
Andras Sebok	669c5e12ba	main: add gui for release upgrades	2024-05-08 12:59:00 +02:00
Stefan Hansson	ee41607a00	xiaomi-tissot-downstream: remove (MR 5106) No longer builds, can't be bothered to investigate why as the error is unusual and I don't understand it. See issue linked below for more detailed information. Clsoes https://gitlab.com/postmarketOS/pmaports/-/issues/2798 [ci:skip-build]: already built successfully in CI	2024-05-07 10:56:11 -07:00
Clayton Craft	9d356be7bb	linux-lenovo-21bx: upgrade to 6.9-rc7 (MR 5104)	2024-05-07 20:43:45 +09:00
Arnav SinghandRobert Mader	d52346cf1f	linux-postmarketos-allwinner: add patch to define PinePhone camera orientations and rotations. (MR 5096) libcamera etc need them. Ref: https://gitlab.com/postmarketOS/pmaports/-/issues/2787 Co-authored-by: Robert Mader <robert.mader@collabora.com>	2024-05-06 16:06:54 -07:00
Clayton Craft	c0b5f13420	{main,community}/linux-*: unset CONFIG_RT_GROUP_SCHED (MR 5088) fixes #2652 [ci:skip-build] too many kernels to build, CI will never finish [ci:ignore-count]	2024-05-06 10:24:48 -07:00
Stefan Hansson	02aad8d342	linux-samsung-klte-downstream: fix build (MR 5101) Part of https://gitlab.com/postmarketOS/pmaports/-/issues/2401 [ci:skip-build]: already built successfully in CI	2024-05-06 15:21:41 +02:00
Teemu Ikonen	461b2c28e9	temp/gtk4.0: upgrade to 4.14.3 (MR 5100) [ci:skip-build]: already built successfully in CI	2024-05-06 13:26:49 +02:00
Tetra Green	a00122a6f8	motorola-titan: set kernel compression mode to LZMA This helps the boot image fit the partition. Additionally, add a patch to fix build.	2024-05-06 11:50:15 +02:00
Andreas Kemnade	a09d8eba5c	linux-kobo-clara-mainline: enable more input devices and EPD regulators (MR 5062) Satisfy the requirements of more devices including some Kobo Nia fixes [ci:skip-build]: already built successfully in CI	2024-05-05 11:28:50 +03:00
Andreas Kemnade	c44ba04184	kobo-nia: new device (MR 5062) This only support revision A, but nothing dangerous is expected if run on revision C.	2024-05-05 11:28:50 +03:00
Stefan Hansson	4889ea583d	main/boot-deploy: upgrade to 0.16 (MR 5095) [ci:skip-build]: already built successfully in CI	2024-05-04 19:48:30 +02:00
				`@@ -0,0 +1 @@`
				`../../.shared-patches/linux/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch`
				`@@ -0,0 +1 @@`
				`../../.shared-patches/linux/linux3.4-fix-piggy.gzip.S.patch`
				`@@ -1 +0,0 @@`
				`../../.shared-patches/linux/linux4.2-gcc10-extern_YYLOC_global_declaration.patch`