summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch13
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch13
2 files changed, 10 insertions, 16 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch
index 7de4b7f723..203c585053 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch
@@ -11,10 +11,10 @@ Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
11 opkg-build | 11 ++++++++--- 11 opkg-build | 11 ++++++++---
12 1 file changed, 8 insertions(+), 3 deletions(-) 12 1 file changed, 8 insertions(+), 3 deletions(-)
13 13
14diff --git a/opkg-build b/opkg-build 14Index: opkg-utils-0.3.6/opkg-build
15index 265906f..094d69f 100755 15===================================================================
16--- a/opkg-build 16--- opkg-utils-0.3.6.orig/opkg-build
17+++ b/opkg-build 17+++ opkg-utils-0.3.6/opkg-build
18@@ -232,6 +232,11 @@ if [ $compressor = "gzip" ] ; then 18@@ -232,6 +232,11 @@ if [ $compressor = "gzip" ] ; then
19 compressorargs=$zipargs 19 compressorargs=$zipargs
20 fi 20 fi
@@ -40,13 +40,10 @@ index 265906f..094d69f 100755
40 echo "2.0" > $tmp_dir/debian-binary 40 echo "2.0" > $tmp_dir/debian-binary
41@@ -296,7 +301,7 @@ rm -f $pkg_file 41@@ -296,7 +301,7 @@ rm -f $pkg_file
42 if [ "$outer" = "ar" ] ; then 42 if [ "$outer" = "ar" ] ; then
43 ( cd $tmp_dir && ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) 43 ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext )
44 else 44 else
45- ( cd $tmp_dir && tar -c --sort=name --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) 45- ( cd $tmp_dir && tar -c --sort=name --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file )
46+ ( cd $tmp_dir && tar -c $tsortargs --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) 46+ ( cd $tmp_dir && tar -c $tsortargs --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file )
47 fi 47 fi
48 48
49 rm $tmp_dir/debian-binary $tmp_dir/data.tar.$cext $tmp_dir/control.tar.gz 49 rm $tmp_dir/debian-binary $tmp_dir/data.tar.$cext $tmp_dir/control.tar.gz
50--
512.16.1
52
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch
index b42d7878c9..0a7403d674 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch
@@ -12,10 +12,10 @@ Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
12 opkg-build | 8 ++++---- 12 opkg-build | 8 ++++----
13 1 file changed, 4 insertions(+), 4 deletions(-) 13 1 file changed, 4 insertions(+), 4 deletions(-)
14 14
15diff --git a/opkg-build b/opkg-build 15Index: opkg-utils-0.3.6/opkg-build
16index 094d69f..0050c2b 100755 16===================================================================
17--- a/opkg-build 17--- opkg-utils-0.3.6.orig/opkg-build
18+++ b/opkg-build 18+++ opkg-utils-0.3.6/opkg-build
19@@ -282,11 +282,11 @@ fi 19@@ -282,11 +282,11 @@ fi
20 tmp_dir=$dest_dir/IPKG_BUILD.$$ 20 tmp_dir=$dest_dir/IPKG_BUILD.$$
21 mkdir $tmp_dir 21 mkdir $tmp_dir
@@ -33,13 +33,10 @@ index 094d69f..0050c2b 100755
33 echo "2.0" > $tmp_dir/debian-binary 33 echo "2.0" > $tmp_dir/debian-binary
34@@ -301,7 +301,7 @@ rm -f $pkg_file 34@@ -301,7 +301,7 @@ rm -f $pkg_file
35 if [ "$outer" = "ar" ] ; then 35 if [ "$outer" = "ar" ] ; then
36 ( cd $tmp_dir && ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) 36 ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext )
37 else 37 else
38- ( cd $tmp_dir && tar -c $tsortargs --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) 38- ( cd $tmp_dir && tar -c $tsortargs --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file )
39+ ( cd $tmp_dir && tar -c $tsortargs --mtime="$build_date" $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) 39+ ( cd $tmp_dir && tar -c $tsortargs --mtime="$build_date" $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file )
40 fi 40 fi
41 41
42 rm $tmp_dir/debian-binary $tmp_dir/data.tar.$cext $tmp_dir/control.tar.gz 42 rm $tmp_dir/debian-binary $tmp_dir/data.tar.$cext $tmp_dir/control.tar.gz
43--
442.16.1
45