host-opkg-utils: version bump 0.3.6 -> 0.4.1

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

8 files changed, 12 insertions, 135 deletions

diff --git a/patches/opkg-utils-0.3.6/0001-opkg-build-improve-ipk-package-reproducibility.patch b/patches/opkg-utils-0.3.6/0001-opkg-build-improve-ipk-package-reproducibility.patch
deleted file mode 100644
index f06a7d415..000000000
--- a/patches/opkg-utils-0.3.6/0001-opkg-build-improve-ipk-package-reproducibility.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Gardon Lukasz <garjack555@gmail.com>
-Date: Wed, 21 Feb 2018 13:09:39 +0100
-Subject: [PATCH] opkg-build: improve ipk package reproducibility
-
-Implement timestamp recommendation from reproducible-build.org [1]
-
-- Enable deterministic archieve by setting zero timestamp and
-  uids/guds with using 'D' in GNU ar tool
-
-[1] https://reproducible-builds.org/docs/archives/
-
-Signed-off-by: Gardon Lukasz <garjack555@gmail.com>
-Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
----
- opkg-build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/opkg-build b/opkg-build
-index 318f308069a7..265906f66a8a 100755
---- a/opkg-build
-+++ b/opkg-build
-@@ -294,7 +294,7 @@ fi
- 
- rm -f $pkg_file
- if [ "$outer" = "ar" ] ; then
--  ( cd $tmp_dir && ar -crf $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 )
- else
-   ( cd $tmp_dir && tar -c --sort=name --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file )
- fi
diff --git a/patches/opkg-utils-0.3.6/0002-Only-use-sort-name-on-versions-of-tar-which-support-.patch b/patches/opkg-utils-0.3.6/0002-Only-use-sort-name-on-versions-of-tar-which-support-.patch
deleted file mode 100644
index 84a2c816a..000000000
--- a/patches/opkg-utils-0.3.6/0002-Only-use-sort-name-on-versions-of-tar-which-support-.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Michael Hansen <michael.j.hansen@hp.com>
-Date: Mon, 26 Feb 2018 09:42:56 -0800
-Subject: [PATCH] Only use --sort=name on versions of tar which support it.
- This fixes compatibility with bsdtar and old versions of GNU tar (e.g.
- RHEL6).
-
-Signed-off-by: Michael Hansen <michael.j.hansen@hp.com>
-Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
----
- opkg-build | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/opkg-build b/opkg-build
-index 265906f66a8a..094d69f8fad3 100755
---- a/opkg-build
-+++ b/opkg-build
-@@ -232,6 +232,11 @@ if [ $compressor = "gzip" ] ; then
- 	compressorargs=$zipargs
- fi
- 
-+tsortargs=
-+if tar --help 2>&1 | grep -- "--sort=" > /dev/null; then
-+	tsortargs="--sort=name"
-+fi
-+
- shift $(($OPTIND - 1))
- 
- # continue on to process additional arguments
-@@ -280,8 +285,8 @@ mkdir $tmp_dir
- build_date="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)"
- 
- echo $CONTROL > $tmp_dir/tarX
--( cd $pkg_dir && tar $ogargs --sort=name --mtime=$build_date -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext )
--( cd $pkg_dir/$CONTROL && tar $ogargs --sort=name --mtime=$build_date -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz )
-+( cd $pkg_dir && tar $ogargs $tsortargs --mtime=$build_date -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext )
-+( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --mtime=$build_date -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz )
- rm $tmp_dir/tarX
- 
- echo "2.0" > $tmp_dir/debian-binary
-@@ -296,7 +301,7 @@ rm -f $pkg_file
- if [ "$outer" = "ar" ] ; then
-   ( cd $tmp_dir && ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext )
- else
--  ( cd $tmp_dir && tar -c --sort=name --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file )
-+  ( cd $tmp_dir && tar -c $tsortargs --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file )
- fi
- 
- rm $tmp_dir/debian-binary $tmp_dir/data.tar.$cext $tmp_dir/control.tar.gz
diff --git a/patches/opkg-utils-0.3.6/0003-opkg-build-Use-local-time-for-build_date-since-opkg-.patch b/patches/opkg-utils-0.3.6/0003-opkg-build-Use-local-time-for-build_date-since-opkg-.patch
deleted file mode 100644
index 000371cb8..000000000
--- a/patches/opkg-utils-0.3.6/0003-opkg-build-Use-local-time-for-build_date-since-opkg-.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Michael Hansen <michael.j.hansen@hp.com>
-Date: Mon, 26 Feb 2018 10:17:01 -0800
-Subject: [PATCH] opkg-build: Use local time for build_date, since opkg
- extracts files assuming local time rather than UTC.
-
-Also increase resolution of build date down to the second, rather than
-clamping to midnight of the current date.
-
-Signed-off-by: Michael Hansen <michael.j.hansen@hp.com>
-Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
----
- opkg-build | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/opkg-build b/opkg-build
-index 094d69f8fad3..0050c2bb11ed 100755
---- a/opkg-build
-+++ b/opkg-build
-@@ -282,11 +282,11 @@ fi
- tmp_dir=$dest_dir/IPKG_BUILD.$$
- mkdir $tmp_dir
- 
--build_date="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)"
-+build_date="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" "+%Y-%m-%d %H:%M:%S")"
- 
- echo $CONTROL > $tmp_dir/tarX
--( cd $pkg_dir && tar $ogargs $tsortargs --mtime=$build_date -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext )
--( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --mtime=$build_date -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz )
-+( cd $pkg_dir && tar $ogargs $tsortargs --mtime="$build_date" -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext )
-+( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --mtime="$build_date" -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz )
- rm $tmp_dir/tarX
- 
- echo "2.0" > $tmp_dir/debian-binary
-@@ -301,7 +301,7 @@ rm -f $pkg_file
- if [ "$outer" = "ar" ] ; then
-   ( cd $tmp_dir && 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="$build_date" $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file )
- fi
- 
- rm $tmp_dir/debian-binary $tmp_dir/data.tar.$cext $tmp_dir/control.tar.gz
diff --git a/patches/opkg-utils-0.3.6/0100-opkg-build-use-CROSS_COMPILE-ar.patch b/patches/opkg-utils-0.4.1/0100-opkg-build-use-CROSS_COMPILE-ar.patch
index 9efe07581..6d78b82e6 100644
--- a/patches/opkg-utils-0.3.6/0100-opkg-build-use-CROSS_COMPILE-ar.patch
+++ b/patches/opkg-utils-0.4.1/0100-opkg-build-use-CROSS_COMPILE-ar.patch
@@ -14,15 +14,15 @@ Signed-off-by: Andreas Bießmann <andreas@biessmann.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/opkg-build b/opkg-build
-index 0050c2bb11ed..4fddf4c9afda 100755
+index dcd2d68ead86..a37e55827a79 100755
 --- a/opkg-build
 +++ b/opkg-build
-@@ -299,7 +299,7 @@ fi
+@@ -314,7 +314,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 )
  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=@$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file )
  fi
diff --git a/patches/opkg-utils-0.3.6/0101-Update-Installed-Size-properly.patch b/patches/opkg-utils-0.4.1/0101-Update-Installed-Size-properly.patch
index f5ecd3967..184095540 100644
--- a/patches/opkg-utils-0.3.6/0101-Update-Installed-Size-properly.patch
+++ b/patches/opkg-utils-0.4.1/0101-Update-Installed-Size-properly.patch
@@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/opkg.py b/opkg.py
-index 153b62c7e7fa..f5cb9b86a773 100644
+index d4e782546bc1..2e58b5f7ad19 100644
 --- a/opkg.py
 +++ b/opkg.py
-@@ -230,7 +230,7 @@ class Package(object):
+@@ -247,7 +247,7 @@ class Package(object):
              lineparts = re.match(r'([\w-]*?):\s*(.*)', line)
              if lineparts:
                  name = lineparts.group(1)
@@ -23,9 +23,9 @@ index 153b62c7e7fa..f5cb9b86a773 100644
                  value = lineparts.group(2)
                  while 1:
                      line = control.readline().rstrip()
-@@ -482,7 +482,7 @@ class Package(object):
-         if self.maintainer: out = out + "Maintainer: %s\n" % (self.maintainer)
-         if self.md5: out = out + "MD5Sum: %s\n" % (self.md5)
+@@ -504,7 +504,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)
 -        if self.installed_size: out = out + "InstalledSize: %d\n" % int(self.installed_size)
 +        if self.installed_size: out = out + "Installed-Size: %d\n" % int(self.installed_size)
diff --git a/patches/opkg-utils-0.3.6/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch b/patches/opkg-utils-0.4.1/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch
index 09f9a4880..76c1defe4 100644
--- a/patches/opkg-utils-0.3.6/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch
+++ b/patches/opkg-utils-0.4.1/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch
@@ -8,7 +8,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/opkg-build b/opkg-build
-index 4fddf4c9afda..9401f34924ee 100755
+index a37e55827a79..bf7ffabae98c 100755
 --- a/opkg-build
 +++ b/opkg-build
 @@ -68,14 +68,14 @@ You probably want to remove them: " >&2
diff --git a/patches/opkg-utils-0.3.6/series b/patches/opkg-utils-0.4.1/series
index d5eb3538a..5a0b7a35a 100644
--- a/patches/opkg-utils-0.3.6/series
+++ b/patches/opkg-utils-0.4.1/series
@@ -1,11 +1,8 @@
 # generated by git-ptx-patches
 #tag:base --start-number 1
 #tag:upstream --start-number 1
-0001-opkg-build-improve-ipk-package-reproducibility.patch
-0002-Only-use-sort-name-on-versions-of-tar-which-support-.patch
-0003-opkg-build-Use-local-time-for-build_date-since-opkg-.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
-# e0f4c3592faf999298db116925fe26a3  - git-ptx-patches magic
+# 043753b8f8c5b034e920d9e2fd664c03  - git-ptx-patches magic
diff --git a/rules/host-opkg-utils.make b/rules/host-opkg-utils.make
index 604459394..d85415fae 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.3.6
-HOST_OPKG_UTILS_MD5	:= 8acd4392f0f998b7d85ac3717749eee6
+HOST_OPKG_UTILS_VERSION	:= 0.4.1
+HOST_OPKG_UTILS_MD5	:= 25c27e2ce458d202be26d9e19c710b8d
 HOST_OPKG_UTILS		:= opkg-utils-$(HOST_OPKG_UTILS_VERSION)
 HOST_OPKG_UTILS_SUFFIX	:= tar.bz2
 HOST_OPKG_UTILS_URL	:= https://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/snapshot/$(HOST_OPKG_UTILS).$(HOST_OPKG_UTILS_SUFFIX)