diff options
Diffstat (limited to 'meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch')
-rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch | 51 |
1 files changed, 0 insertions, 51 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 deleted file mode 100644 index 6b7ca7da3e..0000000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From ef5db062b7d25e6070acc6922ea48f50491313b5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Hansen <michael.j.hansen@hp.com> | ||
3 | Date: Mon, 26 Feb 2018 09:42:56 -0800 | ||
4 | Subject: [PATCH 1/2] Only use --sort=name on versions of tar which support it. | ||
5 | This fixes compatibility with bsdtar and old versions of GNU tar (e.g. | ||
6 | RHEL6). | ||
7 | |||
8 | Signed-off-by: Michael Hansen <michael.j.hansen@hp.com> | ||
9 | Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com> | ||
10 | Upstream-Status: Backport | ||
11 | |||
12 | --- | ||
13 | opkg-build | 11 ++++++++--- | ||
14 | 1 file changed, 8 insertions(+), 3 deletions(-) | ||
15 | |||
16 | Index: opkg-utils-0.3.6/opkg-build | ||
17 | =================================================================== | ||
18 | --- opkg-utils-0.3.6.orig/opkg-build | ||
19 | +++ opkg-utils-0.3.6/opkg-build | ||
20 | @@ -232,6 +232,11 @@ if [ $compressor = "gzip" ] ; then | ||
21 | compressorargs=$zipargs | ||
22 | fi | ||
23 | |||
24 | +tsortargs= | ||
25 | +if tar --help 2>&1 | grep -- "--sort=" > /dev/null; then | ||
26 | + tsortargs="--sort=name" | ||
27 | +fi | ||
28 | + | ||
29 | shift $(($OPTIND - 1)) | ||
30 | |||
31 | # continue on to process additional arguments | ||
32 | @@ -280,8 +285,8 @@ mkdir $tmp_dir | ||
33 | build_date="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)" | ||
34 | |||
35 | echo $CONTROL > $tmp_dir/tarX | ||
36 | -( cd $pkg_dir && tar $ogargs --sort=name --mtime=$build_date -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) | ||
37 | -( cd $pkg_dir/$CONTROL && tar $ogargs --sort=name --mtime=$build_date -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz ) | ||
38 | +( cd $pkg_dir && tar $ogargs $tsortargs --mtime=$build_date -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) | ||
39 | +( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --mtime=$build_date -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz ) | ||
40 | rm $tmp_dir/tarX | ||
41 | |||
42 | echo "2.0" > $tmp_dir/debian-binary | ||
43 | @@ -296,7 +301,7 @@ rm -f $pkg_file | ||
44 | if [ "$outer" = "ar" ] ; then | ||
45 | ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) | ||
46 | else | ||
47 | - ( cd $tmp_dir && tar -c --sort=name --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) | ||
48 | + ( cd $tmp_dir && tar -c $tsortargs --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) | ||
49 | fi | ||
50 | |||
51 | rm $tmp_dir/debian-binary $tmp_dir/data.tar.$cext $tmp_dir/control.tar.gz | ||