build.sh: replace DIRCLEAN by CLEAN

and change the meaning

ReadMe.md

@@ -53,7 +53,7 @@ optional:
 * **AUTOUPDATER** setzt den Autoupdater auf einen anderen Branch als bei **BRANCH** angegeben ('stable', 'testing', 'experimental' oder 'off', default: **BRANCH**)
 * **BROKEN** falls "1", erzeuge zusätzlich Firmware-Images für ungetestete Plattformen (default: "0")
 * **BUILD_TS** setzt den Zeitstempel für den Build-Prozess (format: %Y-%m-%d %H:%M:%S)
-* **DIRCLEAN** falls "1", wird vor dem Build `make dirclean` ausgeführt, ansonsten nur `make clean` (BRANCH=stable/testing default: "1", BRANCH=experimental default: "0")
+* **CLEAN** falls "dirclean", wird `make dirclean` ausgeführt, falls "clean" wird `make clean` ausgeführt, ansonsten keins von beidem (BRANCH=stable/testing default: "dirclean", BRANCH=experimental default: "clean")
 * **FAKETIME_LIB** gibt den Pfad zu libfaketime.so.1 an (default: "/usr/lib/${MACHTYPE}-${OSTYPE}/faketime/libfaketime.so.1")
 * **KEY_DIR** gibt das Verzeichnis für gluon-opkg-key an (default: ./opkg-keys)
 * **MAKEJOBS** spezifiziert die Anzahl der parallel laufenden Compiler-Prozesse (default: ein Prozess pro CPU/Kern)

build.sh

@@ -12,7 +12,7 @@
 # AUTOUPDATER = force Autoupdater Branch (stable/testing/experimental/off)
 # BROKEN      = 0 (default) or 1, build the untested hardware model firmwares, too
 # BUILD_TS    = build timestamp (format: %Y-%m-%d %H:%M:%S)
-# DIRCLEAN    = 1 perform "make dirclean" before build (BRANCH==stable/testing) or 0 perform "make clean" (BRANCH==experimental)
+# CLEAN       = DIRCLEAN perform "make dirclean" before build (BRANCH==stable/testing) or CLEAN perform "make clean" (BRANCH==experimental) or NONE
 # FAKETIME_LIB = path to libfaketime.so.1 if it is not in the standard location
 # KEY_DIR     = specify directory for gluon-opkg-key
 # MAKEJOBS    = number of compiler processes running in parallel (default: number of CPUs/Cores)
@@ -65,11 +65,11 @@ if [ -n "${BROKEN}" ]; then
 fi
 [ -n "${BUILD_TS}" ] || BUILD_TS=$(date +"%Y-%m-%d %H:%M:%S")
 
-if [ -z "${DIRCLEAN}" ]; then
+if [ -z "${CLEAN}" ]; then
 	if [ "${BRANCH}" == "experimental" ]; then
-		DIRCLEAN=0
+		CLEAN="clean"
 	else
-		DIRCLEAN=1
+		CLEAN="dirclean"
 	fi
 fi
 
@@ -161,7 +161,7 @@ git branch -M patched
 
 
 ### DIRCLEAN
-if [ -d "./build/" -a "${DIRCLEAN}" -eq "1" ]; then
+if [ -d "${GLUON_BUILD_DIR}/" -a "${CLEAN}" == "dirclean" ]; then
 	progress "Cleaning your build environment ..."
 	make dirclean
 fi
@@ -225,8 +225,10 @@ for target in ${TARGETS} ; do
 
 	# prepare build environment for our current target
 	progress "Preparing build environment for target ${target}."
-	[ "${DIRCLEAN}" -eq "1" ] || make clean
-	[ "$?" -eq "0" ] || abort "Unable to clean environment for target-platform ${target}."
+	if [ "${CLEAN}" == "clean" ]; then
+		make clean
+		[ "$?" -eq "0" ] || abort "Unable to clean environment for target-platform ${target}."
+	fi
 
 	make -j ${MAKEJOBS} prepare-target ${MAKE_PARAM}
 	[ "$?" -eq "0" ] || abort "Unable to build environment for target-platform ${target}."

docker-build.sh

@@ -30,7 +30,7 @@ docker run -ti -h ffho-build -v "${MYDIR}:/code" \
     --env AUTOUPDATER="${AUTOUPDATER}" \
     --env BROKEN="${BROKEN}" \
     --env BUILD_TS="${BUILD_TS}" \
-    --env DIRCLEAN="${DIRCLEAN}" \
+    --env CLEAN="${CLEAN}" \
     --env FAKETIME_LIB="/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1" \
     --env KEY_DIR="${KEY_DIR}" \
     --env MAKEJOBS="${MAKEJOBS}" \