.ci/lib/common.py

@@ -100,7 +100,7 @@ def get_changed_files(removed=True):
     commit_head = run_git(["rev-parse", "HEAD"])[:-1]
     commit_upstream = run_git(["rev-parse", branch_upstream])[:-1]
     print("commit HEAD: " + commit_head)
-    print(f"commit {branch_upstream}: f{commit_upstream}")
+    print(f"commit {branch_upstream}: {commit_upstream}")
 
     # Check if we are HEAD on the upstream branch
     if commit_head == commit_upstream:

.gitlab-ci.yml

@@ -10,7 +10,12 @@ stages:
   - lint
   - build
   - autoupdate
-
+variables:
+  # Default of 20 is pretty small, sometimes MRs have >20 commits in them. 100
+  # seems like a reasonable balance. If this is too low, git merge-base (from ci/
+  # common.py) can fail
+  GIT_DEPTH: 100
+  
 # This defines the rules for when a pipeline should run.
 workflow:
   rules:

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

@@ -3,13 +3,13 @@
 pkgname=device-samsung-on7xelte-downstream
 pkgdesc="Samsung Galaxy J7 Prime"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	linux-samsung-on7xelte
+	linux-samsung-on7xelte-downstream
 	mkbootimg
 	msm-fb-refresher
 	postmarketos-base

device/community/linux-postmarketos-qcom-msm8953/APKBUILD

@@ -5,7 +5,7 @@
 
 _flavor="postmarketos-qcom-msm8953"
 pkgname=linux-$_flavor
-pkgver=6.11.0
+pkgver=6.11.1
 pkgrel=0
 pkgdesc="Close to mainline linux kernel for Qualcomm Snapdragon MSM8953"
 arch="aarch64"
@@ -27,7 +27,7 @@ makedepends="
 	python3
 "
 
-_tag="$pkgver-r2"
+_tag="$pkgver-r0"
 
 source="
 	$pkgname-v$_tag.tar.gz::$url/archive/v$_tag.tar.gz
@@ -61,6 +61,6 @@ package() {
 		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
 }
 sha512sums="
-3ae8f3f3fa3652b0eaa66d6c144815589969405db96bb60b0ac2fbf8cc6392c96242e5f3f5a4394019a0288821418ec7b6fd2eded4f6d0288cc16d708b71d54e  linux-postmarketos-qcom-msm8953-v6.11.0-r2.tar.gz
-08dc20ca5b72e4c4aaf13dcd34a9346fb08233e97f1cb30c329ac3740afb2cca39743deb0d67bc89a515cfaae41788e7ed105b170c77fc3bffe3242724ad215f  config-postmarketos-qcom-msm8953.aarch64
+1a3778c6c6e05691cdee6358ad76f7b4853a02c2db1be655701db88cc7d68c3ae2355af1a962db052e7622bf7ab30e6b8b03b3e39f26d6e19d035e2a9e17195f  linux-postmarketos-qcom-msm8953-v6.11.1-r0.tar.gz
+49a4f6b018076411909267ac9f2f18544861f2b37e97b3af7828ffd6cf7d89179e43e0eefb5400279577083c471aaa418f79d0869699177265dc76ce4417cf79  config-postmarketos-qcom-msm8953.aarch64
 "

device/community/linux-postmarketos-qcom-msm8953/config-postmarketos-qcom-msm8953.aarch64

 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.11.0 Kernel Configuration
+# Linux/arm64 6.11.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -1745,9 +1745,10 @@ CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_DEF_COMP_LZORLE is not set
-CONFIG_ZRAM_DEF_COMP_LZ4=y
+CONFIG_ZRAM_DEF_COMP_ZSTD=y
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
 # CONFIG_ZRAM_DEF_COMP_LZO is not set
-CONFIG_ZRAM_DEF_COMP="lz4"
+CONFIG_ZRAM_DEF_COMP="zstd"
 # CONFIG_ZRAM_WRITEBACK is not set
 # CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
