svn commit: r240967 - head/release

Garrett Cooper yanegomi at gmail.com
Wed Sep 26 18:44:09 UTC 2012


On Wed, Sep 26, 2012 at 11:04 AM, Glen Barber <gjb at freebsd.org> 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 <arch>'.  (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


More information about the svn-src-all mailing list