From owner-svn-src-all@freebsd.org  Tue Dec  8 00:48:53 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C1034BB9C3;
 Tue,  8 Dec 2020 00:48:53 +0000 (UTC)
 (envelope-from mhorne@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CqhPw440Qz4YYV;
 Tue,  8 Dec 2020 00:48:51 +0000 (UTC)
 (envelope-from mhorne@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 753472DEA;
 Tue,  8 Dec 2020 00:48:51 +0000 (UTC)
 (envelope-from mhorne@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B80mpoC016850;
 Tue, 8 Dec 2020 00:48:51 GMT (envelope-from mhorne@FreeBSD.org)
Received: (from mhorne@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B80mp77016849;
 Tue, 8 Dec 2020 00:48:51 GMT (envelope-from mhorne@FreeBSD.org)
Message-Id: <202012080048.0B80mp77016849@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mhorne set sender to
 mhorne@FreeBSD.org using -f
From: Mitchell Horne <mhorne@FreeBSD.org>
Date: Tue, 8 Dec 2020 00:48:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r368424 - head/release
X-SVN-Group: head
X-SVN-Commit-Author: mhorne
X-SVN-Commit-Paths: head/release
X-SVN-Commit-Revision: 368424
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Dec 2020 00:48:54 -0000

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"