You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by no...@apache.org on 2020/12/29 12:40:27 UTC
[buildstream] branch tlater/freedesktop created (now bf94f5e)
This is an automated email from the ASF dual-hosted git repository.
not-in-ldap pushed a change to branch tlater/freedesktop
in repository https://gitbox.apache.org/repos/asf/buildstream.git.
at bf94f5e Reword documentation to talk about freedesktop-sdk, not alpine
This branch includes the following new commits:
new d7e7e66 integration/base: Create freedesktop-sdk based base image
new 4ab04d8 tests/integration/*: Adjust tests to use new base image
new aca25a8 doc/exmaples/*: Adjust examples to new base image
new e7767db tests/*: Adjust integration tests not in the integration directory
new bf94f5e Reword documentation to talk about freedesktop-sdk, not alpine
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[buildstream] 03/05: doc/exmaples/*: Adjust examples to new base
image
Posted by no...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
not-in-ldap pushed a commit to branch tlater/freedesktop
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit aca25a8a91e4e8f7e1a92c4a77a05f9e1ec647a0
Author: Tristan Maat <tr...@codethink.co.uk>
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/
[buildstream] 01/05: integration/base: Create freedesktop-sdk based
base image
Posted by no...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
not-in-ldap pushed a commit to branch tlater/freedesktop
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit d7e7e668968cabba91feb086173ee783b4717d72
Author: Tristan Maat <tr...@codethink.co.uk>
AuthorDate: Fri Jun 21 13:54:41 2019 +0100
integration/base: Create freedesktop-sdk based base image
---
tests/integration/base/elements/base.bst | 5 ++
.../integration/base/elements/freedesktop-sdk.bst | 9 +++
tests/integration/base/generate-base.sh | 68 +++-------------------
tests/integration/base/project.conf | 13 +++++
4 files changed, 35 insertions(+), 60 deletions(-)
diff --git a/tests/integration/base/elements/base.bst b/tests/integration/base/elements/base.bst
new file mode 100644
index 0000000..697bf6b
--- /dev/null
+++ b/tests/integration/base/elements/base.bst
@@ -0,0 +1,5 @@
+kind: stack
+description: |
+ The provided base system
+depends:
+ - freedesktop-sdk.bst:public-stacks/buildsystems.bst
diff --git a/tests/integration/base/elements/freedesktop-sdk.bst b/tests/integration/base/elements/freedesktop-sdk.bst
new file mode 100644
index 0000000..f42306c
--- /dev/null
+++ b/tests/integration/base/elements/freedesktop-sdk.bst
@@ -0,0 +1,9 @@
+kind: junction
+sources:
+- kind: git
+ url: https://gitlab.com/freedesktop-sdk/freedesktop-sdk/
+ track: freedesktop-sdk-18.08.31.1-bst2
+ ref: 5c639b8d553016ea6c28ea160a572da2e189745e
+config:
+ options:
+ target_arch: '%{arch}'
diff --git a/tests/integration/base/generate-base.sh b/tests/integration/base/generate-base.sh
index 338c6d9..b3e4dbf 100755
--- a/tests/integration/base/generate-base.sh
+++ b/tests/integration/base/generate-base.sh
@@ -2,66 +2,14 @@
# Generate a base sysroot for running the BuildStream integration tests.
#
-# The sysroot is based off the Alpine Linux distribution. The script downloads
-# a release of Alpine, sets up a cheap container using `bwrap` and installs the
-# packages that are needed by the integration tests, then outputs a .tar.xz
-# file.
+# The sysroot is based on freedesktop-sdk; See the project for
+# details, this script only runs BuildStream and compresses the
+# output.
set -eux
-ALPINE_ARCH=${ARCH:-x86-64}
-ALPINE_BASE=http://dl-cdn.alpinelinux.org/alpine/v3.7/releases/${ALPINE_ARCH}/alpine-minirootfs-3.7.0-${ALPINE_ARCH}.tar.gz
-
-mkdir root
-
-wget ${ALPINE_BASE} -O alpine-base.tar.gz
-
-tar -x -f ./alpine-base.tar.gz -C ./root --exclude dev/\*
-
-run() {
- # This turns the unpacked rootfs into a container using Bubblewrap.
- # The Alpine package manager (apk) calls `chroot` when running package
- # triggers so we need to enable CAP_SYS_CHROOT. We also have to fake
- # UID 0 (root) inside the container to avoid permissions errors.
- bwrap --bind ./root / --dev /dev --proc /proc --tmpfs /tmp \
- --ro-bind /etc/resolv.conf /etc/resolv.conf \
- --setenv PATH "/usr/bin:/usr/sbin:/bin:/sbin" \
- --unshare-user --uid 0 --gid 0 \
- --cap-add CAP_SYS_CHROOT \
- /bin/sh -c "$@"
-}
-
-# Enable testing repo for Tiny C Compiler package
-run "echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories"
-
-# Fetch the list of Alpine packages.
-run "apk update"
-
-# There are various random errors from `apk add` to do with ownership, probably
-# because of our hacked up `bwrap` container. The errors seem harmless so I am
-# just ignoring them.
-set +e
-
-# Install stuff needed by all integration tests that compile C code.
-#
-# Note that we use Tiny C Compiler in preference to GCC. There is a huge
-# size difference -- 600KB for TinyCC vs. 50MB to 100MB for GCC. TinyCC
-# supports most of the ISO C99 standard, but has no C++ support at all.
-run "apk add binutils libc-dev make tcc"
-run "ln -s /usr/bin/tcc /usr/bin/cc"
-
-# Install stuff for tests/integration/autotools
-run "apk add autoconf automake"
-
-# Install stuff for tests/integration/cmake
-run "apk add cmake"
-
-# Install stuff for tests/integration/pip
-run "apk add python3"
-
-set -e
-
-# Cleanup the package cache
-run "rm -R /var/cache/apk"
-
-tar -c -v -J -f integration-tests-base.tar.xz -C root .
+bst -o arch "${ARCH:-x86_64}" build base.bst
+# FIXME: This should be replaced with the nice implicit compression
+# resolution that will be introduced with !1451
+bst -o arch "${ARCH:-x86_64}" artifact checkout base.bst --tar integration-tests-base.tar
+xz integration-tests-base.tar
diff --git a/tests/integration/base/project.conf b/tests/integration/base/project.conf
new file mode 100644
index 0000000..9efcdd4
--- /dev/null
+++ b/tests/integration/base/project.conf
@@ -0,0 +1,13 @@
+name: test-base
+element-path: elements
+
+options:
+ arch:
+ type: arch
+ description: Target architecture
+ variable: arch
+ values:
+ - arm
+ - aarch64
+ - i686
+ - x86_64
[buildstream] 05/05: Reword documentation to talk about
freedesktop-sdk, not alpine
Posted by no...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
not-in-ldap pushed a commit to branch tlater/freedesktop
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit bf94f5e86a900a3342cb4fb22f7c5f9af7aeffac
Author: Tristan Maat <tr...@codethink.co.uk>
AuthorDate: Tue Jun 25 13:06:50 2019 +0100
Reword documentation to talk about freedesktop-sdk, not alpine
---
doc/source/advanced-features/junction-elements.rst | 2 ++
doc/source/format_declaring.rst | 2 +-
doc/source/tutorial/autotools.rst | 8 ++---
doc/source/tutorial/integration-commands.rst | 17 +++++-----
doc/source/tutorial/running-commands.rst | 37 +++++++++++++++-------
tests/examples/autotools.py | 2 +-
6 files changed, 43 insertions(+), 25 deletions(-)
diff --git a/doc/source/advanced-features/junction-elements.rst b/doc/source/advanced-features/junction-elements.rst
index b6065d3..aca993f 100644
--- a/doc/source/advanced-features/junction-elements.rst
+++ b/doc/source/advanced-features/junction-elements.rst
@@ -1,5 +1,7 @@
+.. _junction_elements:
+
Junction elements
=================
BuildStream's junction elements are used to import other BuildStream
diff --git a/doc/source/format_declaring.rst b/doc/source/format_declaring.rst
index a389733..afb602d 100644
--- a/doc/source/format_declaring.rst
+++ b/doc/source/format_declaring.rst
@@ -549,7 +549,7 @@ read-only variables are also dynamically declared by BuildStream:
* ``element-name``
- The name of the element being processed (e.g base/alpine.bst).
+ The name of the element being processed (e.g ``base/freedesktop.bst``).
* ``project-name``
diff --git a/doc/source/tutorial/autotools.rst b/doc/source/tutorial/autotools.rst
index ea28358..0fbab8c 100644
--- a/doc/source/tutorial/autotools.rst
+++ b/doc/source/tutorial/autotools.rst
@@ -47,10 +47,10 @@ added another :ref:`source alias <project_source_aliases>` for ``gnu``, the loca
from which we're going to download the ``automake`` tarball.
-``elements/base/alpine.bst`` and ``elements/base.bst``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The alpine base and base stack element are defined in the
-same way as in the last chapter: :ref:`tutorial_running_commands`.
+``elements/base/freedesktop.bst`` and ``elements/base.bst``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The freedesktop base and base stack element are defined in the same
+way as in the last chapter: :ref:`tutorial_running_commands`.
``elements/hello.bst``
diff --git a/doc/source/tutorial/integration-commands.rst b/doc/source/tutorial/integration-commands.rst
index ead5be8..8f0c572 100644
--- a/doc/source/tutorial/integration-commands.rst
+++ b/doc/source/tutorial/integration-commands.rst
@@ -37,13 +37,13 @@ The project.conf and base stack :mod:`stack <elements.stack>` element are config
same way as in the previous chapter: :ref:`tutorial_running_commands`.
-``elements/base/alpine.bst``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+``elements/base/freedesktop.bst``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. literalinclude:: ../../examples/integration-commands/elements/base/alpine.bst
+.. literalinclude:: ../../examples/integration-commands/elements/base/freedesktop.bst
:language: yaml
-This is the same ``base/alpine.bst`` we've seen in previous chapters,
+This is the same ``base/freedesktop.bst`` we've seen in previous chapters,
except that we've added an :ref:`integration command <public_integration>`.
This informs BuildStream that whenever the output of this element is
@@ -91,10 +91,11 @@ following way:
.. raw:: html
:file: ../sessions/integration-commands-build.html
-Observe in the build process above, the integration command declared on the
-``base/alpine.bst`` element is run after staging the dependency artifacts
-into the build sandbox and before running any of the build commands, for
-both of the ``libhello.bst`` and ``hello.bst`` elements.
+Observe in the build process above, the integration command declared
+on the ``base/freedesktop.bst`` element is run after staging the
+dependency artifacts into the build sandbox and before running any of
+the build commands, for both of the ``libhello.bst`` and ``hello.bst``
+elements.
BuildStream assumes that commands which are to be run in the build sandbox
need to be run in an *integrated* sandbox.
diff --git a/doc/source/tutorial/running-commands.rst b/doc/source/tutorial/running-commands.rst
index 1708145..7de6c02 100644
--- a/doc/source/tutorial/running-commands.rst
+++ b/doc/source/tutorial/running-commands.rst
@@ -70,7 +70,7 @@ in detail.
:language: yaml
Our ``project.conf`` is very much like the last one, except that we
-have defined a :ref:`source alias <project_source_aliases>` for ``alpine``.
+have defined a :ref:`source alias <project_source_aliases>` for ``freedesktop``.
.. tip::
@@ -79,19 +79,34 @@ have defined a :ref:`source alias <project_source_aliases>` for ``alpine``.
change the access scheme or URL for a group of repositories which belong together.
-``elements/base/alpine.bst``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+``elements/base/freedesktop.bst``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. literalinclude:: ../../examples/running-commands/elements/base/alpine.bst
+.. literalinclude:: ../../examples/running-commands/elements/base/freedesktop.bst
:language: yaml
-This :mod:`import <elements.import>` element uses a :mod:`tar <sources.tar>`
-source to download our Alpine Linux tarball to create our base runtime.
+This :mod:`import <elements.import>` element uses a :mod:`tar
+<sources.tar>` source to download our freedesktop-sdk Linux tarball to
+create our base runtime.
This tarball is a sysroot which provides the C runtime libraries
and some programs - this is what will be providing the programs we're
going to run in this example.
+.. note::
+
+ The tarball used here is built with BuildStream, it consists of
+ everything included in the BuildStream-facing part of
+ `freedesktop-sdk <https://freedesktop-sdk.io/>`_ (specifically,
+ ``public-stacks/buildsystems.bst``, but don't worry if you don't
+ understand what's going on there yet).
+
+ While we use it as a tarball here, freedesktop-sdk is a BuildStream
+ project, so we could alternatively depend on it as a :ref:`junction
+ element <junction_elements>`, but avoid doing this here to
+ introduce concepts slowly. We do recommend using a junction for
+ more serious projects!
+
``elements/base.bst``
~~~~~~~~~~~~~~~~~~~~~
@@ -100,7 +115,7 @@ going to run in this example.
:language: yaml
This is just a symbolic :mod:`stack <elements.stack>` element which declares that
-anything which depends on it, will implicitly depend on ``base/alpine.bst``.
+anything which depends on it, will implicitly depend on ``base/freedesktop.bst``.
It is typical to use stack elements in places where the implementing logical
software stack could change, but you rather not have your higher level components
@@ -108,7 +123,7 @@ carry knowledge about those changing components.
Any element which :ref:`runtime depends <format_dependencies_types>` on
the ``base.bst`` will now be able to execute programs provided by the imported
-``base/alpine.bst`` runtime.
+``base/freedesktop.bst`` runtime.
``elements/hello.bst``
@@ -171,11 +186,11 @@ following way:
:file: ../sessions/running-commands-build.html
Now we've built our hello world program, using ``make``
-and the C compiler provided by the Alpine Linux image.
+and the C compiler provided by Freedesktop-sdk.
In the :ref:`first chapter <tutorial_first_project>` we observed that the inputs
and output of an element are *directory trees*. In this example, the directory tree
-generated by ``base/alpine.bst`` is consumed by ``hello.bst`` due to the
+generated by ``base/freedesktop.bst`` is consumed by ``hello.bst`` due to the
:ref:`implicit runtime dependency <format_dependencies_types>` introduced by ``base.bst``.
.. tip::
@@ -184,7 +199,7 @@ generated by ``base/alpine.bst`` is consumed by ``hello.bst`` due to the
the sake of a build, are staged at the root of the build sandbox. These comprise the
runtime environment in which the depending element will run commands.
- The result is that the ``make`` program and C compiler provided by ``base/alpine.bst``
+ The result is that the ``make`` program and C compiler provided by ``base/freedesktop.bst``
were already in ``$PATH`` and ready to run when the commands were needed by ``hello.bst``.
Now observe that all of the elements in the loaded pipeline are ``cached``,
diff --git a/tests/examples/autotools.py b/tests/examples/autotools.py
index ca311c4..a4e5b88 100644
--- a/tests/examples/autotools.py
+++ b/tests/examples/autotools.py
@@ -15,7 +15,7 @@ DATA_DIR = os.path.join(
)
-# Tests a build of the autotools amhello project on a alpine-linux base runtime
+# Tests a build of the autotools amhello project on a freedesktop base runtime
@pytest.mark.skipif(MACHINE_ARCH != 'x86-64',
reason='Examples are written for x86-64')
@pytest.mark.skipif(not IS_LINUX or not HAVE_BWRAP, reason='Only available on linux with bubblewrap')
[buildstream] 02/05: tests/integration/*: Adjust tests to use new
base image
Posted by no...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
not-in-ldap pushed a commit to branch tlater/freedesktop
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 4ab04d89ae215b202df48f5ac8c390268c97b69d
Author: Tristan Maat <tr...@codethink.co.uk>
AuthorDate: Fri Jun 21 16:21:02 2019 +0100
tests/integration/*: Adjust tests to use new base image
---
doc/examples/developing/project.conf | 2 +-
doc/examples/integration-commands/project.conf | 2 +-
doc/examples/running-commands/project.conf | 2 +-
tests/integration/pip_element.py | 2 +-
tests/integration/project/elements/base.bst | 2 +-
tests/integration/project/elements/base/base-alpine.bst | 17 -----------------
.../project/elements/base/base-freedesktop.bst | 17 +++++++++++++++++
.../project/elements/sandbox-bwrap/break-shell.bst | 2 +-
.../project/elements/sandbox-bwrap/command-exit-42.bst | 2 +-
tests/integration/project/project.conf | 2 +-
tests/integration/shell.py | 4 ++--
11 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/doc/examples/developing/project.conf b/doc/examples/developing/project.conf
index 1ae2e08..e3dfcef 100644
--- a/doc/examples/developing/project.conf
+++ b/doc/examples/developing/project.conf
@@ -7,6 +7,6 @@ format-version: 9
# Subdirectory where elements are stored
element-path: elements
-# Define an alias for our alpine tarball
+# Define an alias for our freedesktop tarball
aliases:
alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/
diff --git a/doc/examples/integration-commands/project.conf b/doc/examples/integration-commands/project.conf
index 9ae5b2a..9a484de 100644
--- a/doc/examples/integration-commands/project.conf
+++ b/doc/examples/integration-commands/project.conf
@@ -7,6 +7,6 @@ format-version: 9
# Subdirectory where elements are stored
element-path: elements
-# Define an alias for our alpine tarball
+# Define an alias for our freedesktop tarball
aliases:
alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/
diff --git a/doc/examples/running-commands/project.conf b/doc/examples/running-commands/project.conf
index 7127b0d..6c60e39 100644
--- a/doc/examples/running-commands/project.conf
+++ b/doc/examples/running-commands/project.conf
@@ -7,6 +7,6 @@ format-version: 9
# Subdirectory where elements are stored
element-path: elements
-# Define an alias for our alpine tarball
+# Define an alias for our freedesktop tarball
aliases:
alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/
diff --git a/tests/integration/pip_element.py b/tests/integration/pip_element.py
index 91dcaa3..a6fb895 100644
--- a/tests/integration/pip_element.py
+++ b/tests/integration/pip_element.py
@@ -56,7 +56,7 @@ def test_pip_build(cli, datafiles):
assert result.exit_code == 0
assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',
- '/usr/bin/hello', '/usr/lib/python3.6'])
+ '/usr/bin/hello', '/usr/lib/python3.7'])
# Test running an executable built with pip
diff --git a/tests/integration/project/elements/base.bst b/tests/integration/project/elements/base.bst
index 428afa7..91357b5 100644
--- a/tests/integration/project/elements/base.bst
+++ b/tests/integration/project/elements/base.bst
@@ -2,4 +2,4 @@
kind: stack
depends:
- - base/base-alpine.bst
+ - base/base-freedesktop.bst
diff --git a/tests/integration/project/elements/base/base-alpine.bst b/tests/integration/project/elements/base/base-alpine.bst
deleted file mode 100644
index c583309..0000000
--- a/tests/integration/project/elements/base/base-alpine.bst
+++ /dev/null
@@ -1,17 +0,0 @@
-kind: import
-
-description: |
- Alpine Linux base for tests
-
- Generated using the `tests/integration-tests/base/generate-base.sh` script.
-
-sources:
- - kind: tar
- base-dir: ''
- (?):
- - arch == "x86-64":
- ref: 3eb559250ba82b64a68d86d0636a6b127aa5f6d25d3601a79f79214dc9703639
- url: "alpine:integration-tests-base.v1.x86_64.tar.xz"
- - arch == "aarch64":
- ref: 431fb5362032ede6f172e70a3258354a8fd71fcbdeb1edebc0e20968c792329a
- url: "alpine:integration-tests-base.v1.aarch64.tar.xz"
diff --git a/tests/integration/project/elements/base/base-freedesktop.bst b/tests/integration/project/elements/base/base-freedesktop.bst
new file mode 100644
index 0000000..ee7e73b
--- /dev/null
+++ b/tests/integration/project/elements/base/base-freedesktop.bst
@@ -0,0 +1,17 @@
+kind: import
+
+description: |
+ Freedesktop-sdk base for tests
+
+ Generated using the `tests/integration-tests/base/generate-base.sh` script.
+
+sources:
+ - kind: tar
+ base-dir: ''
+ (?):
+ - arch == "x86-64":
+ ref: 5593c0a269291890b466775520e34f90800fc6760abd4ab804a13fe9b824a17c
+ url: "freedesktop:integration-tests-base.v3.x86_64.tar.xz"
+ - arch == "aarch64":
+ ref: 93c62d0d1f400dc37db8ceee122719ffa951d929b7fad684965057ffaeaf2b73
+ url: "freedesktop:integration-tests-base.v3.aarch64.tar.xz"
diff --git a/tests/integration/project/elements/sandbox-bwrap/break-shell.bst b/tests/integration/project/elements/sandbox-bwrap/break-shell.bst
index c93a923..97c8ce6 100644
--- a/tests/integration/project/elements/sandbox-bwrap/break-shell.bst
+++ b/tests/integration/project/elements/sandbox-bwrap/break-shell.bst
@@ -1,6 +1,6 @@
kind: manual
depends:
- - base/base-alpine.bst
+ - base.bst
public:
bst:
diff --git a/tests/integration/project/elements/sandbox-bwrap/command-exit-42.bst b/tests/integration/project/elements/sandbox-bwrap/command-exit-42.bst
index c633334..3f9a0b9 100644
--- a/tests/integration/project/elements/sandbox-bwrap/command-exit-42.bst
+++ b/tests/integration/project/elements/sandbox-bwrap/command-exit-42.bst
@@ -1,6 +1,6 @@
kind: manual
depends:
- - base/base-alpine.bst
+ - base.bst
config:
build-commands:
diff --git a/tests/integration/project/project.conf b/tests/integration/project/project.conf
index ddfe47b..02c817b 100644
--- a/tests/integration/project/project.conf
+++ b/tests/integration/project/project.conf
@@ -2,7 +2,7 @@
name: test
element-path: elements
aliases:
- alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/
+ freedesktop: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/
project_dir: file://{project_dir}
options:
linux:
diff --git a/tests/integration/shell.py b/tests/integration/shell.py
index f7de3e4..330035f 100644
--- a/tests/integration/shell.py
+++ b/tests/integration/shell.py
@@ -325,10 +325,10 @@ def test_workspace_visible(cli, datafiles):
@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
def test_sysroot(cli, tmpdir, datafiles):
project = str(datafiles)
- base_element = "base/base-alpine.bst"
+ base_element = "base.bst"
# test element only needs to be something lightweight for this test
test_element = "script/script.bst"
- checkout_dir = os.path.join(str(tmpdir), 'alpine-sysroot')
+ checkout_dir = os.path.join(str(tmpdir), 'freedesktop-sysroot')
test_file = 'hello'
# Build and check out a sysroot
[buildstream] 04/05: tests/*: Adjust integration tests not in the
integration directory
Posted by no...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
not-in-ldap pushed a commit to branch tlater/freedesktop
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit e7767db61331445e54651ec4da490db70856339a
Author: Tristan Maat <tr...@codethink.co.uk>
AuthorDate: Tue Jun 25 11:50:05 2019 +0100
tests/*: Adjust integration tests not in the integration directory
---
.../testing/_sourcetests/project/elements/base.bst | 2 +-
.../_sourcetests/project/elements/base/base-alpine.bst | 17 -----------------
.../project/elements/base/base-freedesktop.bst | 17 +++++++++++++++++
.../testing/_sourcetests/project/project.conf | 2 +-
tests/remoteexecution/project/elements/base.bst | 2 +-
.../project/elements/base/base-alpine.bst | 17 -----------------
.../project/elements/base/base-freedesktop.bst | 17 +++++++++++++++++
tests/remoteexecution/project/project.conf | 2 +-
.../sources/local/deterministic-umask/elements/base.bst | 2 +-
.../deterministic-umask/elements/base/base-alpine.bst | 17 -----------------
.../elements/base/base-freedesktop.bst | 17 +++++++++++++++++
tests/sources/project/elements/base.bst | 2 +-
tests/sources/project/elements/base/base-alpine.bst | 17 -----------------
.../sources/project/elements/base/base-freedesktop.bst | 17 +++++++++++++++++
14 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/src/buildstream/testing/_sourcetests/project/elements/base.bst b/src/buildstream/testing/_sourcetests/project/elements/base.bst
index 428afa7..91357b5 100644
--- a/src/buildstream/testing/_sourcetests/project/elements/base.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/base.bst
@@ -2,4 +2,4 @@
kind: stack
depends:
- - base/base-alpine.bst
+ - base/base-freedesktop.bst
diff --git a/src/buildstream/testing/_sourcetests/project/elements/base/base-alpine.bst b/src/buildstream/testing/_sourcetests/project/elements/base/base-alpine.bst
deleted file mode 100644
index c583309..0000000
--- a/src/buildstream/testing/_sourcetests/project/elements/base/base-alpine.bst
+++ /dev/null
@@ -1,17 +0,0 @@
-kind: import
-
-description: |
- Alpine Linux base for tests
-
- Generated using the `tests/integration-tests/base/generate-base.sh` script.
-
-sources:
- - kind: tar
- base-dir: ''
- (?):
- - arch == "x86-64":
- ref: 3eb559250ba82b64a68d86d0636a6b127aa5f6d25d3601a79f79214dc9703639
- url: "alpine:integration-tests-base.v1.x86_64.tar.xz"
- - arch == "aarch64":
- ref: 431fb5362032ede6f172e70a3258354a8fd71fcbdeb1edebc0e20968c792329a
- url: "alpine:integration-tests-base.v1.aarch64.tar.xz"
diff --git a/src/buildstream/testing/_sourcetests/project/elements/base/base-freedesktop.bst b/src/buildstream/testing/_sourcetests/project/elements/base/base-freedesktop.bst
new file mode 100644
index 0000000..ee7e73b
--- /dev/null
+++ b/src/buildstream/testing/_sourcetests/project/elements/base/base-freedesktop.bst
@@ -0,0 +1,17 @@
+kind: import
+
+description: |
+ Freedesktop-sdk base for tests
+
+ Generated using the `tests/integration-tests/base/generate-base.sh` script.
+
+sources:
+ - kind: tar
+ base-dir: ''
+ (?):
+ - arch == "x86-64":
+ ref: 5593c0a269291890b466775520e34f90800fc6760abd4ab804a13fe9b824a17c
+ url: "freedesktop:integration-tests-base.v3.x86_64.tar.xz"
+ - arch == "aarch64":
+ ref: 93c62d0d1f400dc37db8ceee122719ffa951d929b7fad684965057ffaeaf2b73
+ url: "freedesktop:integration-tests-base.v3.aarch64.tar.xz"
diff --git a/src/buildstream/testing/_sourcetests/project/project.conf b/src/buildstream/testing/_sourcetests/project/project.conf
index 05b68bf..69c142e 100644
--- a/src/buildstream/testing/_sourcetests/project/project.conf
+++ b/src/buildstream/testing/_sourcetests/project/project.conf
@@ -2,7 +2,7 @@
name: test
element-path: elements
aliases:
- alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/
+ freedesktop: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/
project_dir: file://{project_dir}
options:
linux:
diff --git a/tests/remoteexecution/project/elements/base.bst b/tests/remoteexecution/project/elements/base.bst
index 428afa7..91357b5 100644
--- a/tests/remoteexecution/project/elements/base.bst
+++ b/tests/remoteexecution/project/elements/base.bst
@@ -2,4 +2,4 @@
kind: stack
depends:
- - base/base-alpine.bst
+ - base/base-freedesktop.bst
diff --git a/tests/remoteexecution/project/elements/base/base-alpine.bst b/tests/remoteexecution/project/elements/base/base-alpine.bst
deleted file mode 100644
index c583309..0000000
--- a/tests/remoteexecution/project/elements/base/base-alpine.bst
+++ /dev/null
@@ -1,17 +0,0 @@
-kind: import
-
-description: |
- Alpine Linux base for tests
-
- Generated using the `tests/integration-tests/base/generate-base.sh` script.
-
-sources:
- - kind: tar
- base-dir: ''
- (?):
- - arch == "x86-64":
- ref: 3eb559250ba82b64a68d86d0636a6b127aa5f6d25d3601a79f79214dc9703639
- url: "alpine:integration-tests-base.v1.x86_64.tar.xz"
- - arch == "aarch64":
- ref: 431fb5362032ede6f172e70a3258354a8fd71fcbdeb1edebc0e20968c792329a
- url: "alpine:integration-tests-base.v1.aarch64.tar.xz"
diff --git a/tests/remoteexecution/project/elements/base/base-freedesktop.bst b/tests/remoteexecution/project/elements/base/base-freedesktop.bst
new file mode 100644
index 0000000..ee7e73b
--- /dev/null
+++ b/tests/remoteexecution/project/elements/base/base-freedesktop.bst
@@ -0,0 +1,17 @@
+kind: import
+
+description: |
+ Freedesktop-sdk base for tests
+
+ Generated using the `tests/integration-tests/base/generate-base.sh` script.
+
+sources:
+ - kind: tar
+ base-dir: ''
+ (?):
+ - arch == "x86-64":
+ ref: 5593c0a269291890b466775520e34f90800fc6760abd4ab804a13fe9b824a17c
+ url: "freedesktop:integration-tests-base.v3.x86_64.tar.xz"
+ - arch == "aarch64":
+ ref: 93c62d0d1f400dc37db8ceee122719ffa951d929b7fad684965057ffaeaf2b73
+ url: "freedesktop:integration-tests-base.v3.aarch64.tar.xz"
diff --git a/tests/remoteexecution/project/project.conf b/tests/remoteexecution/project/project.conf
index ddfe47b..02c817b 100644
--- a/tests/remoteexecution/project/project.conf
+++ b/tests/remoteexecution/project/project.conf
@@ -2,7 +2,7 @@
name: test
element-path: elements
aliases:
- alpine: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/
+ freedesktop: https://bst-integration-test-images.ams3.cdn.digitaloceanspaces.com/
project_dir: file://{project_dir}
options:
linux:
diff --git a/tests/sources/local/deterministic-umask/elements/base.bst b/tests/sources/local/deterministic-umask/elements/base.bst
index 428afa7..91357b5 100644
--- a/tests/sources/local/deterministic-umask/elements/base.bst
+++ b/tests/sources/local/deterministic-umask/elements/base.bst
@@ -2,4 +2,4 @@
kind: stack
depends:
- - base/base-alpine.bst
+ - base/base-freedesktop.bst
diff --git a/tests/sources/local/deterministic-umask/elements/base/base-alpine.bst b/tests/sources/local/deterministic-umask/elements/base/base-alpine.bst
deleted file mode 100644
index c583309..0000000
--- a/tests/sources/local/deterministic-umask/elements/base/base-alpine.bst
+++ /dev/null
@@ -1,17 +0,0 @@
-kind: import
-
-description: |
- Alpine Linux base for tests
-
- Generated using the `tests/integration-tests/base/generate-base.sh` script.
-
-sources:
- - kind: tar
- base-dir: ''
- (?):
- - arch == "x86-64":
- ref: 3eb559250ba82b64a68d86d0636a6b127aa5f6d25d3601a79f79214dc9703639
- url: "alpine:integration-tests-base.v1.x86_64.tar.xz"
- - arch == "aarch64":
- ref: 431fb5362032ede6f172e70a3258354a8fd71fcbdeb1edebc0e20968c792329a
- url: "alpine:integration-tests-base.v1.aarch64.tar.xz"
diff --git a/tests/sources/local/deterministic-umask/elements/base/base-freedesktop.bst b/tests/sources/local/deterministic-umask/elements/base/base-freedesktop.bst
new file mode 100644
index 0000000..ee7e73b
--- /dev/null
+++ b/tests/sources/local/deterministic-umask/elements/base/base-freedesktop.bst
@@ -0,0 +1,17 @@
+kind: import
+
+description: |
+ Freedesktop-sdk base for tests
+
+ Generated using the `tests/integration-tests/base/generate-base.sh` script.
+
+sources:
+ - kind: tar
+ base-dir: ''
+ (?):
+ - arch == "x86-64":
+ ref: 5593c0a269291890b466775520e34f90800fc6760abd4ab804a13fe9b824a17c
+ url: "freedesktop:integration-tests-base.v3.x86_64.tar.xz"
+ - arch == "aarch64":
+ ref: 93c62d0d1f400dc37db8ceee122719ffa951d929b7fad684965057ffaeaf2b73
+ url: "freedesktop:integration-tests-base.v3.aarch64.tar.xz"
diff --git a/tests/sources/project/elements/base.bst b/tests/sources/project/elements/base.bst
index 428afa7..91357b5 100644
--- a/tests/sources/project/elements/base.bst
+++ b/tests/sources/project/elements/base.bst
@@ -2,4 +2,4 @@
kind: stack
depends:
- - base/base-alpine.bst
+ - base/base-freedesktop.bst
diff --git a/tests/sources/project/elements/base/base-alpine.bst b/tests/sources/project/elements/base/base-alpine.bst
deleted file mode 100644
index c583309..0000000
--- a/tests/sources/project/elements/base/base-alpine.bst
+++ /dev/null
@@ -1,17 +0,0 @@
-kind: import
-
-description: |
- Alpine Linux base for tests
-
- Generated using the `tests/integration-tests/base/generate-base.sh` script.
-
-sources:
- - kind: tar
- base-dir: ''
- (?):
- - arch == "x86-64":
- ref: 3eb559250ba82b64a68d86d0636a6b127aa5f6d25d3601a79f79214dc9703639
- url: "alpine:integration-tests-base.v1.x86_64.tar.xz"
- - arch == "aarch64":
- ref: 431fb5362032ede6f172e70a3258354a8fd71fcbdeb1edebc0e20968c792329a
- url: "alpine:integration-tests-base.v1.aarch64.tar.xz"
diff --git a/tests/sources/project/elements/base/base-freedesktop.bst b/tests/sources/project/elements/base/base-freedesktop.bst
new file mode 100644
index 0000000..ee7e73b
--- /dev/null
+++ b/tests/sources/project/elements/base/base-freedesktop.bst
@@ -0,0 +1,17 @@
+kind: import
+
+description: |
+ Freedesktop-sdk base for tests
+
+ Generated using the `tests/integration-tests/base/generate-base.sh` script.
+
+sources:
+ - kind: tar
+ base-dir: ''
+ (?):
+ - arch == "x86-64":
+ ref: 5593c0a269291890b466775520e34f90800fc6760abd4ab804a13fe9b824a17c
+ url: "freedesktop:integration-tests-base.v3.x86_64.tar.xz"
+ - arch == "aarch64":
+ ref: 93c62d0d1f400dc37db8ceee122719ffa951d929b7fad684965057ffaeaf2b73
+ url: "freedesktop:integration-tests-base.v3.aarch64.tar.xz"