diff options
Diffstat (limited to 'meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch')
-rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch | 44 |
1 files changed, 0 insertions, 44 deletions
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 deleted file mode 100644 index e338914b09..0000000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From 5727826b51cf99feaff3483a9df8af2043e7efc1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Hansen <michael.j.hansen@hp.com> | ||
3 | Date: Mon, 26 Feb 2018 10:17:01 -0800 | ||
4 | Subject: [PATCH 2/2] opkg-build: Use local time for build_date, since opkg | ||
5 | extracts files assuming local time rather than UTC. Also increase resolution | ||
6 | of build date down to the second, rather than clamping to midnight of the | ||
7 | current date. | ||
8 | |||
9 | Signed-off-by: Michael Hansen <michael.j.hansen@hp.com> | ||
10 | Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com> | ||
11 | Upstream-Status: Backport | ||
12 | |||
13 | --- | ||
14 | opkg-build | 8 ++++---- | ||
15 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
16 | |||
17 | Index: opkg-utils-0.3.6/opkg-build | ||
18 | =================================================================== | ||
19 | --- opkg-utils-0.3.6.orig/opkg-build | ||
20 | +++ opkg-utils-0.3.6/opkg-build | ||
21 | @@ -282,11 +282,11 @@ fi | ||
22 | tmp_dir=$dest_dir/IPKG_BUILD.$$ | ||
23 | mkdir $tmp_dir | ||
24 | |||
25 | -build_date="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)" | ||
26 | +build_date="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" "+%Y-%m-%d %H:%M:%S")" | ||
27 | |||
28 | echo $CONTROL > $tmp_dir/tarX | ||
29 | -( cd $pkg_dir && tar $ogargs $tsortargs --mtime=$build_date -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) | ||
30 | -( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --mtime=$build_date -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz ) | ||
31 | +( cd $pkg_dir && tar $ogargs $tsortargs --mtime="$build_date" -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) | ||
32 | +( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --mtime="$build_date" -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz ) | ||
33 | rm $tmp_dir/tarX | ||
34 | |||
35 | echo "2.0" > $tmp_dir/debian-binary | ||
36 | @@ -301,7 +301,7 @@ rm -f $pkg_file | ||
37 | if [ "$outer" = "ar" ] ; then | ||
38 | ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) | ||
39 | else | ||
40 | - ( cd $tmp_dir && tar -c $tsortargs --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) | ||
41 | + ( cd $tmp_dir && tar -c $tsortargs --mtime="$build_date" $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) | ||
42 | fi | ||
43 | |||
44 | rm $tmp_dir/debian-binary $tmp_dir/data.tar.$cext $tmp_dir/control.tar.gz | ||