* name of the bootstrap tarball changed into
bootstrapfs-<id>-<arch>.tar.bz2
with id=<planetlab-distro> for the main tarball
and id=<extension> for the extensions tarballs
* bootmanager to use node's nodegroups to figure the tarball to use
* the noderepo rpm allows to install /var/www/html/install-rpms/<repo>
==
status
* checkpoint version to verify that mono-arch mono-distro still works
* build phase tested
* but some parts are still missing for complete multi-arch behaviour:
* bootstrapfs's rpm name should sontain pldistro and arch (as it is a noarch rpm)
* yum.php.conf also needs tunings
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
+./build.sh %{distroname} %{pldistro}
popd BootstrapFS
%install
rm -rf $RPM_BUILD_ROOT
pushd BootstrapFS
popd BootstrapFS
%install
rm -rf $RPM_BUILD_ROOT
pushd BootstrapFS
-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
%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
-# Build PlanetLab-Bootstrap.tar.bz2, the reference image for PlanetLab
-# nodes.
+# Build bootstrapfs-*.tar.bz2, the reference image(s) for PlanetLab nodes.
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Marc E. Fiuczynski <mef@cs.princeton.edu>
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Marc E. Fiuczynski <mef@cs.princeton.edu>
-# This will build the Planetlab-Bootstrap.tar.bz2, which comprises
+# This will build the bootstrafs-*.tar.bz2 images, which comprises
# the base root image on the node, then create the ${NAME} bootstrap image
# which is made up of just the additional files needed for a ${NAME} nodegroup
# node.
# the base root image on the node, then create the ${NAME} bootstrap image
# which is made up of just the additional files needed for a ${NAME} nodegroup
# node.
PATH=/sbin:/bin:/usr/sbin:/usr/bin
PATH=/sbin:/bin:/usr/sbin:/usr/bin
-# In both a normal CVS environment and a PlanetLab RPM
-# build environment, all of our dependencies are checked out into
-# directories at the same level as us.
+# in the PlanetLab build environment, our dependencies are checked out
+# into directories at the same level as us.
if [ -d ../build ] ; then
PATH=$PATH:../build
srcdir=../
else
if [ -d ../build ] ; then
PATH=$PATH:../build
srcdir=../
else
- echo "Error: Could not find $(cd ../.. && pwd -P)/build/"
+ echo "Error: Could not find ../build in $(pwd)"
shiftcount=$?
shift $shiftcount
shiftcount=$?
shift $shiftcount
-# pldistro expected as $1 - defaults to planetlab
-pldistro=planetlab
-[ -n "$@" ] && pldistro=$1
+# expecting fcdistro and pldistro on the command line
+fcdistro=$1; shift
+pldistro=$1; shift
# Do not tolerate errors
set -e
# Do not tolerate errors
set -e
echo "+++++++++++++pkgsfile=$pkgsfile (and -k)"
echo "+++++++++++++pkgsfile=$pkgsfile (and -k)"
-# Populate a minimal /dev and then the files for the base PlanetLab-Bootstrap content
+# Populate a minimal /dev and then the files for the base bootstrapfs content
vref=${PWD}/base
install -d -m 755 ${vref}
pl_root_makedevs $vref
vref=${PWD}/base
install -d -m 755 ${vref}
pl_root_makedevs $vref
[ $pkgs_count -gt 0 ] && for pkgs in $(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs); do
NAME=$(basename $pkgs .pkgs | sed -e s,bootstrapfs-,,)
[ $pkgs_count -gt 0 ] && for pkgs in $(ls ../build/config.${pldistro}/bootstrapfs-*.pkgs); do
NAME=$(basename $pkgs .pkgs | sed -e s,bootstrapfs-,,)
- echo "--------START BUILDING PlanetLab-Bootstrap-${NAME}: $(date)"
+ echo "--------START BUILDING bootstrapfs-${NAME}: $(date)"
# "Parse" out the packages and groups for yum
packages=$(pl_getPackages ${pl_DISTRO_NAME} $pkgs)
# "Parse" out the packages and groups for yum
packages=$(pl_getPackages ${pl_DISTRO_NAME} $pkgs)
rm -f ${vdir}.changes
mv ${vdir}-tmp ${vdir}
rm -f ${vdir}.changes
mv ${vdir}-tmp ${vdir}
- echo "--------STARTING tar'ing PlanetLab-Bootstrap-${NAME}.tar.bz2: $(date)"
- tar -cpjf ${pldistro}-filesystems/PlanetLab-Bootstrap-${NAME}.tar.bz2 -C ${vdir} .
- echo "--------FINISHED tar'ing PlanetLab-Bootstrap-${NAME}.tar.bz2: $(date)"
- echo "--------DONE BUILDING PlanetLab-Bootstrap-${NAME}: $(date)"
+ echo "--------STARTING tar'ing bootstrapfs-${NAME}-${pl_DISTRO_ARCH}.tar.bz2: $(date)"
+ tar -cpjf ${pldistro}-filesystems/bootstrapfs-${NAME}-${pl_DISTRO_ARCH}.tar.bz2 -C ${vdir} .
+ echo "--------FINISHED tar'ing bootstrapfs-${NAME}-${pl_DISTRO_ARCH}.tar.bz2: $(date)"
+ echo "--------DONE BUILDING bootstrapfs-${NAME}-${pl_DISTRO_ARCH}: $(date)"
done
# Build the base Bootstrap filesystem
# clean out yum cache to reduce space requirements
yum -c ${vref}/etc/yum.conf --installroot=${vref} -y clean all
done
# Build the base Bootstrap filesystem
# clean out yum cache to reduce space requirements
yum -c ${vref}/etc/yum.conf --installroot=${vref} -y clean all
-echo "--------STARTING tar'ing PlanetLab-Bootstrap.tar.bz2: $(date)"
-tar -cpjf PlanetLab-Bootstrap.tar.bz2 -C ${vref} .
-echo "--------FINISHED tar'ing PlanetLab-Bootstrap.tar.bz2: $(date)"
+echo "--------STARTING tar'ing bootstrapfs-${pldistro}-${pl_DISTRO_ARCH}.tar.bz2: $(date)"
+tar -cpjf bootstrapfs-${pldistro}-${pl_DISTRO_ARCH}.tar.bz2 -C ${vref} .
+echo "--------FINISHED tar'ing bootstrapfs-${pldistro}-${pl_DISTRO_ARCH}.tar.bz2: $(date)"
# %{distrorelease} : e.g. 8
# %{node_rpms_plus} : as a +++ separated list of rpms from the build dir
# %{distrorelease} : e.g. 8
# %{node_rpms_plus} : as a +++ separated list of rpms from the build dir
-%define nodetype %{pldistro}%{distroname}%{_arch}
+%define nodetype %{pldistro}-%{_arch}
%define name noderepo-%{nodetype}
%define version 0.1
%define name noderepo-%{nodetype}
%define version 0.1
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
BuildRequires: rsync
Requires: myplc
BuildRequires: rsync
Requires: myplc