diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-15 16:21:38 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-15 16:21:38 +0000 |
| commit | 710442694755b4f0c0e9d80f1383575f91a6ad24 (patch) | |
| tree | b6a8fff010a2ac043e28e1d178fbb511951da317 | |
| parent | 07ccfddd8c72c3a24f5132c3125b130061d254a8 (diff) | |
| parent | dd3cd5b0b333d496ce036e46b31cb35e298c59cb (diff) | |
| download | linux-710442694755b4f0c0e9d80f1383575f91a6ad24.tar.gz | |
Merge branch 'baserock/samthursfield/build-essential-2-rebase' into baserock/build-essential
| -rw-r--r-- | linux-api-headers.morph | 2 | ||||
| -rwxr-xr-x | morph-arch | 20 | ||||
| -rw-r--r-- | stage2-linux-api-headers.morph | 10 | ||||
| -rw-r--r-- | stage2-linux-api-headers.morph.yaml | 11 |
4 files changed, 42 insertions, 1 deletions
diff --git a/linux-api-headers.morph b/linux-api-headers.morph index 0ec7d2eae2d7..7e9672eafa63 100644 --- a/linux-api-headers.morph +++ b/linux-api-headers.morph @@ -3,7 +3,7 @@ "kind": "chunk", "install-commands": [ "make mrproper", - "make INSTALL_HDR_PATH=dest headers_install", + "ARCH=$(./morph-arch) make INSTALL_HDR_PATH=dest headers_install", "install -d \"$DESTDIR${PREFIX-/usr}/include\"", "cp -r dest/include/* \"$DESTDIR/${PREFIX-/usr}/include\"" ] diff --git a/morph-arch b/morph-arch new file mode 100755 index 000000000000..0252ce21edee --- /dev/null +++ b/morph-arch @@ -0,0 +1,20 @@ +#!/bin/sh + +# Get Linux ARCH from Morph architecture + +if [ -z "$MORPH_ARCH" ]; then + echo "Error: MORPH_ARCH is not set" >&2 + exit 1 +fi + +case "$MORPH_ARCH" in + armv7b|armv7l) + echo arm ;; + x86_32) + echo i386 ;; + x86_64) + echo x86_64 ;; + *) + echo "Error: unsupported Morph architecture: $MORPH_ARCH" >&2 + exit 1 +esac diff --git a/stage2-linux-api-headers.morph b/stage2-linux-api-headers.morph new file mode 100644 index 000000000000..fc3f1a74fcfb --- /dev/null +++ b/stage2-linux-api-headers.morph @@ -0,0 +1,10 @@ +{ + "name": "stage2-linux-api-headers", + "kind": "chunk", + "install-commands": [ + "make mrproper", + "export ARCH=$(./morph-arch)\nmake INSTALL_HDR_PATH=dest headers_install\n", + "install -d \"$DESTDIR${PREFIX-/usr}/include\"", + "cp -r dest/include/* \"$DESTDIR/${PREFIX-/usr}/include\"" + ] +} diff --git a/stage2-linux-api-headers.morph.yaml b/stage2-linux-api-headers.morph.yaml new file mode 100644 index 000000000000..9703bbf8228e --- /dev/null +++ b/stage2-linux-api-headers.morph.yaml @@ -0,0 +1,11 @@ +name: stage2-linux-api-headers +kind: chunk + +install-commands: + - make mrproper + + - | + export ARCH=$(./morph-arch) + make INSTALL_HDR_PATH=dest headers_install + - install -d "$DESTDIR${PREFIX-/usr}/include" + - cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include" |