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
Second step towards multiarch myplc https://svn.planet-lab.org/ticket/214
[nodeimage.git]
/
bootstrapfs.spec
diff --git
a/bootstrapfs.spec
b/bootstrapfs.spec
index
a43e01e
..
4efaea9
100644
(file)
--- a/
bootstrapfs.spec
+++ b/
bootstrapfs.spec
@@
-22,6
+22,8
@@
License: BSD
Group: System Environment/Base
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Group: System Environment/Base
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+# other archs must be able to install this
+BuildArch: noarch
Requires: tar, gnupg, sharutils, bzip2
Requires: tar, gnupg, sharutils, bzip2
@@
-38,21
+40,22
@@
BootManager to instantiate a node with a new filesystem.
%build
pushd BootstrapFS
%build
pushd BootstrapFS
-./build.sh %{pldistro}
+./build.sh %{pldistro}
popd BootstrapFS
%install
rm -rf $RPM_BUILD_ROOT
pushd BootstrapFS
popd BootstrapFS
%install
rm -rf $RPM_BUILD_ROOT
pushd BootstrapFS
+arch=$(uname -i)
-install -D -m 644
PlanetLab-Bootstrap
.tar.bz2 \
- $RPM_BUILD_ROOT/var/www/html/boot/
PlanetLab-Bootstrap
.tar.bz2
+install -D -m 644
bootstrapfs-%{pldistro}-${arch}
.tar.bz2 \
+ $RPM_BUILD_ROOT/var/www/html/boot/
bootstrapfs-%{pldistro}-${arch}
.tar.bz2
for pkgs in $(ls ../build/config.%{pldistro}/bootstrapfs-*.pkgs) ; do
NAME=$(basename $pkgs .pkgs | sed -e s,bootstrapfs-,,)
for pkgs in $(ls ../build/config.%{pldistro}/bootstrapfs-*.pkgs) ; do
NAME=$(basename $pkgs .pkgs | sed -e s,bootstrapfs-,,)
- install -D -m 644 %{pldistro}-filesystems/
PlanetLab-Bootstrap-${NAME
}.tar.bz2 \
- $RPM_BUILD_ROOT/var/www/html/boot/
PlanetLab-Bootstrap-${NAME}.tar.bz2
+ install -D -m 644 %{pldistro}-filesystems/
bootstrapfs-${NAME}-${arch
}.tar.bz2 \
+ $RPM_BUILD_ROOT/var/www/html/boot/
bootstrapfs-${NAME}-${arch}.tar.bz2
done
popd
done
popd
@@
-73,10
+76,9
@@
fi
%post
%post
-
%files
%defattr(-,root,root,-)
%files
%defattr(-,root,root,-)
-/var/www/html/boot/
PlanetLab-Bootstrap
*.tar.bz2
+/var/www/html/boot/
bootstrapfs
*.tar.bz2
%changelog
* Fri Jan 18 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootstrapfs-0.1-1 bootstrapfs-0.1-2
%changelog
* Fri Jan 18 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootstrapfs-0.1-1 bootstrapfs-0.1-2