Commit eb0a7d08 authored by Ariadne Conill's avatar Ariadne Conill

abuild: prepare_metafiles: use new /bin/sh virtual instead of hardcoded busybox dependency

parent a74359e8
...@@ -894,13 +894,13 @@ prepare_metafiles() { ...@@ -894,13 +894,13 @@ prepare_metafiles() {
EOF EOF
local i deps local i deps
deps="$depends" deps="$depends"
if [ "$pkgname" != "busybox" ] && ! depends_has busybox; then if [ "$pkgname" != "busybox" ] && ! depends_has busybox && ! depends_has /bin/sh; then
for i in $install $triggers; do for i in $install $triggers; do
local s=${i%=*} local s=${i%=*}
[ "$name" != "${s%.*}" ] && continue [ "$name" != "${s%.*}" ] && continue
if head -n 1 "$startdir/$s" | grep '^#!/bin/sh' >/dev/null ; then if head -n 1 "$startdir/$s" | grep '^#!/bin/sh' >/dev/null ; then
msg "Script found. busybox added as a dependency for $pkg" msg "Script found. /bin/sh added as a dependency for $pkg"
deps="$deps busybox" deps="$deps /bin/sh"
break break
fi fi
done done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment