From 96374fb4f544d04f50ee617edbbf33a23233ce7a Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Fri, 13 Feb 2015 16:34:30 +0000 Subject: busybox to /usr/[s]bin --- strata/build-essential/busybox.morph | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.morph index 85327648..c02fb0c1 100644 --- a/strata/build-essential/busybox.morph +++ b/strata/build-essential/busybox.morph @@ -8,9 +8,6 @@ configure-commands: - sed -e 's|.*UDHCPC_DEFAULT_SCRIPT.*|CONFIG_UDHCPC_DEFAULT_SCRIPT="'"$PREFIX"/share/udhcpc/default.script'"|' -i .config - sed -e 's|.*IFUPDOWN_IFSTATE_PATH.*|CONFIG_IFUPDOWN_IFSTATE_PATH="/run/ifstate"|' -i .config -# Avoid dividing applets between $PREFIX/[s]bin and $PREFIX/usr/[s]bin. -- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' -i .config' - # We have GAWK, but in GENIVI baseline we want to get rid of it # - sed -e 's/CONFIG_AWK=y.*/# CONFIG_AWK is not set/' -i .config @@ -61,9 +58,8 @@ build-commands: install-commands: - | - if [ "$PREFIX" = /usr ]; then PREFIX=; fi && - make CONFIG_PREFIX="$DESTDIR$PREFIX" install && - chmod 6755 "$DESTDIR$PREFIX"/bin/busybox + make CONFIG_PREFIX="$DESTDIR$PREFIX" install && + chmod 6755 "$DESTDIR$PREFIX"/bin/busybox # Set up man environment variables - mkdir -p "$DESTDIR"/etc -- cgit v1.2.1