@@ -3723,6 +3724,12 @@ CONFIG_DRM_PANEL_EDP=m
 # MSM8953 panel drivers generated with linux-mdss-dsi-panel-driver-generator
 #
 CONFIG_DRM_PANEL_MSM8953_GENERATED=m
+CONFIG_DRM_PANEL_ASUS_ZE520KL_ILI7807B_BOE=m
+CONFIG_DRM_PANEL_ASUS_ZE520KL_R63350_TM=m
+CONFIG_DRM_PANEL_ASUS_ZE552KL_ILI7807B_CTC=m
+CONFIG_DRM_PANEL_ASUS_ZE552KL_NT35596_TXD=m
+CONFIG_DRM_PANEL_ASUS_ZE552KL_OTM1901A_LCE=m
+CONFIG_DRM_PANEL_ASUS_ZE552KL_R63350_TM=m
 CONFIG_DRM_PANEL_BOE_BS052FHM_A00_6C01=m
 CONFIG_DRM_PANEL_CSOT_622_V0=m
 CONFIG_DRM_PANEL_FAIRPHONE_FP3_HX83112B=m
@@ -6694,7 +6701,7 @@ CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_842 is not set
 CONFIG_CRYPTO_LZ4=m
 # CONFIG_CRYPTO_LZ4HC is not set
-# CONFIG_CRYPTO_ZSTD is not set
+CONFIG_CRYPTO_ZSTD=m
 # end of Compression
 
 #

device/testing/device-pine64-pinenote/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-pine64-pinenote
 pkgdesc="Pine64 PineNote"
 pkgver=2
-pkgrel=6
+pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -24,7 +24,6 @@ source="
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-gnome
 	$pkgname-phosh
 "
 
@@ -45,12 +44,6 @@ package() {
 		"$pkgdir"/usr/lib/udev/rules.d
 }
 
-gnome() {
-	install_if="$pkgname=$pkgver-r$pkgrel gnome"
-	depends="gnome-shell gnome-shell-extension-pinenote"
-	mkdir -p "$subpkgdir"
-}
-
 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel phosh"
 	depends="postmarketos-theme"

device/testing/device-qcom-msm8953/APKBUILD

+# Maintainer: Barnabas Czeman <trabarni@gmail.com>
+# Reference: <https://postmarketos.org/devicepkg>
+
+pkgname=device-qcom-msm8953
+pkgdesc="Generic device package for various Qualcomm MSM8953/SDM450/SDM632-based devices"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="
+	firmware-qcom-adreno-a530
+	linux-postmarketos-qcom-msm8953
+	lk2nd-msm8953
+	mkbootimg
+	msm-firmware-loader
+	postmarketos-base
+	soc-qcom-msm8953
+	soc-qcom-msm8953-modem
+"
+makedepends="devicepkg-dev"
+source="
+	deviceinfo
+	modules-initfs
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+b624c27c7e87cc57c20f79682ca119765b826e0f95bec94f18617d67a832cd2869475fa212d7c21e36a9b448312cb98c497007e0081e1a3c64bf3d60b40bb87a  deviceinfo
+bd17b9384a4aba90d3938b170e47349b98f5e035715abac6ae8cb2e65431159e20e5324c72e69f8f0492d12dd45813615850f1f83a48327fd1a7313e82183d43  modules-initfs
+"

device/testing/device-qcom-msm8953/deviceinfo

+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Qualcomm msm8953-based device"
+deviceinfo_manufacturer="Qualcomm"
+deviceinfo_codename="qcom-msm8953"
+deviceinfo_year="2016"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_gpu_accelerated="true"
+deviceinfo_chassis="embedded"
+deviceinfo_external_storage="true"
+deviceinfo_keyboard="false"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+
+# extlinux.conf
+deviceinfo_dtb="qcom/apq8053-* qcom/msm8953-* qcom/sdm450-* qcom/sdm632-*"
+deviceinfo_generate_extlinux_config="true"
+deviceinfo_boot_filesystem="ext2"

