From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 59B22138350 for ; Sat, 2 May 2020 23:03:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64746E0ABF; Sat, 2 May 2020 23:03:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 46B9FE0ABF for ; Sat, 2 May 2020 23:03:45 +0000 (UTC) Date: Sat, 2 May 2020 16:03:42 -0700 From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] [PATCH 3/8] targets: Inline filesystem-functions.sh Message-ID: <20200502160342.3d3b05ca@storm> In-Reply-To: <20200502014036.1039317-3-mattst88@gentoo.org> References: <20200502014036.1039317-1-mattst88@gentoo.org> <20200502014036.1039317-3-mattst88@gentoo.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Archives-Salt: ea3e4d8b-433c-4042-915d-b5ef098c397c X-Archives-Hash: 1cb8e90cbad48b3e9de1e067924b152e On Fri, 1 May 2020 18:40:31 -0700 Matt Turner wrote: > Signed-off-by: Matt Turner > --- Again, no reasoning > targets/support/filesystem-functions.sh | 19 ------------------- > targets/support/target_image_setup.sh | 20 ++++++-------------- > 2 files changed, 6 insertions(+), 33 deletions(-) > delete mode 100755 targets/support/filesystem-functions.sh > > 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