From faa26795bbf7a7fff3fa23f1310b07398a281aa6 Mon Sep 17 00:00:00 2001 From: Aster Boese Date: Thu, 30 Jul 2026 23:05:34 +0200 Subject: [PATCH] linux-xiaomi-merlin: move to archived [ci:skip-vercheck] Signed-off-by: Aster Boese Part-of: --- device/{downstream => archived}/linux-xiaomi-merlin/APKBUILD | 4 +++- .../linux-xiaomi-merlin/config-xiaomi-merlin.aarch64 | 0 .../selinux_include_generated_headers.patch | 0 .../stop-inlining-blk_crypto_flock-and-ksm_flock.patch | 0 .../linux-xiaomi-merlin/use_system_cpio.patch | 0 .../linux-xiaomi-merlin/use_system_dtc.patch | 0 6 files changed, 3 insertions(+), 1 deletion(-) rename device/{downstream => archived}/linux-xiaomi-merlin/APKBUILD (97%) rename device/{downstream => archived}/linux-xiaomi-merlin/config-xiaomi-merlin.aarch64 (100%) rename device/{downstream => archived}/linux-xiaomi-merlin/selinux_include_generated_headers.patch (100%) rename device/{downstream => archived}/linux-xiaomi-merlin/stop-inlining-blk_crypto_flock-and-ksm_flock.patch (100%) rename device/{downstream => archived}/linux-xiaomi-merlin/use_system_cpio.patch (100%) rename device/{downstream => archived}/linux-xiaomi-merlin/use_system_dtc.patch (100%) diff --git a/device/downstream/linux-xiaomi-merlin/APKBUILD b/device/archived/linux-xiaomi-merlin/APKBUILD similarity index 97% rename from device/downstream/linux-xiaomi-merlin/APKBUILD rename to device/archived/linux-xiaomi-merlin/APKBUILD index a8bf49c9f..ddf1eeb69 100644 --- a/device/downstream/linux-xiaomi-merlin/APKBUILD +++ b/device/archived/linux-xiaomi-merlin/APKBUILD @@ -1,6 +1,8 @@ +# Archived: Maintainer had no pmOS GitLab account + # Reference: # Kernel config based on: arch/arm64/configs/merlin_defconfig -maintainer="Natalia M. Sother " +maintainer="" pkgname=linux-xiaomi-merlin pkgver=4.14.320 pkgrel=0 diff --git a/device/downstream/linux-xiaomi-merlin/config-xiaomi-merlin.aarch64 b/device/archived/linux-xiaomi-merlin/config-xiaomi-merlin.aarch64 similarity index 100% rename from device/downstream/linux-xiaomi-merlin/config-xiaomi-merlin.aarch64 rename to device/archived/linux-xiaomi-merlin/config-xiaomi-merlin.aarch64 diff --git a/device/downstream/linux-xiaomi-merlin/selinux_include_generated_headers.patch b/device/archived/linux-xiaomi-merlin/selinux_include_generated_headers.patch similarity index 100% rename from device/downstream/linux-xiaomi-merlin/selinux_include_generated_headers.patch rename to device/archived/linux-xiaomi-merlin/selinux_include_generated_headers.patch diff --git a/device/downstream/linux-xiaomi-merlin/stop-inlining-blk_crypto_flock-and-ksm_flock.patch b/device/archived/linux-xiaomi-merlin/stop-inlining-blk_crypto_flock-and-ksm_flock.patch similarity index 100% rename from device/downstream/linux-xiaomi-merlin/stop-inlining-blk_crypto_flock-and-ksm_flock.patch rename to device/archived/linux-xiaomi-merlin/stop-inlining-blk_crypto_flock-and-ksm_flock.patch diff --git a/device/downstream/linux-xiaomi-merlin/use_system_cpio.patch b/device/archived/linux-xiaomi-merlin/use_system_cpio.patch similarity index 100% rename from device/downstream/linux-xiaomi-merlin/use_system_cpio.patch rename to device/archived/linux-xiaomi-merlin/use_system_cpio.patch diff --git a/device/downstream/linux-xiaomi-merlin/use_system_dtc.patch b/device/archived/linux-xiaomi-merlin/use_system_dtc.patch similarity index 100% rename from device/downstream/linux-xiaomi-merlin/use_system_dtc.patch rename to device/archived/linux-xiaomi-merlin/use_system_dtc.patch