Jeremy Katz wrote:
---
scripts/buildinstall | 4 ++--
scripts/makestamp.py | 19 -------------------
2 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/scripts/buildinstall b/scripts/buildinstall
index 339779c..eb5d7fc 100755
--- a/scripts/buildinstall
+++ b/scripts/buildinstall
@@ -138,12 +138,12 @@ echo "Building images..."
$UPD_INSTROOT $DEBUGSTR $NOGRSTR $PKGDIR $TREEDIR/minstg2 $TREEDIR/stage2 $DIR
echo "Writing .treeinfo file..."
-$MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BUILDARCH --packagedir=${PKGDIR#$DIR/} --outfile=$DIR/.treeinfo
+$MK_TREEINFO --family="$PRODUCTSTR" ${VARIANT:+--variant="$VARIANT"} --version=$VERSION --arch=$BUILDARCH --outfile=$DIR/.treeinfo
echo "Making images..."
$MK_IMAGES $DEBUGSTR $NOGRSTR $PKGDIR $DIR $TREEDIR/minstg2 $TREEDIR/stage2 $BUILDARCH "$PRODUCTSTR" $VERSION $PRODUCTPATH "$BUGURL"
echo "Writing .discinfo file"
-$MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="ALL" --baseDir=$PRODUCTPATH/base --packagesDir=$PKGDIR --pixmapsDir=$PRODUCTPATH/pixmaps --outfile=$DIR/.discinfo
+$MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="ALL" --outfile=$DIR/.discinfo
rm -rf $TREEDIR $BUILDINSTDIR
diff --git a/scripts/makestamp.py b/scripts/makestamp.py
index 9d919d0..c3f416c 100755
--- a/scripts/makestamp.py
+++ b/scripts/makestamp.py
@@ -34,9 +34,6 @@ data = {"timestamp": None,
"releasestr": None,
"arch": None,
"discNum": None,
- "baseDir": None,
- "packagesDir": None,
- "pixmapsDir": None,
"outfile": None}
allDiscs = None
@@ -77,19 +74,6 @@ if data["discNum"] is None and allDiscs is None:
print >> sys.stderr, "No disc number specified; assuming disc 1"
data["discNum"] = "1"
-if data["baseDir"] is None:
- print "Where is the comps file located?"
- data["baseDir"] = sys.stdin.readline()[:-1]
-
-if data["packagesDir"] is None:
- print "Where are the packages located?"
- data["packagesDir"] = sys.stdin.readline()[:-1]
-
-if data["pixmapsDir"] is None:
- print "Where are the images located?"
- data["pixmapsDir"] = sys.stdin.readline()[:-1]
-
-
if data["outfile"] is None:
f = sys.stdout
else:
@@ -102,8 +86,5 @@ if allDiscs is None:
f.write("%s\n" % data["discNum"])
else:
f.write("0\n")
-f.write("%s\n" % data["baseDir"])
-f.write("%s\n" % data["packagesDir"])
-f.write("%s\n" % data["pixmapsDir"])
Why remove package dir from the treeinfo info? better. Why remove the info pointing to the package dirs? In fedora where the only package dir is Packages its a little redundant to have this info in the treeinfo file. but in other spins, where you might want to separate your repos into logical sections (RHEL) it might not work as well. The buildinstall process itself does not need this information because it just needs the anaconda-runtime package to build (AFAICT), but it would be good to be able to put a list of "package dirs" into the treeinfo file to reflect the stage of the tree.
I would leave this change but put in some type of probing logic in treeinfo so as to find all the dirs that contain repositories (a valid repodata file) and put it in the treeinfo file.
--
Joel Andres Granados
Red Hat / Brno, Czech Republic
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
