This is an automated email from the ASF dual-hosted git repository. tvb pushed a commit to branch tlater/freedesktop in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit aca25a8a91e4e8f7e1a92c4a77a05f9e1ec647a0 Author: Tristan Maat <[email protected]> AuthorDate: Mon Jun 24 13:54:54 2019 +0100 doc/exmaples/*: Adjust examples to new base image --- doc/examples/autotools/elements/base.bst | 2 +- doc/examples/autotools/elements/base/alpine.bst | 13 ------------- doc/examples/autotools/elements/base/freedesktop.bst | 10 ++++++++++ doc/examples/autotools/project.conf | 2 +- doc/examples/developing/elements/base.bst | 2 +- doc/examples/developing/elements/base/alpine.bst | 13 ------------- doc/examples/developing/elements/base/freedesktop.bst | 10 ++++++++++ doc/examples/developing/project.conf | 2 +- doc/examples/integration-commands/elements/base.bst | 2 +- .../integration-commands/elements/base/alpine.bst | 17 ----------------- .../integration-commands/elements/base/freedesktop.bst | 18 ++++++++++++++++++ doc/examples/integration-commands/project.conf | 2 +- doc/examples/junctions/autotools/elements/base.bst | 2 +- .../junctions/autotools/elements/base/alpine.bst | 13 ------------- .../junctions/autotools/elements/base/freedesktop.bst | 10 ++++++++++ doc/examples/junctions/autotools/project.conf | 2 +- doc/examples/running-commands/elements/base.bst | 2 +- doc/examples/running-commands/elements/base/alpine.bst | 13 ------------- .../running-commands/elements/base/freedesktop.bst | 10 ++++++++++ doc/examples/running-commands/project.conf | 2 +- 20 files changed, 68 insertions(+), 79 deletions(-) diff --git a/doc/examples/autotools/elements/base.bst b/doc/examples/autotools/elements/base.bst index 1b85a9e..16146d7 100644 --- a/doc/examples/autotools/elements/base.bst +++ b/doc/examples/autotools/elements/base.bst @@ -2,4 +2,4 @@ kind: stack description: Base stack depends: -- base/alpine.bst +- base/freedesktop.bst diff --git a/doc/examples/autotools/elements/base/alpine.bst b/doc/examples/autotools/elements/base/alpine.bst deleted file mode 100644 index cf85df5..0000000 --- a/doc/examples/autotools/elements/base/alpine.bst +++ /dev/null @@ -1,13 +0,0 @@ -kind: import -description: | - - Alpine Linux base runtime - -sources: -- kind: tar - - # This is a post doctored, trimmed down system image - # of the Alpine linux distribution. - # - url: alpine:integration-tests-base.v1.x86_64.tar.xz - ref: 3eb559250ba82b64a68d86d0636a6b127aa5f6d25d3601a79f79214dc9703639 diff --git a/doc/examples/autotools/elements/base/freedesktop.bst b/doc/examples/autotools/elements/base/freedesktop.bst new file mode 100644 index 0000000..7412f05 --- /dev/null +++ b/doc/examples/autotools/elements/base/freedesktop.bst @@ -0,0 +1,10 @@ +kind: import +description: | + + Freedesktop-sdk base runtime + +sources: +- kind: tar + url: freedesktop:integration-tests-base.v3.x86_64.tar.xz + ref: 5593c0a269291890b466775520e34f90800fc6760abd4ab804a13fe9b824a17c + base-dir: '' diff --git a/doc/examples/autotools/project.conf b/doc/examples/autotools/project.conf index 96e0284..1603d1c 100644 --- a/doc/examples/autotools/project.conf +++ b/doc/examples/autotools/project.conf @@ -9,5 +9,5 @@ element-path: elements # Define some aliases for the tarballs we download aliases: - alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/ + freedesktop: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/ gnu: http://ftpmirror.gnu.org/gnu/automake/ diff --git a/doc/examples/developing/elements/base.bst b/doc/examples/developing/elements/base.bst index 1b85a9e..16146d7 100644 --- a/doc/examples/developing/elements/base.bst +++ b/doc/examples/developing/elements/base.bst @@ -2,4 +2,4 @@ kind: stack description: Base stack depends: -- base/alpine.bst +- base/freedesktop.bst diff --git a/doc/examples/developing/elements/base/alpine.bst b/doc/examples/developing/elements/base/alpine.bst deleted file mode 100644 index cf85df5..0000000 --- a/doc/examples/developing/elements/base/alpine.bst +++ /dev/null @@ -1,13 +0,0 @@ -kind: import -description: | - - Alpine Linux base runtime - -sources: -- kind: tar - - # This is a post doctored, trimmed down system image - # of the Alpine linux distribution. - # - url: alpine:integration-tests-base.v1.x86_64.tar.xz - ref: 3eb559250ba82b64a68d86d0636a6b127aa5f6d25d3601a79f79214dc9703639 diff --git a/doc/examples/developing/elements/base/freedesktop.bst b/doc/examples/developing/elements/base/freedesktop.bst new file mode 100644 index 0000000..7412f05 --- /dev/null +++ b/doc/examples/developing/elements/base/freedesktop.bst @@ -0,0 +1,10 @@ +kind: import +description: | + + Freedesktop-sdk base runtime + +sources: +- kind: tar + url: freedesktop:integration-tests-base.v3.x86_64.tar.xz + ref: 5593c0a269291890b466775520e34f90800fc6760abd4ab804a13fe9b824a17c + base-dir: '' diff --git a/doc/examples/developing/project.conf b/doc/examples/developing/project.conf index e3dfcef..061b5ec 100644 --- a/doc/examples/developing/project.conf +++ b/doc/examples/developing/project.conf @@ -9,4 +9,4 @@ element-path: elements # Define an alias for our freedesktop tarball aliases: - alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/ + freedesktop: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/ diff --git a/doc/examples/integration-commands/elements/base.bst b/doc/examples/integration-commands/elements/base.bst index 1b85a9e..16146d7 100644 --- a/doc/examples/integration-commands/elements/base.bst +++ b/doc/examples/integration-commands/elements/base.bst @@ -2,4 +2,4 @@ kind: stack description: Base stack depends: -- base/alpine.bst +- base/freedesktop.bst diff --git a/doc/examples/integration-commands/elements/base/alpine.bst b/doc/examples/integration-commands/elements/base/alpine.bst deleted file mode 100644 index 433f477..0000000 --- a/doc/examples/integration-commands/elements/base/alpine.bst +++ /dev/null @@ -1,17 +0,0 @@ -kind: import -description: | - - Alpine Linux base runtime - -sources: -- kind: tar - url: alpine:integration-tests-base.v1.x86_64.tar.xz - ref: 3eb559250ba82b64a68d86d0636a6b127aa5f6d25d3601a79f79214dc9703639 - -# -# Run ldconfig in the libdir before running anything -# -public: - bst: - integration-commands: - - ldconfig "%{libdir}" diff --git a/doc/examples/integration-commands/elements/base/freedesktop.bst b/doc/examples/integration-commands/elements/base/freedesktop.bst new file mode 100644 index 0000000..1dd8d16 --- /dev/null +++ b/doc/examples/integration-commands/elements/base/freedesktop.bst @@ -0,0 +1,18 @@ +kind: import +description: | + + Freedesktop-sdk base runtime + +sources: +- kind: tar + url: freedesktop:integration-tests-base.v3.x86_64.tar.xz + ref: 5593c0a269291890b466775520e34f90800fc6760abd4ab804a13fe9b824a17c + base-dir: '' + +# +# Run ldconfig in the libdir before running anything +# +public: + bst: + integration-commands: + - ldconfig "%{libdir}" diff --git a/doc/examples/integration-commands/project.conf b/doc/examples/integration-commands/project.conf index 9a484de..ab404ef 100644 --- a/doc/examples/integration-commands/project.conf +++ b/doc/examples/integration-commands/project.conf @@ -9,4 +9,4 @@ element-path: elements # Define an alias for our freedesktop tarball aliases: - alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/ + freedesktop: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/ diff --git a/doc/examples/junctions/autotools/elements/base.bst b/doc/examples/junctions/autotools/elements/base.bst index 1b85a9e..16146d7 100644 --- a/doc/examples/junctions/autotools/elements/base.bst +++ b/doc/examples/junctions/autotools/elements/base.bst @@ -2,4 +2,4 @@ kind: stack description: Base stack depends: -- base/alpine.bst +- base/freedesktop.bst diff --git a/doc/examples/junctions/autotools/elements/base/alpine.bst b/doc/examples/junctions/autotools/elements/base/alpine.bst deleted file mode 100644 index cf85df5..0000000 --- a/doc/examples/junctions/autotools/elements/base/alpine.bst +++ /dev/null @@ -1,13 +0,0 @@ -kind: import -description: | - - Alpine Linux base runtime - -sources: -- kind: tar - - # This is a post doctored, trimmed down system image - # of the Alpine linux distribution. - # - url: alpine:integration-tests-base.v1.x86_64.tar.xz - ref: 3eb559250ba82b64a68d86d0636a6b127aa5f6d25d3601a79f79214dc9703639 diff --git a/doc/examples/junctions/autotools/elements/base/freedesktop.bst b/doc/examples/junctions/autotools/elements/base/freedesktop.bst new file mode 100644 index 0000000..7412f05 --- /dev/null +++ b/doc/examples/junctions/autotools/elements/base/freedesktop.bst @@ -0,0 +1,10 @@ +kind: import +description: | + + Freedesktop-sdk base runtime + +sources: +- kind: tar + url: freedesktop:integration-tests-base.v3.x86_64.tar.xz + ref: 5593c0a269291890b466775520e34f90800fc6760abd4ab804a13fe9b824a17c + base-dir: '' diff --git a/doc/examples/junctions/autotools/project.conf b/doc/examples/junctions/autotools/project.conf index 2cf5824..8848d9b 100644 --- a/doc/examples/junctions/autotools/project.conf +++ b/doc/examples/junctions/autotools/project.conf @@ -9,5 +9,5 @@ element-path: elements # Define some aliases for the tarballs we download aliases: - alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/ + freedesktop: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/ gnu: https://ftpmirror.gnu.org/gnu/automake/ diff --git a/doc/examples/running-commands/elements/base.bst b/doc/examples/running-commands/elements/base.bst index 1b85a9e..16146d7 100644 --- a/doc/examples/running-commands/elements/base.bst +++ b/doc/examples/running-commands/elements/base.bst @@ -2,4 +2,4 @@ kind: stack description: Base stack depends: -- base/alpine.bst +- base/freedesktop.bst diff --git a/doc/examples/running-commands/elements/base/alpine.bst b/doc/examples/running-commands/elements/base/alpine.bst deleted file mode 100644 index cf85df5..0000000 --- a/doc/examples/running-commands/elements/base/alpine.bst +++ /dev/null @@ -1,13 +0,0 @@ -kind: import -description: | - - Alpine Linux base runtime - -sources: -- kind: tar - - # This is a post doctored, trimmed down system image - # of the Alpine linux distribution. - # - url: alpine:integration-tests-base.v1.x86_64.tar.xz - ref: 3eb559250ba82b64a68d86d0636a6b127aa5f6d25d3601a79f79214dc9703639 diff --git a/doc/examples/running-commands/elements/base/freedesktop.bst b/doc/examples/running-commands/elements/base/freedesktop.bst new file mode 100644 index 0000000..7412f05 --- /dev/null +++ b/doc/examples/running-commands/elements/base/freedesktop.bst @@ -0,0 +1,10 @@ +kind: import +description: | + + Freedesktop-sdk base runtime + +sources: +- kind: tar + url: freedesktop:integration-tests-base.v3.x86_64.tar.xz + ref: 5593c0a269291890b466775520e34f90800fc6760abd4ab804a13fe9b824a17c + base-dir: '' diff --git a/doc/examples/running-commands/project.conf b/doc/examples/running-commands/project.conf index 6c60e39..98be956 100644 --- a/doc/examples/running-commands/project.conf +++ b/doc/examples/running-commands/project.conf @@ -9,4 +9,4 @@ element-path: elements # Define an alias for our freedesktop tarball aliases: - alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/ + freedesktop: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/
