EXTRA_PACKAGES macro in src/nrelease/Makefile

[Chris Pressey]

On Wed, 22 Dec 2004 18:57:33 -0800
Chuck Tuffli <chuck_tuffli at xxxxxxxxxxx> wrote:

> I've been playing in the nrelease directory to customize the ISO image
> and am finding that the EXTRA_PACKAGES macro isn't behaving the way I
> would have expected (line 15 in the Makefile). Is the intent of this
> macro to include additional packages in the image from the command
> line? For example,
> 
> # make EXTRA_PACKAGES="XFree86-4.3.0,1" release
> 
> would add the XFree86 package to the install image. If so, here's a
> patch.
> 
> diff -u -r1.19 Makefile
> --- nrelease/Makefile   11 Nov 2004 19:45:19 -0000      1.19
> +++ nrelease/Makefile   23 Dec 2004 02:54:35 -0000
> @@ -52,7 +52,7 @@
>                 thttpd-notimeout-2.24 dfuife_cgi-1.1
>  INSTALLER_SKELS= installer
>  
> -INSTALLER_ENV= EXTRA_PACKAGES="${INSTALLER_PKGS}" \
> +INSTALLER_ENV= EXTRA_PACKAGES="${INSTALLER_PKGS} ${EXTRA_PACKAGES}" \
>                 EXTRA_ROOTSKELS="${INSTALLER_SKELS}"

Yep, that's the intent of those variables (EXTRA_ROOTSKELS too) - it's
how the installer was originally put on the CD image.  The omission here
must have just been an oversight when the install_* targets were added.

Committed, thanks!

-Chris