diff mbox series

[V2] squashfs-tools: upgrade 4.5.1 -> 4.6.0

Message ID 1681174888-30847-2-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [V2] squashfs-tools: upgrade 4.5.1 -> 4.6.0 | expand

Commit Message

Mingyu Wang (Fujitsu) April 11, 2023, 1:01 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

Changelog:
https://github.com/plougher/squashfs-tools/blob/master/CHANGES

0001-install-manpages.sh-do-not-write-original-timestamps.patch
removed since it's included in 4.6.0

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ....sh-do-not-write-original-timestamps.patch | 30 -------------------
 ...s-tools_git.bb => squashfs-tools_4.6.0.bb} |  4 +--
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 meta/recipes-devtools/squashfs-tools/files/0001-install-manpages.sh-do-not-write-original-timestamps.patch
 rename meta/recipes-devtools/squashfs-tools/{squashfs-tools_git.bb => squashfs-tools_4.6.0.bb} (91%)

Comments

Luca Ceresoli April 11, 2023, 2:18 p.m. UTC | #1 
Hello Wang,

On Tue, 11 Apr 2023 09:01:28 +0800
"wangmy" <wangmy@fujitsu.com> wrote:

> From: Wang Mingyu <wangmy@fujitsu.com>
> 
> Changelog:
> https://github.com/plougher/squashfs-tools/blob/master/CHANGES
> 
> 0001-install-manpages.sh-do-not-write-original-timestamps.patch
> removed since it's included in 4.6.0
> 
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>

Reproducible testing fails with this patch, even though I'm not sure
exactly why in detail:

Log:
https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/2692/steps/12/logs/stdio

Diffoscope output:
http://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20230411-n16xgjqy/packages/diff-html/
diff mbox series

Patch

diff --git a/meta/recipes-devtools/squashfs-tools/files/0001-install-manpages.sh-do-not-write-original-timestamps.patch b/meta/recipes-devtools/squashfs-tools/files/0001-install-manpages.sh-do-not-write-original-timestamps.patch
deleted file mode 100644
index ed1d2f5b3b..0000000000
--- a/meta/recipes-devtools/squashfs-tools/files/0001-install-manpages.sh-do-not-write-original-timestamps.patch
+++ /dev/null
@@ -1,30 +0,0 @@ 
-From b44b00dae195d8587857c7e8054e9be4eaa1f8b3 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Thu, 7 Apr 2022 09:26:09 +0200
-Subject: [PATCH] install-manpages.sh: do not write original timestamps into
- .gz metadata
-
-This helps binary reproducibility.
-
-Upstream-Status: Submitted [https://github.com/plougher/squashfs-tools/pull/177]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- generate-manpages/install-manpages.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/generate-manpages/install-manpages.sh b/generate-manpages/install-manpages.sh
-index d4c9e91..6a43b89 100755
---- a/generate-manpages/install-manpages.sh
-+++ b/generate-manpages/install-manpages.sh
-@@ -56,7 +56,7 @@ for i in mksquashfs unsquashfs sqfstar sqfscat; do
- 		exit 1
- 	fi
- 
--	if ! gzip -f9 $2/$i.1; then
-+	if ! gzip -n -f9 $2/$i.1; then
- 		echo "$0: Compressing installed manpage failed.  Aborting" >&2
- 		exit 1
- 	fi
--- 
-2.30.2
-
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.6.0.bb
similarity index 91%
rename from meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
rename to meta/recipes-devtools/squashfs-tools/squashfs-tools_4.6.0.bb
index 4e009d2625..6a95079da5 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.6.0.bb
@@ -7,10 +7,8 @@  SECTION = "base"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-PV = "4.5.1"
-SRCREV = "afdd63fc386919b4aa40d573b0a6069414d14317"
+SRCREV = "8c7c87ea85546dd51651ce0ce898a4a2a54311d0"
 SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=master \
-           file://0001-install-manpages.sh-do-not-write-original-timestamps.patch \
            "
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"