summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-07-28 00:52:27 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-07-28 00:52:27 +0000
commit67d1676d7f4c8f980a1aeb1d9983ec9571f0e1fb (patch)
treeaf33b13efd44511214c622954b2f7705679c89e2
parent9df78377ad065cf945e0325881b1b59e878805a2 (diff)
downloadpackages-67d1676d7f4c8f980a1aeb1d9983ec9571f0e1fb.tar.gz
packages-67d1676d7f4c8f980a1aeb1d9983ec9571f0e1fb.tar.bz2
packages-67d1676d7f4c8f980a1aeb1d9983ec9571f0e1fb.tar.xz
packages-67d1676d7f4c8f980a1aeb1d9983ec9571f0e1fb.zip
system/adelie-base: fix that
-rw-r--r--system/adelie-base/APKBUILD2
-rw-r--r--system/bash/APKBUILD1
-rw-r--r--system/dash/APKBUILD3
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"