Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Dec 2020 00:48:51 +0000 (UTC)
From:      Mitchell Horne <mhorne@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r368424 - head/release
Message-ID:  <202012080048.0B80mp77016849@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mhorne
Date: Tue Dec  8 00:48:50 2020
New Revision: 368424
URL: https://svnweb.freebsd.org/changeset/base/368424

Log:
  release: don't checksum images if there are none
  
  For platforms that don't have any of the memstick, cdrom, or dvdrom
  release images (i.e. riscv64), the release-install target will trip up
  when invoking md5(1) on the non-existent image files. Skipping this
  allows the install to complete successfully.

Modified:
  head/release/Makefile

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Tue Dec  8 00:42:03 2020	(r368423)
+++ head/release/Makefile	Tue Dec  8 00:48:50 2020	(r368424)
@@ -317,6 +317,7 @@ release-install:
 	mkdir -p ${DESTDIR}
 .endif
 	cp -a ftp ${DESTDIR}/
+.if !empty(IMAGES)
 .for I in ${IMAGES}
 	cp -p ${I} ${DESTDIR}/${OSRELEASE}-${I}
 . if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES)
@@ -325,6 +326,7 @@ release-install:
 .endfor
 	cd ${DESTDIR} && sha512 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA512
 	cd ${DESTDIR} && sha256 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA256
+.endif
 
 .include "${.CURDIR}/Makefile.inc1"
 .include "${.CURDIR}/Makefile.vm"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012080048.0B80mp77016849>