diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-10-27 13:49:38 +0000 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2017-11-05 12:14:48 +0000 |
commit | 4203865325c33d752f814850f43d2ecb16c8fa16 (patch) | |
tree | 8bf81042a356db74fad2905b46ea369a316e4309 /elements/gnu-toolchain/linux-api-headers.bst | |
parent | b917c363cc13b13ed553051844095469e1d6fc82 (diff) | |
download | definitions-4203865325c33d752f814850f43d2ecb16c8fa16.tar.gz |
Replace use of architecture conditionals with generic project conditions
The initial implementation of architecture conditionals has been
removed, as the same behaviours can be implemented using the more
generic mechanism for conditionals that is being introduced for
BuildStream 1.0.
We now have two architecture options: build_arch and arch. They are
documented in project.conf. The first one controls the build sandbox
while the second controls the host and target of the binaries we
produce.
Diffstat (limited to 'elements/gnu-toolchain/linux-api-headers.bst')
-rw-r--r-- | elements/gnu-toolchain/linux-api-headers.bst | 45 |
1 files changed, 12 insertions, 33 deletions
diff --git a/elements/gnu-toolchain/linux-api-headers.bst b/elements/gnu-toolchain/linux-api-headers.bst index a8096b31..aefe8a5b 100644 --- a/elements/gnu-toolchain/linux-api-headers.bst +++ b/elements/gnu-toolchain/linux-api-headers.bst @@ -13,38 +13,17 @@ depends: variables: kernel-arch: unsupported - -arches: - armv5: - variables: - kernel-arch: arm - armv7b: - variables: - kernel-arch: arm - armv7l: - variables: - kernel-arch: arm - armv7lhf: - variables: - kernel-arch: arm - armv8l64: - variables: - kernel-arch: arm64 - armv8b64: - variables: - kernel-arch: arm64 - ppc64b: - variables: - kernel-arch: powerpc - ppc64l: - variables: - kernel-arch: powerpc - x86_32: - variables: - kernel-arch: i386 - x86_64: - variables: - kernel-arch: x86_64 + (?): + - arch in ["armv5", "armv7b", "armv7l", "armv7lhf"]: + kernel-arch: arm + - arch in ["armv8b64", "armv8l64"]: + kernel-arch: arm64 + - arch in ["ppc64b", "ppc64l"]: + kernel-arch: powerpc + - arch == "x86_32": + kernel-arch: i386 + - arch == "x86_64": + kernel-arch: x86_64 environment: PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin @@ -53,7 +32,7 @@ config: install-commands: - | if [ '%{kernel-arch}' == 'unsupported' ]; then - echo "Error: unsupported architecture: %{bst-target-arch}" >&2 + echo "Error: unsupported architecture: %{arch}" >&2 exit 1 fi ARCH=%{kernel-arch} make INSTALL_HDR_PATH=dest headers_install |