summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Hansen <michael.j.hansen@hp.com>2018-02-26 10:17:01 -0800
committerAlejandro del Castillo <alejandro.delcastillo@ni.com>2018-02-28 13:37:00 -0600
commit306d704d55722f4a431a36dea2d3f227cfd8a566 (patch)
tree0e277707bd931762f5e73de8f03cf3038bb16e41
parentef5db062b7d25e6070acc6922ea48f50491313b5 (diff)
downloadopkg-utils-306d704d55722f4a431a36dea2d3f227cfd8a566.tar.gz
opkg-utils-306d704d55722f4a431a36dea2d3f227cfd8a566.tar.bz2
opkg-utils-306d704d55722f4a431a36dea2d3f227cfd8a566.zip
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 <michael.j.hansen@hp.com> Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
-rwxr-xr-xopkg-build8
1 files changed, 4 insertions, 4 deletions
diff --git a/opkg-build b/opkg-build
index 094d69f..0050c2b 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