* [ptxdist] [PATCH 1/2] squashfs-tools: version bump 4.5.1 -> 4.6.1
@ 2024-07-16 14:41 Andreas Helmcke
2024-07-16 14:41 ` [ptxdist] [PATCH 2/2] host-squashfs-tools: Follow target squashfs-tools Andreas Helmcke
2024-08-05 6:49 ` [ptxdist] [APPLIED] squashfs-tools: version bump 4.5.1 -> 4.6.1 Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Andreas Helmcke @ 2024-07-16 14:41 UTC (permalink / raw)
To: ptxdist
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 <ahelmcke@ela-soft.com>
---
.../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 <m.olbrich@pengutronix.de>
-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 <m.olbrich@pengutronix.de>
----
- 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH 2/2] host-squashfs-tools: Follow target squashfs-tools
2024-07-16 14:41 [ptxdist] [PATCH 1/2] squashfs-tools: version bump 4.5.1 -> 4.6.1 Andreas Helmcke
@ 2024-07-16 14:41 ` Andreas Helmcke
2024-08-05 6:49 ` [ptxdist] [APPLIED] " Michael Olbrich
2024-08-05 6:49 ` [ptxdist] [APPLIED] squashfs-tools: version bump 4.5.1 -> 4.6.1 Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Andreas Helmcke @ 2024-07-16 14:41 UTC (permalink / raw)
To: ptxdist
install prebuild man pages
Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
---
rules/host-squashfs-tools.make | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/rules/host-squashfs-tools.make b/rules/host-squashfs-tools.make
index d24accd91..aa490b59d 100644
--- a/rules/host-squashfs-tools.make
+++ b/rules/host-squashfs-tools.make
@@ -27,8 +27,17 @@ HOST_SQUASHFS_TOOLS_MAKE_OPT := \
XZ_SUPPORT=$(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_XZ_SUPPORT,1,0) \
ZSTD_SUPPORT=$(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_ZSTD_SUPPORT,1,0)
-HOST_SQUASHFS_TOOLS_MAKE_ENV := $(HOST_ENV) EXTRA_LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/usr/lib/xz"
+HOST_SQUASHFS_TOOLS_MAKE_ENV := \
+ $(HOST_ENV) \
+ EXTRA_LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/usr/lib/xz" \
+ CONFIG=1 \
+ USE_PREBUILT_MANPAGES=y
+
HOST_SQUASHFS_TOOLS_MAKE_PAR := NO
-HOST_SQUASHFS_TOOLS_INSTALL_OPT = install INSTALL_DIR="$(HOST_SQUASHFS_TOOLS_PKGDIR)/usr/sbin"
+HOST_SQUASHFS_TOOLS_INSTALL_OPT = \
+ install \
+ INSTALL_DIR="$(HOST_SQUASHFS_TOOLS_PKGDIR)/usr/sbin" \
+ INSTALL_MANPAGES_DIR="$(HOST_SQUASHFS_TOOLS_PKGDIR)/usr/local/man/man1"
+
# vim: syntax=make
--
2.43.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] squashfs-tools: version bump 4.5.1 -> 4.6.1
2024-07-16 14:41 [ptxdist] [PATCH 1/2] squashfs-tools: version bump 4.5.1 -> 4.6.1 Andreas Helmcke
2024-07-16 14:41 ` [ptxdist] [PATCH 2/2] host-squashfs-tools: Follow target squashfs-tools Andreas Helmcke
@ 2024-08-05 6:49 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2024-08-05 6:49 UTC (permalink / raw)
To: ptxdist; +Cc: Andreas Helmcke
Thanks, applied as 8492f750f9506247fe3d1227d9547d936b1979dc.
Michael
[sent from post-receive hook]
On Mon, 05 Aug 2024 08:49:38 +0200, Andreas Helmcke <ahelmcke@ela-soft.com> 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 <ahelmcke@ela-soft.com>
> Message-Id: <20240716144114.115155-2-ahelmcke@ela-soft.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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 <m.olbrich@pengutronix.de>
> -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 <m.olbrich@pengutronix.de>
> ----
> - 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
>
> # ----------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] host-squashfs-tools: Follow target squashfs-tools
2024-07-16 14:41 ` [ptxdist] [PATCH 2/2] host-squashfs-tools: Follow target squashfs-tools Andreas Helmcke
@ 2024-08-05 6:49 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2024-08-05 6:49 UTC (permalink / raw)
To: ptxdist; +Cc: Andreas Helmcke
Thanks, applied as da065c9e58cebac61bec1a77733124e9bb2b6d20.
Michael
[sent from post-receive hook]
On Mon, 05 Aug 2024 08:49:39 +0200, Andreas Helmcke <ahelmcke@ela-soft.com> wrote:
> install prebuild man pages
>
> Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
> Message-Id: <20240716144114.115155-4-ahelmcke@ela-soft.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-squashfs-tools.make b/rules/host-squashfs-tools.make
> index d24accd91d04..aa490b59d349 100644
> --- a/rules/host-squashfs-tools.make
> +++ b/rules/host-squashfs-tools.make
> @@ -27,8 +27,17 @@ HOST_SQUASHFS_TOOLS_MAKE_OPT := \
> XZ_SUPPORT=$(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_XZ_SUPPORT,1,0) \
> ZSTD_SUPPORT=$(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_ZSTD_SUPPORT,1,0)
>
> -HOST_SQUASHFS_TOOLS_MAKE_ENV := $(HOST_ENV) EXTRA_LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/usr/lib/xz"
> +HOST_SQUASHFS_TOOLS_MAKE_ENV := \
> + $(HOST_ENV) \
> + EXTRA_LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/usr/lib/xz" \
> + CONFIG=1 \
> + USE_PREBUILT_MANPAGES=y
> +
> HOST_SQUASHFS_TOOLS_MAKE_PAR := NO
> -HOST_SQUASHFS_TOOLS_INSTALL_OPT = install INSTALL_DIR="$(HOST_SQUASHFS_TOOLS_PKGDIR)/usr/sbin"
> +HOST_SQUASHFS_TOOLS_INSTALL_OPT = \
> + install \
> + INSTALL_DIR="$(HOST_SQUASHFS_TOOLS_PKGDIR)/usr/sbin" \
> + INSTALL_MANPAGES_DIR="$(HOST_SQUASHFS_TOOLS_PKGDIR)/usr/local/man/man1"
> +
>
> # vim: syntax=make
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-05 6:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-16 14:41 [ptxdist] [PATCH 1/2] squashfs-tools: version bump 4.5.1 -> 4.6.1 Andreas Helmcke
2024-07-16 14:41 ` [ptxdist] [PATCH 2/2] host-squashfs-tools: Follow target squashfs-tools Andreas Helmcke
2024-08-05 6:49 ` [ptxdist] [APPLIED] " Michael Olbrich
2024-08-05 6:49 ` [ptxdist] [APPLIED] squashfs-tools: version bump 4.5.1 -> 4.6.1 Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox