[BACK]Return to Makefile CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / etc

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/etc/Makefile between version 1.412 and 1.412.2.1

version 1.412, 2014/01/27 21:37:17 version 1.412.2.1, 2014/08/10 07:03:06
Line 47  CKSUM?=  ${TOOL_CKSUM}
Line 47  CKSUM?=  ${TOOL_CKSUM}
 MAKESUMS=       MAKE=${MAKE:Q} CKSUM=${CKSUM:Q} ${HOST_SH} ${NETBSDSRCDIR}/distrib/sets/makesums  MAKESUMS=       MAKE=${MAKE:Q} CKSUM=${CKSUM:Q} ${HOST_SH} ${NETBSDSRCDIR}/distrib/sets/makesums
 DISTRIBVER!=    ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh  DISTRIBVER!=    ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
   
   GZIP_FLAGS= -9 ${GZIP_N_FLAG}
   
 # Flags for creating ISO CDROM image  # Flags for creating ISO CDROM image
 # 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.
Line 193  etc-release: .EXEC .MAKE
Line 195  etc-release: .EXEC .MAKE
                 echo ; \                  echo ; \
                 cat ${NETBSDSRCDIR}/sys/conf/copyright; \                  cat ${NETBSDSRCDIR}/sys/conf/copyright; \
                 echo ; \                  echo ; \
                 echo "Build settings:"; \                  echo "Build information:"; \
                 printf "%20s   %s\n" "Build date" "$$(date -u)"; \                  printf "%20s   %s\n" "Build date" "$$(date -u)"; \
                 printf "%20s   %s\n"  "Built by" "$${USER-root}@$$(hostname)"; \                  printf "%20s   %s\n"  "Built by" "$${USER-root}@$$(hostname)"; \
                   if [ -n "${BUILDID}" ]; then \
                       printf "%20s   %s\n"  "Build ID" "${BUILDID}" ; \
                   fi ; \
                   if [ -n "${BUILDINFO}" ]; then \
                       echo ; \
                       info="$$(printf "%b" ${BUILDINFO:Q})" ; \
                       printf "%s\n" "$${info}" \
                       | ${TOOL_SED} -e 's/^/        /' ; \
                   fi ; \
                   echo ; \
                   echo "Build settings:"; \
                 echo ; \                  echo ; \
                 ${PRINT_PARAMS} ; \                  ${PRINT_PARAMS} ; \
         ) >${.OBJDIR}/${.TARGET}          ) >${.OBJDIR}/${.TARGET}
Line 402  release snapshot: .PHONY .MAKE check_DES
Line 415  release snapshot: .PHONY .MAKE check_DES
 #       Note: At least mkisofs 2.0 should be used.  #       Note: At least mkisofs 2.0 should be used.
 #  #
 CDROM_NAME_ADD?=  CDROM_NAME_ADD?=
 CDROM_IMAGE?=${RELEASEDIR}/iso/NetBSD-${DISTRIBVER}-${MACHINE}.iso  CDROM_IMAGE?=${RELEASEDIR}/images/NetBSD-${DISTRIBVER}-${MACHINE}.iso
 CDROM.dir=      ${.OBJDIR}/cdrom.dir  CDROM.dir=      ${.OBJDIR}/cdrom.dir
 CDROM.pathlist= ${.OBJDIR}/cdrom.pathlist  CDROM.pathlist= ${.OBJDIR}/cdrom.pathlist
   
Line 410  iso-image:
Line 423  iso-image:
   
 .if ${MKISOFS} != true  .if ${MKISOFS} != true
 do-iso-image: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-post  do-iso-image: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-post
         ${MAKESUMS} -t ${RELEASEDIR}/iso/ '*.iso'          ${MAKESUMS} -t ${RELEASEDIR}/images/ '*.iso'
         @echo "iso-image created as: ${CDROM_IMAGE}"          @echo "iso-image created as: ${CDROM_IMAGE}"
 .else  .else
 do-iso-image:  do-iso-image:
Line 426  iso-image-setup: .PHONY check_RELEASEDIR
Line 439  iso-image-setup: .PHONY check_RELEASEDIR
 .endfor  .endfor
         echo "${MACHINE}/=${RELEASEDIR}/${RELEASEMACHINEDIR}/" >> ${CDROM.pathlist}          echo "${MACHINE}/=${RELEASEDIR}/${RELEASEMACHINEDIR}/" >> ${CDROM.pathlist}
         mkdir -p ${CDROM.dir}          mkdir -p ${CDROM.dir}
         mkdir -p ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom  
   check_imagedir:
           mkdir -p ${RELEASEDIR}/images
   
 # iso-image-mi --  # iso-image-mi --
 #       Create the image after the MD operations have completed.  #       Create the image after the MD operations have completed.
 #  #
 iso-image-mi: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-pre  iso-image-mi: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-pre check_imagedir
         @if ! ${MKISOFS} --version; then \          @if ! ${MKISOFS} --version; then \
                 echo "install pkgsrc/sysutils/cdrtools and run 'make iso-image'." ; \                  echo "install pkgsrc/sysutils/cdrtools and run 'make iso-image'." ; \
                 false; \                  false; \
Line 558  build_kernels: .PHONY
Line 573  build_kernels: .PHONY
 build_kernels: kern-${configfile}  build_kernels: kern-${configfile}
 kern-${configfile}: .PHONY .MAKE  kern-${configfile}: .PHONY .MAKE
         cd ${KERNCONFDIR} && ${TOOL_CONFIG} -s ${KERNSRCDIR} \          cd ${KERNCONFDIR} && ${TOOL_CONFIG} -s ${KERNSRCDIR} \
             -b ${KERNOBJDIR}/${configfile:C/.*\///} ${configfile}              -U DEBUG -b ${KERNOBJDIR}/${configfile:C/.*\///} ${configfile}
 .if ${MKUPDATE} == "no"  .if ${MKUPDATE} == "no"
         cd ${KERNOBJDIR}/${configfile:C/.*\///} && ${MAKE} distclean          cd ${KERNOBJDIR}/${configfile:C/.*\///} && ${MAKE} distclean
 .endif  .endif
Line 580  kernset-${configfile}: .PHONY build_kern
Line 595  kernset-${configfile}: .PHONY build_kern
         kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \          kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \
         kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \          kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \
         kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.tgz; \          kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.tgz; \
         pax_cmd="COMPRESS_PROGRAM=${TOOL_GZIP:Q} GZIP=-9n ${TOOL_PAX} -O -zw -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \          pax_cmd="GZIP=${GZIP_FLAGS:Q} ${TOOL_PAX} --use-compress-program ${TOOL_GZIP:Q} -O -w -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
         cd $${kerndir} && { \          cd $${kerndir} && { \
                 kernels=; newest=; \                  kernels=; newest=; \
                 for kernel in $${kernlist}; do \                  for kernel in $${kernlist}; do \
Line 625  releasekern-${configfile}: .PHONY build_
Line 640  releasekern-${configfile}: .PHONY build_
                                 knl_gz="${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/$${kernel}-${configfile:C/.*\///}$${s}.gz"; \                                  knl_gz="${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/$${kernel}-${configfile:C/.*\///}$${s}.gz"; \
                                 [ $${knl_gz} -nt $${ks} ] && continue; \                                  [ $${knl_gz} -nt $${ks} ] && continue; \
                                 rm -f $${knl_gz}; \                                  rm -f $${knl_gz}; \
                                 echo "${TOOL_GZIP} -nc -9 < $${kerndir}/$${ks} > $${knl_gz}"; \                                  echo "${TOOL_GZIP} ${GZIP_FLAGS} -c < $${kerndir}/$${ks} > $${knl_gz}"; \
                                 ${TOOL_GZIP} -nc -9 < $${ks} > $${knl_gz}; \                                  ${TOOL_GZIP} ${GZIP_FLAGS} -c < $${ks} > $${knl_gz}; \
                         done; \                          done; \
                 done; \                  done; \
         }          }
Legend:
Removed from v.1.412  
changed lines
  Added in v.1.412.2.1
CVSweb <webmaster@jp.NetBSD.org>