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 A54B8138350 for ; Sat, 2 May 2020 01:40:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE3F6E0990; Sat, 2 May 2020 01:40:49 +0000 (UTC) Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) (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 981DDE0990 for ; Sat, 2 May 2020 01:40:49 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id w65so2352605pfc.12 for ; Fri, 01 May 2020 18:40:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6e9oDI3L45R9ytqRHUMjK/HdbzIb/H2LosZmjwOeHVk=; b=KGE3ITEmQ1B98xDGZ1mcka0mZA9zxTJbP0LyvjAdzylzVcSRg/cPbRfgzaYpb/U+9D g21tcw1CCoo83K6ZaoAYjL9WjF9dFT5DpC3UStmIxvNbuOlhr58XFVq3Usa7b3Tf4+9j Wy3VRJXPZo4l5zzXeoW84gMVzJR7VFzkaka5304hhwaL2G90uc6kszsyfbLczVD9bWu6 Y9bnXRzcKtQBQhvGzYZ++j37/A/ujVXX6Kb16kV24TL4Oh8brwoK2HzmfBGRUyuaXUUp ueAczGhrHAgVgzHvVcPK13k176xF1uBKciJuXaO2AjvW0QutV/8L980eCNmsbTwOlMGa 8RBw== X-Gm-Message-State: AGi0PuYs09CIo/FzSYqBQ9sJFj6uv0lHX38AkUsmvaJBhEQcDLNxAJTX tvJr3kJ0MigWWJQFAG6ezpXjUz/c X-Google-Smtp-Source: APiQypKRhowAHDaPxNVIU50N2eXg3+9IOr04pwtLG/C+QOtFr7KJ6CX4l07KoPiKduAvws+4Ka+cUw== X-Received: by 2002:a63:67c5:: with SMTP id b188mr6614494pgc.111.1588383647985; Fri, 01 May 2020 18:40:47 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id f21sm3277753pfn.71.2020.05.01.18.40.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 May 2020 18:40:46 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 1/8] targets: Use gensquashfs instead of mksquashfs Date: Fri, 1 May 2020 18:40:29 -0700 Message-Id: <20200502014036.1039317-1-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 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-Transfer-Encoding: 8bit X-Archives-Salt: 55fefd1c-1c92-44a7-b051-7b8b243014f8 X-Archives-Hash: a1d98c419ec0930c772cf0d79ef4a29f 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() { -- 2.26.2