sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixup for non-fatal mkisofs error.

Browse source 
The corresponding rules have been commented out through .ifdef blocks.

Change-Id: I36afb75f049b39806ede1f7dd6950710826b3555
This commit is contained in:
Lionel Sambuc 2012-11-16 12:13:42 +01:00
parent 6e535c3aaf
commit 0e33224aa2
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
distrib/sets/lists/minix/mi
View file

@ -4457,6 +4457,7 @@
./usr/var/run minix-sys ./usr/var/run minix-sys
./var/db minix-sys ./var/db minix-sys
./var/db/obsolete minix-sys ./var/db/obsolete minix-sys
./var/db/obsolete/minix minix-sys
./var minix-sys ./var minix-sys
./var/run minix-sys ./var/run minix-sys
./boot/minix/.temp minix-sys ./boot/minix/.temp minix-sys

7
etc/Makefile
View file

@ -52,6 +52,8 @@ DISTRIBVER!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
# mkisofs is expected to be in $PATH, install via pkgsrc/sysutils/cdrtools # mkisofs is expected to be in $PATH, install via pkgsrc/sysutils/cdrtools
# Note: At least mkisofs 2.0 should be used. # Note: At least mkisofs 2.0 should be used.
# #
.if !defined(__MINIX)
# LSC: We do not yet support iso creation anyway, then do not try to find it.
.if !defined(MKISOFS) .if !defined(MKISOFS)
MKISOFS!= (which mkisofs || echo true) MKISOFS!= (which mkisofs || echo true)
.endif .endif
@ -65,6 +67,7 @@ MKISOFS_FLAGS+= -J -l -hide-joliet-trans-tbl -r -T \
.if ${MKISOFS_FLAGS:N-v} .if ${MKISOFS_FLAGS:N-v}
MKISOFS_FLAGS+= -quiet MKISOFS_FLAGS+= -quiet
.endif .endif
.endif # !defined(__MINIX)
# MD Makefile.inc may append MD targets to BIN[123]. Make sure all # MD Makefile.inc may append MD targets to BIN[123]. Make sure all
@ -437,6 +440,8 @@ install-etc-files: .PHONY .MAKE check_DESTDIR MAKEDEV
OBSOLETE.dir= ${.OBJDIR}/obsolete.dir OBSOLETE.dir= ${.OBJDIR}/obsolete.dir
.if !defined(__MINIX) .if !defined(__MINIX)
OBSOLETE.files= base comp etc games man misc text OBSOLETE.files= base comp etc games man misc text
.else
OBSOLETE.files= minix
.endif # defined(__MINIX) .endif # defined(__MINIX)
.if ${MKKMOD} != "no" .if ${MKKMOD} != "no"
OBSOLETE.files+= modules OBSOLETE.files+= modules
@ -485,6 +490,7 @@ release snapshot: .PHONY .MAKE check_DESTDIR check_RELEASEDIR snap_md_post
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel '*.gz' ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel '*.gz'
.if !defined(__MINIX)
# iso-image -- # iso-image --
# Standalone target to create a CDROM image after the release # Standalone target to create a CDROM image after the release
# was composed. Should be run after "make release" in src and xsrc. # was composed. Should be run after "make release" in src and xsrc.
@ -571,6 +577,7 @@ install-image: .PHONY check_DESTDIR check_RELEASEDIR
${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib install_image \ ${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib install_image \
INSTIMG_RELEASEDIR=${INSTIMG_RELEASEDIR} INSTIMG_RELEASEDIR=${INSTIMG_RELEASEDIR}
${MAKESUMS} -t ${INSTIMG_RELEASEDIR} '*.img.gz' ${MAKESUMS} -t ${INSTIMG_RELEASEDIR} '*.img.gz'
.endif # !defined(__MINIX)
# snap_pre -- # snap_pre --
# Create ${RELEASEDIR} and necessary subdirectories. # Create ${RELEASEDIR} and necessary subdirectories.