diff options
| author | Javier Jardón <jjardon@gnome.org> | 2019-11-19 22:00:33 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2019-11-19 22:00:33 +0000 |
| commit | 9bf0eae1cb887f1bb214b72e11f1212b6a8bc2c4 (patch) | |
| tree | 0d93a0366a963d9e05cdc03d527e6394d2229b2d | |
| parent | 497ded27a786283ea7939a76891d131de0be5375 (diff) | |
| parent | a573cce33c90cafb029e1d782af112e7a99bcfdd (diff) | |
| download | buildstream-9bf0eae1cb887f1bb214b72e11f1212b6a8bc2c4.tar.gz | |
Merge branch 'abderrahim/no-sdk-gnome-org-2' into 'master'
doc/examples/flatpak-autotools: remove references to sdk.gnome.org
Closes #690
See merge request BuildStream/buildstream!1719
| -rw-r--r-- | doc/examples/flatpak-autotools/elements/base/sdk.bst | 12 | ||||
| -rw-r--r-- | doc/examples/flatpak-autotools/keys/flathub.gpg | bin | 0 -> 2844 bytes | |||
| -rw-r--r-- | doc/examples/flatpak-autotools/keys/gnome-sdk.gpg | bin | 629 -> 0 bytes | |||
| -rw-r--r-- | doc/examples/flatpak-autotools/project.conf | 2 | ||||
| -rw-r--r-- | doc/source/examples/flatpak-autotools.rst | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/doc/examples/flatpak-autotools/elements/base/sdk.bst b/doc/examples/flatpak-autotools/elements/base/sdk.bst index 97089b83b..7d99aaba1 100644 --- a/doc/examples/flatpak-autotools/elements/base/sdk.bst +++ b/doc/examples/flatpak-autotools/elements/base/sdk.bst @@ -2,15 +2,15 @@ kind: import description: Import the base freedesktop SDK sources: - kind: ostree - url: gnomesdk:repo/ - gpg-key: keys/gnome-sdk.gpg + url: flathub:repo/ + gpg-key: keys/flathub.gpg (?): - arch == "x86-64": - track: runtime/org.freedesktop.BaseSdk/x86_64/1.4 - ref: 0d9d255d56b08aeaaffb1c820eef85266eb730cb5667e50681185ccf5cd7c882 + track: runtime/org.freedesktop.BaseSdk/x86_64/1.6 + ref: 7306169ea9c563f3ce75bb57be9e94b0acf1d742edacab0aa751cf6646a4b52e - arch == "x86-32": - track: runtime/org.freedesktop.BaseSdk/i386/1.4 - ref: 16036b747c1ec8e7fe291f5b1f667cb942f0267d08fcad962e9b7627d6cf1981 + track: runtime/org.freedesktop.BaseSdk/i386/1.6 + ref: 63f9537eea89448ec865f907a3ec89b261493b3d999121a81603c827b6219d20 config: source: files target: usr diff --git a/doc/examples/flatpak-autotools/keys/flathub.gpg b/doc/examples/flatpak-autotools/keys/flathub.gpg Binary files differnew file mode 100644 index 000000000..79880f65b --- /dev/null +++ b/doc/examples/flatpak-autotools/keys/flathub.gpg diff --git a/doc/examples/flatpak-autotools/keys/gnome-sdk.gpg b/doc/examples/flatpak-autotools/keys/gnome-sdk.gpg Binary files differdeleted file mode 100644 index 8434b686c..000000000 --- a/doc/examples/flatpak-autotools/keys/gnome-sdk.gpg +++ /dev/null diff --git a/doc/examples/flatpak-autotools/project.conf b/doc/examples/flatpak-autotools/project.conf index 73197b9ec..1318014f9 100644 --- a/doc/examples/flatpak-autotools/project.conf +++ b/doc/examples/flatpak-autotools/project.conf @@ -1,7 +1,7 @@ name: flatpak-autotools aliases: - gnomesdk: https://sdk.gnome.org/ + flathub: https://dl.flathub.org/ element-path: elements diff --git a/doc/source/examples/flatpak-autotools.rst b/doc/source/examples/flatpak-autotools.rst index e7039affb..bfafb2b12 100644 --- a/doc/source/examples/flatpak-autotools.rst +++ b/doc/source/examples/flatpak-autotools.rst @@ -31,7 +31,7 @@ architecture. For this example we only support the ``i386`` and ``x86_64`` architectures. Note that we've added a :ref:`source alias <project_source_aliases>` for -the ``https://sdk.gnome.org/`` repository to download the SDK from. +the ``https://dl.flathuhb.org/`` repository to download the SDK from. ``elements/base/sdk.bst`` |