DO NOT MERGE: fix install_pmbootstrap

DO NOT MERGE: use local install_pmb script
DO NOT MERGE: add install_pmbootstrap.sh from ci-common
2024-10-10 22:17:35 -07:00 · 2024-10-10 12:02:42 -07:00 · 2024-10-10 12:02:42 -07:00 · 2024-10-10 12:02:42 -07:00 · 2024-10-07 12:59:45 +02:00 · 2024-10-07 12:58:04 +02:00
87 changed files with 792 additions and 408 deletions
@@ -6,7 +6,7 @@

 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi
@@ -6,7 +6,7 @@
 if [ "$(id -u)" = 0 ]; then
 	set -x
 	apk add git openssh-keygen grep curl
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0 $*"
 fi
@@ -90,9 +90,9 @@ update_linux_next() {
 }

 # For testing
-#git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.com/postmarketOS/pmaports-autoupdate-test.git
+#git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.postmarketos.org/postmarketOS/pmaports-autoupdate-test.git

-git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.com/postmarketOS/pmaports.git
+git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.postmarketos.org/postmarketOS/pmaports.git
 git fetch gitlab
 git checkout --track gitlab/master

@@ -8,12 +8,7 @@

 if [ "$(id -u)" = 0 ]; then
 	set -x
-	# In .gitlab-ci.yml currently .ci/pytest.sh runs before this and
-	# already downloads and runs install_pmbootstrap.sh.
-	if ! [ -e install_pmbootstrap.sh ]; then
-		wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
-		sh ./install_pmbootstrap.sh
-	fi
+
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi

@@ -57,7 +57,7 @@ fi

 POSTMARKETOS_WALLPAPER_PATH='/usr/share/wallpapers/postmarketos.jpg'
 # The excluded devices are "grandfathered in". New devices should not be added here.
-# See https://gitlab.com/postmarketOS/pmaports/-/issues/2529
+# See https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/2529
 if grep -qr $POSTMARKETOS_WALLPAPER_PATH \
 	--exclude-dir='device-pine64-pinetab' \
 	--exclude-dir='device-oneplus-kebab' \
@@ -6,7 +6,7 @@

 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi
@@ -2,6 +2,7 @@
 # Copyright 2021 Oliver Smith
 # SPDX-License-Identifier: GPL-3.0-or-later
 import sys
+import os
 import pathlib

 # Same dir
@@ -9,6 +10,7 @@ import common

 # pmbootstrap
 import add_pmbootstrap_to_import_path
+import pmb.core
 import pmb.parse
 import pmb.parse._apkbuild
 import pmb.helpers.pmaports
@@ -66,9 +68,29 @@ if __name__ == "__main__":
    args = pmb.parse.arguments()
    context = get_context()

-    # Filter out packages that can't be built for given arch
+    # Get set of all buildable packages for the enabled repos, for skipping unbuildable
+    # aports later. We might be given a changed aport from e.g. extra-repos/systemd when
+    # that repo is not enabled
+    buildable_pkgs = set()
+    for path in pmb.core.pkgrepo.pkgrepo_iter_package_dirs():
+        buildable_pkgs.add(os.path.basename(path))
+
+    # To store a list of packages from extra-repos/systemd for special handling later:
+    systemd_pkgs = list()
+
+    # Filter out packages that either:
+    #  1. can't be built for given arch
+    #  2. are not found in enabled repos
    # (Iterate over copy of packages, because we modify it in this loop)
    for package in packages.copy():
+        if package not in buildable_pkgs:
+            print(f"{package}: not in any available repos, skipping")
+            packages.remove(package)
+            # FIXME: this should probably be more generic, if other repos are added later?
+            # This just tosses the package into the list of packages to try building later w/ systemd enabled, and assumes it'll be found there.
+            systemd_pkgs.append(package)
+            continue
+
        apkbuild_path = pmb.helpers.pmaports.find(package)
        apkbuild = pmb.parse._apkbuild.apkbuild(pathlib.Path(apkbuild_path, "APKBUILD"))

@@ -84,3 +106,10 @@ if __name__ == "__main__":
    # Build packages
    print(f"building in strict mode for {arch}: {', '.join(packages)}")
    build_strict(packages, arch)
+
+    # Build packages in extra-repos/systemd
+    # FIXME: this should probably be more generic, if other repos are added later?
+    if systemd_pkgs:
+        print(f"building in strict mode for {arch}, from extra-repos/systemd: {', '.join(packages)}")
+        common.run_pmbootstrap(["config", "systemd", "always"])
+        build_strict(systemd_pkgs, arch)
@@ -5,7 +5,7 @@

 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+	wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi
@@ -36,7 +36,7 @@ def run_git(parameters, check=True, stderr=None):
 def add_upstream_git_remote():
    """ Add a remote pointing to postmarketOS/pmaports. """
    run_git(["remote", "add", "upstream",
-             "https://gitlab.com/postmarketOS/pmaports.git"], False)
+             "https://gitlab.postmarketos.org/postmarketOS/pmaports.git"], False)
    run_git(["fetch", "-q", "upstream"])


@@ -8,7 +8,6 @@

 if [ "$(id -u)" = 0 ]; then
 	set -x
-	wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
 	sh ./install_pmbootstrap.sh pytest
 	exec su "${TESTUSER:-pmos}" -c "sh -e $0"
 fi
@@ -28,7 +28,7 @@ def test_directories():


 # Ensure no file in pmaports are executable.
-# see https://gitlab.com/postmarketOS/pmaports/-/issues/593.
+# see https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/593.
 def test_executable_files():
    for file in glob.iglob("[!temp]**/**/*", recursive=True):
        if os.path.isdir(file) or os.path.islink(file):
@@ -8,8 +8,7 @@ after_script:
  - .ci/lib/move_logs.sh $CI_PROJECT_DIR
 stages:
  - lint
-  - build
-  - autoupdate
+

 # This defines the rules for when a pipeline should run.
 workflow:
@@ -22,61 +21,14 @@ workflow:
    # Run scheduled pipeline for autoupdate or manually triggered pipeline
    - if: $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"

-# device documentation
-wiki:
-  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - .ci/**/*
-        - .gitlab-ci.yml
-        - device/*/device-*/*
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/wiki.sh
-
-# testcases linting
-ruff:
-  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - .ci/*
-        - .ci/*/*
-        - .gitlab-ci.yml
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/ruff.sh
-
-# shellcheck and various grep checks
-shellcheck-grep:
-  stage: lint
-  image: alpine:edge
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/shellcheck.sh
-    - .ci/grep.sh
-    - .ci/codeowners.sh
-
-editor-config:
-  stage: lint
-  image: alpine:edge
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/ec.sh
-
 # aports checks (generic)
 pytest-commits:
  stage: lint
  rules:
    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
  script:
-    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/pytest.sh
+    - .ci/lib/gitlab_prepare_ci.sh
    - .ci/commits.sh
  artifacts:
    when: on_failure
@@ -85,104 +37,3 @@ pytest-commits:
      - log_testsuite_pmaports.txt
      - pmbootstrap.cfg
    expire_in: 1 week
-
-# APKBUILD linting
-aport-lint:
-  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/apkbuild-lint.sh
-  allow_failure: true
-
-# kernel kconfig check
-kernel-kconfig:
-  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-      changes:
-        - kconfigcheck.toml
-        - device/*/linux-*/config-*
-        - main/linux-*/config-*
-  script:
-    - .ci/lib/gitlab_prepare_ci.sh
-    - .ci/kconfig.sh
-
-# MR settings
-# (Checks for "Allow commits from members who can merge to the target branch")
-mr-settings:
-  stage: lint
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  before_script:
-    - *global_before_scripts
-    - apk -q add python3
-  script:
-    - wget -q "https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
-    - python3 ./check_mr_settings.py
-
-# build changed aports
-.build:
-  stage: build
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_REF_PROTECTED == "false"
-  before_script:
-    - *global_before_scripts
-    - .ci/lib/gitlab_prepare_ci.sh
-  after_script:
-    - cp -r /home/pmos/.local/var/pmbootstrap/packages/ packages/ || true
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - packages/
-  timeout: 10 h
-
-build-x86_64:
-  extends: .build
-  script:
-    - .ci/build-x86_64.sh
-
-build-x86:
-  extends: .build
-  script:
-    - .ci/build-x86.sh
-
-build-aarch64:
-  extends: .build
-  script:
-    - .ci/build-aarch64.sh
-
-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
-
-auto-update:
-  stage: autoupdate
-  rules:
-    # This variable is set in the scheduled pipeline configuration. It should be a space separated list of
-    # package names to update.
-    - if: $AUTOUPDATE_PACKAGES != null && $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"
-  before_script:
-    - .ci/lib/gitlab_prepare_ci.sh
-  script:
-    - .ci/autoupdate.sh "$AUTOUPDATE_PACKAGES"
-  after_script:
-    - .ci/lib/move_logs.sh $CI_PROJECT_DIR
-  artifacts:
-    when: on_failure
-    paths:
-      - log.txt
-      - log_testsuite_pmaports.txt
-      - pmbootstrap.cfg
@@ -20,7 +20,7 @@

 pkgname=crossdirect
 pkgver=5.1.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Wrappers to launch native cross compilers in foreign chroots"
 url="https://postmarketOS.org"
 arch="all"
@@ -82,7 +82,7 @@ package() {

 sha512sums="
 0f4b48f250425dc57f63955fc8b38477d23db793bee367c3fbe03c3d2a559ba576434d07518310db4cae9d90d501af4051b80038b10fae94b980e537fc9374ad  cargo.sh
-500107e5aff8b34e74b54982ebcd447fc41bc8283956d506561b031a055cb30ec12698047c2604918b4b6d8560fe03db427a63dff2b83c907e8494b7f5233f29  crossdirect.c
+a1af3d2876dc05bb840e4bfb8b6e1c1dcf5b952375a6644dcb9cf659d82ec8bfc4be5d813064057fe9626104a10907ae7072a9d5fd7ac40f3b87e90dbf535eaf  crossdirect.c
 de2aa6929bbff5db9132673e667f4525b333d062cb1f7a0597dd924de9e5c7215a9f8e2e6263b6fb5ace06f2c4b64f4ebfd0ede9b78add07c2cd08ec8613e98f  rustc.sh
 ea9bf8db3810d03d0a7395057f3d6e57f7127d87c55deaedc171c255288f5f3cc6fbcc680a5a1b92786cf573875d5dc22521173799fe2639acc97d0715ff905b  rust-qemu-linker.sh
 "
@@ -43,7 +43,7 @@

 void exit_userfriendly()
 {
-	fprintf(stderr, "Please report this at: https://gitlab.com/postmarketOS/pmaports/issues\n");
+	fprintf(stderr, "Please report this at: https://gitlab.postmarketos.org/postmarketOS/pmaports/issues\n");
 	fprintf(stderr, "As a workaround, you can compile without crossdirect.\n");
 	fprintf(stderr, "See 'pmbootstrap -h' for related options.\n");
 	exit(1);
@@ -33,7 +33,7 @@ nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
 	# harpia's WCNSS firmware has problems with WiFi channels on some device
 	# variants, using osprey's firmware seems to help as a workaround
-	# (see https://gitlab.com/postmarketOS/pmaports/-/issues/1085)
+	# (see https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/1085)
 	depends="firmware-qcom-adreno-a300 msm-firmware-loader
 		 firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus
 		 firmware-motorola-osprey-wcnss"
@@ -5,8 +5,8 @@

 _flavor="postmarketos-qcom-sdm845"
 pkgname=linux-$_flavor
-pkgver=6.9.0
-pkgrel=4
+pkgver=6.11.0
+pkgrel=1
 pkgdesc="Mainline Kernel fork for SDM845 devices"
 arch="aarch64"
 _carch="arm64"
@@ -18,7 +18,7 @@ options="!check !tracedeps
 makedepends="bash bison findutils flex installkernel openssl-dev perl zstd python3"

 _config="config-$_flavor.$arch"
-_tag="sdm845-6.9.0-r2"
+_tag="sdm845-6.11"

 # Source
 source="
@@ -71,6 +71,6 @@ package() {
 }

 sha512sums="
-45fb653328776a7b3687b9192979ada93c5ac7c321d54d4b72f47cddc10120982701d4990edc9103f6ec3ffcd2bc917b43ce7fea6ec15a3d3aded2279ecd9226  linux-sdm845-6.9.0-r2.tar.gz
-daf67730b0f8a1280a40ee595e477fd2c86679cd28160227d60821f1feee74de092cb6d2568167086e9edc3f12eafd42024b07cdbbd994f1e71adf6705626391  config-postmarketos-qcom-sdm845.aarch64
+40a127d280404c61f3c87692b85de6270144f98109b6e026649629e50c8e52a6a067d7f841cbbba6337791b115620894f205016a0dce46e65f9b95bcccff793a  linux-sdm845-6.11.tar.gz
+98b9bf6313079676dd8289a5f7fa79b3ff827e66894683cc2a3f39a2d6905514c9512ead4c8e7681f319fc6d140bf8145a721087fef6558b7fc3bf391eba8506  config-postmarketos-qcom-sdm845.aarch64
 "
@@ -2,8 +2,8 @@

 _flavor="postmarketos-qcom-sm6350"
 pkgname=linux-$_flavor
-pkgver=6.10.5
-pkgrel=3
+pkgver=6.11.0
+pkgrel=0
 pkgdesc="Mainline Kernel fork for SM6350/SM7225 devices"
 arch="aarch64"
 _carch="arm64"
@@ -54,6 +54,6 @@ package() {
 }

 sha512sums="
-5756a8fd466f5c34dcaa9818d274facbe0b0b541ce9d7997b95868b2e84f1491ce8bf7d2714206ad8378d560996b8a736bc3c8505ef8022371644866c841e2a1  linux-v6.10.5-sm6350.tar.gz
-711e5ce6a7e9b491b40270eb23114ee4ad1deeb6312d10ec012abafd0c2cca288f72c4b5f49503f9c12c33ebd6fa3e0dc64ca8323121872d60f7ffd2a0411312  config-postmarketos-qcom-sm6350.aarch64
+6394edf25f6d4476b3bc26484c6fe6a02e2aa40b74e8526ab07b8257fe11accdd4b037fd7ce4429a246e36aaa443f556f1a9208003569ef044bee439931e93c9  linux-v6.11.0-sm6350.tar.gz
+234683d98b8a526e892bb4547c6e2b10715f171ac2a9ddc20cf47e449b70ba828fee8d00954d37442863ab354ce3ba513fb64a2a53be866733f4f5b6b6d51602  config-postmarketos-qcom-sm6350.aarch64
 "
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.10.5 Kernel Configuration
+# Linux/arm64 6.11.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -11,8 +11,6 @@ CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
@@ -167,7 +165,7 @@ CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
-CONFIG_MEMCG_KMEM=y
+# CONFIG_MEMCG_V1 is not set
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
@@ -243,7 +241,6 @@ CONFIG_CACHESTAT_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_SELFTEST is not set
 CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_HAVE_PERF_EVENTS=y

@@ -525,6 +522,7 @@ CONFIG_ARM64_CONTPTE=y
 CONFIG_CMDLINE=""
 CONFIG_EFI_STUB=y
 CONFIG_EFI=y
+# CONFIG_COMPRESSED_INSTALL is not set
 CONFIG_DMI=y
 # end of Boot options

@@ -771,7 +769,6 @@ CONFIG_BLK_CGROUP_PUNT_BIO=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 # CONFIG_BLK_DEV_ZONED is not set
 CONFIG_BLK_DEV_THROTTLING=y
@@ -891,6 +888,7 @@ CONFIG_COREDUMP=y
 #
 CONFIG_SWAP=y
 # CONFIG_ZSWAP is not set
+CONFIG_HAVE_ZSMALLOC=y
 CONFIG_ZSMALLOC=m
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC_CHAIN_SIZE=8
@@ -902,6 +900,7 @@ CONFIG_SLUB=y
 CONFIG_SLAB_MERGE_DEFAULT=y
 # CONFIG_SLAB_FREELIST_RANDOM is not set
 # CONFIG_SLAB_FREELIST_HARDENED is not set
+# CONFIG_SLAB_BUCKETS is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_RANDOM_KMALLOC_CACHES is not set
@@ -1666,6 +1665,9 @@ CONFIG_ARM_PSCI_FW=y
 # Qualcomm firmware drivers
 #
 CONFIG_QCOM_SCM=y
+CONFIG_QCOM_TZMEM=y
+CONFIG_QCOM_TZMEM_MODE_GENERIC=y
+# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCOM_QSEECOM is not set
 # end of Qualcomm firmware drivers
@@ -1925,6 +1927,7 @@ CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_MLXSW_CORE is not set
 # CONFIG_MLXFW is not set
+CONFIG_NET_VENDOR_META=y
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_KS8842 is not set
 # CONFIG_KS8851_MLL is not set
@@ -2058,6 +2061,7 @@ CONFIG_MDIO_DEVRES=y
 #
 # PCS device drivers
 #
+# CONFIG_PCS_XPCS is not set
 # end of PCS device drivers

 # CONFIG_PPP is not set
@@ -2089,6 +2093,7 @@ CONFIG_ATH10K_CE=y
 CONFIG_ATH10K_SNOC=m
 CONFIG_ATH10K_DEBUG=y
 # CONFIG_ATH10K_DEBUGFS is not set
+CONFIG_ATH10K_LEDS=y
 # CONFIG_ATH10K_TRACING is not set
 # CONFIG_WCN36XX is not set
 # CONFIG_ATH11K is not set
@@ -2601,6 +2606,7 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_SINGLE is not set
 # CONFIG_PINCTRL_STMFX is not set
 # CONFIG_PINCTRL_SX150X is not set
+# CONFIG_PINCTRL_IMX_SCMI is not set
 CONFIG_PINCTRL_MSM=y
 # CONFIG_PINCTRL_IPQ5018 is not set
 # CONFIG_PINCTRL_IPQ5332 is not set
@@ -2713,6 +2719,12 @@ CONFIG_GPIO_CDEV_V1=y
 # CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers

+#
+# GPIO Debugging utilities
+#
+# CONFIG_GPIO_VIRTUSER is not set
+# end of GPIO Debugging utilities
+
 # CONFIG_W1 is not set
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_GPIO is not set
@@ -2728,6 +2740,7 @@ CONFIG_POWER_RESET_QCOM_PON=y
 CONFIG_REBOOT_MODE=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
+# CONFIG_POWER_SEQUENCING is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_POWER_SUPPLY_HWMON=y
@@ -2746,6 +2759,7 @@ CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_BATTERY_BQ27XXX is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_MAX1720X is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
@@ -2785,7 +2799,6 @@ CONFIG_HWMON=y
 #
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
-# CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1029 is not set
@@ -2851,7 +2864,6 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_MAX6620 is not set
 # CONFIG_SENSORS_MAX6621 is not set
 # CONFIG_SENSORS_MAX6639 is not set
-# CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_MAX6697 is not set
 # CONFIG_SENSORS_MAX31790 is not set
@@ -2916,6 +2928,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_INA2XX is not set
 # CONFIG_SENSORS_INA238 is not set
 # CONFIG_SENSORS_INA3221 is not set
+# CONFIG_SENSORS_SPD5118 is not set
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_TMP102 is not set
@@ -3043,6 +3056,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_88PM886_PMIC is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77541 is not set
 # CONFIG_MFD_MAX77620 is not set
@@ -3111,10 +3125,12 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
+# CONFIG_MFD_ROHM_BD96801 is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_ATC260X_I2C is not set
 CONFIG_MFD_QCOM_PM8008=y
+# CONFIG_MFD_CS40L50_I2C is not set
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_MFD_RSMU_I2C is not set
 # end of Multifunction device drivers
@@ -3224,14 +3240,17 @@ CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
-CONFIG_DRM_DISPLAY_HELPER=m
-CONFIG_DRM_DISPLAY_DP_AUX_BUS=m
+CONFIG_DRM_DISPLAY_DP_AUX_BUS=y
+CONFIG_DRM_DISPLAY_HELPER=y
+CONFIG_DRM_BRIDGE_CONNECTOR=y
 # CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set
 # CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set
 CONFIG_DRM_DISPLAY_DP_HELPER=y
-CONFIG_DRM_EXEC=m
+CONFIG_DRM_DISPLAY_HDMI_HELPER=y
+CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y
+CONFIG_DRM_EXEC=y
 CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_SCHED=m
+CONFIG_DRM_SCHED=y

 #
 # I2C encoder or helper chips
@@ -3253,7 +3272,7 @@ CONFIG_DRM_SCHED=m
 # CONFIG_DRM_VGEM is not set
 # CONFIG_DRM_VKMS is not set
 # CONFIG_DRM_UDL is not set
-CONFIG_DRM_MSM=m
+CONFIG_DRM_MSM=y
 CONFIG_DRM_MSM_GPU_STATE=y
 CONFIG_DRM_MSM_MDSS=y
 # CONFIG_DRM_MSM_MDP4 is not set
@@ -3285,9 +3304,11 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set
 # CONFIG_DRM_PANEL_DSI_CM is not set
 # CONFIG_DRM_PANEL_LVDS is not set
-CONFIG_DRM_PANEL_HIMAX_HX83112A=m
+# CONFIG_DRM_PANEL_HIMAX_HX83102 is not set
+CONFIG_DRM_PANEL_HIMAX_HX83112A=y
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
@@ -3299,6 +3320,7 @@ CONFIG_DRM_PANEL_HIMAX_HX83112A=m
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
+# CONFIG_DRM_PANEL_LINCOLNTECH_LCD197 is not set
 # CONFIG_DRM_PANEL_LG_SW43408 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set
@@ -3452,6 +3474,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_QCOM_WLED=y
 # CONFIG_BACKLIGHT_ADP8860 is not set
 # CONFIG_BACKLIGHT_ADP8870 is not set
+# CONFIG_BACKLIGHT_LM3509 is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_LV5207LP is not set
@@ -3655,7 +3678,6 @@ CONFIG_HID_LOGITECH=y
 #
 # HID-BPF support
 #
-# CONFIG_HID_BPF is not set
 # end of HID-BPF support

 #
@@ -4023,6 +4045,7 @@ CONFIG_LEDS_QCOM_FLASH=y
 # CONFIG_LEDS_RT4505 is not set
 # CONFIG_LEDS_RT8515 is not set
 # CONFIG_LEDS_SGM3140 is not set
+# CONFIG_LEDS_SY7802 is not set

 #
 # RGB LED drivers
@@ -4050,6 +4073,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LEDS_TRIGGER_NETDEV is not set
 CONFIG_LEDS_TRIGGER_PATTERN=y
 # CONFIG_LEDS_TRIGGER_TTY is not set
+# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set

 #
 # Simple LED drivers
@@ -4228,10 +4252,12 @@ CONFIG_VIRTIO=y
 # CONFIG_STAGING is not set
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
+# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 # CONFIG_SURFACE_PLATFORMS is not set
 CONFIG_ARM64_PLATFORM_DEVICES=y
 # CONFIG_EC_ACER_ASPIRE1 is not set
+# CONFIG_EC_LENOVO_YOGA_C630 is not set
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -4268,6 +4294,7 @@ CONFIG_COMMON_CLK_QCOM=y
 # CONFIG_CLK_X1E80100_GCC is not set
 # CONFIG_CLK_X1E80100_GPUCC is not set
 # CONFIG_CLK_X1E80100_TCSRCC is not set
+# CONFIG_CLK_QCM2290_GPUCC is not set
 # CONFIG_QCOM_A53PLL is not set
 # CONFIG_QCOM_A7PLL is not set
 # CONFIG_QCOM_CLK_APCC_MSM8996 is not set
@@ -4279,6 +4306,7 @@ CONFIG_QCOM_CLK_RPMH=y
 # CONFIG_IPQ_GCC_6018 is not set
 # CONFIG_IPQ_GCC_8074 is not set
 # CONFIG_IPQ_GCC_9574 is not set
+# CONFIG_IPQ_NSSCC_QCA8K is not set
 # CONFIG_MSM_GCC_8916 is not set
 # CONFIG_MSM_GCC_8917 is not set
 # CONFIG_MSM_GCC_8939 is not set
@@ -4330,9 +4358,11 @@ CONFIG_QCOM_CLK_RPMH=y
 # CONFIG_SDM_LPASSCC_845 is not set
 # CONFIG_SDX_GCC_75 is not set
 CONFIG_SM_CAMCC_6350=y
+# CONFIG_SM_CAMCC_7150 is not set
 # CONFIG_SM_CAMCC_8250 is not set
 # CONFIG_SM_CAMCC_8450 is not set
 # CONFIG_SM_CAMCC_8550 is not set
+# CONFIG_SM_CAMCC_8650 is not set
 CONFIG_SM_DISPCC_6350=y
 # CONFIG_SM_DISPCC_8650 is not set
 # CONFIG_SM_GCC_4450 is not set
@@ -4359,6 +4389,7 @@ CONFIG_SM_GPUCC_6350=y
 # CONFIG_SM_GPUCC_8650 is not set
 # CONFIG_SM_TCSRCC_8550 is not set
 # CONFIG_SM_TCSRCC_8650 is not set
+# CONFIG_SM_VIDEOCC_7150 is not set
 # CONFIG_SM_VIDEOCC_8150 is not set
 # CONFIG_SM_VIDEOCC_8250 is not set
 # CONFIG_SM_VIDEOCC_8350 is not set
@@ -4395,6 +4426,7 @@ CONFIG_MAILBOX=y
 # CONFIG_ALTERA_MBOX is not set
 # CONFIG_MAILBOX_TEST is not set
 # CONFIG_QCOM_APCS_IPC is not set
+# CONFIG_QCOM_CPUCP_MBOX is not set
 CONFIG_QCOM_IPCC=y
 CONFIG_IOMMU_IOVA=y
 CONFIG_IOMMU_API=y
@@ -4507,8 +4539,10 @@ CONFIG_QCOM_COMMAND_DB=y
 CONFIG_QCOM_GENI_SE=y
 # CONFIG_QCOM_GSBI is not set
 CONFIG_QCOM_LLCC=y
-CONFIG_QCOM_MDT_LOADER=m
+CONFIG_QCOM_MDT_LOADER=y
 # CONFIG_QCOM_OCMEM is not set
+CONFIG_QCOM_PD_MAPPER=m
+CONFIG_QCOM_PDR_MSG=m
 # CONFIG_QCOM_PMIC_PDCHARGER_ULOG is not set
 # CONFIG_QCOM_PMIC_GLINK is not set
 CONFIG_QCOM_QMI_HELPERS=y
@@ -4650,7 +4684,6 @@ CONFIG_IIO=y
 # CONFIG_AD7291 is not set
 # CONFIG_AD7606_IFACE_PARALLEL is not set
 # CONFIG_AD799X is not set
-# CONFIG_ADI_AXI_ADC is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
 # CONFIG_HX711 is not set
@@ -4674,6 +4707,7 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_SD_ADC_MODULATOR is not set
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADS1015 is not set
+# CONFIG_TI_ADS1119 is not set
 # CONFIG_TI_ADS7924 is not set
 # CONFIG_TI_ADS1100 is not set
 # CONFIG_VF610_ADC is not set
@@ -4712,6 +4746,7 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_ATLAS_EZO_SENSOR is not set
 # CONFIG_BME680 is not set
 # CONFIG_CCS811 is not set
+# CONFIG_ENS160 is not set
 # CONFIG_IAQCORE is not set
 # CONFIG_PMS7003 is not set
 # CONFIG_SCD30_CORE is not set
@@ -4747,7 +4782,6 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_AD5380 is not set
 # CONFIG_AD5446 is not set
 # CONFIG_AD5593R is not set
-# CONFIG_ADI_AXI_DAC is not set
 # CONFIG_AD5696_I2C is not set
 # CONFIG_DPOT_DAC is not set
 # CONFIG_DS4424 is not set
@@ -4891,6 +4925,7 @@ CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_VCNL4000 is not set
 # CONFIG_VCNL4035 is not set
 # CONFIG_VEML6030 is not set
+# CONFIG_VEML6040 is not set
 # CONFIG_VEML6070 is not set
 # CONFIG_VEML6075 is not set
 # CONFIG_VL6180 is not set
@@ -5024,7 +5059,9 @@ CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_MAX_NR=1
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
+CONFIG_IRQ_MSI_LIB=y
 # CONFIG_AL_FIC is not set
+# CONFIG_LAN966X_OIC is not set
 # CONFIG_XILINX_INTC is not set
 CONFIG_PARTITION_PERCPU=y
 CONFIG_QCOM_PDC=y
@@ -5115,6 +5152,7 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 # CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android

+CONFIG_TRACE_GPU_MEM=y
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_DAX is not set
 CONFIG_NVMEM=y
@@ -5174,6 +5212,7 @@ CONFIG_INTERCONNECT_QCOM_SM6350=y
 # CONFIG_INTERCONNECT_QCOM_SM8550 is not set
 # CONFIG_INTERCONNECT_QCOM_SM8650 is not set
 # CONFIG_INTERCONNECT_QCOM_X1E80100 is not set
+CONFIG_INTERCONNECT_CLK=y
 # CONFIG_COUNTER is not set
 # CONFIG_MOST is not set
 # CONFIG_PECI is not set
@@ -5265,6 +5304,7 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 CONFIG_NETFS_SUPPORT=m
 # CONFIG_NETFS_STATS is not set
+# CONFIG_NETFS_DEBUG is not set
 # CONFIG_FSCACHE is not set
 # end of Caches

@@ -5529,7 +5569,6 @@ CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECDSA is not set
 # CONFIG_CRYPTO_ECRDSA is not set
-# CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_CURVE25519 is not set
 # end of Public-key cryptography

@@ -5856,6 +5895,7 @@ CONFIG_NLATTR=y
 CONFIG_CLZ_TAB=y
 CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=y
+CONFIG_DIMLIB=y
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_UCS2_STRING=y
@@ -6177,7 +6217,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_BITOPS is not set
 # CONFIG_TEST_VMALLOC is not set
-# CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
 # CONFIG_TEST_BLACKHOLE_DEV is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
@@ -2,8 +2,8 @@
 # Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
 pkgname=soc-qcom-sdm845
 pkgdesc="Common package for Qualcomm SDM845 devices"
-pkgver=22
-pkgrel=3
+pkgver=23
+pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -25,7 +25,7 @@ subpackages="
 	$pkgname-vulkan
 "

-_ucm_commit="aaa7889f7a6de640b4d78300e118457335ad16c0"
+_ucm_commit="45cb4c634e534ddfb255e85162fe705f94a23015"
 source="
 	10-initramfs-sdm845.files
 	51-qcom-sdm845.conf
@@ -153,7 +153,7 @@ sha512sums="
 28c14f47eaedec577d152001c51753537c98f267ac4a0acf78a304efebe5f6a1b4dc6d501497da9a0a925806a1d9c80b25e001cf9b1eb21efa22cd6a41ff753b  51-qcom-sdm845.conf
 4f2c22a3a3fc7d380e200ad977578107d81f0e7ade7918e03bdb15b60a564e8db5f47e13cce22f636d38fd3722696bb46076b8872dae0ca2d8a3838522a1f025  90-feedbackd-pmi8998.rules
 9d455b56558d453d501a1ad869ffa79f9952ed43485a9847d506db6a78bfcd9f9c9d855660ee1d368eb74f4429385ec166addc30d802261c75562e785fe84c52  UPower.conf
-62e85ff4d983bd58078633088a6506b8ed9dab88b13adb1af72abd324386a3614ad4af6b3a9594c5a1d1fbdb1891ad906d360764081c83318e9970c94838dfb8  alsa-ucm-conf-aaa7889f7a6de640b4d78300e118457335ad16c0.tar.gz
+af58c9dfcbeb9fe01e433c36e869bef1f2fe03e1087fb28fb6752008d5320b5ac19c32aa64bb88f7d3a619d8e20ab001ec36f11960957d806cc3b14eb30b377d  alsa-ucm-conf-45cb4c634e534ddfb255e85162fe705f94a23015.tar.gz
 6fb4c0bd8b7ed534d855a6732ccff783960e3cfa0e0cc7effcbb93afa00798dec15361a37a3200081bc114c8d266b7a0851cc4e819ad36eabdb47a50c72620d9  call_audio_idle_suspend_workaround.confd
 5a58475b6e2ee1d655f3f23d8dc19e1cb2f32f1dfff3b9a9337d9c5baad1ec24bfaec0fb9cc03f00e5a291bee27c6b8bffbc65157e2bee5d65ef6d1adcb0910b  call_audio_idle_suspend_workaround.initd
 6da0a9209f114354aa2aa1185ec3896a8e0bb1bfce0dc3fc4c0de339cf1389feaa2d724e733c251ff032a5e86d37d9549e94f8f7c7a5accfedbd8a4d6316bbfd  call_audio_idle_suspend_workaround.sh
@@ -3,7 +3,7 @@
 # legacy u-boot images are no longer necessary, but were generated outside of
 # packaging so remove them here to prevent a failed upgrade if /boot is too
 # full
-# see: https://gitlab.com/postmarketOS/pmaports/-/merge_requests/2449
+# see: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/2449
 rm -f /boot/uImage-postmarketos-allwinner
 rm -f /boot/uInitrd-postmarketos-allwinner

@@ -4,7 +4,7 @@
 # Contributor: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-purism-librem5
 pkgver=4
-pkgrel=2
+pkgrel=3
 _confver=64
 _purismrel=1
 # <librem5-base ver>.<purism release>
@@ -208,11 +208,11 @@ sha512sums="
 703d12826464eb2bdb6bf4a7d10adb73b37564d3792794523b252f0f7cb66184add150a6938580cc33615281d1c0abd7ff158ae2143b89fa28c0cd3dc367e5ff  deviceinfo
 138ed85e6509e4611bf21a0061c312e6c2ce60f722ee9e4565d19c5f025301d4df3fa321343524219a54b20c5288dc6ed1b058ac66f4d608af22eb5bc83e84c6  modules-initfs
 ccb47fd421c5e35a8def8e6fb61dad99e42cf542690068a68f90c257e41d33f45f1069db0a8d89372d9029681812957033995639a6a8a5e3eed48019325e0f4d  flash_script.lst
-3f62c04eb92d850e32d5e1b17534dec753563342ea6c4f9dc2572700d4f6eeb8ae8cd8e8e4f1b0f5c61f21d87bc61c02212f27313986157220003d78e2d69505  modprobe.d_rsi.conf
+79a7088139629745a19b0465ac632d61ce7c513fc0bb6ea71784cd615f5ab8b32bee5ea903d7d7eb1a4508c4844f90f0435d789ea2642a529dd930d0de631ca5  modprobe.d_rsi.conf
 a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f6e65a5d1b1a9099936382c99b49a44303f7b6d77a075a471  modules-load.d_librem5.conf
 8ef4ec7a9e9a4fb801d207e7d94b627aacc9243a93b0ec28e0823a6f44b8102416c040e4ddf499f87bb9dfa960cf6f627b008b79f197f6814b3fd881e18ae8ef  pcscd-librem5-reader.conf
 2618b40eebd3602066ee75ab85cbdbb4cfee498def9879c95a304f05a6eeedf1ab28c5dd9fa5efc8f88c790f49c96458c61d5dfe8a3ca0f96bcc0e244313ab01  pcscd-librem5.initd
-976c36b469a5c36e1823c35e4e1bc41d88f12c6710d1d4f8f904349ab06ee58a6c728dc4b705b7578427e322c57ecd4e4c61fc62effc88e25987f6ea3e6ffcc2  uboot-script.cmd
+59634b85867a65191934e365ccde40ae03dbad6cf3dc3cc513daf3265dd1105af7cca7d52ef8e20f40fdbdbeb74aee5a26908ae8de083a80e223d2c275a8135d  uboot-script.cmd
 1cbc65cf2cb8fad4b0332d012a0256a266205b9b64371f5c0dae09dbb7f1e45b254e8c43993b896097e9d7035a72d547d9bce1ab2133addc56a5abdb80b44616  xorg.conf
 fad386071fc45f9880a94cc8004fabd5d98b3e6a12606c98d8e72e0208f22ab54f03b921f5967a959782507e2bff67d2fa92e46d8cd242011a3afcdbda529279  70-librem5-xwayland-accel.sh
 b45749fcddfd65a302b502bcabfa5828d1b63e45d844fd50e44009a756b919db20fe9526102947c0f0dfcdffe4a037e5050fe1b24fb915933ce0837f49759378  0001-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch
@@ -2,7 +2,7 @@
 blacklist rsi_91x
 blacklist rsi_sdio
 # Redpine WIFI module
-# Note: LE coex. disabled, see: https://gitlab.com/postmarketOS/pmaports/-/issues/1042
+# Note: LE coex. disabled, see: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/1042
 options redpine_91x dev_oper_mode=5 rsi_zone_enabled=1 antenna_diversity=1
 # Note: this line re-enables LE, replace above line with this one when LE
 # is fixed:
@@ -23,7 +23,7 @@ setenv bootargs init=/init.sh rw console=ttymxc0,115200 PMOS_FORCE_PARTITION_RES
 # Default to "-r4" if board_rev isn't set, since there are apparently Evergreen
 # boards that either 1) identify as r4, 2) identify as r5 (or something else?),
 # or 3) don't identify as anything(?).
-# See: https://gitlab.com/postmarketOS/pmaports/-/issues/1643#note_1147248594
+# See: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/1643#note_1147248594
 dtb_file=imx8mq-librem5-r4.dtb
 if itest.s "x3" == "x$board_rev" ; then
        dtb_file=imx8mq-librem5-r3.dtb
@@ -39,7 +39,7 @@ package() {
 	#
 	# Ref:
 	#
-	# - https://gitlab.com/postmarketOS/pmaports/-/issues/3179
+	# - https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3179
 	#
 	# - https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=ed9c1349f8ebae720f3572ad3e74af59bfe345d7

@@ -0,0 +1,42 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Victoria Brekenfeld <postmarketos@drakulix.de>
+# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+# Co-Maintainer: Caleb Connolly <caleb@postmarketos.org>
+
+pkgname=device-google-blueline
+pkgdesc="Google Pixel 3"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	linux-postmarketos-qcom-sdm845
+	mkbootimg
+	firmware-google-blueline
+	firmware-google-blueline-dtbo
+	postmarketos-base
+	soc-qcom-sdm845
+	soc-qcom-sdm845-ucm
+	soc-qcom-sdm845-qbootctl
+	soc-qcom-sdm845-nonfree-firmware
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	modules-initfs
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+1a6c56470ccf94a51d235b011d0069ed028f781eb94863759113b62646138e3a8a34936536715eb908b5bea06c360567b0f217427fc4e5b34a617388072367ec  deviceinfo
+e92b431723994d0edc9d946d45746282d7ff25d13b799bada703ba13669de131a97f317ed0fecdedeefea7879a06bafe1df7e4a42f86c46e9e4f30309a928b15  modules-initfs
+"
@@ -0,0 +1,39 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Google Pixel 3"
+deviceinfo_manufacturer="Google"
+deviceinfo_codename="google-blueline"
+deviceinfo_year="2018"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_gpu_accelerated="true"
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="false"
+deviceinfo_screen_width="1080"
+deviceinfo_screen_height="2160"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_flash_offset_base="0x00000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x00000000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="4096"
+deviceinfo_flash_sparse="true"
+
+# Kernel options
+deviceinfo_dtb="qcom/sdm845-google-blueline"
+deviceinfo_append_dtb="true"
+deviceinfo_flash_kernel_on_update="true"
+
+# Required for devices using UFS as storage (instead of e.g. eMMC)
+deviceinfo_rootfs_image_sector_size="4096"
@@ -0,0 +1,6 @@
+i2c_qcom_geni
+rmi_core
+rmi_i2c
+qcom_fg
+qcom_pmi8998_charger
+ftm5
@@ -0,0 +1,28 @@
+# Maintainer: Victoria Brekenfeld <postmarketos@drakulix.de>
+# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+# Co-Maintainer: Caleb Connolly <caleb@postmarketos.org>
+
+pkgname=firmware-google-blueline-dtbo
+pkgver=1
+pkgrel=0
+_commit="88468ea69b2598551861cb48f0785463a61f066c"
+pkgdesc="dtbo.img needed to boot mainline on Pixel 3"
+url="https://gitlab.com/phodina/dtbo-google-blueline"
+arch="aarch64"
+license="GPL-2.0-only"
+makedepends="dtc android-tools"
+source="$pkgname-$_commit.tar.gz::https://gitlab.com/phodina/dtbo-google-blueline/-/archive/$_commit.tar.gz"
+options="!check !archcheck !strip !tracedeps pmb:cross-native"
+builddir="$srcdir/dtbo-google-blueline-$_commit"
+
+build() {
+	dtc -O dtb -o sdm845-b1-dvt1.1.dtbo -b 0 -@ sdm845-b1-dvt.dts
+	mkdtboimg cfg_create dtbo.img dtboimg.cfg
+}
+
+package() {
+	install -D -m644 dtbo.img \
+		"$pkgdir"/boot/dtbo-google-blueline.img
+}
+
+sha512sums="7c8e27ab8c29027b53a699954f62571a6750a3c7337659d166507b063a843feff9e357f0b5f5ebbb30ffbb8ae7f4bc7fe3da267cb86b0c77c2e36d62fb471061  firmware-google-blueline-dtbo-88468ea69b2598551861cb48f0785463a61f066c.tar.gz"
@@ -0,0 +1,42 @@
+# Maintainer: Victoria Brekenfeld <postmarketos@drakulix.de>
+# Co-Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>
+# Co-Maintainer: Caleb Connolly <caleb@postmarketos.org>
+
+pkgname=firmware-google-blueline
+pkgver=1
+pkgrel=0
+pkgdesc="Firmware for Google Pixel 3 (blueline)"
+url="https://gitlab.com/phodina/firmware-google-blueline"
+# Suggested by Caleb as it has working Wifi
+url="https://gitlab.com/sdm845-mainline/firmware-google-pixel3"
+arch="aarch64"
+depends="linux-firmware-qcom linux-firmware-ath10k"
+license="proprietary"
+options="!check !strip !archcheck !tracedeps pmb:cross-native"
+
+_commit="7deb5f8e0b0499a80ea85dfc7941351c77e7738c"
+
+source="firmware-google-blueline-$_commit.tar.gz::https://gitlab.com/phodina/firmware-google-blueline/-/archive/$_commit/firmware-google-blueline-$_commit.tar.gz
+	firmware.files"
+
+builddir="$srcdir/firmware-google-blueline-$_commit"
+
+package() {
+
+	while IFS="" read -r _i || [ -n "$_i" ]; do
+		install -Dm644 "$_i" "$pkgdir/$_i"
+	done < "$srcdir/firmware.files"
+
+	# TODO: Do we need these? If so put them into correct paths and into
+	# NFC/Secure Element firmware
+	#install -Dm644 misc/pn557.bin "$pkgdir/lib/firmware/postmarketos/"
+	# Haptic driver firmware
+	#install -Dm644 misc/cs40l20.bin "$pkgdir/lib/firmware/postmarketos/"
+	# Haptic driver firmware
+	#install -Dm644 misc/drv2624.bin "$pkgdir/lib/firmware/postmarketos/"
+}
+
+sha512sums="
+a556672e5c463a6421c97da679819e8a7d327194d56f7c02eac03dbbb9d34117331a8bdcb71e0e9fd6b965129ae0788db76d8c34c436a26bf5e030e57d01fab7  firmware-google-blueline-7deb5f8e0b0499a80ea85dfc7941351c77e7738c.tar.gz
+4fb96f0cda7cac67bb31afdb86fbc6d587d51318fc0b377f37af794423e185bdcba5304670cc53bd618cf8839db6cc1ed7a1d84ba149df817bc2e345b2787694  firmware.files
+"
@@ -0,0 +1,15 @@
+./lib/firmware/postmarketos/qca/crbtfw21.tlv
+./lib/firmware/qcom/sdm845/pixel3/a630_zap.mbn
+./lib/firmware/qcom/sdm845/pixel3/adsp.mbn
+./lib/firmware/qcom/sdm845/pixel3/adspr.jsn
+./lib/firmware/qcom/sdm845/pixel3/adspua.jsn
+./lib/firmware/qcom/sdm845/pixel3/cdsp.mbn
+./lib/firmware/qcom/sdm845/pixel3/cdspr.jsn
+./lib/firmware/qcom/sdm845/pixel3/ipa_fws.mbn
+./lib/firmware/qcom/sdm845/pixel3/mba.mbn
+./lib/firmware/qcom/sdm845/pixel3/modem.mbn
+./lib/firmware/qcom/sdm845/pixel3/modemr.jsn
+./lib/firmware/qcom/sdm845/pixel3/modemuw.jsn
+./lib/firmware/qcom/sdm845/pixel3/slpi.mbn
+./lib/firmware/qcom/sdm845/pixel3/venus.mbn
+./lib/firmware/qcom/sdm845/pixel3/wlanmdsp.mbn
@@ -1,5 +1,5 @@
 # Maintainer: Timbz <timon.baetz@protonmail.com>
-# See https://gitlab.com/postmarketOS/pmaports/-/merge_requests/2248#note_605868837
+# See https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/2248#note_605868837
 pkgname=firmware-samsung-s5k5baf
 pkgver=1.0
 pkgrel=0
@@ -1,26 +1,26 @@
 # Maintainer: Andreas Kemnade <andreas@kemnade.info>
 pkgname=kobo-epdc-extractor
-pkgver=1.0
-pkgrel=1
+pkgver=1.1
+pkgrel=0
 pkgdesc="Extractor for waveform on the kobo devices"
 arch="armv7"
 license="MIT"
-url="https://postmarketos.org"
+url="https://github.com/akemnade/kobo-firmware-extractor"
 install="$pkgname.post-install"
 source="
-	kobo-firmware-extractor-1.0.tar.gz::https://github.com/akemnade/kobo-firmware-extractor/archive/refs/tags/1.0.tar.gz
+	kobo-firmware-extractor-$pkgver.tar.gz::https://github.com/akemnade/kobo-firmware-extractor/archive/refs/tags/$pkgver.tar.gz
 	start-epd.sh
 	kobo-epdc-extractor.files
 	extract-waveform.initd
 	"
-builddir="$srcdir"/kobo-firmware-extractor-1.0
+builddir="$srcdir"/kobo-firmware-extractor-$pkgver

 build() {
 	make
 }

 package() {
-	make DESTDIR="$pkgdir" install
+	make PREFIX="/usr" DESTDIR="$pkgdir" install
 	touch kobo-epdc-extractor
 	# we need it in case we want to do use a graphical display unlock
 	install -Dm644 kobo-epdc-extractor -t \
@@ -35,8 +35,8 @@ package() {
 }

 sha512sums="
-2e44387b1275902f296ce77efd18b4759487891b28cb6b88477f44cd21ac6bc81b23c8d3016f81fe926bf87750b588d621fc1c36ca477dce42d3150f0b010953  kobo-firmware-extractor-1.0.tar.gz
+0f7c3dc3f08543ecabf8ab9e5abbaed3e04b75da666150ade8afbfa6482958ee9efe5df49412445aec9eccbe9722b0d37c2ae6a8211c2633bc2d2ba696cc21c0  kobo-firmware-extractor-1.1.tar.gz
 d008a75fb6ae229e1257af517e741717611cb2bc9cd11ab736f9e066493986cf4a6199854deaf90a1e8c91cbc02e7f79b2cf67ccd92ba110290d4af0b5c5f8ef  start-epd.sh
-c71bf714bd05f9c4c2724fc855b90f5a7fa4c1014ff41f16a07a91e791ada67fede5b92536e22ef3634724a881492fa4151b1fb8060561e1bea2a2f960ba794e  kobo-epdc-extractor.files
+d2d4aab75a39e7c7667c15fbaac081e6007950b1b6e8c7073ee75eb0266e86c312d6ba3d9976bc9046ca07bbf761ec9e7091476037f952b8a2335a872e2e92a2  kobo-epdc-extractor.files
 380a131085f50c1a5a80504368c943f3a9372c21ef9dc7fab74eccfc03795652f65a5f4dcf436930f316ba03ad13472e9bc4bfc045f5f0acdb1b94cb0bb5d687  extract-waveform.initd
 "
@@ -1,2 +1,2 @@
-/bin/extract-kobohidden
-/bin/extract-waveform.sh
+/usr/bin/extract-kobohidden
+/usr/bin/extract-waveform.sh
@@ -1,6 +1,6 @@
 # Kernel config based on: arch/arm64/configs/defconfig
 # APKBUILD based on linux-postmarketos-mainline
-# See: https://gitlab.com/postmarketOS/pmaports/issues/153
+# See: https://gitlab.postmarketos.org/postmarketOS/pmaports/issues/153

 _flavor=google-crosshatch-mainline
 _config="config-$_flavor.$CARCH"
@@ -2,7 +2,7 @@
 # Kernel config based on: arch/arm64/configs/defconfig

 pkgname=linux-next
-pkgver=6.12_git20241003
+pkgver=6.12_git20241004
 pkgrel=2
 _nextver="${pkgver#*_git}"
 pkgdesc="Linux next kernel"
@@ -69,7 +69,7 @@ package() {
 }

 sha512sums="
-9e55e41171227ae1d3d01e25bb22fa68306db2370531d3d22cb529cf9a295553129d23c77516576a84f2f31ab12fd418ffe32113c63509d64ac8c7cebff83f48  linux-next-next-20241003.tar.gz
+3ca798a76b7b17e0948f27377dafd05df43cc241f2aab590e4297213ee714ccca2457f4d3bfccdde48e227bee4a7abb65fbbd83c55506d7cdbd20ac125cfeefa  linux-next-next-20241004.tar.gz
 adbb506c0a2d676b1964a5d7c693f72338541ebd0cacee62e4579d43163c468d95607d73bf7439fb55b4d6bfa0dd42578b07ee20965aa03c2a9d8022cb3ae267  devices.config
 a30df186f06519e2f519bfe622bbd46caec6c2473a1fd3df370320a661d53882b49cfb2b3be7edd92fabdb4a8e6e3419194e8d43cca3cf4ab1615275dab4fee4  pmos.config
 "
@@ -1,6 +1,6 @@
 # Kernel config based on: arch/arm/configs/qcom_defconfig
 # APKBUILD based on linux-postmarketos-mainline
-# See: https://gitlab.com/postmarketOS/pmaports/issues/184
+# See: https://gitlab.postmarketos.org/postmarketOS/pmaports/issues/184

 _flavor=sony-nicki-mainline
 _config="config-$_flavor.$CARCH"
@@ -0,0 +1,137 @@
+#!/bin/sh -e
+# Copyright 2020 Oliver Smith
+# SPDX-License-Identifier: GPL-3.0-or-later
+# usage: install_pmbootstrap.sh [ADDITIONAL_PACKAGE, ...]
+
+: "${PMBOOTSTRAP_TAG:="master"}"
+: "${PMBOOTSTRAP_URL:="https://gitlab.postmarketos.org/postmarketOS/pmbootstrap.git"}"
+
+# Add the "origin-original" remote to an existing pmaports.git clone, so
+# pmbootstrap can use its channels.cfg.
+add_remote_origin_original() {
+	# Skip if existing (happens in single runner setup)
+	remote_url="https://gitlab.postmarketos.org/postmarketOS/pmaports.git"
+	remote_url_existing="$(git -C "$pmaports" \
+				remote get-url origin-original 2>/dev/null \
+				|| true)"
+	if [ "$remote_url" = "$remote_url_existing" ]; then
+		echo "Remote 'origin-original' is already configured"
+		git -C "$pmaports" fetch -q origin-original
+		return
+	fi
+
+	# Mark pmaports dir as 'safe directory', so git doesn't complain about
+	# it being owned by another user.
+	git config --global --add safe.directory "$pmaports"
+	su pmos -c "git config --global --add safe.directory '$pmaports'"
+
+	# Add the remote, display the output only on error
+	if ! git -C "$pmaports" \
+		remote add -f origin-original \
+		"https://gitlab.postmarketos.org/postmarketOS/pmaports.git" \
+		>/tmp/git_remote_add 2>&1; then
+		echo "ERROR: failed to add original remote with git!"
+		echo
+		cat /tmp/git_remote_add
+		exit 1
+	fi
+
+	# Make sure everyone can write to the repo later, since CI runs as several different users (root, TESTUSER/pmos, build)
+	chmod -R go+w "$pmaports/.git"
+}
+
+# Set up depends
+depends="
+	coreutils
+	git
+	losetup
+	openssl
+	procps
+	python3
+	sudo
+	$*
+"
+printf "Installing dependencies:"
+for i in $depends; do
+	printf "%s" " $i"
+done
+printf "\n"
+# shellcheck disable=SC2086
+apk -q add $depends
+
+# Force IPv4 for gitlab.postmarketos.org until it supports IPv6 too, OSUOSL is
+# working on it (infra#195)
+echo "140.211.167.182 gitlab.postmarketos.org" >> /etc/hosts
+
+# Set up binfmt_misc
+if ! mount | grep -q /proc/sys/fs/binfmt_misc; then
+	mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
+fi
+
+# Create pmos user
+if id "pmos" > /dev/null 2>&1; then
+	echo "User 'pmos' exists already"
+else
+	echo "Creating pmos user"
+	adduser -D pmos
+	chown -R pmos:pmos .
+	echo 'pmos ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
+fi
+
+# pmaports: either checked out in current dir, or let pmbootstrap download it
+pmaports="$(cd "$(dirname "$0")"; pwd -P)"
+pmaports_arg=""
+if [ -e "$pmaports/pmaports.cfg" ]; then
+	CFG="pmbootstrap_v3.cfg"
+	if [ "$PMBOOTSTRAP_TAG" = "2.3.x" ]; then
+		CFG="pmbootstrap.cfg"
+	fi
+	echo "pmbootstrap config file: $CFG"
+
+	echo "Found pmaports.cfg in current dir"
+	pmaports_arg="--aports '$pmaports'"
+
+	add_remote_origin_original
+
+	# Use the channel of the current branch
+	mkdir -p ~pmos/.config
+
+	( echo "[pmbootstrap]"
+	  echo "is_default_channel = False" ) > ~pmos/.config/"$CFG"
+	chown -R pmos:pmos ~pmos/.config
+fi
+
+# Download pmbootstrap (to /tmp/pmbootstrap)
+echo "Downloading pmbootstrap ($PMBOOTSTRAP_TAG): $PMBOOTSTRAP_URL"
+cd /tmp
+rm -rf pmbootstrap
+git clone -q "$PMBOOTSTRAP_URL" pmbootstrap
+git -C pmbootstrap checkout -q "$PMBOOTSTRAP_TAG"
+
+# Install to $PATH and init
+ln -sf /tmp/pmbootstrap/pmbootstrap.py /usr/local/bin/pmbootstrap
+echo "Initializing pmbootstrap"
+if ! su pmos -c "yes '' | pmbootstrap \
+		$pmaports_arg \
+		--details-to-stdout \
+		init \
+		>/tmp/pmb_init 2>&1"; then
+	cat /tmp/pmb_init
+	echo
+	echo "ERROR: pmbootstrap init failed!"
+	echo
+	echo "Most likely, this gets fixed by rebasing on master (or whatever"
+	echo "branch yours is based on). Please do this and try again."
+	echo
+	echo "Let us know in the chat or issues if you have trouble with that"
+	echo "and we will be happy to help. Sorry for the inconvenience."
+	exit 1
+fi
+echo ""
+
+# Workaround for pmb#2412: currently the pmaports_arg gets ignored in pmb v3,
+# so let pmbootstrap clone pmaports in the default dir during init, then change
+# the pmaports path to the one from the current merge request.
+if [ "$PMBOOTSTRAP_TAG" != "2.3.x" ] && [ -n "$pmaports_arg" ]; then
+	su - pmos -c "pmbootstrap config aports '$pmaports'"
+fi
@@ -304,7 +304,7 @@ NETFILTER_XT_TARGET_TCPMSS = true  # change MTU e.g. for Wireguard
 # PM_WAKELOCKS = true  # Sxmo
 UCLAMP_TASK = true  # Scheduler hints
 UCLAMP_TASK_GROUP = true  # Scheduler hints
-RT_GROUP_SCHED = false  # https://gitlab.com/postmarketOS/pmaports/-/issues/2652
+RT_GROUP_SCHED = false  # https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/2652
 DM_INTEGRITY = true  # Device-mapper integrity target

 # uefi: proper modern booting
@@ -1,9 +1,9 @@
 # Maintainer: Luca Weiss <luca@lucaweiss.eu>
 pkgname=adsp-audio
 pkgver=1
-pkgrel=4
+pkgrel=5
 pkgdesc="Init script for enabling the adsp audio subsystem (downstream Android kernels)"
-url="https://gitlab.com/postmarketOS/pmaports"
+url="https://gitlab.postmarketos.org/postmarketOS/pmaports"
 arch="noarch"
 license="GPL-3.0-or-later"
 source="$pkgname.initd"
@@ -18,4 +18,6 @@ openrc() {
 	default_openrc
 }

-sha512sums="1edd94b45d37d82b37e04a4f3ff9f3c116bee088a0f83c7b605a0107a3da4f5c9f7d0c1a50c082eb05914352979114135bde8942be9f6ac4fe3a7041e9190bc3  adsp-audio.initd"
+sha512sums="
+1edd94b45d37d82b37e04a4f3ff9f3c116bee088a0f83c7b605a0107a3da4f5c9f7d0c1a50c082eb05914352979114135bde8942be9f6ac4fe3a7041e9190bc3  adsp-audio.initd
+"
@@ -1,14 +1,14 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=boot-deploy
 pkgver=0.18
-pkgrel=0
+pkgrel=2
 pkgdesc="tool for finalizing and deploying boot related files"
 url="https://gitlab.com/postmarketos/boot-deploy"
 arch="noarch"
 license="GPL-2.0-or-later"
 source="
 	os-customization
-	https://gitlab.com/postmarketOS/boot-deploy/-/archive/$pkgver/boot-deploy-$pkgver.tar.gz
+	https://gitlab.postmarketos.org/postmarketOS/boot-deploy/-/archive/$pkgver/boot-deploy-$pkgver.tar.gz
 	"

 check() {
@@ -16,7 +16,7 @@ check() {
 }

 package() {
-	install -Dm755 boot-deploy "$pkgdir"/sbin/boot-deploy
+	install -Dm755 boot-deploy "$pkgdir"/usr/bin/boot-deploy
 	install -Dm755 boot-deploy-functions.sh \
 		"$pkgdir"/usr/share/boot-deploy/boot-deploy-functions.sh
 	install -Dm644 "$srcdir"/os-customization \
@@ -1,7 +1,7 @@
 # Maintainer: Pops Dylan <popsdylan@protonmail.com>
 pkgname=bootchart2
 pkgver=0.14.8_git20170531
-pkgrel=4
+pkgrel=5
 pkgdesc="Boot Process Performance Visualization"
 url="https://github.com/xrmx/bootchart"
 arch="all"
@@ -26,7 +26,7 @@ check() {
 package() {
 	# install everything but the service
 	for target in "py-install-compile" "install-collector" "install-docs"; do
-		make PYTHON=python3 DESTDIR="$pkgdir" "$target"
+		make PYTHON=python3 EARLY_PREFIX="/usr" DESTDIR="$pkgdir" "$target"
 	done
 }

@@ -1,12 +1,12 @@
 # Maintainer: Dylan Van Assche <me@dylanvanassche.be>
 pkgname=bootmac
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Configure MAC addresses at boot"
-url="https://gitlab.com/postmarketOS/bootmac"
+url="https://gitlab.postmarketos.org/postmarketOS/bootmac"
 arch="all"
 license="GPLv3-or-later"
-source="https://gitlab.com/postmarketOS/bootmac/-/archive/v$pkgver/bootmac-v$pkgver.tar.gz"
+source="https://gitlab.postmarketos.org/postmarketOS/bootmac/-/archive/v$pkgver/bootmac-v$pkgver.tar.gz"
 depends="bluez-btmgmt bluez-deprecated"
 options="!check"
 builddir="$srcdir/$pkgname-v$pkgver"
@@ -1,9 +1,9 @@
 # Maintainer Ignacy Kuchciński <ignacykuchcinski@gmail.com>
 pkgname=hisi-wlan
 pkgver=2
-pkgrel=0
+pkgrel=1
 pkgdesc="Init script for enabling hisi wlan driver (downstream Android kernels)"
-url="https://gitlab.com/postmarketOS/pmaports"
+url="https://gitlab.postmarketos.org/postmarketOS/pmaports"
 arch="noarch"
 license="GPL-3.0-or-later"
 install="$pkgname.post-install"
@@ -1,7 +1,7 @@
 # Maintainer: Caleb Connolly <caleb@postmarketos.org>
 pkgname=iskey
 pkgver=1
-pkgrel=0
+pkgrel=1
 pkgdesc="Tiny tool to check if a key is pressed"
 url="https://postmarketos.org"
 arch="all"
@@ -9,7 +9,7 @@ license="GPL-2.0"
 makedepends="meson linux-headers libevdev-dev"
 options="!check"
 _commit="4bc43d2bbf424ca90e11b3ed0c56e925898a130d"
-source="https://gitlab.com/postmarketOS/buffybox/-/archive/$_commit/buffybox-$_commit.tar.gz"
+source="https://gitlab.postmarketos.org/postmarketOS/buffybox/-/archive/$_commit/buffybox-$_commit.tar.gz"

 # We're only building the iskey utility
 builddir="$srcdir/buffybox-$_commit/iskey"
@@ -1,9 +1,9 @@
 # Maintainer: Atilla Szollosi <ata2001@airmail.cc>
 pkgname=mdss-fb-init-hack
 pkgver=0.1
-pkgrel=2
+pkgrel=4
 pkgdesc="Workaround for buggy framebuffer driver (mdss-fb)"
-url="https://gitlab.com/postmarketOS/pmaports"
+url="https://gitlab.postmarketos.org/postmarketOS/pmaports"
 arch="noarch"
 license="GPL-3.0-or-later"
 depends="msm-fb-refresher"
@@ -13,7 +13,7 @@ subpackages="$pkgname-openrc"

 package() {
 	install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
-	install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/sbin/mdss-fb-hack"
+	install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/mdss-fb-hack"
 }

 openrc() {
@@ -21,5 +21,7 @@ openrc() {
 	default_openrc
 }

-sha512sums="dcda465ef62cd9d92d5e7c9f17e45982d5428950b1f6248b172408dce33d53eb866000a9290b63d41c61a8050547048f90ff9016d64f39c25f06fb6537ddc401  mdss-fb-init-hack.initd
-22cb037d51a74fd363748c7c0b84f313ac9fce04a32953da00c338befc3af58012a24b7cb92a011fc8fe55722d1ceae7d42173c477297e00094e45d58d2e5b82  mdss-fb-init-hack.sh"
+sha512sums="
+dcda465ef62cd9d92d5e7c9f17e45982d5428950b1f6248b172408dce33d53eb866000a9290b63d41c61a8050547048f90ff9016d64f39c25f06fb6537ddc401  mdss-fb-init-hack.initd
+22cb037d51a74fd363748c7c0b84f313ac9fce04a32953da00c338befc3af58012a24b7cb92a011fc8fe55722d1ceae7d42173c477297e00094e45d58d2e5b82  mdss-fb-init-hack.sh
+"
@@ -1,11 +1,11 @@
 # Maintainer: Oliver Smith <ollieparaoid@postmarketos.org>
 pkgname=mobile-config-firefox
 pkgver=4.3.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Firefox tweaks for mobile and privacy"
-url="https://gitlab.com/postmarketOS/mobile-config-firefox"
+url="https://gitlab.postmarketos.org/postmarketOS/mobile-config-firefox"
 source="
-	https://gitlab.com/postmarketOS/mobile-config-firefox/-/archive/$pkgver/mobile-config-firefox-$pkgver.tar.bz2
+	https://gitlab.postmarketos.org/postmarketOS/mobile-config-firefox/-/archive/$pkgver/mobile-config-firefox-$pkgver.tar.bz2
 "
 arch="noarch"
 license="GPL-3.0-or-later"
@@ -1,13 +1,13 @@
 pkgname=msm-firmware-loader
 pkgver=1.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Set of init services to automatically load firmware from device partitions"
 url="https://postmarketos.org/"
 subpackages="$pkgname-openrc $pkgname-wcnss"
 arch="armhf armv7 aarch64"
 license="MIT"
 source="
-	https://gitlab.com/postmarketOS/msm-firmware-loader/-/archive/$pkgver/msm-firmware-loader-$pkgver.tar.gz
+	https://gitlab.postmarketos.org/postmarketOS/msm-firmware-loader/-/archive/$pkgver/msm-firmware-loader-$pkgver.tar.gz
 	msm-firmware-loader.initd
 	msm-firmware-loader-unpack.initd
 "
@@ -1,7 +1,7 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-android-recovery-installer
 pkgver=1.0.7
-pkgrel=0
+pkgrel=1
 pkgdesc="TWRP compatible postmarketOS installer script"
 arch="all"
 url="https://postmarketos.org"
@@ -17,7 +17,7 @@ build() {

 package() {
 	install -Dm755 build_zip.sh \
-		"$pkgdir"/sbin/build-recovery-zip
+		"$pkgdir"/usr/bin/build-recovery-zip
 	install -Dm644 update-binary \
 		"$pkgdir"/var/lib/postmarketos-android-recovery-installer/META-INF/com/google/android/update-binary
 	install -Dm755 pmos_chroot \
@@ -1,13 +1,13 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-artwork
 pkgver=5
-pkgrel=3
+pkgrel=4
 pkgdesc="Meta package for the postmarketOS artwork"
 url="https://postmarketos.org/"
 arch="noarch"
 license="CC-BY-SA-4.0"
 _hash="f28dd5fef287c970f50ca49bc44814ee1e3b229d"
-source="postmarketos-artwork-$_hash.tar.gz::https://gitlab.com/postmarketOS/artwork/-/archive/$_hash/artwork-$_hash.tar.gz
+source="postmarketos-artwork-$_hash.tar.gz::https://gitlab.postmarketos.org/postmarketOS/artwork/-/archive/$_hash/artwork-$_hash.tar.gz
 	10_pmOS-wallpaper.gschema.override
 	postmarketos-gnome.xml
 	set-plasma-wallpaper.desktop
@@ -1,7 +1,7 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-base-ui
 pkgver=28
-pkgrel=5
+pkgrel=6
 pkgdesc="Meta package for minimal postmarketOS UI base"
 url="https://postmarketos.org"
 arch="noarch"
@@ -244,7 +244,7 @@ iwd() {
 	pkgdesc="Use iwd as the WiFi backend (but may not work with all devices)"
 	provides="postmarketos-base-ui-wifi=$pkgver-r$pkgrel"
 	# Lower than wpa_supplicant for now, see:
-	# https://gitlab.com/postmarketOS/pmaports/-/issues/1379
+	# https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/1379
 	provider_priority=90

 	depends="iwd"
@@ -295,7 +295,7 @@ flatpak() {
 }

 sha512sums="
-e5d049db1d82c510bab9246208b51b8ec2711d008d67792fc10d4c0b65ed4dece7b5ae3c3dd28a8539d177b6849c1f921cb9fef3d2c7bee0355451f7b4757ec6  rootfs-etc-chrony-chrony.conf
+187baa4a2b77e1e97a13536553ef2e1f64c3968f07ab2a372b550e4eee10a801a3b9797766d0d9f566148230335f3d4d150cd335bc40050322313a195874d608  rootfs-etc-chrony-chrony.conf
 8d2c54fe3ca62c62f8337fb6be28479d0e02ea63f32abae81907f2768631e65c9e17485f8bc0854a013377f729b06dd1873e2b75f86f657ece866d00aecbbdb4  rootfs-etc-elogind-logind.conf
 b841282b96110ec59a7aa539db0737327b09549d55c78dc4b2c3b28b4a6ad1facf015b3175cb6d3a38f13e47aa6314ef3dc1514a4e60dd653a97409ec54ba706  rootfs-etc-conf.d-bluetooth
 49fb494b659fe0149a93eafe109609acce6a470bb8acea160638d07e0e4b11af2544f34549d5ef2deb2914a7ef13d0d470b04ad62981f14f96999af02a5f24cf  rootfs-etc-conf.d-openrc-settingsd
@@ -316,7 +316,7 @@ d4b4c4fed2dee7266f6a87ae266691377593014943e2953e4cd87a59f3110f25bfb5f3f866cc8435
 1b8add60574ec4644197cb93263c0653325c2e88e03673de918be5fb3280c7b81e8e97dce498850a07f2f3307771c44f3c876922e5cbd5207523ede31816296f  rootfs-usr-lib-NetworkManager-system-connections-USB_Networking.nmconnection
 d1ddd43489e6016e3ffd716027ed2bae4a2ab5f213118bdbcb96750e267ab7c0367cd0e0e386300aa5550352653144f5caeddd790621fe0879f83ca1995bb65c  rootfs-etc-tinydm.d-env-wayland.d-50-firefox-wayland.sh
 ecaa57d033a119a53a6574c27636b7c89d659d75ea48a973a6a4ff6f90e5d07202529fd489bfc9dfc7430f5b60f40612f6d5c06f7fab47e681b0a3112a874058  rootfs-etc-tinydm.d-env-wayland.d-50-sdl-wayland.sh
-52d58729cbf3cd0318de633e8a8da74c7af246025a8c5746d5e7c854bdabbf27fa07d8558ffec92a30491cdb687fe4414de5adcddd7da5be3510f918fba463a2  rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh
+36e0037f6d26a99db7b47831263be610d594e2c1c4a8ee7f6fc8b41092f501d3064d80b80ddf6a82b616bd2da09aa4da896074ad9f7fd53aba7e397da4190d22  rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh
 9dcf698c729e6a3d05201aa74c1618169f344f9c973e6a074591b0b4f352470235decbbc658393f44c62b6b1508c68f3c1787a640f219dbcc136e9335f3994c4  rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh
 bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1  rootfs-etc-profile.d-qt-mobile-controls.sh
 6e193eca3961a78d47b4656892eae34d019d9317a255a201f5ea61e3300caff04c526a27cd98d0edc072b36e3eaf3a1768f4cd27c5e2be8b19c167d535c820a6  rootfs-etc-profile.d-qt-wayland.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 # WARNING: do not symlink this file to postmarketos-base-ui.post-install!
 # Needs further discussion, see:
-# https://gitlab.com/postmarketOS/pmaports/-/merge_requests/2243#note_602226491
+# https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/2243#note_602226491
@@ -3,7 +3,7 @@
 pool pool.ntp.org iburst

 # Commented out to avoid delay during boot
-# https://gitlab.com/postmarketOS/pmaports/-/issues/44#note_264516692
+# https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/44#note_264516692
 # initstepslew 10 pool.ntp.org

 driftfile /var/lib/chrony/chrony.drift
@@ -4,8 +4,8 @@
 # supported by NetworkManager's "Primary Connection". The script requires that
 # NetworkManager is configured to use/manage dnsmasq.
 # For more information about *why* this is necessary, see:
-#  - https://gitlab.com/postmarketOS/pmaports/-/issues/1430
-#  - https://gitlab.com/postmarketOS/pmaports/-/merge_requests/3823
+#  - https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/1430
+#  - https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/3823
 # Related:
 #  - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/1279

@@ -1,6 +1,6 @@
 pkgname=postmarketos-base
 pkgver=36
-pkgrel=2
+pkgrel=4
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://postmarketos.org"
 arch="noarch"
@@ -70,7 +70,7 @@ _source755="
 	etc/init.d/deferred-initcalls
 	etc/init.d/swapfile
 	etc/init.d/tmpfs
-	sbin/swapfile
+	usr/bin/swapfile
 	usr/lib/firmwareload.sh
 	"

@@ -174,12 +174,12 @@ sha512sums="
 e529f5cef1f31481b577f99b8917704f2cfefb963d98bf40a14b017938e55a00134d2033f81d2cb0b8489c5e9b4a92fdc0a788013f1adb4cd46d9580c9988186  rootfs-etc-sudoers
 ab09e67203bb82226b0c9e600c8bc231a5c0111977b80edb355e55be101d008ac3c06798c263f0ca50e203758e1bfbf25767ad12f2654d082fb007c0411bbd1f  rootfs-etc-doas.d-10-postmarketos.conf
 e0d2d48b82a03239a4c0a00acaf83e00d397c23a8d7c71053d4e2a383357c22dcedef9e81b0e12a1d7514e1fdbe0bb3eb82613d18b29034a7ce5447f13c84a53  rootfs-etc-conf.d-swapfile
-4bc9f9c62d2cb75c1e562e070bc5260c9bc2b0abe6941b7cebd9b5a649342cb4121a0713153d3c246d0a284a50fd335638c9738778698a08fcaed7058b69efb9  rootfs-etc-conf.d-zram-init
+96ba663d7fc9a4296c64bf3344ed8958889379fda94ab2b4064af091dd461caa6c7918884464e2249a0983b369860cb5df7c5d7d4a3eaab5b56fbe2f459b0aaf  rootfs-etc-conf.d-zram-init
 e4576c58c35f80bedddb1e89e186f37d31a186d3e9eb046581b8c5d7b7d435e18924539e851d3e67dc0ede80f9d44d16bd9ef52e73350d3f13224edc31d73a34  rootfs-etc-conf.d-syslog
 9b8d0493bb64457fe176fea801e0771d3c5279302c61559824bf81b3d2b66d2c1e076f4aaac65f55389005acb18c27e44bed858c2bdbad37d74199f07c86c354  rootfs-etc-fstab
 45bd0742a64a9d3c4a88e152b97edcf3fa1edca28884f9ea69e7c4c365f1e41ef9056dbe204545de7d4b2ba92e1e5872b2a929c2dcc1dd468e627cc3f090b8e6  rootfs-etc-issue
 01403df3b5a2be0dd70387a3c32cf24a77bc097679fbefca585082a0970b7d756723c33687be3809351b5e31c85947db84861118bfeced8f5f865fe2452555ec  rootfs-etc-motd
-093c201f0c7aa203df447f2a8c27e5834520a7016ce2934ddc35fb037d2ec9acf0f7df7c06e07ad24ba7b4d94ef21fe7ff848c58bd62277eeeb08659fbddf1e9  rootfs-usr-lib-os-release
+a4392d174905e42ecf4459d69a5ccc45d841ef9c773e3fd2c3b03ff5c64f5b832c42213986d8e32a58a977b2221c2e9d2c7e63480b0150b799d459f64651552e  rootfs-usr-lib-os-release
 b70ee1b39b5f33c9a3e6bf4259158519691c82c8cefb700d4df49eb749a2cce208082e00d4905b9eea2c4f75b6da62f73931931c92157b4132adb35dcf0e0a6f  rootfs-etc-sysctl.d-disable-rp-filter.conf
 b61c6116f972df08f460494cf3b511b7cb4046a65bb3bd840cddb5ca98518c4514dc5f8a9330bc9ac630e5adbfecc839cbd21f70cac5000a30fd2daeab0f02d7  rootfs-usr-lib-udev-rules.d-20-tm2-touchkey-input.rules
 de4d8f258cb2ce654be15abe0188caa6ca9cc163fd45350f2025e7e9d043878e3f1202ef9033b1b15d7e18c4b40c3b19db387ee050a3baf03c4bd4293f4721e3  rootfs-usr-lib-udev-rules.d-20-tm2-touchkey-leds.rules
@@ -188,8 +188,8 @@ de4d8f258cb2ce654be15abe0188caa6ca9cc163fd45350f2025e7e9d043878e3f1202ef9033b1b1
 f5c6913040a0448c346fdd0b5dbea865a3ac92ac1a21646d32753e6521642a27b061c314f10a14b612b78aa6bc8d3209e51f7ced95c478f1be55e478ff04067b  rootfs-usr-lib-udev-rules.d-90-feedbackd-regulator-haptic.rules
 d89a7e4b9d601431c62c11f83c9c72fdb90384d9100ee5fc4aff25dda0836fd3bf9e48c0536615be791374459eb8fbaf36d27358d4402ce768a9b9a32bed4f93  rootfs-usr-share-mkinitfs-files-postmarketos-base.files
 3c049c5e6fbe3079ac333f416cbaf5d3890a7941b79d68741bfc861ee94358fba6d8b72614fe99ab84563f9208613037c6702a7d0fc5a6dfa9d0518b5a13b0cb  rootfs-etc-init.d-deferred-initcalls
-f5cc0f1265955d2646e5f099dd4b5d4c287945bfc18c16044db57670d456f55c678fc11cc59e6dab3fa340832ce869d516302a3a35c13518539ed0cedca51819  rootfs-etc-init.d-swapfile
+42d6bce78b6e3c118dcbd9228b138661a05f8f321f17457e8df8f2398c0b780399d8d056f0a7c50d91557ac8698ab37dde61ec1a13fd69a7b3faad092f126580  rootfs-etc-init.d-swapfile
 0cd9a0b8490028d854b65d0648aaf84e4703921b8b7797517dd65ffaa1ec9e225487007dcccd42c249a9f2470e5adacf95760536c9508138b14de7252de38473  rootfs-etc-init.d-tmpfs
-23df2632e8ef372dccd6b9abac61441dd0ee447ccc7428fba495e28f1b697ebc415f7580dbb9a39d22d162a175d7264b47bdf9f66552347e35d9d0bb7828647d  rootfs-sbin-swapfile
+23df2632e8ef372dccd6b9abac61441dd0ee447ccc7428fba495e28f1b697ebc415f7580dbb9a39d22d162a175d7264b47bdf9f66552347e35d9d0bb7828647d  rootfs-usr-bin-swapfile
 72c73bd67bfe2a659c469781e4def038a9b2482e014c0304150fbc25c5325fc7a36b288de76447837741bb9a828eb1db6df0d33b41cf67c7a25bb27b03777b1f  rootfs-usr-lib-firmwareload.sh
 "
@@ -27,7 +27,7 @@ fi
 # Fixup old pmOS installations that run setup-timezone without "-i" option
 # and those later installations that run with it, but have missing
 # https://gitlab.alpinelinux.org/alpine/alpine-conf/-/merge_requests/157
-# See https://gitlab.com/postmarketOS/pmaports/-/issues/2168 for context
+# See https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/2168 for context
 # This is probably safe to remove after a couple of releases of the alpine-conf
 # fix having been merged
 [ -L /etc/localtime ] || exit 0
@@ -5,7 +5,7 @@
 # - 50% of RAM for devices with between 2GB and 6GB of RAM
 # - 25% of RAM for devices with greater 6GB of RAM
 # This is loosely based on some data here:
-# https://gitlab.com/postmarketOS/pmaports/-/merge_requests/3752#note_1229631449
+# https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/3752#note_1229631449

 _mem_size_mb="$(LC_ALL=C free -m | awk '/^Mem:/{print $2}')"

@@ -8,14 +8,14 @@ depend()
 start()
 {
 	ebegin "Activating swap file"
-	/sbin/swapfile
+	swapfile
 	eend $?
 }

 stop()
 {
 	ebegin "Deactivating swap file"
-	/sbin/swapoff -a >/dev/null
+	swapoff -a >/dev/null
 	eend $?
 }

@@ -5,6 +5,6 @@ VERSION="edge"
 ID="postmarketos"
 ID_LIKE="alpine"
 HOME_URL="https://www.postmarketos.org/"
-SUPPORT_URL="https://gitlab.com/postmarketOS"
-BUG_REPORT_URL="https://gitlab.com/postmarketOS/pmaports/issues"
+SUPPORT_URL="https://gitlab.postmarketos.org/postmarketOS"
+BUG_REPORT_URL="https://gitlab.postmarketos.org/postmarketOS/pmaports/issues"
 LOGO="postmarketos-logo"
@@ -2,7 +2,7 @@
 # only be used on devices that do not have space for the full size ramdisk.
 pkgname=postmarketos-initramfs-minimal
 pkgver=2.8.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Deprecated minimal initramfs for space constrained devices"
 url="https://postmarketos.org"
 options="!check"  # no tests
@@ -92,7 +92,7 @@ sha512sums="
 ab41b45b0613f25a61114ed8c8b92bc53c60838f6e2e0ba18c76e5369b2984e6023a0661887692673aca3f647f268c468a468f6b1ac424cfee609017a89481dd  00-initramfs-base.files
 fb8acfff431f8f8a8af7770de7cbcf8d8e31e95235116f1d65bfa6aa222d2d48d190dfd12d86f715c8b07195250ea13d58d0dc65c46913df807eac8b20384f6b  00-initramfs-extra-base.files
 102cb49a5b44282afee7808945c69e9bb9310677efeefc681d92217f0399a90fcbb37eb9ac7aed89cc27c324780298c7c2de6de2bdb89a77499faad1c312e539  init.sh
-3e3cb29eabf9ee4c8dbd7ff2366aa8cea5f44b11b04df060d7841e9b8f25c85f0a2b19838b177a8b651f2b3c8b69135d36603534382c54736596d0bfa429ed87  init_functions.sh
+54019d53c0e6b18e79fbf9a8bf6ae323f614f96c392c3e5c49768d934aa835d1f85597e1239bbe406e73173732c729b544a708dac1bb354f0200382a4de8d0b2  init_functions.sh
 ba3275a9af788c7c782322a22a0f144d5e50e3498ea6886486a29331f23ae89cd32d500a3635cfa7cab369afba92edc18aeca64ccbf0cd589061cce23d15b46c  unudhcpd.conf
 675e7d5bee39b2df7d322117f8dcaccc274d61beaf4d50ead19bbf2109446d64b1c0aa0c5b4f9846eb6c1c403418f28f6364eff4537ba41120fbfcbc484b7da7  mdev.conf
 "
@@ -673,7 +673,7 @@ setup_usb_configfs_udc() {
 	# Remove any existing UDC to avoid "write error: Resource busy" when setting UDC again
 	echo "" > /config/usb_gadget/g1/UDC || echo "  Couldn't write to clear UDC"
 	# Link the gadget instance to an USB Device Controller. This activates the gadget.
-	# See also: https://gitlab.com/postmarketOS/pmbootstrap/issues/338
+	# See also: https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/issues/338
 	echo "$_udc_dev" > /config/usb_gadget/g1/UDC || echo "  Couldn't write new UDC"
 }

@@ -929,7 +929,7 @@ create_logs_disk() {
 	Something went wrong and your device did not boot properly. If this was unexpected
 	then please open a new issue by visiting

-	https://gitlab.com/postmarketOS/pmaports/-/issues/new
+	https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/new

 	and attach the following file by dragging it onto the page:

@@ -2,7 +2,7 @@
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-initramfs
 pkgver=3.3.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Base files for the postmarketOS initramfs / initramfs-extra"
 url="https://postmarketos.org"
 options="!check"  # no tests
@@ -93,6 +93,6 @@ sha512sums="
 0f4c14b63ba22bbf6466f3b9b3c46e2a8cdd9f53600e3d5536288af1f37ae1b10efd0d038ed0669b3c128eb056758e7f1dbbcc6ef5768a27775776f8f11b2fdc  00-initramfs-base.files
 c4ce6c9ef5b1aa8fce0937676eb68f0172474cb86f2ab9d839f327b1c58f22ed6ae2a48133dd1c04ede33324ce82f78863f68ab6e62f88b716964b3b84f0ae9e  00-initramfs-extra-base.files
 7ea2c318e3b63b84ba8eb09e31dd74cdd9c86f5f4d8970ab54bb9213930e913c09728b60d429828007ea2dbb0472fd50dc3daae2efbe307babf854e4d8ecb238  init.sh
-7518662b584328cc94b108d9283c19c4d551d0a25d51b4fed60b4367c129789a5d895ab68244ec448c92c6818e7cefc68552184b6e9098c8f9b9c7fcf008517d  init_functions.sh
+6ccfbf84dd0315bfe2d9556ddfaaa2533ac4d1ab2055bb04e321cf945ae3ecbf6dc2c5e14a836cbc62f28da9eec1136a25d49764b330019bd04b918c8d36e6c6  init_functions.sh
 ba3275a9af788c7c782322a22a0f144d5e50e3498ea6886486a29331f23ae89cd32d500a3635cfa7cab369afba92edc18aeca64ccbf0cd589061cce23d15b46c  unudhcpd.conf
 "
@@ -729,7 +729,7 @@ setup_usb_configfs_udc() {
 		echo "" > "$CONFIGFS"/g1/UDC || echo "  Couldn't write to clear UDC"
 	fi
 	# Link the gadget instance to an USB Device Controller. This activates the gadget.
-	# See also: https://gitlab.com/postmarketOS/pmbootstrap/issues/338
+	# See also: https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/issues/338
 	echo "$_udc_dev" > "$CONFIGFS"/g1/UDC || echo "  Couldn't write new UDC"
 }

@@ -1195,7 +1195,7 @@ create_logs_disk() {
 	Something went wrong and your device did not boot properly. If this was unexpected
 	then please open a new issue by visiting

-	https://gitlab.com/postmarketOS/pmaports/-/issues/new
+	https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/new

 	and attach the following file by dragging it onto the page:

@@ -4,9 +4,9 @@
 # https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/main/installkernel
 pkgname=postmarketos-installkernel
 pkgver=0.1
-pkgrel=0
+pkgrel=2
 pkgdesc="postmarketOS script for installing mainline kernels"
-url="https://gitlab.com/postmarketOS/pmaports/tree/main/postmarketos-installkernel"
+url="https://gitlab.postmarketos.org/postmarketOS/pmaports/tree/main/postmarketos-installkernel"
 arch="noarch"
 license="GPL-2.0"
 options="!check" # no test suite
@@ -20,7 +20,7 @@ build() {
 }

 package() {
-	install -Dm755 "$srcdir"/installkernel-pmos "$pkgdir"/sbin/installkernel
+	install -Dm755 "$srcdir"/installkernel-pmos "$pkgdir"/usr/bin/installkernel
 }

 sha512sums="
@@ -38,7 +38,7 @@ index 138667b..6494504 100644
 +	"strings"
 	"time"
 
- 	"gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/archive"
+ 	"gitlab.postmarketos.org/postmarketOS/postmarketos-mkinitfs/internal/archive"
@@ -26,8 +28,14 @@ import (
 
 // set at build time
@@ -2,7 +2,7 @@
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-mkinitfs
 pkgver=2.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Tool to generate initramfs images for postmarketOS"
 url="https://postmarketos.org"
 depends="
@@ -22,9 +22,9 @@ triggers="$pkgname.trigger=\
 "

 # mkinitfs-vendor-$pkgver.tar.gz: vendored Go deps, is part of the release:
-# https://gitlab.com/postmarketOS/postmarketos-mkinitfs/-/releases
+# https://gitlab.postmarketos.org/postmarketOS/postmarketos-mkinitfs/-/releases
 source="
-	https://gitlab.com/postmarketOS/postmarketos-mkinitfs/-/archive/$pkgver/postmarketos-mkinitfs-$pkgver.tar.gz
+	https://gitlab.postmarketos.org/postmarketOS/postmarketos-mkinitfs/-/archive/$pkgver/postmarketos-mkinitfs-$pkgver.tar.gz
 	https://gitlab.com/api/v4/projects/postmarketOS%2Fpostmarketos-mkinitfs/packages/generic/mkinitfs-vendor-$pkgver/$pkgver/mkinitfs-vendor-$pkgver.tar.gz
 	0001-add-compile-time-flag-to-disable-Go-GC-MR-56.patch
 	"
@@ -70,5 +70,5 @@ check() {
 sha512sums="
 6f2e5c8281a8e6b340f2288b31fb102dcc98480e8bf905bf57a54a81d36a5615b194f0a56f5cd3be207784278257eb6ee3dfecaccb60c3332f4d0f45bafedaa3  postmarketos-mkinitfs-2.5.1.tar.gz
 420e4bd8126f765c18b3ea48b2dc7356727958826dbe1086b753f5d46bc9b56d25ed668db8f9f4e8c9d5b1e943105850071c9c3ce442daf12eaa80516e973372  mkinitfs-vendor-2.5.1.tar.gz
-2af899c69cbdc84ca85f2a5fe609974b2b9e4c0389d9487596d86d403e55b09fdc2e7daf4452bf33b8a27a2b37339d9311b8d1f903074a1410689665425b7d68  0001-add-compile-time-flag-to-disable-Go-GC-MR-56.patch
+2c7b95ba05fed50a05338e0300d0330f9ac82c649345553015f867dad947738c2729780e5a26585cc32180999fd8b1ecffaff0e8117c8c817b79d7119b0fdc14  0001-add-compile-time-flag-to-disable-Go-GC-MR-56.patch
 "
@@ -1,11 +1,11 @@
 # Maintainer: Oliver Smith <ollieparaoid@postmarketos.org>
 pkgname=postmarketos-release-upgrade
 pkgver=1.7.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Upgrade from one pmOS release to the next one"
-url="https://gitlab.com/postmarketOS/postmarketos-release-upgrade/"
+url="https://gitlab.postmarketos.org/postmarketOS/postmarketos-release-upgrade/"
 source="
-	https://gitlab.com/postmarketOS/postmarketos-release-upgrade/-/archive/$pkgver/postmarketos-release-upgrade-$pkgver.tar.bz2
+	https://gitlab.postmarketos.org/postmarketOS/postmarketos-release-upgrade/-/archive/$pkgver/postmarketos-release-upgrade-$pkgver.tar.bz2
 "
 arch="noarch"
 license="GPL-3.0-or-later"
@@ -1,12 +1,12 @@
 pkgname=postmarketos-theme
 pkgver=0.6.0
-pkgrel=0
+pkgrel=1
 pkgdesc="GTK themes adjusted for postmarketOS"
-url="https://gitlab.com/postmarketOS/postmarketos-theme"
+url="https://gitlab.postmarketos.org/postmarketOS/postmarketos-theme"
 arch="all"
 license="GPL-2.0-only"
 makedepends="meson sassc"
-source="https://gitlab.com/postmarketOS/postmarketos-theme/-/archive/$pkgver/postmarketos-theme-$pkgver.tar.gz"
+source="https://gitlab.postmarketos.org/postmarketOS/postmarketos-theme/-/archive/$pkgver/postmarketos-theme-$pkgver.tar.gz"
 options="!check" # There's no testsuite

 build() {
@@ -1,9 +1,9 @@
 # Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=postmarketos-tweaks
 pkgver=0.13.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Tweak tool for phone UIs"
-url="https://gitlab.com/postmarketOS/postmarketos-tweaks"
+url="https://gitlab.postmarketos.org/postmarketOS/postmarketos-tweaks"
 arch="noarch"
 license="GPL-3.0-or-later"
 subpackages="
@@ -14,7 +14,7 @@ subpackages="
 	"
 depends="python3 py3-gobject3 py3-yaml gtk+3.0 libhandy1"
 makedepends="py3-setuptools glib-dev libhandy1-dev meson"
-source="$pkgname-$pkgver.tar.gz::https://gitlab.com/postmarketOS/postmarketos-tweaks/-/archive/$pkgver/postmarketos-tweaks-$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://gitlab.postmarketos.org/postmarketOS/postmarketos-tweaks/-/archive/$pkgver/postmarketos-tweaks-$pkgver.tar.gz"
 options="!check" # There's no testsuite

 build() {
@@ -9,7 +9,7 @@ url="https://postmarketos.org/"
 license="GPL-3.0-or-later"
 options="!check"
 depends="postmarketos-base-ui-cage"
-# https://gitlab.com/postmarketOS/pmbootstrap/-/issues/2347
+# https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/issues/2347
 _pmb_groups="seat"
 _pmb_recommends="postmarketos-demos"

@@ -2,7 +2,7 @@
 # Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
 pkgname=postmarketos-ui-lxqt
 pkgver=0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="(X11) Lightweight Qt Desktop Environment (stylus recommended)"
 url="https://lxqt-project.org/"
 # armhf: lxqt-desktop not available
@@ -12,6 +12,7 @@ depends="
 	dbus-x11
 	dnsmasq
 	elogind
+	font-dejavu
 	lxqt-desktop
 	lxqt-policykit
 	mesa-egl
@@ -2,7 +2,7 @@
 # Maintainer: Jakko <jahau@rocketmail.com>
 pkgname=postmarketos-ui-mate
 pkgver=7
-pkgrel=3
+pkgrel=4
 pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)"
 url="http://mate-desktop.org/"
 arch="noarch"
@@ -12,6 +12,7 @@ depends="
 	dbus-x11
 	dnsmasq
 	elogind
+	font-dejavu
 	gtk+2.0
 	lightdm
 	mate-desktop-environment
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
 options="!check"
 depends="postmarketos-base-ui-cage"
 source="10-moonlight-qt.sh"
-# https://gitlab.com/postmarketOS/pmbootstrap/-/issues/2347
+# https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/issues/2347
 _pmb_groups="seat"
 # TODO: use flatpak version here for aarch64, as it uses forked ffmpeg with
 # v4l2-request support.
@@ -7,6 +7,6 @@
 # Therefore set the blue accent color back until phosh has support for accent colors
 #
 # Ref: https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1533
-# Ref: https://gitlab.com/postmarketOS/pmaports/-/issues/3218
+# Ref: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3218
 [org.gnome.desktop.interface]
 accent-color='blue'
@@ -2,7 +2,7 @@
 # Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=postmarketos-ui-phosh
 pkgver=22.4
-pkgrel=0
+pkgrel=1
 pkgdesc="(Wayland) Mobile UI initially developed for the Librem 5"
 url="https://phosh.mobi"
 arch="noarch !armhf"
@@ -68,7 +68,7 @@ systemd() {

 sha512sums="
 e577b8073df680ccee75ef5b6bb1f2877d5727687d63d6fd9211298e791b6c9f593eb79278c77a4b4918e3c57333c2a012030baf5a3c8d6d16000cc63a030f84  01_postmarketos-ui-phosh.gschema.override
-b5269303032b35d6e249479eb8870063b862280eca9605522f47d09a3c2266861560934643cf4a39af2d309696bad16b086d8b98e1240bbaef5e6ba3048de1dd  20_postmarketos-blue-accent.gschema.override
+f835435eea55184256229741f6ed2aa1a31d9c0dadaf0d2698a35fbeecae042b00f15ea991b0abc6b19db9e90b53879afcfa3be8721af29b28e4809973e485e8  20_postmarketos-blue-accent.gschema.override
 a741e8db9e4232334b924326c48be4e4c8f7a2382a7608926918a7491c518b2dda551e55a00d4d5fcf58c7950a78dc35d5cc5eaab53ad93a56de40887071f242  mimeapps.list
 53f5c565b4ca8a12f12b63ec84a0194ef530703565d123203d41582a35a54d66afaf3a676df158ae0effe327dcfc1c6496a082ce9dbe803b2547417c3c3fad6e  udiskie.desktop
 "
@@ -6,7 +6,7 @@ pkgrel=2
 _commit_configs="a8bd93e279c222be6058ef46b065c11e88aa8400"
 pkgdesc="(Wayland) 10-feet variant of Plasma, made for big screen TVs"
 url="https://wiki.postmarketos.org/wiki/Plasma_Bigscreen"
-# Crashes on armhf due to https://gitlab.com/postmarketOS/pmaports/issues/75
+# Crashes on armhf due to https://gitlab.postmarketos.org/postmarketOS/pmaports/issues/75
 # riscv64: plasma-workspace, qt5-qtbase need rebuild against libcui18n in alpine edge
 arch="!armhf !riscv64"
 license="GPL-3.0-or-later"
@@ -2,9 +2,9 @@
 # Maintainer: Jakko <jahau@rocketmail.com>
 pkgname=postmarketos-ui-xfce4
 pkgver=0.5.2
-pkgrel=3
+pkgrel=4
 pkgdesc="(X11) Lightweight desktop (stylus recommended)"
-url="https://gitlab.com/postmarketOS/xfce4-phone"
+url="https://gitlab.postmarketos.org/postmarketOS/xfce4-phone"
 arch="noarch"
 license="GPL-3.0-or-later"
 depends="
@@ -39,7 +39,7 @@ _pmb_recommends="
 	"
 subpackages="$pkgname-openrc"
 source="
-	xfce4-phone-$pkgver.tar.gz::https://gitlab.com/postmarketOS/xfce4-phone/-/archive/$pkgver/xfce4-phone-$pkgver.tar.gz
+	xfce4-phone-$pkgver.tar.gz::https://gitlab.postmarketos.org/postmarketOS/xfce4-phone/-/archive/$pkgver/xfce4-phone-$pkgver.tar.gz
 	10_onboard.gschema.override
 	64-lightdm-autologin.conf
 	enable-scrollbars.sh
@@ -1,9 +1,9 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-welcome
 pkgver=0.8.0
-pkgrel=0
+pkgrel=1
 pkgdesc="postmarketOS welcome app"
-url="https://gitlab.com/postmarketOS/postmarketos-welcome"
+url="https://gitlab.postmarketos.org/postmarketOS/postmarketos-welcome"
 arch="all"
 license="GPL-3.0-or-later"
 makedepends="
@@ -14,7 +14,7 @@ makedepends="
 	meson
 	"
 source="
-	https://gitlab.com/postmarketOS/postmarketos-welcome/-/archive/$pkgver/postmarketos-welcome-$pkgver.tar.bz2
+	https://gitlab.postmarketos.org/postmarketOS/postmarketos-welcome/-/archive/$pkgver/postmarketos-welcome-$pkgver.tar.bz2
 	org.postmarketos.Welcome.desktop
 	"
 options="!check" # No tests
@@ -1,19 +1,25 @@
 # Maintainer: Jakko <jahau@rocketmail.com>
 pkgname=swclock-offset
-pkgver=0.2.2
-pkgrel=0
+pkgver=0.2.4
+pkgrel=1
 pkgdesc="Keep system time at an offset to a non-writable RTC"
-url="https://gitlab.com/postmarketOS/swclock-offset"
+url="https://gitlab.postmarketos.org/postmarketOS/swclock-offset"
 arch="noarch"
 license="GPL-3.0-or-later"
 install="$pkgname.post-deinstall"
-subpackages="$pkgname-openrc"
-source="https://gitlab.com/postmarketOS/swclock-offset/-/archive/$pkgver/swclock-offset-$pkgver.tar.gz"
+subpackages="$pkgname-openrc $pkgname-systemd"
+source="https://gitlab.postmarketos.org/postmarketOS/swclock-offset/-/archive/$pkgver/swclock-offset-$pkgver.tar.gz"
 options="!check" # No tests

 package() {
 	make DESTDIR="$pkgdir" install
-	make DESTDIR="$pkgdir" install_openrc
+}
+
+systemd() {
+	install="$subpkgname.post-install $subpkgname.pre-deinstall"
+	install_if="$pkgname=$pkgver-r$pkgrel systemd"
+
+	amove usr/lib/systemd
 }

 openrc() {
@@ -22,5 +28,5 @@ openrc() {
 }

 sha512sums="
-44f759dd2249ecce35f5baf9f432fd933e3a07b7ea425ea0f07314c7c3c94ce2d1ab7442d9bce8f03f5d436d15865ae3f4f63d3dc83cc6063af09986b7767e10  swclock-offset-0.2.2.tar.gz
+73392b993cfa844cd8588378e282b0bd2b87e715c8ddeb4dd82c725e0afc3f66669db1682ea945b7558ade85a30e31c58ccc35332a470c73a7166ccc4ecfe642  swclock-offset-0.2.4.tar.gz
 "
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. /usr/lib/systemd/systemd-apk-macros.sh
+systemd_service_post_install system swclock-offset-boot.service
+systemd_service_post_install system swclock-offset-shutdown.service
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. /usr/lib/systemd/systemd-apk-macros.sh
+systemd_service_pre_deinstall system swclock-offset-boot.service
+systemd_service_pre_deinstall system swclock-offset-shutdown.service
@@ -1,15 +1,15 @@
 # Maintainer: Caleb Connolly <caleb@connolly.tech>
 pkgname=ttyescape
 pkgver=1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Daemon to allow users to escape to a tty"
-url="https://gitlab.com/postmarketOS/ttyescape"
+url="https://gitlab.postmarketos.org/postmarketOS/ttyescape"
 arch="noarch"
 license="GPL-2.0"
 depends="hkdm buffyboard terminus-font kbd"
 subpackages="$pkgname-openrc"
 source="
-	https://gitlab.com/postmarketOS/ttyescape/-/archive/$pkgver/ttyescape-$pkgver.tar.gz
+	https://gitlab.postmarketos.org/postmarketOS/ttyescape/-/archive/$pkgver/ttyescape-$pkgver.tar.gz
 	etc-conf-d-ttyescape.conf
 "
 options="!check"
@@ -1,10 +1,10 @@
 # Maintainer: Johannes Marbach <n0-0ne+gitlab@mailbox.org>
 pkgname=unl0kr
 pkgver=3.2.0
-pkgrel=2
+pkgrel=4
 _commit_lvgl=ceadda8a468b7d5fa6ba973bd82cf610166278d8
 pkgdesc="Framebuffer-based disk unlocker for the initramfs based on LVGL"
-url="https://gitlab.com/postmarketOS/buffybox"
+url="https://gitlab.postmarketos.org/postmarketOS/buffybox"
 arch="all"
 license="GPL-3.0-or-later"
 depends="
@@ -25,7 +25,7 @@ makedepends="
 	scdoc
 	"
 source="
-	https://gitlab.com/postmarketOS/buffybox/-/archive/$pkgver/buffybox-$pkgver.tar.gz
+	https://gitlab.postmarketos.org/postmarketOS/buffybox/-/archive/$pkgver/buffybox-$pkgver.tar.gz
 	lvgl-$_commit_lvgl.tar.gz::https://github.com/lvgl/lvgl/archive/$_commit_lvgl.tar.gz
 	unl0kr.conf
 	unl0kr.files
@@ -57,7 +57,7 @@ package() {
 		"$pkgdir"/etc/unl0kr.conf

 	install -Dm755 "$srcdir"/unlock.sh \
-		"$pkgdir"/bin/fde-unlock
+		"$pkgdir"/usr/bin/fde-unlock

 	touch unl0kr
 	install -Dm644 unl0kr \
@@ -86,7 +86,7 @@ sha512sums="
 83d6724750e6f7e048063863e78251d32a23b1c7aa9e3529a0b176c415bda70c91b83924f6a71cc7f5ca29f019e7a974b406f6e83ff038dae92430b53183d5fa  buffybox-3.2.0.tar.gz
 d3611fe9d55ed105d9567b6019dc49fc0510ac4ed6ca6e15ba0c1bae47f2833d8784b3e008a4dec76dce55bf3809531d07c62e4ba24bafad69c6c54fdd0b70c0  lvgl-ceadda8a468b7d5fa6ba973bd82cf610166278d8.tar.gz
 7155c2f95dcf3716c0f392cf5717e96f1414c383a1f7c2ed30a1f8518dfe0b17c3c0e0e93f6476a342504aa855404099e2f5444eeb099023491c9a9a26fa3d90  unl0kr.conf
-ea0d5f1fa57dd73f13c6bc826d68facd441ed256561ec6e72e11f8cc13d82bee2803b9321ee3c1f39df9a2013de1419af8a91137cafa34216188a5d975e92c74  unl0kr.files
+147db775a7b3632e60bba011f26310977d11084e1dbd83529e1fb54cb044eff322f59d02bc0200eebd9276b1adcedc4351328c47d15e68b4f4a1256a497dca17  unl0kr.files
 5386f434cd4f1fb9e0d561a8689e5e85d6a8b3c562823122c082d4932d2fb0ad4edcd635f14f0c61e5c8b5e53648c9937b042409c21683007700faea8894c750  unlock.sh
 407180b49c1a05f12bd6ee6e59dca0a6e74fe7b01f195087dcf2865598c47827d0bb569afdba55defa2f9a16437230fa62aa64f35111508b906bcbf9537acba4  30-unl0kr-test.sh
 "
@@ -2,7 +2,7 @@
 /etc/unl0kr.conf.d
 /sbin/cryptsetup
 /usr/bin/unl0kr
-/bin/fde-unlock
+/usr/bin/fde-unlock
 /usr/share/libinput/*.quirks
 /bin/udevadm
 /sbin/udevd
@@ -1,9 +1,9 @@
 # Maintainer Attila Szollosi <ata2001@airmail.cc>
 pkgname=wcnss-wlan
 pkgver=2
-pkgrel=1
+pkgrel=2
 pkgdesc="Init script for enabling wcnss wlan driver (downstream Android kernels)"
-url="https://gitlab.com/postmarketOS/pmaports"
+url="https://gitlab.postmarketos.org/postmarketOS/pmaports"
 arch="noarch"
 license="GPL-3.0-or-later"
 source="$pkgname.initd"
@@ -1,9 +1,9 @@
 # Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=msm-cros-efs-loader
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="EFS loader for Qualcomm-based Chrome OS devices"
-url="https://gitlab.com/postmarketOS/msm-cros-efs-loader"
+url="https://gitlab.postmarketos.org/postmarketOS/msm-cros-efs-loader"
 arch="aarch64"
 license="GPL-3.0-or-later"
 install="$pkgname.post-install"
@@ -2,14 +2,14 @@
 pkgname=q6voiced
 pkgver=0_git20210408
 _commit="a75518e1ddf44971b1181e12c328dd250b62962a"
-pkgrel=0
+pkgrel=1
 pkgdesc="Enable q6voice audio when call is performed with oFono/ModemManager"
 url="https://github.com/msm8916-mainline/linux"
 arch="all"
 license="MIT"
 makedepends="tinyalsa-dev dbus-dev"
 subpackages="$pkgname-openrc"
-source="https://gitlab.com/postmarketOS/q6voiced/-/archive/$_commit/q6voiced-$_commit.tar.gz
+source="https://gitlab.postmarketos.org/postmarketOS/q6voiced/-/archive/$_commit/q6voiced-$_commit.tar.gz
 	q6voiced.initd
 	"
 options="!check" # no tests
@@ -25,5 +25,7 @@ package() {
 	install -Dm755 "$srcdir"/q6voiced.initd "$pkgdir"/etc/init.d/q6voiced
 }

-sha512sums="1d60d65235b152f368fd64a1b294080623542cb86fcf2f6e12e3ff7ca275a119669313c764f3dd4f07b4f57622ba618d4394f376352e88100e58df57ec1b3a3d  q6voiced-a75518e1ddf44971b1181e12c328dd250b62962a.tar.gz
-02e5b338f2b1ed2bbcb1f8cc29d57a5915bf5fc03bc946906b545d2c31bd16302399508bbe8000ec660eee54bb1a6407689a4f85631be727ebd963e1964a54b9  q6voiced.initd"
+sha512sums="
+1d60d65235b152f368fd64a1b294080623542cb86fcf2f6e12e3ff7ca275a119669313c764f3dd4f07b4f57622ba618d4394f376352e88100e58df57ec1b3a3d  q6voiced-a75518e1ddf44971b1181e12c328dd250b62962a.tar.gz
+02e5b338f2b1ed2bbcb1f8cc29d57a5915bf5fc03bc946906b545d2c31bd16302399508bbe8000ec660eee54bb1a6407689a4f85631be727ebd963e1964a54b9  q6voiced.initd
+"
Author	SHA1	Message	Date
Clayton Craft	234d57d512	DO NOT MERGE: fix install_pmbootstrap	2024-10-10 22:17:35 -07:00
Clayton Craft	4ad661057c	DO NOT MERGE: use local install_pmb script	2024-10-10 12:02:42 -07:00
Clayton Craft	4a46552bd5	DO NOT MERGE: add install_pmbootstrap.sh from ci-common for hackin around	2024-10-10 12:02:42 -07:00
Clayton Craft	663e7c3dfc	DO NOT MERGE: trim gitlab-ci.yml	2024-10-10 12:02:42 -07:00
Pablo Correa Gómez	c1013ea2fd	device-purism-librem5: rebuild to update references to gitlab.postmarketos.org (MR 5696) [ci:skip-vercheck] [ci:ignore-count]	2024-10-07 12:59:45 +02:00
Pablo Correa Gómez	8a14c77745	cross/crossdirect: rebuild to update references to gitlab.postmarketos.org (MR 5696)	2024-10-07 12:58:04 +02:00
Pablo Correa Gómez	fdaee79c61	main,modem/*: rebuild to update references to gitlab.postmarketos.org (MR 5696) Since either url or source change	2024-10-07 12:58:03 +02:00
Pablo Correa Gómez	9552b4a781	/: update references to gitlab.postmarketos.org that need no rebuild (MR 5696) These are in files or parts of files that are not part of the checksums, or that serve as packaging-information only. Thus, require no rebuild	2024-10-07 12:57:38 +02:00
Pablo Correa Gómez	8e1d778ecc	ci: fix paths to point to gitlab.postmarketos.org (MR 5696)	2024-10-07 12:57:38 +02:00
Jakob Hauser	d47c81e808	main/swclock-offset: upgrade to 0.2.4 (MR 5687) The Makefile of swclock-offset was previously changed to install the scripts according to the /usr merge. In the service files for openrc and systemd, however, the paths to the scripts need to be adapted as well. Version 0.2.4 catches up on this. [ci:skip-build]: already built successfully in CI	2024-10-05 08:44:29 -07:00
Joel Selvaraj	82a208d1cd	soc-qcom-sdm845: update ucm conf to include pixel3 speaker support (MR 5686) [ci:skip-build]: already built successfully in CI	2024-10-05 12:54:21 +02:00
Joel Selvaraj	05b0edca69	linux-postmarketos-sdm845: update kernel config (MR 5686) The config file was not up-to-date with the sdm845 kernel repo. Fix it. This will also fix the missing Pixel 3 touchscreen config and kconfig checks.	2024-10-05 12:54:21 +02:00
postmarketOS CI	3043f30d72	linux-next: upgrade to next-20241004	2024-10-05 06:59:01 +00:00
Luca Weiss	6bdf450942	linux-postmarketos-qcom-sm6350: upgrade to 6.11.0 (MR 5602) Manual kconfig changes: * Switch DRM_MSM & panel driver back to =y, seems to improve display issues a bit Closes https://gitlab.com/postmarketOS/pmaports/-/issues/2969 [ci:skip-build]: already built successfully in CI	2024-10-04 23:19:25 +02:00
Clayton Craft	8018402b15	main/swclock-offset: upgrade to 0.2.3 (MR 5642) - now installs to /usr by default - now installs systemd service files by default - added -systemd subpkg to handle service files [ci:skip-build]: already built successfully in CI	2024-10-04 13:58:00 -07:00
Clayton Craft	1d04fa02a8	main/postmarketos-base: install swapfile script to /usr/bin (MR 5642)	2024-10-04 13:57:59 -07:00
Clayton Craft	dd0e759c19	main/mdss-fb-init-hack: install to /usr/bin (MR 5642)	2024-10-04 13:57:59 -07:00
Clayton Craft	622140965c	main/postmarketos-installkernel: install to /usr/bin (MR 5642)	2024-10-04 13:57:59 -07:00
Clayton Craft	f60eb86dc0	main/postmarketos-android-recovery-installer: install to /usr/bin (MR 5642)	2024-10-04 13:57:59 -07:00
Clayton Craft	8cc91cfebc	main/bootchart2: install to /usr (MR 5642)	2024-10-04 13:57:59 -07:00
Clayton Craft	21cde1b137	main/boot-deploy: install to /usr/bin (MR 5642)	2024-10-04 13:57:59 -07:00
Clayton Craft	fb2e31c898	kobo-epdc-extractor: upgrade to 1.1, install to /usr (MR 5642) 1.1 includes a patch to support using PREFIX, which we use here to install to /usr	2024-10-04 13:57:59 -07:00
Clayton Craft	b0e12a5532	main/unl0kr: fde-unlock script to /usr/bin (MR 5642) To support merged /usr	2024-10-04 13:57:58 -07:00
Masanori Ogino	2621ad2c48	postmarketos-ui-(lxqt\|mate): depend on DejaVu (MR 5638) MR 5540 breaks the Enter key label in onboard OSK with LXQt and Mate. In theory Droid can be used instead, but it actually does not work. We can't use _pmb_recommends here since v24.06 -> v24.12 upgrade will break onboard unless any package depends on font-dejavu. Signed-off-by: Masanori Ogino <mogino@acm.org> [ci:skip-build]: already built successfully in CI	2024-10-04 13:45:17 -07:00
Clayton Craft	a44590ec47	ci: build_changed_aports: fix building changed aports in extra-repos/systemd (MR 5576) With this change, the build test will only build changed aports when they are in an enabled repo. It will also detect when a changed aport is in extra-repos/systemd, and build it later with systemd support enabled. [ci:skip-build]: already built successfully in CI	2024-10-04 12:07:26 -07:00
Petr Hodina	b97a6d30c3	testing/firmware-google-blueline: new aport (MR 5514) Co-developed-by: Victoria Brekenfeld ...	2024-10-04 20:43:21 +02:00
Petr Hodina	3000151e0a	testing/firmware-google-blueline-dtbo: new aport (MR 5514) Co-developed-by: Victoria Brekenfeld ...	2024-10-04 20:43:21 +02:00
Petr Hodina	6d6f286e53	testing/device-google-blueline: New aport (MR 5514)	2024-10-04 20:43:21 +02:00
Caleb Connolly	008bb8b38d	linux-postmarketos-qcom-sdm845: upgrade to 6.11.0 Let's get this cooking in edge. Boot tested on the OnePlus 6, 6T, and Yoga C630 Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2024-10-04 20:38:15 +02:00