step

Author: pillo79

extra/artifacts/zephyr_unoq.exc

@@ -1,4 +1,4 @@
-libraries/Ethernet
-libraries/Storage
-libraries/WiFi
-libraries/Zephyr_SDRAM
+libraries/Ethernet/
+libraries/Storage/
+libraries/WiFi/
+libraries/Zephyr_SDRAM/

extra/package_core.sh

@@ -59,9 +59,9 @@ cat platform.txt > ${TEMP_PLATFORM}
 sed -ie "s/^version=.*/version=$(extra/get_core_version.sh)/" ${TEMP_PLATFORM}
 
 declutter_file() {
-	# remove comments and empty lines
+	# remove comments, whitespace at EOL, '/' dir terminators and empty lines
 	[ -f "$1" ] || return 0
-	cat "$1" | sed -e 's/\s*#.*//' | grep -v '^\s*$'
+	cat "$1" | sed -e 's/\s*#.*//' -e 's/\s*$//' -e 's/\/$//' | grep -v '^\s*$'
 }
 
 # create the list of files and directories to include
@@ -70,6 +70,7 @@ echo ${TEMP_BOARDS} >> ${TEMP_INC}
 echo ${TEMP_PLATFORM} >> ${TEMP_INC}
 declutter_file extra/artifacts/_common.inc >> ${TEMP_INC}
 declutter_file extra/artifacts/$ARTIFACT.inc >> ${TEMP_INC}
+declutter_file extra/artifacts/$ARTIFACT.only >> ${TEMP_INC}
 for variant in $INCLUDED_VARIANTS ; do
 	echo "- ${variant}"
 	echo "variants/${variant}/" >> ${TEMP_INC}
@@ -84,6 +85,9 @@ done
 TEMP_EXC=$(mktemp -p . | sed 's/\.\///')
 declutter_file extra/artifacts/_common.exc >> ${TEMP_EXC}
 declutter_file extra/artifacts/$ARTIFACT.exc >> ${TEMP_EXC}
+for f in ls extra/artifacts/*.only | grep -v "$ARTIFACT.only" ; do
+	declutter_file $f >> ${TEMP_EXC}
+done
 
 mkdir -p $(dirname ${OUTPUT_FILE})
 tar -cjhf ${OUTPUT_FILE} -X ${TEMP_EXC} -T ${TEMP_INC} \