| Message ID | 1681117314-24836-2-git-send-email-wangmy@fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | squashfs-tools: upgrade 4.5.1 -> 4.6.0 | expand |
On Mon, Apr 10, 2023 at 2:02 AM 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> > --- > ....sh-do-not-write-original-timestamps.patch | 30 ------------------- > .../squashfs-tools/squashfs-tools_git.bb | 5 ++-- > 2 files changed, 2 insertions(+), 33 deletions(-) > delete mode 100644 meta/recipes-devtools/squashfs-tools/files/0001-install-manpages.sh-do-not-write-original-timestamps.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_git.bb > index 4e009d2625..51963fe696 100644 > --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb > +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb rename the recipe to squashfs-tools_4.6.0.bb > @@ -7,10 +7,9 @@ SECTION = "base" > LICENSE = "GPL-2.0-only" > LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > > -PV = "4.5.1" > -SRCREV = "afdd63fc386919b4aa40d573b0a6069414d14317" > +PV = "4.6.0" remove this. > +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+)+))" > > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#179859): https://lists.openembedded.org/g/openembedded-core/message/179859 > Mute This Topic: https://lists.openembedded.org/mt/98171996/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
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_git.bb index 4e009d2625..51963fe696 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb @@ -7,10 +7,9 @@ SECTION = "base" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -PV = "4.5.1" -SRCREV = "afdd63fc386919b4aa40d573b0a6069414d14317" +PV = "4.6.0" +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+)+))"