Jeremy Katz wrote:
On Wed, 2008-02-20 at 18:00 -0700, Gary Thomas wrote:
Jeremy Katz wrote:
It should be fine -- 11.4.0.36 didn't have my changes. 11.4.0.37 should
have everything (which includes changes to mk-images as well as
buildinstall as I changed the way arguments are passed between the two)
I think not. Today's rawhide/i386 has no images, possibly because of this
problem.
pungi may still need changes... Jesse was going to look, but he's also
in training this week
Note also that the first stage loader (anaconda-11.4.0.37/loader2/loader.c)
is still expecting the whole enchilada, including product name and path.
We actually don't ever use the product path for anything in the loader
anymore, even though we parse it out of the file (if present)
'mk-images' and the rest of buildinstall still seem a bit out of sync.
I changed mk-images to ignore the fact that buildinstall no longer
passes a product path. This led to one less line in the .buildstamp
file which then required additional cleanup in the loader.
The attached patch got me past this point - it's not 100% pretty,
but solved the [first] problème du jour.
--
------------------------------------------------------------
Gary Thomas | Consulting for the
MLB Associates | Embedded world
------------------------------------------------------------
--- anaconda-11.4.0.37.ORIG/scripts/mk-images 2008-02-20 12:12:13.000000000 -0700
+++ anaconda-11.4.0.37/scripts/mk-images 2008-02-20 14:20:45.000000000 -0700
@@ -26,7 +26,6 @@
usage () {
echo "usage: mk-images <pkgsrc> <toplevel> <template> <imgdir> <buildarch> <productname> <version> [<productpath>]"
- exit 0
}
NEEDGR=yes
@@ -348,7 +347,6 @@
rm -f $root/.buildstamp
echo $IMAGEUUID > $root/.buildstamp
- echo $PRODUCT >> $root/.buildstamp
echo $VERSION >> $root/.buildstamp
if [ -n "$BUGURL" ]; then
echo $BUGURL >> $root/.buildstamp
--- anaconda-11.4.0.37.ORIG/loader2/loader.c 2008-02-19 15:54:02.000000000 -0700
+++ anaconda-11.4.0.37/loader2/loader.c 2008-02-20 18:08:56.000000000 -0700
@@ -179,7 +179,6 @@
}
static char * productName = NULL;
-static char * productPath = NULL;
static char * productArch = NULL;
static char * productStamp = NULL;
@@ -190,29 +189,20 @@
f = fopen("/.buildstamp", "r");
if (!f) {
productName = strdup("anaconda");
- productPath = strdup("anaconda");
} else {
productStamp = malloc(256);
productName = malloc(256);
- productPath = malloc(256);
productStamp = fgets(productStamp, 256, f); /* stamp time and architecture */
productArch = strstr(productStamp, "."); /* architecture is separated by dot */
if(productArch) productArch++;
productName = fgets(productName, 256, f); /* product name */
- productPath = fgets(productPath, 256, f); /* product version */
- productPath = fgets(productPath, 256, f); /* product path */
i = strlen(productName) - 1;
while (isspace(*(productName + i))) {
*(productName + i) = '\0';
i--;
}
- i = strlen(productPath) - 1;
- while (isspace(*(productPath + i))) {
- *(productPath + i) = '\0';
- i--;
- }
i = strlen(productArch) - 1;
while (isspace(*(productArch + i))) {
*(productArch + i) = '\0';
@@ -239,13 +229,6 @@
return productArch;
}
-char * getProductPath(void) {
- if (!productPath) {
- initProductInfo();
- }
- return productPath;
-}
-
void initializeConsole() {
/* enable UTF-8 console */
printf("\033%%G");
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
