[gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/support/

[Matt Turner]

commit:     415e88f301517f3efc4289912889509a67fe5115
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May  1 06:40:26 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May  3 22:04:18 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=415e88f3

targets: Inline filesystem-functions.sh

Inline create_squashfs and create_jffs2 since they're called only from
one place (in a different file).

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/filesystem-functions.sh | 19 -------------------
 targets/support/target_image_setup.sh   | 20 ++++++--------------
 2 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh
deleted file mode 100755
index a95ae0b9..00000000
--- a/targets/support/filesystem-functions.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Dont forget to update functions.sh  check_looptype
-# $1 is the target directory for the filesystem
-
-create_squashfs() {
-	echo "Creating squashfs..."
-	export loopname="image.squashfs"
-	gensquashfs -D "${clst_destpath}" ${clst_fsops} "$1/${loopname}" \
-		|| die "gensquashfs failed, did you emerge squashfs-tools-ng?"
-}
-
-create_jffs2(){
-	echo "Creating jffs2..."
-	export loopname="image.jffs"
-	# fs_check /usr/sbin/mkfs.jffs2 jffs2 sys-fs/mtd
-	mkfs.jffs2 --root=${clst_destpath} --output=$1/${loopname} ${clst_fsops} \
-		|| die "Could not create a jffs2 filesystem"
-}

diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
index 423dc4c4..03cb4741 100755
--- a/targets/support/target_image_setup.sh
+++ b/targets/support/target_image_setup.sh
@@ -1,25 +1,17 @@
 #!/bin/bash
 
 source ${clst_shdir}/support/functions.sh
-source ${clst_shdir}/support/filesystem-functions.sh
 
-# Make the directory if it doesnt exist
-mkdir -p $1
+mkdir -p "${1}"
 
-loopret=1
+echo "Creating ${clst_fstype} filesystem"
 case ${clst_fstype} in
 	squashfs)
-		create_squashfs $1
-		loopret=$?
+		gensquashfs -D "${clst_destpath}" "${clst_fsops}" "${1}/image.squashfs" \
+			|| die "Failed to create squashfs filesystem"
 	;;
 	jffs2)
-		create_jffs2 $1
-		loopret=$?
+		mkfs.jffs2 --root="${clst_destpath}" --output="${1}/image.jffs" "${clst_fsops}" \
+			|| die "Failed to create jffs2 filesystem"
 	;;
 esac
-
-if [ ${loopret} = "1" ]
-then
-	die "Filesystem not setup"
-fi
-exit $loopret