scripts/package wizard: add support for subdirs

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/scripts/add_new_package.wizard b/scripts/add_new_package.wizard
index d4127f4228dd77151c59d13adfc6a84c125e7657..902718da8407c145caed809759a132287a6e3600 100755 (executable)
--- a/scripts/add_new_package.wizard
+++ b/scripts/add_new_package.wizard
@@ -42,6 +42,16 @@ else
        STAGING="NO"
 fi
 
+echo "Enter an additional subdirectory below package/"
+echo "as category, or just press enter."
+read SUB_DIR
+
+if [ -z "$SUB_DIR" ]; then
+       CATEGORY_DIR=package
+else
+       CATEGORY_DIR=package/${SUB_DIR}
+fi
+
 echo "Enter any configure script options."
 read CONFIG_OPTIONS
 
@@ -49,9 +59,9 @@ URL=${DOWNLOAD_LOC%/*}
 TARBALL=${DOWNLOAD_LOC##*/}
 EXTENSION=${TARBALL##*.tar.}
 NAME_UPPER=`echo ${PACKAGE_NAME} | tr a-z- A-Z_`
-PACKAGE_DIR=`dirname $0`/../package/${PACKAGE_NAME}
+PACKAGE_DIR=`dirname $0`/../${CATEGORY_DIR}/${PACKAGE_NAME}
 
-mkdir ${PACKAGE_DIR}
+mkdir -p ${PACKAGE_DIR}
 
 sed -e 's/ *$//g' > ${PACKAGE_DIR}/${PACKAGE_NAME}.mk <<EOF
 #############################################################
@@ -70,7 +80,7 @@ ${NAME_UPPER}_CONF_OPT = ${CONFIG_OPTIONS}
 
 ${NAME_UPPER}_DEPENDENCIES = uclibc ${EXTRA_DEPS}
 
-\$(eval \$(call AUTOTARGETS,package,${PACKAGE_NAME}))
+\$(eval \$(call AUTOTARGETS,${CATEGORY_DIR},${PACKAGE_NAME}))
 EOF
 
 cat > ${PACKAGE_DIR}/Config.in <<EOF
@@ -82,9 +92,16 @@ config BR2_PACKAGE_${NAME_UPPER}
          ${URL}
 EOF
 
-echo "Just add: source \"package/${PACKAGE_NAME}/Config.in\""
-echo "to the file package/Config.in in an appropriate"
+echo "Just add: source \"${CATEGORY_DIR}/${PACKAGE_NAME}/Config.in\""
+echo "to the file ${CATEGORY_DIR}/Config.in in an appropriate"
 echo "location."
+
+if [ -n "$SUB_DIR" ]; then
+       echo "Additionally add: source \"${CATEGORY_DIR}/Config.in\""
+       echo "to the file package/Config.in in an appropriate"
+       echo "location."
+fi
+
 echo
 echo "You are now ready to build ${PACKAGE_NAME}"
 echo "Just run make menuconfig and select your new"