summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2017-10-24 16:40:08 (GMT)
committerBen Brown <ben.brown@codethink.co.uk>2017-10-25 09:26:25 (GMT)
commit7d81af64cd489c81673322f16ef3a8a580700872 (patch)
tree3fb726085de2644c79de0579b6095be8213f8aab
parentc64551b4f51b3a83ea825f8287950b7472545f7c (diff)
downloaddefinitions-7d81af64cd489c81673322f16ef3a8a580700872.tar.gz
gnu-toolchain: Use new composition operators correctlybenbrown/sam/fix-ci
The default behaviour of BuildStream is now for lists to overwrite the previous value when composing them. In the fhs-dirs elements our goal is extend the install commands in certain cases, so we now need to use the (>) operator to cause it to append to the list instead of overwriting.
-rw-r--r--elements/gnu-toolchain/fhs-dirs.bst15
-rw-r--r--elements/gnu-toolchain/stage2-fhs-dirs.bst15
2 files changed, 18 insertions, 12 deletions
diff --git a/elements/gnu-toolchain/fhs-dirs.bst b/elements/gnu-toolchain/fhs-dirs.bst
index 7359e58..13ed1f2 100644
--- a/elements/gnu-toolchain/fhs-dirs.bst
+++ b/elements/gnu-toolchain/fhs-dirs.bst
@@ -31,15 +31,18 @@ arches:
armv8b64:
config:
install-commands:
- - mkdir -p "%{install-root}/usr/lib64"
- - ln -s "./usr/lib64" "%{install-root}/lib64"
+ (>):
+ - mkdir -p "%{install-root}/usr/lib64"
+ - ln -s "./usr/lib64" "%{install-root}/lib64"
armv8l64:
config:
install-commands:
- - mkdir -p "%{install-root}/usr/lib64"
- - ln -s "./usr/lib64" "%{install-root}/lib64"
+ (>):
+ - mkdir -p "%{install-root}/usr/lib64"
+ - ln -s "./usr/lib64" "%{install-root}/lib64"
x86_64:
config:
install-commands:
- - mkdir -p "%{install-root}/usr/lib64"
- - ln -s "./usr/lib64" "%{install-root}/lib64"
+ (>):
+ - mkdir -p "%{install-root}/usr/lib64"
+ - ln -s "./usr/lib64" "%{install-root}/lib64"
diff --git a/elements/gnu-toolchain/stage2-fhs-dirs.bst b/elements/gnu-toolchain/stage2-fhs-dirs.bst
index 1528172..41a57dd 100644
--- a/elements/gnu-toolchain/stage2-fhs-dirs.bst
+++ b/elements/gnu-toolchain/stage2-fhs-dirs.bst
@@ -36,15 +36,18 @@ arches:
armv8b64:
config:
install-commands:
- - mkdir -p "%{install-root}/usr/lib64"
- - ln -s "./usr/lib64" "%{install-root}/lib64"
+ (>):
+ - mkdir -p "%{install-root}/usr/lib64"
+ - ln -s "./usr/lib64" "%{install-root}/lib64"
armv8l64:
config:
install-commands:
- - mkdir -p "%{install-root}/usr/lib64"
- - ln -s "./usr/lib64" "%{install-root}/lib64"
+ (>):
+ - mkdir -p "%{install-root}/usr/lib64"
+ - ln -s "./usr/lib64" "%{install-root}/lib64"
x86_64:
config:
install-commands:
- - mkdir -p "%{install-root}/usr/lib64"
- - ln -s "./usr/lib64" "%{install-root}/lib64"
+ (>):
+ - mkdir -p "%{install-root}/usr/lib64"
+ - ln -s "./usr/lib64" "%{install-root}/lib64"