9:53 a.m.
All the -dev packages in Debian should use the foreign arch when setting
up cross-builds, rather than than native arch package.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
guests/vars/mappings.yml | 58 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 57 insertions(+), 1 deletion(-)
diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml
index d7f2b28..0e69bb2 100644
--- a/guests/vars/mappings.yml
+++ b/guests/vars/mappings.yml
@@ -58,7 +58,7 @@
# x86_64-deb: libxen-dev
# x86_64-Fedora: xen-devel
#
-# In parallel with this 'cross-arch-XXX:' entries can used to set the
+# In parallel with this 'cross-policy-XXX:' entries can used to set the
# installation policy when setting up a cross-architecture build env,
# taking one of the values:
#
@@ -70,6 +70,7 @@ mappings:
apparmor:
deb: libapparmor-dev
+ cross-policy-Debian: foreign
augeas:
default: augeas
@@ -90,6 +91,7 @@ mappings:
deb: libavahi-client-dev
pkg: avahi
rpm: avahi-devel
+ cross-policy-Debian: foreign
bash:
default: bash
@@ -116,6 +118,7 @@ mappings:
deb: libsasl2-dev
pkg: cyrus-sasl
rpm: cyrus-sasl-devel
+ cross-policy-Debian: foreign
dbus-daemon:
default: dbus
@@ -125,6 +128,7 @@ mappings:
device-mapper:
deb: libdevmapper-dev
rpm: device-mapper-devel
+ cross-policy-Debian: foreign
dnsmasq:
default: dnsmasq
@@ -133,6 +137,7 @@ mappings:
dtrace:
deb: systemtap-sdt-dev
rpm: systemtap-sdt-devel
+ cross-policy-Debian: skip
dwarves:
default: dwarves
@@ -154,6 +159,7 @@ mappings:
deb: libfuse-dev
pkg: fusefs-libs
rpm: fuse-devel
+ cross-policy-Debian: foreign
gcc:
default: gcc
@@ -169,14 +175,17 @@ mappings:
deb: libglib2.0-dev
pkg: glib
rpm: glib2-devel
+ cross-policy-Debian: foreign
glibc:
deb: libc6-dev
rpm: glibc-devel
+ cross-policy-Debian: foreign
glibc-static:
deb: libc6-dev
rpm: glibc-static
+ cross-policy-Debian: foreign
glusterfs:
deb: libglusterfs-dev
@@ -185,6 +194,7 @@ mappings:
Debian9: glusterfs-common
Ubuntu16: glusterfs-common
Ubuntu18: glusterfs-common
+ cross-policy-Debian: foreign
gnome-common:
default: gnome-common
@@ -193,6 +203,7 @@ mappings:
deb: libgnutls28-dev
pkg: gnutls
rpm: gnutls-devel
+ cross-policy-Debian: foreign
go:
default: golang
@@ -202,11 +213,13 @@ mappings:
deb: libgirepository1.0-dev
pkg: gobject-introspection
rpm: gobject-introspection-devel
+ cross-policy-Debian: foreign
gtk3:
deb: libgtk-3-dev
pkg: gtk3
rpm: gtk3-devel
+ cross-policy-Debian: foreign
gtk-doc:
default: gtk-doc
@@ -221,6 +234,7 @@ mappings:
deb: libgtk-vnc-2.0-dev
pkg: gtk-vnc
rpm: gtk-vnc2-devel
+ cross-policy-Debian: foreign
hal:
FreeBSD: hal
@@ -253,31 +267,38 @@ mappings:
deb: libjson-glib-dev
pkg: json-glib
rpm: json-glib-devel
+ cross-policy-Debian: foreign
libacl:
deb: libacl1-dev
rpm: libacl-devel
+ cross-policy-Debian: foreign
libarchive:
deb: libarchive-dev
pkg: libarchive
rpm: libarchive-devel
+ cross-policy-Debian: foreign
libattr:
deb: libattr1-dev
rpm: libattr-devel
+ cross-policy-Debian: foreign
libaudit:
deb: libaudit-dev
rpm: audit-libs-devel
+ cross-policy-Debian: foreign
libblkid:
deb: libblkid-dev
rpm: libblkid-devel
+ cross-policy-Debian: foreign
libcap-ng:
deb: libcap-ng-dev
rpm: libcap-ng-devel
+ cross-policy-Debian: foreign
libcmpiutil:
rpm: libcmpiutil-devel
@@ -286,82 +307,99 @@ mappings:
deb: libconfig-dev
pkg: libconfig
rpm: libconfig-devel
+ cross-policy-Debian: foreign
libcurl:
deb: libcurl4-gnutls-dev
pkg: curl
rpm: libcurl-devel
+ cross-policy-Debian: foreign
libdbus:
deb: libdbus-1-dev
pkg: dbus
rpm: dbus-devel
+ cross-policy-Debian: foreign
libgovirt:
rpm: libgovirt-devel
Debian: libgovirt-dev
Debian8:
+ cross-policy-Debianian: foreign
libiscsi:
deb: libiscsi-dev
rpm: libiscsi-devel
+ cross-policy-Debian: foreign
libnl3:
deb: libnl-3-dev
rpm: libnl3-devel
+ cross-policy-Debian: foreign
libnlroute3:
deb: libnl-route-3-dev
rpm: libnl3-devel
+ cross-policy-Debian: foreign
libnuma:
deb: libnuma-dev
rpm: numactl-devel
armv6l-deb:
armv7l-deb:
+ cross-policy-Debian: foreign
libparted:
deb: libparted-dev
rpm: parted-devel
+ cross-policy-Debian: foreign
libpcap:
deb: libpcap0.8-dev
pkg: libpcap
rpm: libpcap-devel
+ cross-policy-Debian: foreign
libpciaccess:
deb: libpciaccess-dev
pkg: libpciaccess
rpm: libpciaccess-devel
+ cross-policy-Debian: foreign
librbd:
deb: librbd-dev
Fedora: librbd-devel
CentOS7: librbd1-devel
+ cross-policy-Debian: foreign
libselinux:
deb: libselinux1-dev
rpm: libselinux-devel
+ cross-policy-Debian: foreign
libsoup:
deb: libsoup2.4-dev
pkg: libsoup
rpm: libsoup-devel
+ cross-policy-Debian: foreign
libssh:
pkg: libssh
rpm: libssh-devel
Debian: libssh-gcrypt-dev
Ubuntu: libssh-dev
+ cross-policy-Debian: foreign
libssh2:
deb: libssh2-1-dev
pkg: libssh2
rpm: libssh2-devel
+ cross-policy-Debian: foreign
libtirpc:
deb: libtirpc-dev
rpm: libtirpc-devel
+ cross-policy-Debian: foreign
libtool:
default: libtool
@@ -373,21 +411,25 @@ mappings:
libudev:
deb: libudev-dev
rpm: libudev-devel
+ cross-policy-Debian: foreign
libuuid:
deb: uuid-dev
pkg: e2fsprogs-libuuid
rpm: libuuid-devel
+ cross-policy-Debian: foreign
libxml2:
deb: libxml2-dev
pkg: libxml2
rpm: libxml2-devel
+ cross-policy-Debian: foreign
libxslt:
deb: libxslt1-dev
pkg: libxslt
rpm: libxslt-devel
+ cross-policy-Debian: foreign
lvm2:
default: lvm2
@@ -563,6 +605,7 @@ mappings:
netcf:
deb: libnetcf-dev
rpm: netcf-devel
+ cross-policy-Debian: skip
numad:
default: numad
@@ -724,6 +767,7 @@ mappings:
deb: python-dev
pkg: python2
rpm: python2-devel
+ cross-policy-Debian: foreign
python2-lxml:
default: python-lxml
@@ -748,6 +792,7 @@ mappings:
deb: python3-dev
pkg: python3
Fedora: python3-devel
+ cross-policy-Debian: foreign
python3-gi:
deb: python3-gi
@@ -793,6 +838,7 @@ mappings:
deb: libreadline-dev
pkg: readline
rpm: readline-devel
+ cross-policy-Debian: foreign
rpcgen:
deb: libc-dev-bin
@@ -806,6 +852,7 @@ mappings:
sanlock:
deb: libsanlock-dev
rpm: sanlock-devel
+ cross-policy-Debian: foreign
screen:
default: screen
@@ -828,6 +875,7 @@ mappings:
deb: libspice-client-gtk-3.0-dev
pkg: spice-gtk
rpm: spice-gtk3-devel
+ cross-policy-Debian: foreign
sudo:
default: sudo
@@ -859,16 +907,19 @@ mappings:
deb: wireshark-dev
Fedora: wireshark-devel
Debian8:
+ cross-policy-Debian: skip
xen:
Fedora: xen-devel
x86_64-deb: libxen-dev
armv7l-deb: libxen-dev
aarch64-deb: libxen-dev
+ cross-policy-Debian: foreign
xfsprogs:
deb: xfslibs-dev
rpm: xfsprogs-devel
+ cross-policy-Debian: foreign
xmllint:
default: libxml2
@@ -881,15 +932,18 @@ mappings:
xz:
deb: liblzma-dev
rpm: xz-devel
+ cross-policy-Debian: foreign
xz-static:
deb: liblzma-dev
Fedora: xz-static
+ cross-policy-Debian: foreign
yajl:
deb: libyajl-dev
pkg: yajl
rpm: yajl-devel
+ cross-policy-Debian: foreign
zfs:
default: zfs-fuse
@@ -899,7 +953,9 @@ mappings:
zlib:
deb: zlib1g-dev
rpm: zlib-devel
+ cross-policy-Debian: foreign
zlib-static:
deb: zlib1g-dev
rpm: zlib-static
+ cross-policy-Debian: foreign
--
2.20.1