From 67d1676d7f4c8f980a1aeb1d9983ec9571f0e1fb Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 28 Jul 2019 00:52:27 +0000 Subject: system/adelie-base: fix that --- system/adelie-base/APKBUILD | 2 +- system/bash/APKBUILD | 1 + system/dash/APKBUILD | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD index d0d0b362b..a62633c57 100644 --- a/system/adelie-base/APKBUILD +++ b/system/adelie-base/APKBUILD @@ -9,7 +9,7 @@ arch="noarch" options="!check !fhs" license="NCSA" _core_depends="apk-tools adelie-keys musl-utils shadow - shimmy grep procps cmd:sh + shimmy grep procps /bin/sh coreutils diffutils findutils util-linux net-tools nvi sed psmisc less tzdata" diff --git a/system/bash/APKBUILD b/system/bash/APKBUILD index 1e1dccbee..7ece88d4a 100644 --- a/system/bash/APKBUILD +++ b/system/bash/APKBUILD @@ -83,6 +83,7 @@ package() { binsh() { pkgdesc="Use bash as /bin/sh" + depends="bash" provides="/bin/sh" provider_priority=10 mkdir -p "$subpkgdir"/bin diff --git a/system/dash/APKBUILD b/system/dash/APKBUILD index 1cdc53f5b..5ad4f8f51 100644 --- a/system/dash/APKBUILD +++ b/system/dash/APKBUILD @@ -37,10 +37,11 @@ package() { binsh() { pkgdesc="Use dash as /bin/sh" + depends="dash" provides="/bin/sh" provider_priority=1 mkdir -p "$subpkgdir"/bin - ln -s dash "$subpkgdir"/bin/sh + ln -s /bin/dash "$subpkgdir"/bin/sh } sha512sums="0ae29be77794df0ba254967649b9728611a75fbb3acd32ab6634d76399d1ce97c7d12d31da465482a7e4f3207093415c496c39525cace9b78ab3cb9444dd7640 dash-0.5.10.2.tar.gz" -- cgit v1.2.3-60-g2f50