From 3e9bd854d8613d16d3a92ebe4a6b09bfb18890aa Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 27 Jan 2014 05:43:37 +0100 Subject: [PATCH] config: cleanup buildsystem Signed-off-by: Stephan Raue --- config/functions | 3 --- config/path | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/config/functions b/config/functions index 8850e1a5d6..37f95bf8b1 100644 --- a/config/functions +++ b/config/functions @@ -76,9 +76,6 @@ get_build_dir() { local _PKG_DIR=$(find $ROOT/packages -name $1) if [ -d $_PKG_DIR -a -f $_PKG_DIR/package.mk ] ; then . $_PKG_DIR/package.mk - # TODO: remove - elif [ -d $_PKG_DIR -a -f $_PKG_DIR/meta ] ; then - . $_PKG_DIR/meta fi echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION} fi diff --git a/config/path b/config/path index 4cc1bf05c8..4bd01998a5 100644 --- a/config/path +++ b/config/path @@ -68,7 +68,7 @@ SED="sed -i" else ALL_DIRS="$ALL_DIRS\\n$DIR" fi - if [ -f "$DIR/package.mk" -o -f "$DIR/meta" -o -f "$DIR/install" -o -f "$DIR/build" ] ; then + if [ -f "$DIR/package.mk" ] ; then FOUND=$((FOUND+1)) # found first. set $PKG_DIR PKG_DIR="$DIR" @@ -84,8 +84,6 @@ SED="sed -i" if [ -r $PKG_DIR/package.mk ]; then . $PKG_DIR/package.mk - elif [ -r $PKG_DIR/meta ]; then - . $PKG_DIR/meta fi if [ "$PKG_IS_ADDON" = "yes" ] ; then