device/testing/device-qcom-msm8953/modules-initfs

+atmel_mxt_ts
+edt_ft5x06
+goodix_ts
+msm
+nt36xxx
+panel-motorola-ali-boe
+panel-motorola-ali-tianma
+panel-samsung-s6e3fa7
+panel-xiaomi-rosy-ft8006m-boe
+panel-xiaomi-rosy-ft8613-csot
+panel-xiaomi-rosy-ft8613-ebbg
+panel_boe_bs052fhm_a00_6c01
+panel_himax_hx8399c_fhdplus
+panel_huawei_milan_boe_otm1906c
+panel_huawei_milan_boe_td4322
+panel_huawei_milan_boe_test1906c
+panel_huawei_milan_ctc_nt35596s
+panel_huawei_milan_ctc_otm1906c
+panel_huawei_milan_jdi_r63452
+panel_huawei_milan_tianma_fic8736
+panel_huawei_milan_tianma_focal8716
+panel_huawei_milan_tianma_otm1906c
+panel_mdss_ft8716_fhd
+panel_mdss_ili7807_fhd
+panel_mdss_ili7807_fhdplus
+panel_mdss_nt35596_ebbg
+panel_mdss_otm1911_fhd
+panel_mdss_otm1911_fhdplus
+panel_mdss_r63350
+panel_tianma_tl052vdxp02
+panel_xiaomi_boe_ili9885
+panel_xiaomi_ebbg_r63350
+panel_xiaomi_nt35532
+panel_xiaomi_nt36672_csot_fhdplus_e7
+panel_xiaomi_nt36672_tianma_fhdplus_e7
+panel_xiaomi_onclite_hx8394f
+panel_xiaomi_onclite_ili9881
+panel_xiaomi_onclite_otm1901a
+panel_xiaomi_otm1911
+panel_xiaomi_td4310_ebbg_fhdplus_e7
+panel_xiaomi_td4310_fhdplus_e7
+panel_xiaomi_td4310_fhdplus_e7_g55
+panel_xiaomi_tianma_nt35596
+panel_xiaomi_ysl_hx8394f
+panel_xiaomi_ysl_ili7807d
+panel_xiaomi_ysl_ili9881c
+rmi_core
+rmi_i2c
+s6sy761
+simple-mfd-i2c
+sm5708-charger

device/testing/device-raspberry-pi/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-raspberry-pi
 pkgdesc="Raspberry Pi"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armhf"
@@ -44,7 +44,7 @@ kernel_rpi() {
 
 kernel_rpi2() {
 	pkgdesc="Kernel for the Raspberry Pi 2 (from Alpine, depends on non free firmware!)"
-	depends="$pkgname linux-rpi2"
+	depends="$pkgname linux-rpi"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 }

device/testing/gnome-shell-extension-pinenote/0001-Change-to-GNOME-Shell-44.patch

-From 41d7e0206ac0a7a703f02341a8b7095429cc5828 Mon Sep 17 00:00:00 2001
-From: Petr Hodina <phodina@protonmail.com>
-Date: Fri, 23 Jun 2023 07:34:19 +0200
-Subject: [PATCH] Change to GNOME Shell 44
-
-
-diff --git a/pnhelper@m-weigand.github.com/metadata.json b/pnhelper@m-weigand.github.com/metadata.json
-index 2d87329..3d54c91 100644
---- a/pnhelper@m-weigand.github.com/metadata.json
-+++ b/pnhelper@m-weigand.github.com/metadata.json
-@@ -3,6 +3,6 @@
-     "name": "Pinenote Helper",
-     "description": "Provides easy access to some PineNote-related functionality",
-     "version": 1.0,
--    "shell-version": ["43" ],
-+    "shell-version": ["44" ],
-     "url": "https://github.com/PNDeb/pinenote-gnome-extension"
- }
-
-base-commit: aee52e853196b142552337a0633ef28e5cceddf2
--- 
-2.39.1
-

device/testing/gnome-shell-extension-pinenote/APKBUILD

-# Maintainer: Petr Hodina <phodina@protonmail.com>
-pkgname=gnome-shell-extension-pinenote
-pkgver=1.0
-pkgrel=0
-pkgdesc="GNOME Pinenote helper extension"
-url="https://github.com/PNDeb/pinenote-gnome-extension"
-arch="aarch64"
-license="GPL-2.0-or-later"
-depends="sassc mozjs102-dev gettext-dev pinenote-dbus-service"
-source="
-	$pkgname-$pkgver.tar.gz::https://github.com/PNDeb/pinenote-gnome-extension/archive/refs/tags/v$pkgver.tar.gz
-	0001-Change-to-GNOME-Shell-44.patch
-"
-
-_extension_dir="usr/share/gnome-shell/extensions/"
-options="!check"
-
-builddir="$srcdir/pinenote-gnome-extension-$pkgver"
-
-package() {
-	mkdir -p "$pkgdir/$_extension_dir"
-	cp -r pnhelper@m-weigand.github.com "$pkgdir/$_extension_dir/"
-}
-
-sha512sums="
-e71fad02656f862495ea77a070830ba37b4eee95aa4e6ed2eee4549911da4852aac7db2772eafdfe8e91340c333e3e2a7f4a4e2fd7f203cd21d9d3d7ab554883  gnome-shell-extension-pinenote-1.0.tar.gz
-f94480d69533653a60c45729a7c6594fbf64faecbf14fb624ad9152924523b5d337392183bf53ef27dcbaa552bb856103fc6013666bb5261e94937b32c95f494  0001-Change-to-GNOME-Shell-44.patch
-"

main/unixbench/APKBUILD

 pkgname=unixbench
-pkgver=5.1.3_git20180129
-_commit="070030e09f6effdf0c6721e8fcc3a5c6fb5bed1a"
-pkgrel=2
+pkgver=5.1.3_git20230411
+_commit="a07fcc03264915c624f0e4818993c5b4df3fa703"
+pkgrel=0
 pkgdesc="The original BYTE UNIX benchmark suite"
 url="https://github.com/kdlucas/byte-unixbench"
-# riscv64: doesn't build
-arch="all !riscv64"
+arch="all"
 license="GPL-2.0-or-later"
 depends="perl make"
 options="!check"
@@ -26,5 +25,7 @@ package() {
 	cp -a pgms testdir Makefile src "$pkgdir"/usr/share/unixbench
 }
 
-sha512sums="ca4b7ab21eaacddcb99f9237998c42e2179d8e136e23dc0e4d9b2774f460588bc1851dbf0cdb9ad99bd485eb67434a74408f878f76a8ea5672615495ea074124  unixbench-070030e09f6effdf0c6721e8fcc3a5c6fb5bed1a.tar.gz
-91590bfaac3b118ad9a7ec66200ecc7b5ff88b84f5e8552c6b30fcc4436669eb4467d6b9a89d0be8682903e88b843fc4e40e3c7f90406c398449edb187ad6771  ubench"
+sha512sums="
+43bb6cbbb4ed1c1e564c6b17cb1b8f0ee3852a5ef9133200e1cb0891c4809615cf9a3b69cf4ffe62bdee6ef9ecc0f05dc9d3d83bbff929013d17199eaad11a4a  unixbench-a07fcc03264915c624f0e4818993c5b4df3fa703.tar.gz
+91590bfaac3b118ad9a7ec66200ecc7b5ff88b84f5e8552c6b30fcc4436669eb4467d6b9a89d0be8682903e88b843fc4e40e3c7f90406c398449edb187ad6771  ubench
+"