From owner-svn-src-head@freebsd.org  Tue Jul 31 18:57:12 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A23D11061D70;
 Tue, 31 Jul 2018 18:57:12 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 53F427769F;
 Tue, 31 Jul 2018 18:57:12 +0000 (UTC)
 (envelope-from manu@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 32F411797F;
 Tue, 31 Jul 2018 18:57:12 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6VIvChY070733;
 Tue, 31 Jul 2018 18:57:12 GMT (envelope-from manu@FreeBSD.org)
Received: (from manu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6VIvCDR070732;
 Tue, 31 Jul 2018 18:57:12 GMT (envelope-from manu@FreeBSD.org)
Message-Id: <201807311857.w6VIvCDR070732@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: manu set sender to
 manu@FreeBSD.org using -f
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Tue, 31 Jul 2018 18:57:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r336995 - head/release
X-SVN-Group: head
X-SVN-Commit-Author: manu
X-SVN-Commit-Paths: head/release
X-SVN-Commit-Revision: 336995
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Jul 2018 18:57:12 -0000

Author: manu
Date: Tue Jul 31 18:57:11 2018
New Revision: 336995
URL: https://svnweb.freebsd.org/changeset/base/336995

Log:
  release: Deinstall u-boot ports before installing
  
  FORCE_PKG_REGISTER is broken so multiple invocation of release.sh for the
  same board will fails if /scratch isn't cleaned.
  Leave it but deinstall the package first.
  
  Reviewed by:	gjb
  Differential Revision:	https://reviews.freebsd.org/D16513

Modified:
  head/release/release.sh

Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh	Tue Jul 31 18:55:44 2018	(r336994)
+++ head/release/release.sh	Tue Jul 31 18:57:11 2018	(r336995)
@@ -307,7 +307,7 @@ extra_chroot_setup() {
 		for _PORT in ${EMBEDDEDPORTS}; do
 			eval chroot ${CHROOTDIR} env ${PBUILD_FLAGS} make -C \
 				/usr/ports/${_PORT} \
-				FORCE_PKG_REGISTER=1 install clean distclean
+				FORCE_PKG_REGISTER=1 deinstall install clean distclean
 		done
 	fi