* [ptxdist] [PATCH] host-opkg-utils: Version bump. 0.4.2 -> 0.5.0
@ 2022-05-13 13:27 Christian Melki
2022-05-25 9:45 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2022-05-13 13:27 UTC (permalink / raw)
To: ptxdist
Follow opkg upgrade.
Minor bugfixes. Notable features is zstd which
follows the inclusion of zstd in opkg.
* Remove old patches. The one in the upstream tag series is now included in the release.
Forward the rest.
* Add patch directory with non upstream patches.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
...reproducibility-issues-in-opkg-build.patch | 35 -------------------
...0100-opkg-build-use-CROSS_COMPILE-ar.patch | 0
.../0101-Update-Installed-Size-properly.patch | 0
...xdist-the-maxium-UID-for-system-user.patch | 0
...ld-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch | 0
...pkg-build-fix-typo-in-compressorargs.patch | 0
.../series | 3 +-
rules/host-opkg-utils.make | 4 +--
8 files changed, 3 insertions(+), 39 deletions(-)
delete mode 100644 patches/opkg-utils-0.4.2/0001-Fix-reproducibility-issues-in-opkg-build.patch
rename patches/{opkg-utils-0.4.2 => opkg-utils-0.5.0}/0100-opkg-build-use-CROSS_COMPILE-ar.patch (100%)
rename patches/{opkg-utils-0.4.2 => opkg-utils-0.5.0}/0101-Update-Installed-Size-properly.patch (100%)
rename patches/{opkg-utils-0.4.2 => opkg-utils-0.5.0}/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch (100%)
rename patches/{opkg-utils-0.4.2 => opkg-utils-0.5.0}/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch (100%)
rename patches/{opkg-utils-0.4.2 => opkg-utils-0.5.0}/0104-opkg-build-fix-typo-in-compressorargs.patch (100%)
rename patches/{opkg-utils-0.4.2 => opkg-utils-0.5.0}/series (77%)
diff --git a/patches/opkg-utils-0.4.2/0001-Fix-reproducibility-issues-in-opkg-build.patch b/patches/opkg-utils-0.4.2/0001-Fix-reproducibility-issues-in-opkg-build.patch
deleted file mode 100644
index f1615a392..000000000
--- a/patches/opkg-utils-0.4.2/0001-Fix-reproducibility-issues-in-opkg-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Richard Purdie <richard.purdie@linuxfoundation.org>
-Date: Wed, 5 Feb 2020 12:08:39 +0000
-Subject: [PATCH] Fix reproducibility issues in opkg-build
-
-There is a sorting problem with opkg-build where the ipk generated is depending
-upon the order of files on disk. The reason is the --sort option to tar only
-influences the orders of files tar reads, not those passed by the -T option.
-
-Add in a sort call to resolve this issue. To ensure consistent sorting we
-also need to force to a specific locale (C) else the results are still not
-deterministic.
-
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
----
- opkg-build | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/opkg-build b/opkg-build
-index 8b3d7a9f78de..1b564166a7a4 100755
---- a/opkg-build
-+++ b/opkg-build
-@@ -305,8 +305,10 @@ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then
- mtime_args="--mtime=@$build_date --clamp-mtime"
- fi
-
--( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list )
--( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print > $tmp_dir/file_list )
-+export LANG=C
-+export LC_ALL=C
-+( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list )
-+( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list )
- ( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext )
- ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz )
- rm $tmp_dir/file_list
diff --git a/patches/opkg-utils-0.4.2/0100-opkg-build-use-CROSS_COMPILE-ar.patch b/patches/opkg-utils-0.5.0/0100-opkg-build-use-CROSS_COMPILE-ar.patch
similarity index 100%
rename from patches/opkg-utils-0.4.2/0100-opkg-build-use-CROSS_COMPILE-ar.patch
rename to patches/opkg-utils-0.5.0/0100-opkg-build-use-CROSS_COMPILE-ar.patch
diff --git a/patches/opkg-utils-0.4.2/0101-Update-Installed-Size-properly.patch b/patches/opkg-utils-0.5.0/0101-Update-Installed-Size-properly.patch
similarity index 100%
rename from patches/opkg-utils-0.4.2/0101-Update-Installed-Size-properly.patch
rename to patches/opkg-utils-0.5.0/0101-Update-Installed-Size-properly.patch
diff --git a/patches/opkg-utils-0.4.2/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch b/patches/opkg-utils-0.5.0/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch
similarity index 100%
rename from patches/opkg-utils-0.4.2/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch
rename to patches/opkg-utils-0.5.0/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch
diff --git a/patches/opkg-utils-0.4.2/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch b/patches/opkg-utils-0.5.0/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch
similarity index 100%
rename from patches/opkg-utils-0.4.2/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch
rename to patches/opkg-utils-0.5.0/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch
diff --git a/patches/opkg-utils-0.4.2/0104-opkg-build-fix-typo-in-compressorargs.patch b/patches/opkg-utils-0.5.0/0104-opkg-build-fix-typo-in-compressorargs.patch
similarity index 100%
rename from patches/opkg-utils-0.4.2/0104-opkg-build-fix-typo-in-compressorargs.patch
rename to patches/opkg-utils-0.5.0/0104-opkg-build-fix-typo-in-compressorargs.patch
diff --git a/patches/opkg-utils-0.4.2/series b/patches/opkg-utils-0.5.0/series
similarity index 77%
rename from patches/opkg-utils-0.4.2/series
rename to patches/opkg-utils-0.5.0/series
index 5782e137f..dd02ae5e5 100644
--- a/patches/opkg-utils-0.4.2/series
+++ b/patches/opkg-utils-0.5.0/series
@@ -1,11 +1,10 @@
# generated by git-ptx-patches
#tag:base --start-number 1
#tag:upstream --start-number 1
-0001-Fix-reproducibility-issues-in-opkg-build.patch
#tag:ptx --start-number 100
0100-opkg-build-use-CROSS_COMPILE-ar.patch
0101-Update-Installed-Size-properly.patch
0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch
0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch
0104-opkg-build-fix-typo-in-compressorargs.patch
-# beebeb187639b0a8c121563179f0d21b - git-ptx-patches magic
+# 5dc8ab865b0d2f99f1b9b711848d5ae2 - git-ptx-patches magic
diff --git a/rules/host-opkg-utils.make b/rules/host-opkg-utils.make
index cec8ac4f6..da77db024 100644
--- a/rules/host-opkg-utils.make
+++ b/rules/host-opkg-utils.make
@@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_OPKG_UTILS) += host-opkg-utils
#
# Paths and names
#
-HOST_OPKG_UTILS_VERSION := 0.4.2
-HOST_OPKG_UTILS_MD5 := 1c8683135c2998d9bb459a547bcdfb2f
+HOST_OPKG_UTILS_VERSION := 0.5.0
+HOST_OPKG_UTILS_MD5 := 475a85baea919752a21fcd1952aff7b8
HOST_OPKG_UTILS := opkg-utils-$(HOST_OPKG_UTILS_VERSION)
HOST_OPKG_UTILS_SUFFIX := tar.bz2
HOST_OPKG_UTILS_URL := http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/snapshot/$(HOST_OPKG_UTILS).$(HOST_OPKG_UTILS_SUFFIX)
--
2.34.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] host-opkg-utils: Version bump. 0.4.2 -> 0.5.0
2022-05-13 13:27 [ptxdist] [PATCH] host-opkg-utils: Version bump. 0.4.2 -> 0.5.0 Christian Melki
@ 2022-05-25 9:45 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2022-05-25 9:45 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as ed660a4b4bff78144b040e4553a72f2b1bb70fe8.
Michael
[sent from post-receive hook]
On Wed, 25 May 2022 11:45:24 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Follow opkg upgrade.
> Minor bugfixes. Notable features is zstd which
> follows the inclusion of zstd in opkg.
>
> * Remove old patches. The one in the upstream tag series is now included in the release.
> Forward the rest.
> * Add patch directory with non upstream patches.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220513132742.1962637-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/opkg-utils-0.4.2/0001-Fix-reproducibility-issues-in-opkg-build.patch b/patches/opkg-utils-0.4.2/0001-Fix-reproducibility-issues-in-opkg-build.patch
> deleted file mode 100644
> index f1615a392ee6..000000000000
> --- a/patches/opkg-utils-0.4.2/0001-Fix-reproducibility-issues-in-opkg-build.patch
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -From: Richard Purdie <richard.purdie@linuxfoundation.org>
> -Date: Wed, 5 Feb 2020 12:08:39 +0000
> -Subject: [PATCH] Fix reproducibility issues in opkg-build
> -
> -There is a sorting problem with opkg-build where the ipk generated is depending
> -upon the order of files on disk. The reason is the --sort option to tar only
> -influences the orders of files tar reads, not those passed by the -T option.
> -
> -Add in a sort call to resolve this issue. To ensure consistent sorting we
> -also need to force to a specific locale (C) else the results are still not
> -deterministic.
> -
> -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> -Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
> ----
> - opkg-build | 6 ++++--
> - 1 file changed, 4 insertions(+), 2 deletions(-)
> -
> -diff --git a/opkg-build b/opkg-build
> -index 8b3d7a9f78de..1b564166a7a4 100755
> ---- a/opkg-build
> -+++ b/opkg-build
> -@@ -305,8 +305,10 @@ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then
> - mtime_args="--mtime=@$build_date --clamp-mtime"
> - fi
> -
> --( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list )
> --( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print > $tmp_dir/file_list )
> -+export LANG=C
> -+export LC_ALL=C
> -+( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list )
> -+( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list )
> - ( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext )
> - ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz )
> - rm $tmp_dir/file_list
> diff --git a/patches/opkg-utils-0.4.2/0100-opkg-build-use-CROSS_COMPILE-ar.patch b/patches/opkg-utils-0.5.0/0100-opkg-build-use-CROSS_COMPILE-ar.patch
> similarity index 100%
> rename from patches/opkg-utils-0.4.2/0100-opkg-build-use-CROSS_COMPILE-ar.patch
> rename to patches/opkg-utils-0.5.0/0100-opkg-build-use-CROSS_COMPILE-ar.patch
> diff --git a/patches/opkg-utils-0.4.2/0101-Update-Installed-Size-properly.patch b/patches/opkg-utils-0.5.0/0101-Update-Installed-Size-properly.patch
> similarity index 100%
> rename from patches/opkg-utils-0.4.2/0101-Update-Installed-Size-properly.patch
> rename to patches/opkg-utils-0.5.0/0101-Update-Installed-Size-properly.patch
> diff --git a/patches/opkg-utils-0.4.2/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch b/patches/opkg-utils-0.5.0/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch
> similarity index 100%
> rename from patches/opkg-utils-0.4.2/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch
> rename to patches/opkg-utils-0.5.0/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch
> diff --git a/patches/opkg-utils-0.4.2/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch b/patches/opkg-utils-0.5.0/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch
> similarity index 100%
> rename from patches/opkg-utils-0.4.2/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch
> rename to patches/opkg-utils-0.5.0/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch
> diff --git a/patches/opkg-utils-0.4.2/0104-opkg-build-fix-typo-in-compressorargs.patch b/patches/opkg-utils-0.5.0/0104-opkg-build-fix-typo-in-compressorargs.patch
> similarity index 100%
> rename from patches/opkg-utils-0.4.2/0104-opkg-build-fix-typo-in-compressorargs.patch
> rename to patches/opkg-utils-0.5.0/0104-opkg-build-fix-typo-in-compressorargs.patch
> diff --git a/patches/opkg-utils-0.4.2/series b/patches/opkg-utils-0.5.0/series
> similarity index 77%
> rename from patches/opkg-utils-0.4.2/series
> rename to patches/opkg-utils-0.5.0/series
> index 5782e137fa08..dd02ae5e56d1 100644
> --- a/patches/opkg-utils-0.4.2/series
> +++ b/patches/opkg-utils-0.5.0/series
> @@ -1,11 +1,10 @@
> # generated by git-ptx-patches
> #tag:base --start-number 1
> #tag:upstream --start-number 1
> -0001-Fix-reproducibility-issues-in-opkg-build.patch
> #tag:ptx --start-number 100
> 0100-opkg-build-use-CROSS_COMPILE-ar.patch
> 0101-Update-Installed-Size-properly.patch
> 0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch
> 0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch
> 0104-opkg-build-fix-typo-in-compressorargs.patch
> -# beebeb187639b0a8c121563179f0d21b - git-ptx-patches magic
> +# 5dc8ab865b0d2f99f1b9b711848d5ae2 - git-ptx-patches magic
> diff --git a/rules/host-opkg-utils.make b/rules/host-opkg-utils.make
> index cec8ac4f6b24..da77db02405d 100644
> --- a/rules/host-opkg-utils.make
> +++ b/rules/host-opkg-utils.make
> @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_OPKG_UTILS) += host-opkg-utils
> #
> # Paths and names
> #
> -HOST_OPKG_UTILS_VERSION := 0.4.2
> -HOST_OPKG_UTILS_MD5 := 1c8683135c2998d9bb459a547bcdfb2f
> +HOST_OPKG_UTILS_VERSION := 0.5.0
> +HOST_OPKG_UTILS_MD5 := 475a85baea919752a21fcd1952aff7b8
> HOST_OPKG_UTILS := opkg-utils-$(HOST_OPKG_UTILS_VERSION)
> HOST_OPKG_UTILS_SUFFIX := tar.bz2
> HOST_OPKG_UTILS_URL := http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/snapshot/$(HOST_OPKG_UTILS).$(HOST_OPKG_UTILS_SUFFIX)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-25 9:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-13 13:27 [ptxdist] [PATCH] host-opkg-utils: Version bump. 0.4.2 -> 0.5.0 Christian Melki
2022-05-25 9:45 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox