From 3bca58c3845d34cc9b527ca0afbb9ba8e0376c9f Mon Sep 17 00:00:00 2001 From: Achill Gilgenast Date: Thu, 28 Aug 2025 21:25:20 +0200 Subject: [PATCH] main/postmarketos-base: move /etc/apk/config to /usr/lib/apk/config apk supports loading the config file from /lib/apk/config since . Since all systems are now /usr-merged, we can now even have the file in /usr/lib/! Part-of: --- main/postmarketos-base/APKBUILD | 8 ++++---- .../{rootfs-etc-apk-config => rootfs-usr-lib-apk-config} | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename main/postmarketos-base/{rootfs-etc-apk-config => rootfs-usr-lib-apk-config} (100%) diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD index 011a86a7f..154e61086 100644 --- a/main/postmarketos-base/APKBUILD +++ b/main/postmarketos-base/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-base -pkgver=47 -pkgrel=1 +pkgver=48 +pkgrel=0 pkgdesc="Meta package for minimal postmarketOS base" url="https://postmarketos.org" arch="noarch" @@ -63,7 +63,6 @@ _source600=" etc/ssh/sshd_config.d/50-postmarketos-ui-policy.conf " _source644=" - etc/apk/config etc/conf.d/swapfile etc/conf.d/zram-init etc/conf.d/syslog @@ -71,6 +70,7 @@ _source644=" etc/issue etc/motd etc/udev/udev.conf + usr/lib/apk/config usr/lib/os-release usr/lib/sysctl.d/90-disable-rp-filter.conf usr/lib/sysctl.d/90-steam.conf @@ -220,7 +220,6 @@ sha512sums=" e529f5cef1f31481b577f99b8917704f2cfefb963d98bf40a14b017938e55a00134d2033f81d2cb0b8489c5e9b4a92fdc0a788013f1adb4cd46d9580c9988186 rootfs-etc-sudoers 49cff0dbf37fc3c3ca30709be3bc4bbac9b2c05d1f88356922c6ab849e1fe893da7eca92b42a4095cfa00fe475470a711a93bfa60f1cedfde9c890a6dcc61de9 rootfs-etc-doas.d-10-postmarketos.conf 1d2975e7e2745020f88fac639021cc9a47b477fb0390c3e146a070d98faab32c3f1c7bd1121f45a26be97301ab65c736ae0a4905d28a7251919a1994895f9c8d rootfs-etc-ssh-sshd_config.d-50-postmarketos-ui-policy.conf -224d58717f7f95851c91914753f4aefaf8964a2e62350ed898783c295c509cdadd85c325ee00baceb21ff2763ca2f4c7b1478a5638eb7d86836f91336b739376 rootfs-etc-apk-config e0d2d48b82a03239a4c0a00acaf83e00d397c23a8d7c71053d4e2a383357c22dcedef9e81b0e12a1d7514e1fdbe0bb3eb82613d18b29034a7ce5447f13c84a53 rootfs-etc-conf.d-swapfile a286c261dbab800b4bd2891c679cae1fbbf3e3169014bf7e89451961bbd3cbe0f6e34465cd1409aa4373f32ed74f38eb042b166767512be9ee7104e26cd712fa rootfs-etc-conf.d-zram-init e4576c58c35f80bedddb1e89e186f37d31a186d3e9eb046581b8c5d7b7d435e18924539e851d3e67dc0ede80f9d44d16bd9ef52e73350d3f13224edc31d73a34 rootfs-etc-conf.d-syslog @@ -228,6 +227,7 @@ e4576c58c35f80bedddb1e89e186f37d31a186d3e9eb046581b8c5d7b7d435e18924539e851d3e67 45bd0742a64a9d3c4a88e152b97edcf3fa1edca28884f9ea69e7c4c365f1e41ef9056dbe204545de7d4b2ba92e1e5872b2a929c2dcc1dd468e627cc3f090b8e6 rootfs-etc-issue 01403df3b5a2be0dd70387a3c32cf24a77bc097679fbefca585082a0970b7d756723c33687be3809351b5e31c85947db84861118bfeced8f5f865fe2452555ec rootfs-etc-motd 6025282c9513835ae8e8d71a17ee81a6ef75c9651a5db9d6f018867264705f4eb874089abe2f01e31808486951c44d9dd8191ac0298734d905e772494b363f43 rootfs-etc-udev-udev.conf +224d58717f7f95851c91914753f4aefaf8964a2e62350ed898783c295c509cdadd85c325ee00baceb21ff2763ca2f4c7b1478a5638eb7d86836f91336b739376 rootfs-usr-lib-apk-config 6593a61cb4cbb5d557bdd0f98ce09bf91a6e076cfe0023fe3f495e17044c8d586708328a0fae52b58b3ff008a347b1f63a222a2a4d4f3f4d95777531f8a5c1a8 rootfs-usr-lib-os-release b70ee1b39b5f33c9a3e6bf4259158519691c82c8cefb700d4df49eb749a2cce208082e00d4905b9eea2c4f75b6da62f73931931c92157b4132adb35dcf0e0a6f rootfs-usr-lib-sysctl.d-90-disable-rp-filter.conf 6b16fd00756926c6fdc6f01960f59c854c90920dd9c0e67c19506a90fd26ac887a8dbfd5b1ec2712fff91f0369ddc5b91d56041360018d4d0c4d78e49733b644 rootfs-usr-lib-sysctl.d-90-steam.conf diff --git a/main/postmarketos-base/rootfs-etc-apk-config b/main/postmarketos-base/rootfs-usr-lib-apk-config similarity index 100% rename from main/postmarketos-base/rootfs-etc-apk-config rename to main/postmarketos-base/rootfs-usr-lib-apk-config