Re: Adding RELEASEDIR/iso to release(7)
Manuel Bouyer <[email protected]>
| Newsgroups | gmane.os.netbsd.devel.installation |
|---|---|
| Message-ID | <[email protected]> |
On Sun, Apr 08, 2007 at 01:30:26PM +0200, Manuel Bouyer wrote: > On Fri, Apr 06, 2007 at 02:58:50PM +0200, Alan Barrett wrote: > > On Thu, 05 Apr 2007, Manuel Bouyer wrote: > > > > releases(7) doesn't talk about RELEASEDIR/iso at all. I'd like to > > > > update it, but first I'd like to understand the difference between the > > > > two locations. Given a CD-ROM image, how would you determine which > > > > directory it belongs in, and how would you choose the file name? > > > > > > Well, the isos in RELEASEDIR/MACHINE/install/cdrom/* only contains > > > INSTALL kernels, but not the binary sets. > > > > Is that true for all architectures, including those that still use > > mkisofs to generate images? > > Not yet; the attached patch should make it that way. With the patch, this time -- Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
diff
(text/plain, 945 B)
Index: Makefile
===================================================================
RCS file: /cvsroot/src/etc/Makefile,v
retrieving revision 1.342
diff -u -p -u -r1.342 Makefile
--- Makefile 16 Mar 2007 21:12:17 -0000 1.342
+++ Makefile 8 Apr 2007 11:26:50 -0000
@@ -414,7 +414,7 @@ release snapshot: .PHONY .MAKE check_DES
# Note: At least mkisofs 2.0 should be used.
#
CDROM_NAME_ADD?=
-CDROM.image=${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom/netbsd-${MACHINE}${CDROM_NAME_ADD}.iso
+CDROM.image?=${RELEASEDIR}/iso/${MACHINE}cd.iso
CDROM.dir= ${.OBJDIR}/cdrom.dir
CDROM.pathlist= ${.OBJDIR}/cdrom.pathlist
@@ -422,7 +422,7 @@ iso-image:
.if ${MKISOFS} != true
do-iso-image: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-post
- ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom '*.iso'
+ ${MAKESUMS} -t ${RELEASEDIR}/iso/ '*.iso'
@echo "iso-image created as: ${CDROM.image}"
.else
do-iso-image: