[gnome-build-meta/valentindavid/riscv64: 4/5] freedesktop-sdk.bst: Update to master
- From: Valentin David <valentindavid src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/valentindavid/riscv64: 4/5] freedesktop-sdk.bst: Update to master
- Date: Wed, 21 Apr 2021 17:38:24 +0000 (UTC)
commit 835351fd2cf11f0d61c51eebb309fa99f5f4b0dd
Author: Valentin David <valentin david codethink co uk>
Date: Wed Apr 21 19:16:15 2021 +0200
freedesktop-sdk.bst: Update to master
elements/core-deps/cvt.bst | 38 +++++++++++++++++++++++++++++++++++++
elements/core-deps/slirp-helper.bst | 5 +----
elements/core/gnome-tour.bst | 4 +---
elements/core/mutter.bst | 3 ++-
elements/freedesktop-sdk.bst | 4 ++--
elements/iso/initramfs.bst | 8 +++++---
elements/sdk-platform.bst | 6 +++---
elements/sdk.bst | 2 +-
elements/sdk/gst-plugins-bad.bst | 2 +-
elements/sdk/gtk.bst | 3 +++
elements/sdk/librsvg.bst | 4 +---
elements/sdk/libsecret.bst | 2 +-
elements/vm/initramfs.bst | 6 +++++-
junction.refs | 2 +-
project.conf | 6 +++---
15 files changed, 68 insertions(+), 27 deletions(-)
---
diff --git a/elements/core-deps/cvt.bst b/elements/core-deps/cvt.bst
new file mode 100644
index 00000000..f94c02f2
--- /dev/null
+++ b/elements/core-deps/cvt.bst
@@ -0,0 +1,38 @@
+kind: autotools
+
+build-depends:
+- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+- freedesktop-sdk.bst:components/xorg-lib-x11.bst
+- freedesktop-sdk.bst:components/xorg-lib-xkbfile.bst
+- freedesktop-sdk.bst:components/xorg-lib-xfont2.bst
+
+depends:
+- freedesktop-sdk.bst:components/pixman.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+
+variables:
+ conf-local: >-
+ --disable-xvfb
+ --disable-xnest
+ --disable-xwin
+ --disable-libdrm
+ --disable-glamor
+ --disable-dri
+ --disable-dri2
+ --disable-dri3
+ --disable-glx
+ --disable-pciaccess
+ --disable-int10-module
+
+config:
+ build-commands:
+ - |
+ make -C 'hw/xfree86/modes'
+
+ install-commands:
+ - |
+ make -j1 -C 'hw/xfree86/utils/cvt' install-binPROGRAMS DESTDIR='%{install-root}'
+
+sources:
+- kind: tar
+ url: https://www.x.org/archive/individual/xserver/xorg-server-1.20.11.tar.bz2
diff --git a/elements/core-deps/slirp-helper.bst b/elements/core-deps/slirp-helper.bst
index c53cd182..6d93de1a 100644
--- a/elements/core-deps/slirp-helper.bst
+++ b/elements/core-deps/slirp-helper.bst
@@ -1,7 +1,7 @@
kind: manual
build-depends:
-- freedesktop-sdk.bst:extensions/rust/rust.bst
+- freedesktop-sdk.bst:components/rust.bst
- freedesktop-sdk.bst:components/libffi.bst
- freedesktop-sdk.bst:components/pkg-config.bst
@@ -10,9 +10,6 @@ depends:
- freedesktop-sdk.bst:components/dbus.bst
- freedesktop-sdk.bst:bootstrap-import.bst
-environment:
- PATH: /usr/bin:/usr/lib/sdk/rust/bin
-
sources:
- kind: tar
url: https://static.crates.io/crates/libslirp/libslirp-4.3.0.crate
diff --git a/elements/core/gnome-tour.bst b/elements/core/gnome-tour.bst
index 29c7ecc2..67da6e24 100644
--- a/elements/core/gnome-tour.bst
+++ b/elements/core/gnome-tour.bst
@@ -5,12 +5,10 @@ sources:
track: master
- kind: cargo
build-depends:
-- freedesktop-sdk.bst:extensions/rust/rust.bst
+- freedesktop-sdk.bst:components/rust.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
- sdk/adwaita-icon-theme.bst
- sdk/gtk+-3.bst
- sdk/libhandy.bst
- freedesktop-sdk.bst:bootstrap-import.bst
-environment:
- PATH: /usr/bin:/usr/lib/sdk/rust/bin
diff --git a/elements/core/mutter.bst b/elements/core/mutter.bst
index cc883002..0e5778f0 100644
--- a/elements/core/mutter.bst
+++ b/elements/core/mutter.bst
@@ -6,6 +6,7 @@ sources:
track: master
build-depends:
+- core-deps/cvt.bst
- core/sysprof.bst
- sdk/gtk-doc.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
@@ -35,7 +36,7 @@ depends:
- freedesktop-sdk.bst:components/wayland.bst
- freedesktop-sdk.bst:components/xorg-lib-xcursor.bst
- freedesktop-sdk.bst:components/xorg-lib-xtst.bst
-- freedesktop-sdk.bst:components/xorg-server.bst
+- freedesktop-sdk.bst:components/xwayland.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index 0b14f9e1..e696d243 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -2,8 +2,8 @@ kind: junction
sources:
- kind: git_tag
url: https://gitlab.com/freedesktop-sdk/freedesktop-sdk.git
- track: release/20.08
- track-tags: true
+ track: master
+ track-tags: false
config:
options:
target_arch: '%{arch}'
diff --git a/elements/iso/initramfs.bst b/elements/iso/initramfs.bst
index cb18f242..4de2898a 100644
--- a/elements/iso/initramfs.bst
+++ b/elements/iso/initramfs.bst
@@ -8,13 +8,15 @@ build-depends:
variables:
uuidnamespace: aea54278-2587-4075-ae67-8688ace4ce3d
install-root: /boot
-
+ image-name: vmlinuz
efi-arch: "%{arch}"
(?):
- arch == "x86_64":
efi-arch: x64
- arch == "i686":
efi-arch: ia32
+ - arch in ["aarch64"]:
+ image-name: Image
config:
layout:
@@ -42,7 +44,7 @@ config:
- |
dracut -v --uefi \
--uefi-stub /usr/lib/systemd/boot/efi/linux%{efi-arch}.efi.stub \
- --kernel-image "/boot/vmlinuz" \
+ --kernel-image "/boot/%{image-name}" \
--no-machineid \
--kver "$(ls -1 /usr/lib/modules | head -n1)" \
--kernel-cmdline 'rw quiet splash root=live:LABEL=%{installer-volume-id}' \
@@ -69,6 +71,6 @@ config:
EOF
- |
- rm -f /boot/vmlinuz
+ rm -f /boot/%{image-name}
rm -f /boot/System.map
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index 28ccecc4..28f8f31f 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -41,7 +41,6 @@ depends:
- sdk/libwpe.bst
- sdk/pango.bst
- sdk/pinentry.bst
-- sdk/pipewire-libjack.bst
- sdk/pipewire.bst
- sdk/pygobject.bst
- sdk/tracker.bst
@@ -114,7 +113,6 @@ depends:
- freedesktop-sdk.bst:components/libarchive.bst
- freedesktop-sdk.bst:components/libassuan.bst
- freedesktop-sdk.bst:components/libcap.bst
-- freedesktop-sdk.bst:components/libclc.bst
- freedesktop-sdk.bst:components/libdatrie.bst
- freedesktop-sdk.bst:components/libdbus.bst
- freedesktop-sdk.bst:components/libdrm.bst
@@ -196,7 +194,9 @@ depends:
- freedesktop-sdk.bst:components/unzip.bst
- freedesktop-sdk.bst:components/util-linux.bst
- freedesktop-sdk.bst:components/v4l-utils.bst
-- freedesktop-sdk.bst:components/vulkan.bst
+- freedesktop-sdk.bst:components/vulkan-headers.bst
+- freedesktop-sdk.bst:components/vulkan-icd-loader.bst
+- freedesktop-sdk.bst:components/vulkan-validation-layers.bst
- freedesktop-sdk.bst:components/wayland.bst
- freedesktop-sdk.bst:components/webrtc-audio-processing.bst
- freedesktop-sdk.bst:components/wget.bst
diff --git a/elements/sdk.bst b/elements/sdk.bst
index 42fc22e7..51c5b864 100644
--- a/elements/sdk.bst
+++ b/elements/sdk.bst
@@ -49,7 +49,7 @@ depends:
- freedesktop-sdk.bst:components/spirv-tools.bst
- freedesktop-sdk.bst:components/strace.bst
- freedesktop-sdk.bst:components/texinfo.bst
-- freedesktop-sdk.bst:components/valgrind.bst
+- freedesktop-sdk.bst:components/valgrind-maybe.bst
- freedesktop-sdk.bst:components/desktop-file-utils.bst
- freedesktop-sdk.bst:components/itstool.bst
- freedesktop-sdk.bst:components/jq.bst
diff --git a/elements/sdk/gst-plugins-bad.bst b/elements/sdk/gst-plugins-bad.bst
index 5d5beb21..de26db1d 100644
--- a/elements/sdk/gst-plugins-bad.bst
+++ b/elements/sdk/gst-plugins-bad.bst
@@ -21,7 +21,7 @@ runtime-depends:
- freedesktop-sdk.bst:components/openal.bst
- freedesktop-sdk.bst:components/orc.bst
- freedesktop-sdk.bst:components/sndfile.bst
-- freedesktop-sdk.bst:components/vulkan.bst
+- freedesktop-sdk.bst:components/vulkan-headers.bst
- freedesktop-sdk.bst:components/wayland.bst
- freedesktop-sdk.bst:components/webrtc-audio-processing.bst
- freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/sdk/gtk.bst b/elements/sdk/gtk.bst
index 6733837a..7d39d291 100644
--- a/elements/sdk/gtk.bst
+++ b/elements/sdk/gtk.bst
@@ -9,6 +9,7 @@ build-depends:
- sdk-deps/sassc.bst
- sdk/gobject-introspection.bst
- sdk/gtk-doc.bst
+- freedesktop-sdk.bst:components/vulkan-headers.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
@@ -26,6 +27,8 @@ depends:
- freedesktop-sdk.bst:components/hicolor-icon-theme.bst
- freedesktop-sdk.bst:components/libepoxy.bst
- freedesktop-sdk.bst:components/libxkbcommon.bst
+- freedesktop-sdk.bst:components/vulkan-icd-loader.bst
+- freedesktop-sdk.bst:components/vulkan-validation-layers.bst
- freedesktop-sdk.bst:components/wayland-protocols.bst
- freedesktop-sdk.bst:components/wayland.bst
- freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/sdk/librsvg.bst b/elements/sdk/librsvg.bst
index d8ab7b31..06199932 100644
--- a/elements/sdk/librsvg.bst
+++ b/elements/sdk/librsvg.bst
@@ -8,7 +8,7 @@ build-depends:
- sdk/gobject-introspection.bst
- sdk/gtk-doc.bst
- sdk/vala.bst
-- freedesktop-sdk.bst:extensions/rust/rust.bst
+- freedesktop-sdk.bst:components/rust.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
depends:
- sdk/gdk-pixbuf.bst
@@ -20,8 +20,6 @@ variables:
conf-local: >-
--disable-gtk-doc
--enable-vala
-environment:
- PATH: /usr/bin:/usr/lib/sdk/rust/bin
public:
bst:
split-rules:
diff --git a/elements/sdk/libsecret.bst b/elements/sdk/libsecret.bst
index 7e5ee804..0d6a4cef 100644
--- a/elements/sdk/libsecret.bst
+++ b/elements/sdk/libsecret.bst
@@ -7,7 +7,7 @@ build-depends:
- sdk/gobject-introspection.bst
- sdk/gtk-doc.bst
- sdk/vala.bst
-- freedesktop-sdk.bst:components/valgrind.bst
+- freedesktop-sdk.bst:components/valgrind-maybe.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
- sdk/glib.bst
diff --git a/elements/vm/initramfs.bst b/elements/vm/initramfs.bst
index dc824668..f5875291 100644
--- a/elements/vm/initramfs.bst
+++ b/elements/vm/initramfs.bst
@@ -7,6 +7,10 @@ build-depends:
variables:
uuidnamespace: aea54278-2587-4075-ae67-8688ace4ce3d
+ image-name: vmlinuz
+ (?):
+ - arch in ["aarch64"]:
+ image-name: Image
config:
layout:
@@ -49,7 +53,7 @@ config:
- |
version="$(ls -1 /lib/modules | head -n1)"
- cp /boot/vmlinuz "%{install-root}/usr/lib/modules/${version}/vmlinuz"
+ cp /boot/%{image-name} "%{install-root}/usr/lib/modules/${version}/vmlinuz"
- dbus-uuidgen >/etc/machine-id
- SYSTEMD_RELAX_ESP_CHECKS=1 bootctl --path='/efi' --no-variables install
diff --git a/junction.refs b/junction.refs
index bfed846f..aeab334b 100644
--- a/junction.refs
+++ b/junction.refs
@@ -1,6 +1,6 @@
projects:
gnome:
freedesktop-sdk.bst:
- - ref: freedesktop-sdk-20.08.8-0-gfbcc9f667d93cb5f106e1bd3ed535f6d0c88f76a
+ - ref: freedesktop-sdk-20.08rc.1-998-g284322ec6c070c37a1227e66d2f88ae94cdf49a5
openh264-extension.bst:
- ref: openh264-2.0.0-4-0-g7191bc88fbeed3ac842543706f856cb6dde99bc9
diff --git a/project.conf b/project.conf
index 035e6263..547cf01c 100644
--- a/project.conf
+++ b/project.conf
@@ -17,6 +17,9 @@ artifacts:
fatal-warnings:
- overlaps
+(@):
+- freedesktop-sdk.bst:include/strip.yml
+
# Options to specify for the project, these provide
# command line switches which control the behavior of
# conditional directives in the element.bst files.
@@ -317,9 +320,6 @@ variables:
- arch == "ppc64le":
gcc_arch: "powerpc64le"
- (@):
- - freedesktop-sdk.bst:include/strip.yml
-
plugins:
- origin: pip
package-name: buildstream-external
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]