-- design
* new notion of a 'nodefamily' - that for now is <pldistro>-<arch>
* standard rpm repository is now named /var/www/html/install-rpms/<nodefamily>
a legacy symlink install-rpms/planetlab is created my myplc packaging
* bootstrafs rpm name is now bootstrapfs-<nodefamily> so that several instances
from various builds can be installed in the same myplc
* noderepo rpm (named noderepo-<nodefamily>) built as part of the planetlab distro
this is for installing /var/www/html/intall-rpms/<nodefamily> from another build
-- other changes
* extensive cleanup of mkfedora:
** obsolete options -p -g -x removed
** option -p removed, pkgsfile is a mandatory argument
** option -k removed, use kexclude: in the pkgs file instead
* also cleaned up pl_root_* functions - no wrapper to pl_root_mkfedora anymore
-- status
* not tested at all - likely to break
* next step planned for storing nodefamily and pass it to yum.php.conf
(impacted would be bootmanager, nodemanager and nodeconfig)
* a final cleanup in mkfedora would be to define mirrors in a separate .pkgs-like file
* kupdate.sh, as well as possibly other convenience scripts, might be impacted
-./build.sh %{distroname} %{pldistro}
popd BootstrapFS
%install
popd BootstrapFS
%install
shift $shiftcount
# expecting fcdistro and pldistro on the command line
shift $shiftcount
# expecting fcdistro and pldistro on the command line
+fcdistro=${pl_DISTRO_NAME}
# Do not tolerate errors
set -e
# Do not tolerate errors
set -e
pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.pkgs)
# -k = exclude kernel* packages
pkgsfile=$(pl_locateDistroFile ../build/ ${pldistro} bootstrapfs.pkgs)
# -k = exclude kernel* packages
-pl_root_mkfedora -k -f $pkgsfile ${vref}
+pl_root_mkfedora ${vref} ${pldistro} $pkgsfile
# optionally invoke a post processing script after packages from
# $pkgsfile have been installed
# optionally invoke a post processing script after packages from
# $pkgsfile have been installed
echo "--------START BUILDING bootstrapfs-${NAME}: $(date)"
# "Parse" out the packages and groups for yum
echo "--------START BUILDING bootstrapfs-${NAME}: $(date)"
# "Parse" out the packages and groups for yum
- packages=$(pl_getPackages ${pl_DISTRO_NAME} $pkgs)
- groups=$(pl_getGroups ${pl_DISTRO_NAME} $pkgs)
+ packages=$(pl_getPackages $fcdistro $pldistro $pkgs)
+ groups=$(pl_getGroups $fcdistro $pldistro $pkgs)
echo "${NAME} has the following packages : ${packages}"
echo "${NAME} has the following groups : ${groups}"
echo "${NAME} has the following packages : ${packages}"
echo "${NAME} has the following groups : ${groups}"
# %{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}-%{_arch}
+%define nodefamily %{pldistro}-%{_arch}
-%define name noderepo-%{nodetype}
+%define name noderepo-%{nodefamily}
%define version 0.1
%define taglevel 2
%define version 0.1
%define taglevel 2
%install
rm -rf $RPM_BUILD_ROOT
%install
rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT/var/www/html/install-rpms/$repo
rpms=$(echo %{node_rpms_plus} | sed -e 's,+++, ,g')
for rpm in $rpms; do rsync %{_topdir}/$rpm $RPM_BUILD_ROOT/var/www/html/install-rpms/$repo/ ; done
install -d -m 755 $RPM_BUILD_ROOT/var/www/html/install-rpms/$repo
rpms=$(echo %{node_rpms_plus} | sed -e 's,+++, ,g')
for rpm in $rpms; do rsync %{_topdir}/$rpm $RPM_BUILD_ROOT/var/www/html/install-rpms/$repo/ ; done
%files
%defattr(-,root,root,-)
%files
%defattr(-,root,root,-)
-/var/www/html/install-rpms/%{nodetype}
+/var/www/html/install-rpms/%{nodefamily}
%changelog
* Tue Mar 4 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> -
%changelog
* Tue Mar 4 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> -