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 | 52 |
1 files changed, 52 insertions, 0 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 new file mode 100644 index 0000000000..7de4b7f723 --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch | |||
@@ -0,0 +1,52 @@ | |||
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 | --- | ||
11 | opkg-build | 11 ++++++++--- | ||
12 | 1 file changed, 8 insertions(+), 3 deletions(-) | ||
13 | |||
14 | diff --git a/opkg-build b/opkg-build | ||
15 | index 265906f..094d69f 100755 | ||
16 | --- a/opkg-build | ||
17 | +++ b/opkg-build | ||
18 | @@ -232,6 +232,11 @@ if [ $compressor = "gzip" ] ; then | ||
19 | compressorargs=$zipargs | ||
20 | fi | ||
21 | |||
22 | +tsortargs= | ||
23 | +if tar --help 2>&1 | grep -- "--sort=" > /dev/null; then | ||
24 | + tsortargs="--sort=name" | ||
25 | +fi | ||
26 | + | ||
27 | shift $(($OPTIND - 1)) | ||
28 | |||
29 | # continue on to process additional arguments | ||
30 | @@ -280,8 +285,8 @@ mkdir $tmp_dir | ||
31 | build_date="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)" | ||
32 | |||
33 | echo $CONTROL > $tmp_dir/tarX | ||
34 | -( cd $pkg_dir && tar $ogargs --sort=name --mtime=$build_date -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) | ||
35 | -( cd $pkg_dir/$CONTROL && tar $ogargs --sort=name --mtime=$build_date -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz ) | ||
36 | +( cd $pkg_dir && tar $ogargs $tsortargs --mtime=$build_date -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) | ||
37 | +( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --mtime=$build_date -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz ) | ||
38 | rm $tmp_dir/tarX | ||
39 | |||
40 | echo "2.0" > $tmp_dir/debian-binary | ||
41 | @@ -296,7 +301,7 @@ rm -f $pkg_file | ||
42 | if [ "$outer" = "ar" ] ; then | ||
43 | ( cd $tmp_dir && ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) | ||
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 ) | ||
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 | ||
48 | |||
49 | rm $tmp_dir/debian-binary $tmp_dir/data.tar.$cext $tmp_dir/control.tar.gz | ||
50 | -- | ||
51 | 2.16.1 | ||
52 | |||