diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-06-14 11:29:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-06-16 15:40:11 +0100 |
commit | d512b5765d162dfeef31b0748076700d7a6cafec (patch) | |
tree | f660eee27a5a9c5528fd19512065a4cc7fb0d060 /meta | |
parent | 8b8cf3e620407610a0cdc80f17812d740aa7eccc (diff) | |
download | poky-d512b5765d162dfeef31b0748076700d7a6cafec.tar.gz |
squashfs-tools: upgrade 4.5.1 -> 4.6.1
(From OE-Core rev: 5e8cfde8f951b4aa0122411bc41d211af4d97eeb)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/squashfs-tools/files/0001-install-manpages.sh-do-not-write-original-timestamps.patch | 30 | ||||
-rw-r--r-- | meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb | 8 |
2 files changed, 3 insertions, 35 deletions
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 @@ | |||
1 | From b44b00dae195d8587857c7e8054e9be4eaa1f8b3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Thu, 7 Apr 2022 09:26:09 +0200 | ||
4 | Subject: [PATCH] install-manpages.sh: do not write original timestamps into | ||
5 | .gz metadata | ||
6 | |||
7 | This helps binary reproducibility. | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/plougher/squashfs-tools/pull/177] | ||
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
11 | --- | ||
12 | generate-manpages/install-manpages.sh | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/generate-manpages/install-manpages.sh b/generate-manpages/install-manpages.sh | ||
16 | index d4c9e91..6a43b89 100755 | ||
17 | --- a/generate-manpages/install-manpages.sh | ||
18 | +++ b/generate-manpages/install-manpages.sh | ||
19 | @@ -56,7 +56,7 @@ for i in mksquashfs unsquashfs sqfstar sqfscat; do | ||
20 | exit 1 | ||
21 | fi | ||
22 | |||
23 | - if ! gzip -f9 $2/$i.1; then | ||
24 | + if ! gzip -n -f9 $2/$i.1; then | ||
25 | echo "$0: Compressing installed manpage failed. Aborting" >&2 | ||
26 | exit 1 | ||
27 | fi | ||
28 | -- | ||
29 | 2.30.2 | ||
30 | |||
diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb index 4e009d2625..982a43f889 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb | |||
@@ -7,11 +7,9 @@ SECTION = "base" | |||
7 | LICENSE = "GPL-2.0-only" | 7 | LICENSE = "GPL-2.0-only" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
9 | 9 | ||
10 | PV = "4.5.1" | 10 | PV = "4.6.1" |
11 | SRCREV = "afdd63fc386919b4aa40d573b0a6069414d14317" | 11 | SRCREV = "d8cb82d9840330f9344ec37b992595b5d7b44184" |
12 | SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=master \ | 12 | SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https;branch=v6.1.1" |
13 | file://0001-install-manpages.sh-do-not-write-original-timestamps.patch \ | ||
14 | " | ||
15 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | 13 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" |
16 | 14 | ||
17 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |