From 63f82d0a4826ced9fb02e876fad227a5362cfd4d Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Mon, 9 Sep 2019 08:58:32 +0200 Subject: host-opkg-utils: version bump 0.3.6 -> 0.4.1 Signed-off-by: Michael Olbrich --- ...build-improve-ipk-package-reproducibility.patch | 30 -------------- ...rt-name-on-versions-of-tar-which-support-.patch | 48 ---------------------- ...Use-local-time-for-build_date-since-opkg-.patch | 42 ------------------- .../0100-opkg-build-use-CROSS_COMPILE-ar.patch | 28 ------------- .../0101-Update-Installed-Size-properly.patch | 34 --------------- ...in-ptxdist-the-maxium-UID-for-system-user.patch | 31 -------------- patches/opkg-utils-0.3.6/series | 11 ----- .../0100-opkg-build-use-CROSS_COMPILE-ar.patch | 28 +++++++++++++ .../0101-Update-Installed-Size-properly.patch | 34 +++++++++++++++ ...in-ptxdist-the-maxium-UID-for-system-user.patch | 31 ++++++++++++++ patches/opkg-utils-0.4.1/series | 8 ++++ rules/host-opkg-utils.make | 4 +- 12 files changed, 103 insertions(+), 226 deletions(-) delete mode 100644 patches/opkg-utils-0.3.6/0001-opkg-build-improve-ipk-package-reproducibility.patch delete mode 100644 patches/opkg-utils-0.3.6/0002-Only-use-sort-name-on-versions-of-tar-which-support-.patch delete mode 100644 patches/opkg-utils-0.3.6/0003-opkg-build-Use-local-time-for-build_date-since-opkg-.patch delete mode 100644 patches/opkg-utils-0.3.6/0100-opkg-build-use-CROSS_COMPILE-ar.patch delete mode 100644 patches/opkg-utils-0.3.6/0101-Update-Installed-Size-properly.patch delete mode 100644 patches/opkg-utils-0.3.6/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch delete mode 100644 patches/opkg-utils-0.3.6/series create mode 100644 patches/opkg-utils-0.4.1/0100-opkg-build-use-CROSS_COMPILE-ar.patch create mode 100644 patches/opkg-utils-0.4.1/0101-Update-Installed-Size-properly.patch create mode 100644 patches/opkg-utils-0.4.1/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch create mode 100644 patches/opkg-utils-0.4.1/series 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 -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 -Signed-off-by: Alejandro del Castillo ---- - 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 -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 -Signed-off-by: Alejandro del Castillo ---- - 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 -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 -Signed-off-by: Alejandro del Castillo ---- - 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.3.6/0100-opkg-build-use-CROSS_COMPILE-ar.patch deleted file mode 100644 index 9efe07581..000000000 --- a/patches/opkg-utils-0.3.6/0100-opkg-build-use-CROSS_COMPILE-ar.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= -Date: Fri, 20 Jan 2012 09:03:55 +0100 -Subject: [PATCH] opkg-build: use ${CROSS_COMPILE}ar -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some host systems do not provide proper ar, make it possible to switch -to cross-ar here. - -Signed-off-by: Andreas Bießmann ---- - opkg-build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/opkg-build b/opkg-build -index 0050c2bb11ed..4fddf4c9afda 100755 ---- a/opkg-build -+++ b/opkg-build -@@ -299,7 +299,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 ) - fi diff --git a/patches/opkg-utils-0.3.6/0101-Update-Installed-Size-properly.patch b/patches/opkg-utils-0.3.6/0101-Update-Installed-Size-properly.patch deleted file mode 100644 index f5ecd3967..000000000 --- a/patches/opkg-utils-0.3.6/0101-Update-Installed-Size-properly.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Michael Olbrich -Date: Tue, 9 Oct 2018 11:19:37 +0200 -Subject: [PATCH] Update Installed-Size properly - -Convert '-' to '_' to match the variable name 'installed_size' and use the -correct property name 'Installed-Size'. - -Signed-off-by: Michael Olbrich ---- - opkg.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/opkg.py b/opkg.py -index 153b62c7e7fa..f5cb9b86a773 100644 ---- a/opkg.py -+++ b/opkg.py -@@ -230,7 +230,7 @@ class Package(object): - lineparts = re.match(r'([\w-]*?):\s*(.*)', line) - if lineparts: - name = lineparts.group(1) -- name_lowercase = name.lower() -+ name_lowercase = name.lower().replace('-',"_") - 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) - 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) - if self.filename: out = out + "Filename: %s\n" % (self.filename) - if self.source: out = out + "Source: %s\n" % (self.source) - if self.description: out = out + "Description: %s\n" % (self.description) 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.3.6/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch deleted file mode 100644 index 09f9a4880..000000000 --- a/patches/opkg-utils-0.3.6/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Michael Olbrich -Date: Fri, 10 Nov 2017 19:52:05 +0100 -Subject: [PATCH] opkg-build: in ptxdist the maxium UID for system users is 999 - -Signed-off-by: Michael Olbrich ---- - opkg-build | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/opkg-build b/opkg-build -index 4fddf4c9afda..9401f34924ee 100755 ---- a/opkg-build -+++ b/opkg-build -@@ -68,14 +68,14 @@ You probably want to remove them: " >&2 - fi - fi - -- large_uid_files=`find . -uid +99 -ls -printf '\\\n' || true` -+ large_uid_files=`find . -uid +999 -ls -printf '\\\n' || true` - - if [ "$ogargs" = "" ] && [ -n "$large_uid_files" ]; then -- echo "*** Warning: The following files have a UID greater than 99. -+ echo "*** Warning: The following files have a UID greater than 999. - You probably want to chown these to a system user: " >&2 - echo -e $large_uid_files - if [ $? -ne 0 ]; then -- echo "*** Error: Fail to list files have a UID greater than 99." -+ echo "*** Error: Fail to list files have a UID greater than 999." - exit 1 - fi - echo >&2 diff --git a/patches/opkg-utils-0.3.6/series b/patches/opkg-utils-0.3.6/series deleted file mode 100644 index d5eb3538a..000000000 --- a/patches/opkg-utils-0.3.6/series +++ /dev/null @@ -1,11 +0,0 @@ -# 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 diff --git a/patches/opkg-utils-0.4.1/0100-opkg-build-use-CROSS_COMPILE-ar.patch b/patches/opkg-utils-0.4.1/0100-opkg-build-use-CROSS_COMPILE-ar.patch new file mode 100644 index 000000000..6d78b82e6 --- /dev/null +++ b/patches/opkg-utils-0.4.1/0100-opkg-build-use-CROSS_COMPILE-ar.patch @@ -0,0 +1,28 @@ +From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= +Date: Fri, 20 Jan 2012 09:03:55 +0100 +Subject: [PATCH] opkg-build: use ${CROSS_COMPILE}ar +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some host systems do not provide proper ar, make it possible to switch +to cross-ar here. + +Signed-off-by: Andreas Bießmann +--- + opkg-build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/opkg-build b/opkg-build +index dcd2d68ead86..a37e55827a79 100755 +--- a/opkg-build ++++ b/opkg-build +@@ -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 ) + fi diff --git a/patches/opkg-utils-0.4.1/0101-Update-Installed-Size-properly.patch b/patches/opkg-utils-0.4.1/0101-Update-Installed-Size-properly.patch new file mode 100644 index 000000000..184095540 --- /dev/null +++ b/patches/opkg-utils-0.4.1/0101-Update-Installed-Size-properly.patch @@ -0,0 +1,34 @@ +From: Michael Olbrich +Date: Tue, 9 Oct 2018 11:19:37 +0200 +Subject: [PATCH] Update Installed-Size properly + +Convert '-' to '_' to match the variable name 'installed_size' and use the +correct property name 'Installed-Size'. + +Signed-off-by: Michael Olbrich +--- + opkg.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/opkg.py b/opkg.py +index d4e782546bc1..2e58b5f7ad19 100644 +--- a/opkg.py ++++ b/opkg.py +@@ -247,7 +247,7 @@ class Package(object): + lineparts = re.match(r'([\w-]*?):\s*(.*)', line) + if lineparts: + name = lineparts.group(1) +- name_lowercase = name.lower() ++ name_lowercase = name.lower().replace('-',"_") + value = lineparts.group(2) + while 1: + line = control.readline().rstrip() +@@ -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) + if self.filename: out = out + "Filename: %s\n" % (self.filename) + if self.source: out = out + "Source: %s\n" % (self.source) + if self.description: out = out + "Description: %s\n" % (self.description) diff --git a/patches/opkg-utils-0.4.1/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 new file mode 100644 index 000000000..76c1defe4 --- /dev/null +++ b/patches/opkg-utils-0.4.1/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch @@ -0,0 +1,31 @@ +From: Michael Olbrich +Date: Fri, 10 Nov 2017 19:52:05 +0100 +Subject: [PATCH] opkg-build: in ptxdist the maxium UID for system users is 999 + +Signed-off-by: Michael Olbrich +--- + opkg-build | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/opkg-build b/opkg-build +index a37e55827a79..bf7ffabae98c 100755 +--- a/opkg-build ++++ b/opkg-build +@@ -68,14 +68,14 @@ You probably want to remove them: " >&2 + fi + fi + +- large_uid_files=`find . -uid +99 -ls -printf '\\\n' || true` ++ large_uid_files=`find . -uid +999 -ls -printf '\\\n' || true` + + if [ "$ogargs" = "" ] && [ -n "$large_uid_files" ]; then +- echo "*** Warning: The following files have a UID greater than 99. ++ echo "*** Warning: The following files have a UID greater than 999. + You probably want to chown these to a system user: " >&2 + echo -e $large_uid_files + if [ $? -ne 0 ]; then +- echo "*** Error: Fail to list files have a UID greater than 99." ++ echo "*** Error: Fail to list files have a UID greater than 999." + exit 1 + fi + echo >&2 diff --git a/patches/opkg-utils-0.4.1/series b/patches/opkg-utils-0.4.1/series new file mode 100644 index 000000000..5a0b7a35a --- /dev/null +++ b/patches/opkg-utils-0.4.1/series @@ -0,0 +1,8 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +#tag:upstream --start-number 1 +#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 +# 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) -- cgit v1.2.3