From eb0a7d081131a287983753d89933c499fc1864c8 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sat, 5 Aug 2017 22:03:13 +0000 Subject: abuild: prepare_metafiles: use new /bin/sh virtual instead of hardcoded busybox dependency --- abuild.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abuild.in b/abuild.in index f3583a2..595f09b 100644 --- a/abuild.in +++ b/abuild.in @@ -894,13 +894,13 @@ prepare_metafiles() { EOF local i deps 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 local s=${i%=*} [ "$name" != "${s%.*}" ] && continue if head -n 1 "$startdir/$s" | grep '^#!/bin/sh' >/dev/null ; then - msg "Script found. busybox added as a dependency for $pkg" - deps="$deps busybox" + msg "Script found. /bin/sh added as a dependency for $pkg" + deps="$deps /bin/sh" break fi done -- cgit v1.2.3-60-g2f50