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 94D36138350 for ; Sat, 2 May 2020 22:56:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6003E0985; Sat, 2 May 2020 22:56: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 5AA3BE0985 for ; Sat, 2 May 2020 22:56:45 +0000 (UTC) Date: Sat, 2 May 2020 15:56:41 -0700 From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] [PATCH 1/8] targets: Use gensquashfs instead of mksquashfs Message-ID: <20200502155641.3debc2ce@storm> In-Reply-To: <20200502014036.1039317-1-mattst88@gentoo.org> References: <20200502014036.1039317-1-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: 8cfd5a00-6ba6-4dcd-978c-a56ee54b5b5c X-Archives-Hash: 053ab8ce0edbeb8f4d8de03e5174351c On Fri, 1 May 2020 18:40:29 -0700 Matt Turner wrote: > We're using tar2sqfs from squashfs-tools-ng, so let's replace the > usage of mksquashfs (from squashfs-tools) with gensquashfs. > > Signed-off-by: Matt Turner > --- > doc/catalyst-spec.5.txt | 4 ++-- > examples/livecd-stage2_template.spec | 2 -- > targets/embedded/fs-runscript.sh | 6 +++--- > targets/support/filesystem-functions.sh | 4 ++-- > 4 files changed, 7 insertions(+), 9 deletions(-) > > diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt > index f87bd69e..e269e16d 100644 > --- a/doc/catalyst-spec.5.txt > +++ b/doc/catalyst-spec.5.txt > @@ -180,8 +180,8 @@ CD. Possible values are as follows: > *livecd/fsops*:: > The fsops are a list of optional parameters that can be passed to the > tool which will create the filesystem specified in *livecd/fstype* > -(example: `-root-owned`). It is valid for the following fstypes: > -`squashfs`, `jffs`, `jffs2`, and `cramfs`. > +It is valid for the following fstypes: `squashfs`, `jffs`, `jffs2`, > +and `cramfs`. > > *livecd/iso*:: > This is the full path and filename to the ISO image that the > diff --git a/examples/livecd-stage2_template.spec > b/examples/livecd-stage2_template.spec index 4cb94d40..3b9ca1da 100644 > --- a/examples/livecd-stage2_template.spec > +++ b/examples/livecd-stage2_template.spec > @@ -95,8 +95,6 @@ livecd/fstype: > # The fsops are a list of optional parameters that can be passed to > the tool # which will create the filesystem specified in > livecd/fstype. It is valid for # the following fstypes: squashfs, > jffs, jffs2, cramfs -# example: > -# livecd/fsops: -root-owned > livecd/fsops: > > # The cdtar is essentially the bootloader for the CD. It also holds > the main diff --git a/targets/embedded/fs-runscript.sh > b/targets/embedded/fs-runscript.sh index 8d5abab1..7e70848b 100755 > --- a/targets/embedded/fs-runscript.sh > +++ b/targets/embedded/fs-runscript.sh > @@ -32,9 +32,9 @@ case ${1} in > ;; > > squashfs) > - fs_check /usr/bin/mksquashfs squashfs > sys-fs/squashfs-tools > - mksquashfs ${root_fs_path} > ${clst_image_path}/root.img \ > - ${clst_embedded_fs_ops} || \ > + fs_check /usr/bin/gensquashfs squashfs > sys-fs/squashfs-tools-ng > + gensquashfs -D ${root_fs_path} > ${clst_embedded_fs_ops} \ > + ${clst_image_path}/root.img || > die "Could not create a squashfs filesystem" > ;; > > diff --git a/targets/support/filesystem-functions.sh > b/targets/support/filesystem-functions.sh index 0c144ba8..03303b14 > 100755 --- a/targets/support/filesystem-functions.sh > +++ b/targets/support/filesystem-functions.sh > @@ -55,8 +55,8 @@ create_noloop() { > create_squashfs() { > echo "Creating squashfs..." > export loopname="image.squashfs" > - mksquashfs "${clst_destpath}" "$1/${loopname}" ${clst_fsops} > -noappend \ > - || die "mksquashfs failed, did you emerge > squashfs-tools?" > + gensquashfs -D "${clst_destpath}" ${clst_fsops} > "$1/${loopname}" \ > + || die "gensquashfs failed, did you emerge > squashfs-tools-ng?" } > > create_jffs() { This one looks good