From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: Re: [gentoo-catalyst] [PATCH 1/8] targets: Use gensquashfs instead of mksquashfs
Date: Sat, 2 May 2020 15:56:41 -0700 [thread overview]
Message-ID: <20200502155641.3debc2ce@storm> (raw)
In-Reply-To: <20200502014036.1039317-1-mattst88@gentoo.org>
On Fri, 1 May 2020 18:40:29 -0700
Matt Turner <mattst88@gentoo.org> 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 <mattst88@gentoo.org>
> ---
> 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
prev parent reply other threads:[~2020-05-02 22:56 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-02 1:40 [gentoo-catalyst] [PATCH 1/8] targets: Use gensquashfs instead of mksquashfs Matt Turner
2020-05-02 1:40 ` [gentoo-catalyst] [PATCH 2/8] targets: Drop most fstypes Matt Turner
2020-05-02 23:00 ` Brian Dolbec
2020-05-02 23:17 ` Matt Turner
2020-05-02 1:40 ` [gentoo-catalyst] [PATCH 3/8] targets: Inline filesystem-functions.sh Matt Turner
2020-05-02 23:03 ` Brian Dolbec
2020-05-02 23:18 ` Matt Turner
2020-05-03 0:25 ` Brian Dolbec
2020-05-02 1:40 ` [gentoo-catalyst] [PATCH 4/8] targets: Remove unused source filesystem-functions.sh Matt Turner
2020-05-02 23:06 ` Brian Dolbec
2020-05-02 23:20 ` Matt Turner
2020-05-02 23:51 ` Brian Dolbec
2020-05-02 1:40 ` [gentoo-catalyst] [PATCH 5/8] targets: Remove run_crossdev() function Matt Turner
2020-05-02 23:06 ` Brian Dolbec
2020-05-02 23:22 ` Matt Turner
2020-05-02 23:45 ` Brian Dolbec
2020-05-02 1:40 ` [gentoo-catalyst] [PATCH 6/8] targets: Inline functions with one caller Matt Turner
2020-05-02 23:12 ` Brian Dolbec
2020-05-02 1:40 ` [gentoo-catalyst] [PATCH 7/8] targets: Remove unused extract_kernel() Matt Turner
2020-05-02 23:15 ` Brian Dolbec
2020-05-02 1:40 ` [gentoo-catalyst] [PATCH 8/8] catalyst: Replace target_portdir with repo_basedir+repo_name Matt Turner
2020-05-02 23:28 ` Brian Dolbec
2020-05-02 22:56 ` Brian Dolbec [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200502155641.3debc2ce@storm \
--to=dolsen@gentoo.org \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox