simplify STAGE checks - use In_List

Closes: #952917

scripts/build/binary_rootfs

@@ -61,10 +61,8 @@ esac
 # Creating directory
 mkdir -p binary/${INITFS}
 
-for STAGE in ${LB_CACHE_STAGES}
-do
-	if [ "${STAGE}" = "rootfs" ] && [ -d cache/binary_rootfs ]
-	then
+if In_list "rootfs" ${LB_CACHE_STAGES} && [ -d cache/binary_rootfs ]
+then
 	# Removing old chroot
 	rm -rf binary/"${INITFS}"/filesystem.*
 
@@ -75,8 +73,7 @@ do
 	# Creating stage file
 	Create_stagefile .build/binary_rootfs
 	exit 0
-	fi
-done
+fi
 
 case "${LB_CHROOT_FILESYSTEM}" in
 	ext2|ext3|ext4)
@@ -443,10 +440,8 @@ case "${LB_CHROOT_FILESYSTEM}" in
 
 esac
 
-for STAGE in ${LB_CACHE_STAGES}
-do
-	if [ "${STAGE}" = "rootfs" ]
-	then
+if In_list "rootfs" ${LB_CACHE_STAGES}
+then
 	rm -rf cache/binary_rootfs
 
 	mkdir -p cache/binary_rootfs
@@ -455,8 +450,7 @@ do
 	then
 		cp -a binary/"${INITFS}"/filesystem.* cache/binary_rootfs
 	fi
-	fi
-done
+fi
 
 # Creating stage file
 Create_stagefile .build/binary_rootfs

scripts/build/bootstrap_cache

@@ -27,11 +27,12 @@ Set_defaults
 # Check architecture
 Check_crossarchitectures
 
-for STAGE in ${LB_CACHE_STAGES}
-do
-	if [ "${STAGE}" = "bootstrap" ]
-	then
-		case "${1}" in
+if ! In_list "bootstrap" ${LB_CACHE_STAGES}
+then
+	exit 0
+fi
+
+case "${1}" in
 	restore)
 		# Checking stage file
 		Check_stagefile .build/bootstrap_cache.restore
@@ -81,6 +82,4 @@ do
 		# Creating stage file
 		Create_stagefile .build/bootstrap_cache.save
 		;;
-		esac
-	fi
-done
+esac

scripts/build/chroot_cache

@@ -24,11 +24,12 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-for STAGE in ${LB_CACHE_STAGES}
-do
-	if [ "${STAGE}" = "chroot" ]
-	then
-		case "${1}" in
+if ! In_list "chroot" ${LB_CACHE_STAGES}
+then
+	exit 0
+fi
+
+case "${1}" in
 	restore)
 		Echo_message "Restoring chroot stage from cache..."
 
@@ -77,6 +78,4 @@ do
 		# Creating stage file
 		Create_stagefile .build/chroot_cache.save
 		;;
-		esac
-	fi
-done
+esac