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 2D66C1382C5 for ; Thu, 4 Feb 2021 11:08:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 629ACE0905; Thu, 4 Feb 2021 11:08:10 +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 3C7D8E0905 for ; Thu, 4 Feb 2021 11:08:08 +0000 (UTC) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=0xdc.io; q=dns/txt; s=smtp; t=1612436890; h=Content-Transfer-Encoding: MIME-Version: Message-Id: Date: Subject: To: From: Sender; bh=uwCymD9sos5lkduMT7kLucBzMpyYr3SvVB7WauYtQbM=; b=iMnxnR0sCqL2vs+FQG2G5qYFcfl/tTzu4CtQF3bQFUQba3Lu4Cw1FiJz4y1nareuIq34QTO1 hubHgHQG0OYn2GEVHCLNpY2nSINIH1S0nEDMH9znlUndQ/+PKH6EXSN9xC5GrdnbIqDPAJga ZwLN2puMUEubq4Ou+mR64IXS0gI= 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-n01.prod.us-east-1.postgun.com with SMTP id 601bd594e3df861f4be68a84 (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Thu, 04 Feb 2021 11:08:04 GMT Sender: gentoo.catalyst=xxoo.ws@0xdc.io Received: from dysnomia (8.b.b.1.e.2.d.8.6.c.e.a.2.0.9.c.0.a.4.7.9.0.c.0.0.b.8.0.1.0.0.2.ip6.arpa [IPv6:2001:8b0:c09:74a0:c902:aec6:8d2e:1bb8]) (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 497561023A3 for ; Thu, 4 Feb 2021 11:08:09 +0000 (UTC) From: Daniel Cordero To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH] Allow the use of mksquashfs to pack livecd contents Date: Thu, 4 Feb 2021 11:07:20 +0000 Message-Id: <20210204110721.33846-3-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: 198cf63e-d841-4d73-ad69-65dac6c91104 X-Archives-Hash: 543e5570a22a5dffc1287225f12608f8 From: Daniel Cordero Users using catalyst outside of the portage tree, or on other distributions, may not have the gensquashfs tool. mksquashfs still creates compatible squashfs images for this purpose. Signed-off-by: Daniel Cordero --- 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 f9427eaf..045b80b3 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_stage_path}" -q ${clst_fsops} "${1}/image.squashfs" \ - || die "Failed to create squashfs filesystem" + if command -v mksquashfs; then + mksquashfs "${clst_stage_path}" "${1}/image.squashfs" ${clst_fsops} -noappend \ + || die "mksquashfs failed" + else + gensquashfs -D "${clst_stage_path}" -q ${clst_fsops} "${1}/image.squashfs" \ + || die "Failed to create squashfs filesystem" + fi ;; jffs2) mkfs.jffs2 --root="${clst_stage_path}" --output="${1}/image.jffs" "${clst_fsops}" \ -- 2.26.2