Thanks, applied as 257618fc39e35d7e33996b4289822153a20b08ef. Michael
[sent from post-receive hook] On Wed, 14 Feb 2024 17:19:35 +0100, Christian Melki <christian.me...@t2data.com> wrote: > https://git.yoctoproject.org/opkg-utils/log/?h=0.6.3 > Added acls and xattrs. Not sure they'll be used? > Othersise, minor changes. Looks like they're trying to follow > the opkg version number. > > * Rework the patch set. Try to follow the intentions > of the previous diff. > > Signed-off-by: Christian Melki <christian.me...@t2data.com> > Message-Id: <20240212204520.1168713-1-christian.me...@t2data.com> > [mol: drop patch for old tar. It was only needed for old distros that > are no longer supported] > Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > > diff --git > a/patches/opkg-utils-0.5.0/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 > deleted file mode 100644 > index b855eec53322..000000000000 > --- > a/patches/opkg-utils-0.5.0/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch > +++ /dev/null > @@ -1,38 +0,0 @@ > -From: Michael Olbrich <m.olbr...@pengutronix.de> > -Date: Sat, 25 Jan 2020 18:28:40 +0100 > -Subject: [PATCH] Revert "opkg-build: clamp mtimes to SOURCE_DATE_EPOCH" > - > -This reverts commit c3cc95693048bdd57a82069bad47abbc72a1932e. > - > -We set the mtime already in PTXdist so it's not needed and this breaks > -building with tar <= 1.28 (e.g. CentOS 7). > - > -Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > ---- > - opkg-build | 9 +-------- > - 1 file changed, 1 insertion(+), 8 deletions(-) > - > -diff --git a/opkg-build b/opkg-build > -index 6d6f7e92b919..2fb6216104b6 100755 > ---- a/opkg-build > -+++ b/opkg-build > -@@ -298,18 +298,11 @@ mkdir $tmp_dir > - > - build_date="${SOURCE_DATE_EPOCH:-$(date +%s)}" > - > --mtime_args="" > --# --clamp-mtime requires tar > 1.28. Only use it if SOURCE_DATE_EPOCH is > set, to avoid having a generic case dependency on tar > 1.28. > --# this setting will make sure files generated at build time have consistent > mtimes, for reproducible builds. > --if [ ! -z "$SOURCE_DATE_EPOCH" ]; then > -- mtime_args="--mtime=@$build_date --clamp-mtime" > --fi > -- > - 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 && tar $ogargs $tsortargs --no-recursion -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 > - rm $tmp_dir/control_list > diff --git > a/patches/opkg-utils-0.5.0/0100-opkg-build-use-CROSS_COMPILE-ar.patch > b/patches/opkg-utils-0.6.3/0100-opkg-build-use-CROSS_COMPILE-ar.patch > similarity index 59% > rename from > patches/opkg-utils-0.5.0/0100-opkg-build-use-CROSS_COMPILE-ar.patch > rename to patches/opkg-utils-0.6.3/0100-opkg-build-use-CROSS_COMPILE-ar.patch > index 9e54dd0eca8a..5560929094ff 100644 > --- a/patches/opkg-utils-0.5.0/0100-opkg-build-use-CROSS_COMPILE-ar.patch > +++ b/patches/opkg-utils-0.6.3/0100-opkg-build-use-CROSS_COMPILE-ar.patch > @@ -14,15 +14,15 @@ Signed-off-by: Andreas Bießmann <andr...@biessmann.de> > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/opkg-build b/opkg-build > -index 1b564166a7a4..eca1ee2fa42c 100755 > +index 6edd938b8f7e..ef2fbfa42c09 100755 > --- a/opkg-build > +++ b/opkg-build > -@@ -324,7 +324,7 @@ fi > +@@ -352,7 +352,7 @@ fi > > rm -f $pkg_file > if [ "$outer" = "ar" ] ; then > -- ( cd $tmp_dir && ar -crfD $pkg_file ./debian-binary ./control.tar.gz > ./data.tar.$cext ) > -+ ( cd $tmp_dir && ${CROSS_COMPILE}ar -crfD $pkg_file ./debian-binary > ./control.tar.gz ./data.tar.$cext ) > +- ( cd $tmp_dir && ar -crfD $pkg_file ./debian-binary ./control.tar.gz > ./data.tar.$cext ) > ++ ( cd $tmp_dir && ${CROSS_COMPILE}ar -crfD $pkg_file ./debian-binary > ./control.tar.gz ./data.tar.$cext ) > else > - ( cd $tmp_dir && tar -c $tsortargs --mtime=@$build_date $tarformat > ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file > ) > + ( cd $tmp_dir && tar -c $tsortargs $mtime_args $tarformat > ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file > ) > fi > diff --git > a/patches/opkg-utils-0.5.0/0101-Update-Installed-Size-properly.patch > b/patches/opkg-utils-0.6.3/0101-Update-Installed-Size-properly.patch > similarity index 91% > rename from patches/opkg-utils-0.5.0/0101-Update-Installed-Size-properly.patch > rename to patches/opkg-utils-0.6.3/0101-Update-Installed-Size-properly.patch > index 3f617eaff7d6..48a00ff9a9d9 100644 > --- a/patches/opkg-utils-0.5.0/0101-Update-Installed-Size-properly.patch > +++ b/patches/opkg-utils-0.6.3/0101-Update-Installed-Size-properly.patch > @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/opkg.py b/opkg.py > -index ba947c2e887b..7b7e216419a1 100644 > +index e5a65dd1ae8f..ec77c147156c 100644 > --- a/opkg.py > +++ b/opkg.py > -@@ -248,7 +248,7 @@ class Package(object): > +@@ -276,7 +276,7 @@ class Package(object): > lineparts = re.match(r'([\w-]*?):\s*(.*)', line) > if lineparts: > name = lineparts.group(1) > @@ -23,7 +23,7 @@ index ba947c2e887b..7b7e216419a1 100644 > value = lineparts.group(2) > while 1: > line = control.readline().rstrip() > -@@ -510,7 +510,7 @@ class Package(object): > +@@ -538,7 +538,7 @@ class Package(object): > if 'sha256' in checksum: > if self.sha256: out = out + "SHA256sum: %s\n" % (self.sha256) > if self.size: out = out + "Size: %d\n" % int(self.size) > diff --git > a/patches/opkg-utils-0.5.0/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch > > b/patches/opkg-utils-0.6.3/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch > similarity index 95% > rename from > patches/opkg-utils-0.5.0/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch > rename to > patches/opkg-utils-0.6.3/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch > index 8a1df58e18b8..ba8c852a1e20 100644 > --- > a/patches/opkg-utils-0.5.0/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch > +++ > b/patches/opkg-utils-0.6.3/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch > @@ -8,11 +8,11 @@ Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/opkg-build b/opkg-build > -index eca1ee2fa42c..6d6f7e92b919 100755 > +index ef2fbfa42c09..6a1b631fc5d5 100755 > --- a/opkg-build > +++ b/opkg-build > @@ -69,14 +69,14 @@ You probably want to remove them: " >&2 > - fi > + fi > fi > > - large_uid_files=`find . -uid +99 -ls -printf '\\\n' || true` > diff --git > a/patches/opkg-utils-0.5.0/0104-opkg-build-fix-typo-in-compressorargs.patch > b/patches/opkg-utils-0.6.3/0103-opkg-build-fix-typo-in-compressorargs.patch > similarity index 86% > rename from > patches/opkg-utils-0.5.0/0104-opkg-build-fix-typo-in-compressorargs.patch > rename to > patches/opkg-utils-0.6.3/0103-opkg-build-fix-typo-in-compressorargs.patch > index ea791bbc21d3..1576296ba8b2 100644 > --- > a/patches/opkg-utils-0.5.0/0104-opkg-build-fix-typo-in-compressorargs.patch > +++ > b/patches/opkg-utils-0.6.3/0103-opkg-build-fix-typo-in-compressorargs.patch > @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/opkg-build b/opkg-build > -index 2fb6216104b6..7e1a1af99948 100755 > +index 6a1b631fc5d5..c609249190f4 100755 > --- a/opkg-build > +++ b/opkg-build > -@@ -236,7 +236,7 @@ if gzip --help 2>&1 | grep -- "-T" > /dev/null; then > +@@ -252,7 +252,7 @@ if gzip --help 2>&1 | grep -- "-T" > /dev/null; then > zipargs="-9nT" > fi > > diff --git a/patches/opkg-utils-0.5.0/series b/patches/opkg-utils-0.6.3/series > similarity index 60% > rename from patches/opkg-utils-0.5.0/series > rename to patches/opkg-utils-0.6.3/series > index dd02ae5e56d1..800146487010 100644 > --- a/patches/opkg-utils-0.5.0/series > +++ b/patches/opkg-utils-0.6.3/series > @@ -5,6 +5,5 @@ > 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 > -# 5dc8ab865b0d2f99f1b9b711848d5ae2 - git-ptx-patches magic > +0103-opkg-build-fix-typo-in-compressorargs.patch > +# 6c399b3d39fd841e35a006cd4534b2eb - git-ptx-patches magic > diff --git a/rules/host-opkg-utils.make b/rules/host-opkg-utils.make > index a9af478ff465..a35a0da0d783 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.5.0 > -HOST_OPKG_UTILS_MD5 := c71939ee02c69462bd3ba1fe0d6de5e2 > +HOST_OPKG_UTILS_VERSION := 0.6.3 > +HOST_OPKG_UTILS_MD5 := 2ca116eda29e0be4a89e92a9b24bda53 > HOST_OPKG_UTILS := opkg-utils-$(HOST_OPKG_UTILS_VERSION) > HOST_OPKG_UTILS_SUFFIX := tar.gz > HOST_OPKG_UTILS_URL := > https://git.yoctoproject.org/opkg-utils/snapshot/$(HOST_OPKG_UTILS).$(HOST_OPKG_UTILS_SUFFIX)
