[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

PATCH don't call createrepo in buildinstall, let compose do it



This patch removes the call to createrepo from within buildinstall.  Instead 
it allows the compose tool to create the repo before calling buildinstall.  
There is a check added to make sure that repodata exists before continuing 
on.  The desired side effect of this is that it allows the compose tool to 
reference the comps.xml file as it needs, and buildinstall no longer needs a 
comps.xml in $PRODUCTPATH/base/.  This should be the last step to killing off 
the base/ directory.

I've tested with pungi (pungi making repodata before calling buildinstall) and 
things seem to work.

-- 
Jesse Keating
Release Engineer: Fedora
--- ./scripts/buildinstall.nobase	2007-03-07 16:07:24.000000000 -0500
+++ ./scripts/buildinstall	2007-03-07 17:12:16.000000000 -0500
@@ -113,6 +113,12 @@
 
 echo "Running buildinstall..."
 
+echo "Checking for repository metadata..."
+if ! [ -d $p/repodata ]; then
+    echo "Repodata must exist in the tree!" >&2
+    exit 1 
+fi
+
 pushd $BUILDINSTDIR
 rpm2cpio $PKGDIR/anaconda-runtime-[0-9]* | cpio --quiet -iumd './usr*'
 popd
@@ -140,9 +146,6 @@
 echo "Building images..."
 $UPD_INSTROOT $DEBUGSTR $NOGRSTR $PKGDIR $TREEDIR/image-template $TREEDIR/instimage
 
-echo "Creating repository metadata..."
-createrepo -d -g $PRODUCTPATH/base/comps.xml -q $p
-
 if [ -n "$PKGORDER" ]; then
     echo "Getting package order..."
     echo "PYTHONPATH=$TREEDIR/instimage/usr/lib/anaconda $TREEDIR/instimage/usr/lib/anaconda-runtime/pkgorder $p $BUILDARCH $PRODUCTPATH"

Attachment: pgp8nicGGwhHg.pgp
Description: PGP signature


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]