buildsystem: eliminate unecessary awk usage

This commit is contained in:
MilhouseVH 2017-10-09 05:25:52 +01:00
parent adf3f57e6c
commit 60f117a793
3 changed files with 26 additions and 17 deletions

View File

@ -31,15 +31,18 @@ if [ ! -f $PKG_DIR/package.mk ]; then
fi fi
# set defaults # set defaults
PKG_CONFIGURE_SCRIPT="" PKG_CONFIGURE_SCRIPT=""
PKG_MAKE_OPTS="" PKG_MAKE_OPTS=""
PKG_MAKEINSTALL_OPTS="" PKG_MAKEINSTALL_OPTS=""
PACKAGE_NAME=$(echo $1 | awk -F : '{print $1}') if [ "${1//:/}" != "${1}" ]; then
TARGET=$(echo $1 | awk -F : '{print $2}') PACKAGE_NAME="${1%:*}"
if [ -z "$TARGET" ]; then TARGET="${1#*:}"
TARGET="target" else
fi PACKAGE_NAME=$1
TARGET=
fi
[ -z "$TARGET" ] && TARGET="target"
if [ -n "$PKG_ARCH" -a ! "$PKG_ARCH" = "any" ]; then if [ -n "$PKG_ARCH" -a ! "$PKG_ARCH" = "any" ]; then
echo "$PKG_ARCH" | grep -q "$TARGET_ARCH" || exit 0 echo "$PKG_ARCH" | grep -q "$TARGET_ARCH" || exit 0

View File

@ -32,11 +32,14 @@ if [ -z "$INSTALL" ] ; then
fi fi
# set defaults # set defaults
PACKAGE_NAME=$(echo $1 | awk -F : '{print $1}') if [ "${1//:/}" != "${1}" ]; then
TARGET=$(echo $1 | awk -F : '{print $2}') PACKAGE_NAME="${1%:*}"
if [ -z "$TARGET" ]; then TARGET="${1#*:}"
TARGET="target" else
PACKAGE_NAME=$1
TARGET=
fi fi
[ -z "$TARGET" ] && TARGET="target"
STAMP=$STAMPS_INSTALL/$PACKAGE_NAME/install_$TARGET STAMP=$STAMPS_INSTALL/$PACKAGE_NAME/install_$TARGET
mkdir -p $STAMPS_INSTALL/$PACKAGE_NAME mkdir -p $STAMPS_INSTALL/$PACKAGE_NAME

View File

@ -25,11 +25,14 @@ if [ -z "$1" ]; then
exit 1 exit 1
fi fi
PACKAGE_NAME=$(echo $1 | awk -F : '{print $1}') if [ "${1//:/}" != "${1}" ]; then
TARGET=$(echo $1 | awk -F : '{print $2}') PACKAGE_NAME="${1%:*}"
if [ -z "$TARGET" ]; then TARGET="${1#*:}"
TARGET="target" else
fi PACKAGE_NAME=$1
TARGET=
fi
[ -z "$TARGET" ] && TARGET="target"
if [ -n "$PKG_ARCH" -a ! "$PKG_ARCH" = "any" ]; then if [ -n "$PKG_ARCH" -a ! "$PKG_ARCH" = "any" ]; then
echo "$PKG_ARCH" | grep -q "$TARGET_ARCH" || exit 0 echo "$PKG_ARCH" | grep -q "$TARGET_ARCH" || exit 0