On Sat, 4 Nov 2006, Julio M. Merino Vidal wrote:
> Given that you are already duplicating the release directory
> (Makefile.bootcd, copy-releasedir target) for makefs to run, couldn't
> you simply rm -rf the iso's directory from the copy before running
> makefs?

Well, you could do that. But what if you hand your install CD that was 
(e.g.) made to boot on the gfx console, and that someone needs to install 
a machine with a serial console? He'll have to go and find bootcd-com.iso 
- I think that should be included on the CD, and the few MBs of space 
should be sacrificed.

I guess if it's really needed to exclude bootable ISOs from the install 
ISO, something like the patch below could be committed to add a flag that 
says to exclude the bootable ISOs from the install ISO.


  - Hubert

Index: Makefile.bootcd
===================================================================
RCS file: /cvsroot/src/distrib/common/Makefile.bootcd,v
retrieving revision 1.4
diff -u -r1.4 Makefile.bootcd
--- Makefile.bootcd	1 Nov 2006 16:47:17 -0000	1.4
+++ Makefile.bootcd	4 Nov 2006 12:05:36 -0000
@@ -14,6 +14,7 @@
  #
  # Optional variables:
  #	CDRELEASE	Set to 'true' to include $RELEASEDIR/$MACHINE on the CD
+#	CDRELEASE_NOISOS Excludes installation/cdrom directory if set
  #	BOOT		Defaults to $DESTDIR/usr/mdec/boot
  #	BOOTXX_CD9660	Defaults to $DESTDIR/usr/mdec/bootxx_cd9660
  #	CDBOOTOPTIONS	Options for installboot, eg -o console=com0,speed=9600
@@ -24,6 +25,9 @@
  BOOTXX_CD9660?=	${DESTDIR}/usr/mdec/bootxx_cd9660
  CDRELEASE?=	false
  CDROMS_RELEASEDIR?=	installation/cdrom
+.if defined(CDRELEASE_NOISOS)
+CDRELEASE_EXCLUDE=	-s ',./installation/cdrom.*,,gp'
+.endif

  CDINSTALLBOOT=	"${TOOL_INSTALLBOOT} ${CDBOOTOPTIONS} -m${MACHINE} @IMAGE@ ${MDEC}/bootxx_cd9660"

@@ -75,7 +79,10 @@
  		release_destdir=`pwd`/cdrom/${MACHINE} ; 		\
  		cd ${RELEASEDIR}/${MACHINE} ; 				\
  		echo Copying `pwd` to $$release_destdir ... ; 		\
-		${TOOL_PAX} -rw -pe -v . $$release_destdir ; 		\
+		${TOOL_PAX} 						\
+			-rw -pe -v 					\
+			${CDRELEASE_EXCLUDE}				\
+			. $$release_destdir ; 				\
  	fi

  image: