summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2016-04-29 23:46:34 +0100
committerAlexander Larsson <alexl@redhat.com>2016-05-09 09:09:00 +0200
commitc3c8e806fdcc7e84a056a1511433f29d6cdf10d8 (patch)
tree2289c41cb3790b4eb263b9b82001e2a6a973f0ee
parent4d54ef4090a1c504d0c7f81acbd2817044f990c3 (diff)
freedesktop.conf: Prefer more recent rpm tool
RPM 4.11.2 does not handle armv7 or aarch64 very well, it manages to create packages for the sysroot and extract them when building aarch64 -> aarch64, but fails to extract them in the sysroot when building aarch64 -> armv7a Using a more fresh RPM lets us build armv7a on aarch64 machines.
-rw-r--r--meta-freedesktop/conf/distro/freedesktop.conf3
1 files changed, 0 insertions, 3 deletions
diff --git a/meta-freedesktop/conf/distro/freedesktop.conf b/meta-freedesktop/conf/distro/freedesktop.conf
index 2757458..f3a1165 100644
--- a/meta-freedesktop/conf/distro/freedesktop.conf
+++ b/meta-freedesktop/conf/distro/freedesktop.conf
@@ -18,9 +18,6 @@ SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
QEMU_TARGETS ?= "x86_64"
-PREFERRED_VERSION_rpm = "4.11.2"
-PREFERRED_VERSION_rpm-native = "4.11.2"
-RPMROOTFSDEPENDS_remove = "rpmresolve-native:do_populate_sysroot"
RDEPENDS_python3-modules_remove = "python3-2to3"
PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"