merge

1 files changed, 10 insertions, 10 deletions

diff --git a/remote/setup_target b/remote/setup_target
index c5566fc2..e7370b1b 100755
--- a/remote/setup_target
+++ b/remote/setup_target
@@ -36,13 +36,11 @@ copy_kernel() {
 }
 
 read_config () {
-	unset REQUIRED_BINARIES
-	unset REQUIRED_LIBRARIES
-	unset REQUIRED_DIRECTORIES
-	unset REQUIRED_FILES
-	unset REQUIRED_MODULES
-	unset REQUIRED_PACKAGES
-	unset REQUIRED_DEPENDENCIES
+
+	# unset previous variables from other config files
+	for VARNAME in "${!REQUIRED_*}"; do
+		unset $VARNAME
+	done
 
 	local MODULE_CONFIG="${MODULE_DIR}/${MODULE}.conf"
 
@@ -65,7 +63,8 @@ read_build () {
 	. "${BUILD_SCRIPT}" || perror "Sourcing '${BUILD_SCRIPT}' failed."
 }
 
-copyfileswithdependencies () {
+
+copy_files_with_deps () {
 
 	[ ! -d $MODULE_BUILD_DIR ] && pinfo "No build directory found, skipping dependency copying" && return 0
 	cd $MODULE_BUILD_DIR
@@ -208,7 +207,6 @@ process_module() {
 		if [ ! -z "$REQUIRED_MODULES" ]; then
 			pinfo "$MODULE depends on ${REQUIRED_MODULES}...."
 			for DEP in $REQUIRED_MODULES; do
-				#[[ "$DESIRED_MODULES" != *"!${DEP}!"* ]] && perror "$TOOL has dependency $DEP, but $DEP is not in current profile."
 				process_module "$DEP"
 			done
 			# Read old config again, as it got overwritten by the deps
@@ -227,7 +225,9 @@ process_module() {
 		# remove *.la files as they might confuse libtool/linker of other tool packages
 		find "${MODULE_DIR}/build" -name '*.la' -exec rm -f {} \;
 		pinfo "## Copying files with dependencies"
-		copyfileswithdependencies
+		copy_files_with_deps
+		pinfo "## Copying static module files"
+		copy_static_data
 		pinfo "## Post copy"
 		post_copy