tech-toolchain archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

INSTALLSETS not passed to subsequent Makefiles for build?



Dear list,

I'd like to force extracting the etc set to INSTALLWORLDDIR, by manually
setting INSTALLSETS to base and etc, like this:

$ ./build.sh -O ../obj [...] -V INSTALLSETS="base etc" install=/mnt/ec2

(obviously, I am using it to generate EC2 AMIs in a quick fashion)

Unfortunately, the environement variable (set through -V) is not passed
to the successive Makefiles as it is unset by the MAKEDIRTARGET call.
See the patch below.

Any reason not to commit this?


Index: Makefile
===================================================================
RCS file: /cvsroot/src/Makefile,v
retrieving revision 1.281
diff -u -p -u -p -r1.281 Makefile
--- Makefile    3 Dec 2010 21:38:46 -0000       1.281
+++ Makefile    29 Jan 2011 00:00:38 -0000
@@ -332,7 +332,7 @@ installworld: .PHONY .MAKE
 .endif
 .endif
        ${MAKEDIRTARGET} distrib/sets installsets \
-          INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS=
+          INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS=${INSTALLSETS:Q}
        ${MAKEDIRTARGET} . postinstall-check DESTDIR=${INSTALLWORLDDIR}
        @echo   "make ${.TARGET} started at:  ${START_TIME}"
        @printf "make ${.TARGET} finished at: " && date

Index: BUILDING
===================================================================
RCS file: /cvsroot/src/BUILDING,v
retrieving revision 1.91
diff -u -p -u -p -r1.91 BUILDING
--- BUILDING    25 Jul 2010 07:19:00 -0000      1.91
+++ BUILDING    29 Jan 2011 00:00:39 -0000
@@ -529,9 +529,10 @@ BUILDING
              ing.

             The INSTALLSETS environment variable may be set to a list
-            of distribution sets to be installed.  By default, all sets
-            except ``etc'' and ``xetc'' are installed, so most files in
-            INSTALLWORLDDIR/etc will not be installed or modified.
+            of distribution sets to be installed, separated by spaces.
+            By default, all sets except ``etc'' and ``xetc'' are
+            installed, so most files in INSTALLWORLDDIR/etc will not
+            be installed or modified.

             Note: Before performing this operation with
             INSTALLWORLDDIR=/, it is highly recommended that you
@@ -665,7 +666,8 @@ BUILDING

install=idir Install the contents of DESTDIR to idir, using ``make
             installworld''.  Note that files that are part of the
-            ``etc'' or ``xetc'' sets will not be installed.
+            ``etc'' or ``xetc'' sets will not be installed, unless
+            overridden by the INSTALLSETS environment variable.

kernel=kconf Build a new kernel.  The kconf argument is the name of a
             configuration file suitable for use by config(1). If kconf

-- 
Jean-Yves Migeon
jeanyves.migeon%free.fr@localhost


Home | Main Index | Thread Index | Old Index