From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 16 Jul 2024 16:41:46 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sTjNC-005TRA-0S for lore@lore.pengutronix.de; Tue, 16 Jul 2024 16:41:46 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sTjNB-00019K-C3; Tue, 16 Jul 2024 16:41:45 +0200 Received: from mail.ela-soft.com ([213.23.49.162]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sTjN1-00018g-80 for ptxdist@pengutronix.de; Tue, 16 Jul 2024 16:41:35 +0200 Received: from tupai.ela-bln.local (tupai.ela-bln.local [10.0.1.140]) by mail.ela-soft.com (mailsystem) with ESMTP id A7CA912E50 for ; Tue, 16 Jul 2024 16:41:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ela-soft.com; s=2021; t=1721140894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=NT07kcZDkU5pIxiltviaO/QXCtBuIe+6Qu6j73qSs3o=; b=jMgk0BZ6g1Rc3R1ID2uFA4Fk6UkYrDQ7Y1cgRSjI5YdWzJ88YBlLi7Y3/rwpPyIvL00RCn liOO09IraKYL8KCm5PBJsoVXAAZcicPBqKmqGQzN4PK0LuIL8DzxPKdlaQ7Y1PD0a6D8fW +mTB0obmMJmGf/ButqPe6TYeCjPKxn5DIeC6y+XIP/V2fp/30+HQipPtw3B+SL0TPuwqDE Uvwrbg7JPislysNh/naPONEgBeHBs7203+wKJXRS4XIltLslZdxjoR7XvqTzih6CY4G1FP zmm4TZsZW+udCo2/4hR1cOjZt/DaD5LuBeNyRu6tTGOBUlXiz3mgQvSihDAoug== Received: by tupai.ela-bln.local (Postfix, from userid 1000) id A5EDA340475; Tue, 16 Jul 2024 16:41:34 +0200 (CEST) From: Andreas Helmcke To: ptxdist@pengutronix.de Date: Tue, 16 Jul 2024 16:41:14 +0200 Message-ID: <20240716144114.115155-2-ahelmcke@ela-soft.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-102.2 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, USER_IN_WELCOMELIST,USER_IN_WHITELIST autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH 1/2] squashfs-tools: version bump 4.5.1 -> 4.6.1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Various bug fixes and changes. link: https://sourceforge.net/projects/squashfs/files/squashfs/squashfs4.6.1/ link: https://sourceforge.net/projects/squashfs/files/squashfs/squashfs4.6/ Changed make options to install prebuild man pages, so patch series is no longer needed. Signed-off-by: Andreas Helmcke --- .../0001-don-t-try-to-generate-manpages.patch | 21 ------------------- patches/squashfs4.5.1/series | 4 ---- rules/squashfs-tools.make | 9 +++++--- 3 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 patches/squashfs4.5.1/0001-don-t-try-to-generate-manpages.patch delete mode 100644 patches/squashfs4.5.1/series diff --git a/patches/squashfs4.5.1/0001-don-t-try-to-generate-manpages.patch b/patches/squashfs4.5.1/0001-don-t-try-to-generate-manpages.patch deleted file mode 100644 index 1dd1d6c43..000000000 --- a/patches/squashfs4.5.1/0001-don-t-try-to-generate-manpages.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Michael Olbrich -Date: Thu, 15 Dec 2022 12:19:04 +0100 -Subject: [PATCH] don't try to generate manpages - -The script tries to execute mksquashfs which does not work for -cross-compiling. - -Signed-off-by: Michael Olbrich ---- - squashfs-tools/Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/squashfs-tools/Makefile b/squashfs-tools/Makefile -index 8b80b8a68c1b..3d147735f506 100755 ---- a/squashfs-tools/Makefile -+++ b/squashfs-tools/Makefile -@@ -422,4 +422,3 @@ install: mksquashfs unsquashfs - cp unsquashfs $(INSTALL_DIR) - ln -fs unsquashfs $(INSTALL_DIR)/sqfscat - ln -fs mksquashfs $(INSTALL_DIR)/sqfstar -- ../generate-manpages/install-manpages.sh $(shell pwd)/.. "$(INSTALL_MANPAGES_DIR)" diff --git a/patches/squashfs4.5.1/series b/patches/squashfs4.5.1/series deleted file mode 100644 index 107a293f5..000000000 --- a/patches/squashfs4.5.1/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-don-t-try-to-generate-manpages.patch -# 44bb5fb8b1cd672d1996e5c3879b55b2 - git-ptx-patches magic diff --git a/rules/squashfs-tools.make b/rules/squashfs-tools.make index 91adfc2ee..7fc696f32 100644 --- a/rules/squashfs-tools.make +++ b/rules/squashfs-tools.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SQUASHFS_TOOLS) += squashfs-tools # # Paths and names # -SQUASHFS_TOOLS_VERSION := 4.5.1 -SQUASHFS_TOOLS_MD5 := 399513f5dbfbf2ceec52db0b1b30f648 +SQUASHFS_TOOLS_VERSION := 4.6.1 +SQUASHFS_TOOLS_MD5 := db23a40fa0dc54b4d6d225fb20ee6555 SQUASHFS_TOOLS := squashfs$(SQUASHFS_TOOLS_VERSION) SQUASHFS_TOOLS_SUFFIX := tar.gz SQUASHFS_TOOLS_URL := $(call ptx/mirror, SF, squashfs/$(SQUASHFS_TOOLS).$(SQUASHFS_TOOLS_SUFFIX)) @@ -33,10 +33,13 @@ SQUASHFS_TOOLS_LICENSE_FILES := \ SQUASHFS_TOOLS_MAKE_PAR := NO SQUASHFS_TOOLS_MAKE_ENV := \ ZSTD_SUPPORT=$(call ptx/ifdef, PTXCONF_SQUASHFS_TOOLS_ZSTD_SUPPORT,1,0) \ - $(CROSS_ENV) + $(CROSS_ENV) \ + CONFIG=1 \ + USE_PREBUILT_MANPAGES=y SQUASHFS_TOOLS_INSTALL_OPT := \ INSTALL_DIR="$(SQUASHFS_TOOLS_PKGDIR)/usr/sbin" \ + INSTALL_MANPAGES_DIR="$(SQUASHFS_TOOLS_PKGDIR)/usr/local/man/man1" \ install # ---------------------------------------------------------------------------- -- 2.43.0