From owner-svn-src-all@FreeBSD.ORG Wed Sep 26 18:44:09 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 041B3106566B; Wed, 26 Sep 2012 18:44:09 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-ie0-f182.google.com (mail-ie0-f182.google.com [209.85.223.182]) by mx1.freebsd.org (Postfix) with ESMTP id 99AB38FC0C; Wed, 26 Sep 2012 18:44:08 +0000 (UTC) Received: by ieak10 with SMTP id k10so3215846iea.13 for ; Wed, 26 Sep 2012 11:44:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=aKBgSRe1YX9uis+Xz/kWN7F0i37bKITclxlvX4fh2bM=; b=kvenSlB4+J5zSI7IDaq7cNIPZHQJNCr7TmprvMk/1ZZDLrDPvptut8TlYB5abFAOHF pmUHLfQ25qGkdUbsYoliZ6TvI3WL4ieXvkcn3a026fXmCpKJe0tWvteC9TzCR3RuH0o7 e9gFr5oVsrchGcjrVzhYaRkojUttT1F/X8ooeH1Z804699tWIKxyUSEw7g1xf+Y+euvw 2ewo0niL+nGjoMGWySA5uuIu22frL2o5MXbNR6IsTblTTD7kvzQXYZ2EyCeSIY7oO+Pr 8QAwsc+EhRweSUSSulACufDNlEkNXP56u8AduNEtqwhi/z42ldns9wdlL5B05gr1GlGE hygQ== MIME-Version: 1.0 Received: by 10.50.183.200 with SMTP id eo8mr12157568igc.54.1348685047863; Wed, 26 Sep 2012 11:44:07 -0700 (PDT) Received: by 10.64.51.39 with HTTP; Wed, 26 Sep 2012 11:44:07 -0700 (PDT) In-Reply-To: <201209261804.q8QI4H9P069204@svn.freebsd.org> References: <201209261804.q8QI4H9P069204@svn.freebsd.org> Date: Wed, 26 Sep 2012 11:44:07 -0700 Message-ID: From: Garrett Cooper To: Glen Barber Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r240967 - head/release X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 26 Sep 2012 18:44:09 -0000 On Wed, Sep 26, 2012 at 11:04 AM, Glen Barber wrote: > Author: gjb (doc,ports committer) > Date: Wed Sep 26 18:04:16 2012 > New Revision: 240967 > URL: http://svn.freebsd.org/changeset/base/240967 > > Log: > - Allow cross-architecture builds with 'generate-release.sh', which > is set by specifying '-a '. (Only supported for i386 on amd64 > and powerpc on powerpc64 currently). > - Change how textproc/docproj is installed: > o Attempt to install from pkg(8); > o Fall back to pkg_add(1) if pkg(8) installation is not > successful; > o Fall back to installing from ports as last resort. > - Ensure the script is run by root[1]. > - Get OSVERSION from param.h[1]. More magic is required to fake a target system; see: http://freenas.svn.sourceforge.net/viewvc/freenas?view=revision&revision=8193 (and the corresponding post made by ambrisko@). More magic was required to deal with $PATH, etc... but you should be able to grok all you need from that function (it hasn't been modified too much since I left iX). ... > +# If target architecture is not specified, use hw.machine_arch > +if [ "x${B_ARCH}" == "x" ]; then See comment about == vs = below. ... > -: ${RELSTRING=`chroot $2 uname -s`-`chroot $2 uname -r`-`chroot $2 uname -p`} > +if [ "x${OSVERSION}" == "x" ]; then This should be `=` in order to be backwards compatible with older (pre-9.1) copies of /bin/sh > + OSRELEASE=`chroot $2 uname -r` > +fi > + > +: ${RELSTRING=`chroot $2 uname -s`-${OSRELEASE}-${B_ARCH}} Thanks! -Garrett