From owner-svn-src-stable-10@FreeBSD.ORG Wed Aug 27 00:50:52 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0731D620; Wed, 27 Aug 2014 00:50:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 CD0463880; Wed, 27 Aug 2014 00:50:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7R0opBt023630; Wed, 27 Aug 2014 00:50:51 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7R0opZn023505; Wed, 27 Aug 2014 00:50:51 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201408270050.s7R0opZn023505@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 27 Aug 2014 00:50:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r270688 - in stable/10/release: . arm X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 00:50:52 -0000 Author: gjb Date: Wed Aug 27 00:50:51 2014 New Revision: 270688 URL: http://svnweb.freebsd.org/changeset/base/270688 Log: MFC r270417, r270418, r270455, r270457: r270417: Fix arm build breakage when building stable/10 on head/. r270418: Also export UNAME_r to fix arm builds. r270455: Set OSREL and UNAME_r in release/release.sh when building ports to prevent ports build failures from killing the release build. r270457: Wrap a long line. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/arm/release.sh stable/10/release/release.sh Directory Properties: stable/10/ (props changed) Modified: stable/10/release/arm/release.sh ============================================================================== --- stable/10/release/arm/release.sh Wed Aug 27 00:48:09 2014 (r270687) +++ stable/10/release/arm/release.sh Wed Aug 27 00:50:51 2014 (r270688) @@ -92,6 +92,14 @@ install_uboot() { } main() { + # Fix broken ports that use kern.osreldate. + OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U) + export OSVERSION + REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION) + BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH) + UNAME_r=${REVISION}-${BRANCH} + export UNAME_r + # Build the 'xdev' target for crochet. eval chroot ${CHROOTDIR} make -C /usr/src \ ${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \ Modified: stable/10/release/release.sh ============================================================================== --- stable/10/release/release.sh Wed Aug 27 00:48:09 2014 (r270687) +++ stable/10/release/release.sh Wed Aug 27 00:50:51 2014 (r270688) @@ -253,11 +253,16 @@ if [ -d ${CHROOTDIR}/usr/ports ]; then ## Trick the ports 'run-autotools-fixup' target to do the right thing. _OSVERSION=$(sysctl -n kern.osreldate) + REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION) + BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH) + UNAME_r=${REVISION}-${BRANCH} if [ -d ${CHROOTDIR}/usr/doc ] && [ -z "${NODOC}" ]; then PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes" - PBUILD_FLAGS="${PBUILD_FLAGS}" + PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}" + PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}" chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \ - ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean + ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \ + install clean distclean fi fi