From 46dcae5cbf86996e5219f7d7b5542738721bd05d Mon Sep 17 00:00:00 2001 From: luca fancellu Date: Thu, 27 May 2021 14:10:13 +0100 Subject: [PATCH] arm-autonomy: fix building for xen-tools >=4.15 The 0001-vif-nat-fix-hostname.patch is merged in xen-tools 4.15, so fix the layer to apply the patch only for 4.14. Issue-Id: SCM-2608 Signed-off-by: Luca Fancellu Change-Id: I1306955ab0b1ee435a8da42e953e142270c4b2d3 Signed-off-by: Jon Mason --- .../0001-vif-nat-fix-hostname.patch | 0 meta-arm-autonomy/recipes-extended/xen/xen-tools_%.bbappend | 5 ----- .../recipes-extended/xen/xen-tools_4.14.bbappend | 4 ++++ 3 files changed, 4 insertions(+), 5 deletions(-) rename meta-arm-autonomy/recipes-extended/xen/{xen-tools => xen-tools-4.14}/0001-vif-nat-fix-hostname.patch (100%) create mode 100644 meta-arm-autonomy/recipes-extended/xen/xen-tools_4.14.bbappend diff --git a/meta-arm-autonomy/recipes-extended/xen/xen-tools/0001-vif-nat-fix-hostname.patch b/meta-arm-autonomy/recipes-extended/xen/xen-tools-4.14/0001-vif-nat-fix-hostname.patch similarity index 100% rename from meta-arm-autonomy/recipes-extended/xen/xen-tools/0001-vif-nat-fix-hostname.patch rename to meta-arm-autonomy/recipes-extended/xen/xen-tools-4.14/0001-vif-nat-fix-hostname.patch diff --git a/meta-arm-autonomy/recipes-extended/xen/xen-tools_%.bbappend b/meta-arm-autonomy/recipes-extended/xen/xen-tools_%.bbappend index 51e0dfa5..f2284b07 100644 --- a/meta-arm-autonomy/recipes-extended/xen/xen-tools_%.bbappend +++ b/meta-arm-autonomy/recipes-extended/xen/xen-tools_%.bbappend @@ -1,8 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-vif-nat-fix-hostname.patch \ - " - PACKAGECONFIG_remove = "\ ${@bb.utils.contains('DISTRO_FEATURES', \ 'arm-autonomy-host', \ diff --git a/meta-arm-autonomy/recipes-extended/xen/xen-tools_4.14.bbappend b/meta-arm-autonomy/recipes-extended/xen/xen-tools_4.14.bbappend new file mode 100644 index 00000000..ea45f313 --- /dev/null +++ b/meta-arm-autonomy/recipes-extended/xen/xen-tools_4.14.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.14:" + +SRC_URI += "file://0001-vif-nat-fix-hostname.patch \ + "