From owner-svn-src-all@FreeBSD.ORG Mon Aug 11 16:31:29 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 35EF5BC9 for ; Mon, 11 Aug 2014 16:31:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C2FD214A for ; Mon, 11 Aug 2014 16:31:29 +0000 (UTC) Received: from gjb (uid 1237) (envelope-from gjb@FreeBSD.org) id 2894 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Mon, 11 Aug 2014 16:31:29 +0000 From: Glen Barber Date: Mon, 11 Aug 2014 16:31:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r269816 - head/release/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e8efe1.2894.7404ff5c@svn.freebsd.org> X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Aug 2014 16:31:29 -0000 Author: gjb Date: Mon Aug 11 16:31:28 2014 New Revision: 269816 URL: http://svnweb.freebsd.org/changeset/base/269816 Log: In arm/release.sh, continue if 'xdev-links' target fails where the target is not valid (stable/10), instead of doing per-branch evaluation on if xdev-links needs to be invoked. Sponsored by: The FreeBSD Foundation Modified: head/release/arm/release.sh Modified: head/release/arm/release.sh ============================================================================== --- head/release/arm/release.sh Mon Aug 11 15:41:55 2014 (r269815) +++ head/release/arm/release.sh Mon Aug 11 16:31:28 2014 (r269816) @@ -103,7 +103,7 @@ main() { eval chroot ${CHROOTDIR} make -C /usr/src \ ${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \ TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \ - ${WORLD_FLAGS} xdev-links + ${WORLD_FLAGS} xdev-links || true # Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints # is created.