shift $shiftcount
# expecting fcdistro and pldistro on the command line
-fcdistro=$1; shift
pldistro=$1; shift
+fcdistro=${pl_DISTRO_NAME}
# Do not tolerate errors
set -e
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
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}"
# %{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
%install
rm -rf $RPM_BUILD_ROOT
-repo=%{nodetype}
+repo=%{nodefamily}
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,-)
-/var/www/html/install-rpms/%{nodetype}
+/var/www/html/install-rpms/%{nodefamily}
%changelog
* Tue Mar 4 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> -