From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 05 Aug 2024 08:53:58 +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 1sarbS-006P8m-2X for lore@lore.pengutronix.de; Mon, 05 Aug 2024 08:53:58 +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 1sarbR-0007f5-SP; Mon, 05 Aug 2024 08:53:57 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sarXG-0003jU-Kp; Mon, 05 Aug 2024 08:49:38 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sarXG-004eB1-7q; Mon, 05 Aug 2024 08:49:38 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sarXG-003jZo-0d; Mon, 05 Aug 2024 08:49:38 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 5 Aug 2024 08:49:38 +0200 Message-Id: <20240805064938.890173-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240716144114.115155-2-ahelmcke@ela-soft.com> References: <20240716144114.115155-2-ahelmcke@ela-soft.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] 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 Cc: Andreas Helmcke 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 Thanks, applied as 8492f750f9506247fe3d1227d9547d936b1979dc. Michael [sent from post-receive hook] On Mon, 05 Aug 2024 08:49:38 +0200, Andreas Helmcke wrote: > 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 > Message-Id: <20240716144114.115155-2-ahelmcke@ela-soft.com> > Signed-off-by: Michael Olbrich > > 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 1dd1d6c43b16..000000000000 > --- 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 107a293f517f..000000000000 > --- 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 91adfc2ee7c5..7fc696f32fb0 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 > > # ----------------------------------------------------------------------------