aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrangé <berrange@redhat.com>2024-03-19 14:56:34 +0000
committerDaniel P. Berrangé <berrange@redhat.com>2024-03-19 15:02:21 +0000
commitaad91c579f8f3df0d0c0706c2bcdf0df1196bf5b (patch)
treec000217bb277e435e67fe034b6b98c060b1f5169
parent55105cc0692fec14f8a7f6ddb49bbb14b5dbbe63 (diff)
downloadlibvirt-ci-aad91c579f8f3df0d0c0706c2bcdf0df1196bf5b.zip
libvirt-ci-aad91c579f8f3df0d0c0706c2bcdf0df1196bf5b.tar.gz
libvirt-ci-aad91c579f8f3df0d0c0706c2bcdf0df1196bf5b.tar.bz2
facts: add mapping for rust std library
This allows for installing non-native arch builds of the std library for cross-compiling Rust code on Debian. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-rw-r--r--lcitool/facts/mappings.yml9
-rw-r--r--tests/data/packages/in/packages.yml1
-rw-r--r--tests/data/packages/out/almalinux-8.yml1
-rw-r--r--tests/data/packages/out/almalinux-9.yml1
-rw-r--r--tests/data/packages/out/centos-stream-8.yml1
-rw-r--r--tests/data/packages/out/centos-stream-9.yml1
-rw-r--r--tests/data/packages/out/debian-11.yml1
-rw-r--r--tests/data/packages/out/debian-12-cross-s390x.yml1
-rw-r--r--tests/data/packages/out/debian-12.yml1
-rw-r--r--tests/data/packages/out/debian-sid.yml1
-rw-r--r--tests/data/packages/out/fedora-38.yml1
-rw-r--r--tests/data/packages/out/fedora-39.yml1
-rw-r--r--tests/data/packages/out/fedora-rawhide.yml1
-rw-r--r--tests/data/packages/out/ubuntu-2004.yml1
-rw-r--r--tests/data/packages/out/ubuntu-2204.yml1
15 files changed, 23 insertions, 0 deletions
diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml
index 0a2db98..659c483 100644
--- a/lcitool/facts/mappings.yml
+++ b/lcitool/facts/mappings.yml
@@ -1901,6 +1901,15 @@ mappings:
default: rust
deb: rustc
+ rust-std:
+ apk: rust
+ deb: libstd-rust-dev
+ pkg: rust
+ rpm: rust-std-static
+ MacOS: rust
+ OpenSUSE: rust
+ cross-policy-default: foreign
+
sanlock:
deb: libsanlock-dev
rpm: sanlock-devel
diff --git a/tests/data/packages/in/packages.yml b/tests/data/packages/in/packages.yml
index 91a25de..7765242 100644
--- a/tests/data/packages/in/packages.yml
+++ b/tests/data/packages/in/packages.yml
@@ -280,6 +280,7 @@ packages:
- rpmbuild
- ruby
- rust
+- rust-std
- sanlock
- screen
- scrub
diff --git a/tests/data/packages/out/almalinux-8.yml b/tests/data/packages/out/almalinux-8.yml
index 871843a..f778aa3 100644
--- a/tests/data/packages/out/almalinux-8.yml
+++ b/tests/data/packages/out/almalinux-8.yml
@@ -240,6 +240,7 @@ native:
- ruby-devel
- rubygem-rake
- rust
+- rust-std-static
- sanlock-devel
- screen
- scrub
diff --git a/tests/data/packages/out/almalinux-9.yml b/tests/data/packages/out/almalinux-9.yml
index c7675f2..7f7e80f 100644
--- a/tests/data/packages/out/almalinux-9.yml
+++ b/tests/data/packages/out/almalinux-9.yml
@@ -231,6 +231,7 @@ native:
- ruby-devel
- rubygem-rake
- rust
+- rust-std-static
- sanlock-devel
- screen
- scrub
diff --git a/tests/data/packages/out/centos-stream-8.yml b/tests/data/packages/out/centos-stream-8.yml
index 464fdbf..34f5de3 100644
--- a/tests/data/packages/out/centos-stream-8.yml
+++ b/tests/data/packages/out/centos-stream-8.yml
@@ -239,6 +239,7 @@ native:
- ruby-devel
- rubygem-rake
- rust
+- rust-std-static
- sanlock-devel
- screen
- scrub
diff --git a/tests/data/packages/out/centos-stream-9.yml b/tests/data/packages/out/centos-stream-9.yml
index c7675f2..7f7e80f 100644
--- a/tests/data/packages/out/centos-stream-9.yml
+++ b/tests/data/packages/out/centos-stream-9.yml
@@ -231,6 +231,7 @@ native:
- ruby-devel
- rubygem-rake
- rust
+- rust-std-static
- sanlock-devel
- screen
- scrub
diff --git a/tests/data/packages/out/debian-11.yml b/tests/data/packages/out/debian-11.yml
index 7eec751..e9ccc6c 100644
--- a/tests/data/packages/out/debian-11.yml
+++ b/tests/data/packages/out/debian-11.yml
@@ -165,6 +165,7 @@ native:
- libspice-server-dev
- libssh-gcrypt-dev
- libssh2-1-dev
+- libstd-rust-dev
- libsub-uplevel-perl
- libsystemd-dev
- libtap-formatter-html-perl
diff --git a/tests/data/packages/out/debian-12-cross-s390x.yml b/tests/data/packages/out/debian-12-cross-s390x.yml
index 587da52..16c9b76 100644
--- a/tests/data/packages/out/debian-12-cross-s390x.yml
+++ b/tests/data/packages/out/debian-12-cross-s390x.yml
@@ -78,6 +78,7 @@ cross:
- libspice-client-gtk-3.0-dev:s390x
- libssh-gcrypt-dev:s390x
- libssh2-1-dev:s390x
+- libstd-rust-dev:s390x
- libsystemd-dev:s390x
- libtasn1-6-dev:s390x
- libtirpc-dev:s390x
diff --git a/tests/data/packages/out/debian-12.yml b/tests/data/packages/out/debian-12.yml
index 83c5500..550ed48 100644
--- a/tests/data/packages/out/debian-12.yml
+++ b/tests/data/packages/out/debian-12.yml
@@ -165,6 +165,7 @@ native:
- libspice-server-dev
- libssh-gcrypt-dev
- libssh2-1-dev
+- libstd-rust-dev
- libsub-uplevel-perl
- libsystemd-dev
- libtap-formatter-html-perl
diff --git a/tests/data/packages/out/debian-sid.yml b/tests/data/packages/out/debian-sid.yml
index 83c5500..550ed48 100644
--- a/tests/data/packages/out/debian-sid.yml
+++ b/tests/data/packages/out/debian-sid.yml
@@ -165,6 +165,7 @@ native:
- libspice-server-dev
- libssh-gcrypt-dev
- libssh2-1-dev
+- libstd-rust-dev
- libsub-uplevel-perl
- libsystemd-dev
- libtap-formatter-html-perl
diff --git a/tests/data/packages/out/fedora-38.yml b/tests/data/packages/out/fedora-38.yml
index 943d48f..4215c5e 100644
--- a/tests/data/packages/out/fedora-38.yml
+++ b/tests/data/packages/out/fedora-38.yml
@@ -255,6 +255,7 @@ native:
- ruby-devel
- rubygem-rake
- rust
+- rust-std-static
- sanlock-devel
- screen
- scrub
diff --git a/tests/data/packages/out/fedora-39.yml b/tests/data/packages/out/fedora-39.yml
index 943d48f..4215c5e 100644
--- a/tests/data/packages/out/fedora-39.yml
+++ b/tests/data/packages/out/fedora-39.yml
@@ -255,6 +255,7 @@ native:
- ruby-devel
- rubygem-rake
- rust
+- rust-std-static
- sanlock-devel
- screen
- scrub
diff --git a/tests/data/packages/out/fedora-rawhide.yml b/tests/data/packages/out/fedora-rawhide.yml
index ddfd0b6..f47c5f7 100644
--- a/tests/data/packages/out/fedora-rawhide.yml
+++ b/tests/data/packages/out/fedora-rawhide.yml
@@ -255,6 +255,7 @@ native:
- ruby-devel
- rubygem-rake
- rust
+- rust-std-static
- sanlock-devel
- screen
- scrub
diff --git a/tests/data/packages/out/ubuntu-2004.yml b/tests/data/packages/out/ubuntu-2004.yml
index 78f57c0..5955a63 100644
--- a/tests/data/packages/out/ubuntu-2004.yml
+++ b/tests/data/packages/out/ubuntu-2004.yml
@@ -163,6 +163,7 @@ native:
- libspice-server-dev
- libssh-dev
- libssh2-1-dev
+- libstd-rust-dev
- libsub-uplevel-perl
- libsystemd-dev
- libtap-formatter-html-perl
diff --git a/tests/data/packages/out/ubuntu-2204.yml b/tests/data/packages/out/ubuntu-2204.yml
index 5f5bbd0..6da148c 100644
--- a/tests/data/packages/out/ubuntu-2204.yml
+++ b/tests/data/packages/out/ubuntu-2204.yml
@@ -165,6 +165,7 @@ native:
- libspice-server-dev
- libssh-dev
- libssh2-1-dev
+- libstd-rust-dev
- libsub-uplevel-perl
- libsystemd-dev
- libtap-formatter-html-perl