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 B5CB1138359 for ; Fri, 23 Oct 2020 09:19:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCE44E0817; Fri, 23 Oct 2020 09:19:25 +0000 (UTC) Received: from rs234.mailgun.us (rs234.mailgun.us [209.61.151.234]) (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 C06B1E0817 for ; Fri, 23 Oct 2020 09:19:21 +0000 (UTC) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=0xdc.io; q=dns/txt; s=smtp; t=1603444765; h=Content-Transfer-Encoding: MIME-Version: Message-Id: Date: Subject: To: From: Sender; bh=KhiMJMQvPxMscB7fdWa32um8ZpAjYnClUfHUrP58I64=; b=uPJFThtSplQRbDBFlxP7uBrT98DpbXY/VWBRkDJL7YL3m/8vBxPSJsNZUHbYiISp/WraH4un wFiSPB5E1ps3EdwsXbmR+W5LcOcfPoPljK5ERWycFm9IxWcclD3mgfzsK5TSVRyYGO+h1UzS EfJtvth0pjDY6k9+WqPwab6QJXw= X-Mailgun-Sending-Ip: 209.61.151.234 X-Mailgun-Sid: WyJiZmIxMyIsICJnZW50b28tY2F0YWx5c3RAbGlzdHMuZ2VudG9vLm9yZyIsICJmNjc0NGUiXQ== Received: from mail.0xdc.io (ip-54-37-0.eu [54.37.0.172]) by smtp-out-n05.prod.us-west-2.postgun.com with SMTP id 5f929ffb83370fa1c167905c (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Fri, 23 Oct 2020 09:18:51 GMT Sender: gentoo.catalyst=xxoo.ws@0xdc.io Received: from dysnomia (1.c.d.0.b.d.3.7.4.0.4.3.a.3.d.5.0.a.4.7.9.0.c.0.0.b.8.0.1.0.0.2.ip6.arpa [IPv6:2001:8b0:c09:74a0:5d3a:3404:73db:dc1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.0xdc.io (Postfix) with ESMTPSA id A14B4102D8F for ; Fri, 23 Oct 2020 09:25:12 +0000 (UTC) From: Daniel Cordero To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH 1/3] Re-allow the use of mksquashfs to pack the livecd contents Date: Fri, 23 Oct 2020 09:18:43 +0000 Message-Id: <20201023091845.71295-1-gentoo.catalyst@xxoo.ws> 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: 890baf2d-78c7-4e33-aafa-3ecb49a39c25 X-Archives-Hash: 2bdba3b564044911e21abe9bfbfc8331 From: Daniel Cordero sys-fs/squashfs-tools-ng is keyworded as unstable. Stable squashfs users can still use mksquashfs to create the squashed image. Fixes: 23e9ea10 "targets: Use gensquashfs instead of mksquashfs" Signed-off-by: Daniel Cordero --- I have not fixed targets/embedded/fs-runscript.sh from the referenced commit. targets/support/target_image_setup.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh index fdc4a234..23150f13 100755 --- a/targets/support/target_image_setup.sh +++ b/targets/support/target_image_setup.sh @@ -7,8 +7,13 @@ mkdir -p "${1}" echo "Creating ${clst_fstype} filesystem" case ${clst_fstype} in squashfs) - gensquashfs -D "${clst_destpath}" -q ${clst_fsops} "${1}/image.squashfs" \ - || die "Failed to create squashfs filesystem" + if command -v mksquashfs; then + mksquashfs "${clst_destpath}" "$1/image.squashfs" ${clst_fsops} -noappend \ + || die "mksquashfs failed" + else + gensquashfs -D "${clst_destpath}" -q ${clst_fsops} "${1}/image.squashfs" \ + || die "Failed to create squashfs filesystem" + fi ;; jffs2) mkfs.jffs2 --root="${clst_destpath}" --output="${1}/image.jffs" "${clst_fsops}" \ -- 2.26.2