From owner-svn-src-user@freebsd.org Wed Jul 27 09:26:47 2016 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 682B4BA68E4 for ; Wed, 27 Jul 2016 09:26:47 +0000 (UTC) (envelope-from glebius@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 mx1.freebsd.org (Postfix) with ESMTPS id 394E01187; Wed, 27 Jul 2016 09:26:47 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6R9QkRb036977; Wed, 27 Jul 2016 09:26:46 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6R9QkQV036976; Wed, 27 Jul 2016 09:26:46 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201607270926.u6R9QkQV036976@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 27 Jul 2016 09:26:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r303378 - user/cperciva/freebsd-update-build/scripts X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jul 2016 09:26:47 -0000 Author: glebius Date: Wed Jul 27 09:26:46 2016 New Revision: 303378 URL: https://svnweb.freebsd.org/changeset/base/303378 Log: Starting with FreeBSD 11 we will use dvd1 disk instead of disc1, since we need kernel-dbg distribution. For 11.0-BETA1 and 11.0-BETA2 this was done as override, but we should use it as default. In case if 10.4-RELEASE will use disc1, we will create override for 10.4 build only. Discussed with: delphij, gjb Modified: user/cperciva/freebsd-update-build/scripts/build.subr Modified: user/cperciva/freebsd-update-build/scripts/build.subr ============================================================================== --- user/cperciva/freebsd-update-build/scripts/build.subr Wed Jul 27 09:23:04 2016 (r303377) +++ user/cperciva/freebsd-update-build/scripts/build.subr Wed Jul 27 09:26:46 2016 (r303378) @@ -302,9 +302,9 @@ checkinit () { fetchiso () { log "Starting fetch" - # Figure out where the disc1 ISO image is + # Figure out where the dvd1 ISO image is RELNUM=${REL%-*} - ISO=${FTP}/FreeBSD-${REL}-${TARGET}-disc1.iso + ISO=${FTP}/releases/${TARGET}/${TARGET}/ISO-IMAGES/${RELNUM}/FreeBSD-${REL}-${TARGET}-dvd1.iso # Fetch the ISO image. We consider the ISO image to be # the One True Release and don't look at the files used @@ -313,11 +313,11 @@ fetchiso () { # again. fetch -o ${WORKDIR}/iso.img -rR ${ISO} 2>&1 - log "Verifying disc1 hash" + log "Verifying dvd1 hash" # Check that the downloaded ISO has the correct hash. if ! [ "`sha512 -q ${WORKDIR}/iso.img`" = "${RELH}" ]; then - echo "FreeBSD ${REL}-${TARGET}-disc1.iso has incorrect hash." + echo "FreeBSD ${REL}-${TARGET}-dvd1.iso has incorrect hash." rm ${WORKDIR}/iso.img return 1 fi