diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2024-04-20 08:23:25 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2024-04-20 08:24:13 +0200 |
| commit | 32ce6985506bb155c6ffd1d3263fbbdfaaddf6c1 (patch) | |
| tree | 2e1a3e78a6d054859445b92adf110d28fd07e505 | |
| parent | be9368ba85775139217ec2252ea7e1aff442136c (diff) | |
for now...
| -rw-r--r-- | main/abuild/0001-abuild-allow-packages-to-install-under-run.patch | 29 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 4 |
2 files changed, 32 insertions, 1 deletions
diff --git a/main/abuild/0001-abuild-allow-packages-to-install-under-run.patch b/main/abuild/0001-abuild-allow-packages-to-install-under-run.patch new file mode 100644 index 00000000000..312df410af6 --- /dev/null +++ b/main/abuild/0001-abuild-allow-packages-to-install-under-run.patch @@ -0,0 +1,29 @@ +From c48f8498e72928778a0501f8c958f0f61c214858 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Sat, 20 Apr 2024 08:16:55 +0200 +Subject: [PATCH] abuild: allow packages to install under run + +I have some vauge memory that it is conveinent for Docker users that the +state dir under /run exists. + +Allow this for alpine 3.20 and revisit later. +--- + abuild.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/abuild.in b/abuild.in +index ac0b6ff..f873620 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -782,7 +782,7 @@ postcheck() { + msg "Running postcheck for $name" + # checking for FHS compat + if ! options_has "!fhs"; then +- for i in srv usr/local opt run var/run tmp var/tmp var/lock var/empty home sys proc mnt dev; do ++ for i in srv usr/local opt var/run tmp var/tmp var/lock var/empty home sys proc mnt dev; do + for j in "$dir"/"$i"/* "$dir"/"$i"/.[!.]* "$dir"/"$i"/..?*; do + if [ -L "$j" ] || [ -e "$j" ]; then + error "Packages must not put anything under /$i" +-- +2.44.0 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 0e60057519b..c59d1781daa 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=3.13.0 _ver=${pkgver%_git*} -pkgrel=1 +pkgrel=2 pkgdesc="Script to build Alpine Packages" url="https://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -37,6 +37,7 @@ options="suid" pkggroups="abuild" source="https://gitlab.alpinelinux.org/alpine/abuild/-/archive/$pkgver/abuild-$pkgver.tar.gz 0001-abuild-pass-APORTS_BOOTSTRAP-to-bubblewrap.patch + 0001-abuild-allow-packages-to-install-under-run.patch " builddir="$srcdir"/abuild-$pkgver @@ -123,4 +124,5 @@ _sudo() { sha512sums=" 9aa46693984bd65a1a940d4547239e0a10170e82f186ab231b0d3a26b09a75cf258fae0e16f936e79cf52353dce9fc8a18881e84042b7961f390aba3f34d88da abuild-3.13.0.tar.gz 2d7cf76202bd50e97fa3ed517c82dd94cbddd27b43d51e41e97c4281092565046aa55cab0869b20753c6bc1d592194528700a779426b67177b9ee7632c943742 0001-abuild-pass-APORTS_BOOTSTRAP-to-bubblewrap.patch +f7a4240972d33be36931527f4764cb8852989f724406cc079567e71875e7ca7b4c897755770a26f9901ebe9faf166d0e8eb88cb028cbf012f55ddd6efad47e6e 0001-abuild-allow-packages-to-install-under-run.patch " |