make: Normalize config options for external trees

Enterprise / Virtualization / Xen - George Dunlap [eu.citrix.com] - 18 July 2014 05:20 UTC

We have four different external trees, and four different naming conventions for specifying the URL, where they live, and what revision to check out.

Normalize config options on the following bases:- QEMU_UPSTREAM- QEMU_TRADITIONAL- SEABIOS_UPSTREAM- OVMF_UPSTREAM

The following suffixes for all trees:- _URL : A remote repository to clone from- _REVISION : The revision to check out

And the following suffixes for the qemu trees:- _INTREE : The location of an inlined tree (for tarball releases)- _LOC : Where to actually look (either a directory or a URL)

The following parameters are still supported for backwards compatibility:- CONFIG_QEMU (=> QEMU_TRADITIONAL_LOC)- QEMU_REMOTE (=> QEMU_TRADITIONAL_URL)- QEMU_TAG (=> QEMU_TRADITIONAL_REVISION)- SEABIOS_UPSTREAM_TAG (=> SEABIOS_UPSTREAM_REVISION)

8962a8f make: Normalize config options for external trees
Config.mk | 43 +++++++++++++++++++++++++++----------------
tools/Makefile | 18 +++++++++---------
tools/firmware/Makefile | 6 +++---
3 files changed, 39 insertions(+), 28 deletions(-)

Upstream: xenbits.xen.org

  • Share