git://git.onelab.eu
/
nodeimage.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
and again
[nodeimage.git]
/
nodeimage.spec
diff --git
a/nodeimage.spec
b/nodeimage.spec
index
92d84d0
..
da01e7d
100644
(file)
--- a/
nodeimage.spec
+++ b/
nodeimage.spec
@@
-45,7
+45,7
@@
Requires: ed
Obsoletes: bootstrapfs-%{nodefamily}
# 5.0 now has 3-fold nodefamily
%define obsolete_nodefamily %{pldistro}-%{_arch}
Obsoletes: bootstrapfs-%{nodefamily}
# 5.0 now has 3-fold nodefamily
%define obsolete_nodefamily %{pldistro}-%{_arch}
-
Obsoletes: bootstrapfs-%
{obsolete_nodefamily}
+
# Obsoletes: bootstrapfs-
{obsolete_nodefamily}
AutoReqProv: no
%define debug_package %{nil}
AutoReqProv: no
%define debug_package %{nil}
@@
-77,10
+77,10
@@
for the MyPLC side.
pushd nodeimage
./build.sh %{pldistro}
for tar in *.tar *.tar.bz2; do
pushd nodeimage
./build.sh %{pldistro}
for tar in *.tar *.tar.bz2; do
- start=$(date
+%H-%M-%S
)
+ start=$(date
--iso-8601=seconds
)
sha1sum $tar > $tar.sha1sum
chmod 444 $tar.sha1sum
sha1sum $tar > $tar.sha1sum
chmod 444 $tar.sha1sum
- end=$(date
+%H-%M-%S
)
+ end=$(date
--iso-8601=seconds
)
echo "* Computed SHA1 checksum for $tar ($start .. $end) "
done
popd
echo "* Computed SHA1 checksum for $tar ($start .. $end) "
done
popd
@@
-105,7
+105,7
@@
for fcdistro in $(ls); do
done
popd
done
popd
-echo "* nodeconfig/yum done $(date
+%H-%M-%S
)"
+echo "* nodeconfig/yum done $(date
--iso-8601=seconds
)"
%install
rm -rf $RPM_BUILD_ROOT
%install
rm -rf $RPM_BUILD_ROOT