From 7aac78e433f40d6ee96e7f52fdca546e34b3dbe9 Mon Sep 17 00:00:00 2001 From: Diego Sueiro Date: Thu, 3 Sep 2020 12:40:23 +0100 Subject: [PATCH] arm-autonomy/xen-devicetree: Use a different sed delimiter character In the do_deploy task, replace the current sed delimiter (',') with '?' since there are use cases where the bootargs variables have the ',' character in it which makes the sed command to fail. Change-Id: If9b8221404ec63568768bf0f303be7759ba5f64d Issue-Id: SCM-1065 Signed-off-by: Diego Sueiro Signed-off-by: Jon Mason --- .../recipes-extended/xen-devicetree/xen-devicetree.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-arm-autonomy/recipes-extended/xen-devicetree/xen-devicetree.bb b/meta-arm-autonomy/recipes-extended/xen-devicetree/xen-devicetree.bb index cef5f79e..ccbb3876 100644 --- a/meta-arm-autonomy/recipes-extended/xen-devicetree/xen-devicetree.bb +++ b/meta-arm-autonomy/recipes-extended/xen-devicetree/xen-devicetree.bb @@ -38,10 +38,10 @@ do_deploy() { die "xen.dtsi.in does not exist" fi cat ${WORKDIR}/xen.dtsi.in \ - | sed -e "s,###XEN_DOM0_BOOTARGS###,${XEN_DEVICETREE_DOM0_BOOTARGS}," \ - | sed -e "s,###XEN_XEN_BOOTARGS###,${XEN_DEVICETREE_XEN_BOOTARGS}," \ - | sed -e "s,###XEN_DOM0_ADDR###,${XEN_DEVICETREE_DOM0_ADDR}," \ - | sed -e "s,###XEN_DOM0_SIZE###,${XEN_DEVICETREE_DOM0_SIZE}," \ + | sed -e "s?###XEN_DOM0_BOOTARGS###?${XEN_DEVICETREE_DOM0_BOOTARGS}?" \ + | sed -e "s?###XEN_XEN_BOOTARGS###?${XEN_DEVICETREE_XEN_BOOTARGS}?" \ + | sed -e "s?###XEN_DOM0_ADDR###?${XEN_DEVICETREE_DOM0_ADDR}?" \ + | sed -e "s?###XEN_DOM0_SIZE###?${XEN_DEVICETREE_DOM0_SIZE}?" \ > ${WORKDIR}/xen.dtsi # Generate final dtbs