more cleanup, *-enabled feature is unused, simplify

4 files changed, 11 insertions, 47 deletions

diff --git a/scripts/create-pkg b/scripts/create-pkg
index 35961ae54..a41d379d2 100755
--- a/scripts/create-pkg
+++ b/scripts/create-pkg
@@ -1,11 +1,6 @@
 #!/usr/bin/env bash
 topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
-
-mkdir -p $topdir/target/packages/pkg-enabled
-rm $topdir/target/packages/pkg-enabled/* 2>/dev/null
-count=1
-for i in $(ls $topdir/target/packages/pkg-available/);do
-	cd $topdir/target/packages/pkg-enabled &&
-	ln -sf ../pkg-available/$i $count-$i
-	count=$((count+1))
-done
+if [ -d "$topdir/target/collections" ];then
+	cat $topdir/target/collections/* > $topdir/package/Config.in.collections 2>/dev/null
+fi
+exit 0
diff --git a/scripts/create-sys b/scripts/create-sys
index d34a0e443..e60428a45 100755
--- a/scripts/create-sys
+++ b/scripts/create-sys
@@ -1,21 +1,8 @@
 #!/usr/bin/env bash
 topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
-systems=$(grep -h config target/*/sys-available/*|cut -d " " -f 2)
-
-while read arch; do
-	count=0
-	rm -rf $topdir/target/$arch/sys-enabled &&
-	mkdir -p $topdir/target/$arch/sys-enabled &&
-	cd $topdir/target/$arch/sys-enabled &&
-	for i in $(ls $topdir/target/$arch/sys-available/);do
-		cd $topdir/target/$arch/sys-enabled/ &&
-		ln -sf ../sys-available/$i $count-$i
-		count=$((count+1))
-	done
-done <${topdir}/target/arch.lst
+systems=$(grep -h config target/*/systems/*|cut -d " " -f 2)
 
 echo '' > $topdir/target/config/Config.in.system.default
-
 for j in $systems;do
 	system=${j#ADK_TARGET_SYSTEM_}
 	systemu=$(echo $system|tr '[:upper:]' '[:lower:]')
@@ -38,4 +25,10 @@ for i in $systems;do
 		printf "\tdefault \"${system}\" if ADK_$systemu\n" >> $topdir/target/config/Config.in.system.default
 	fi
 done
+
+for i in $(ls $topdir/target/);do
+	if [ -d "$topdir/target/$i/systems" ];then
+		cat $topdir/target/$i/systems/* > $topdir/target/$i/Config.in.systems 2>/dev/null
+	fi
+done
 exit 0
diff --git a/scripts/update-pkg b/scripts/update-pkg
deleted file mode 100755
index 4fb16fbe3..000000000
--- a/scripts/update-pkg
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# create package collection Config.in file
-
-topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
-if [ -d "$topdir/target/packages/pkg-enabled" ];then
-	cat $topdir/target/packages/pkg-enabled/* > $topdir/target/packages/Config.in 2>/dev/null
-fi
-exit 0
diff --git a/scripts/update-sys b/scripts/update-sys
deleted file mode 100755
index e4f584c33..000000000
--- a/scripts/update-sys
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-# create Config.in.systems with all available target systems for each architecture
-
-topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
-
-echo 'source "target/config/Config.in.arch.default"' > $topdir/target/config/Config.in.arch
-echo 'source "target/config/Config.in.arch.choice"' >> $topdir/target/config/Config.in.arch
-echo 'source "target/config/Config.in.system.default"' > $topdir/target/config/Config.in.system
-echo 'source "target/config/Config.in.system.choice"' >> $topdir/target/config/Config.in.system
-
-for i in $(ls $topdir/target/);do
-	if [ -d "$topdir/target/$i/sys-enabled" ];then
-		cat $topdir/target/$i/sys-enabled/* > $topdir/target/$i/Config.in.systems 2>/dev/null
-	fi
-done
-exit 0