From c2f79e4edf17cd0018a702a1f377c306e696e9e8 Mon Sep 17 00:00:00 2001 From: George Liu Date: Tue, 8 Sep 2020 13:39:16 +0800 Subject: fp5280g2: Fix parsing version_id format Use the aux property directly in dev_id.json if the version_id property fails to match the specified regex, and avoid list index out of range. (From meta-inspur rev: 48e6171e36d479fa722b448fb4977bf1288ac7d9) Signed-off-by: George Liu Change-Id: I974005dc1a5e612dc53a8a70f67831927d2616d2 Signed-off-by: Andrew Geissler --- .../meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 3256e834a..0eaffff37 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -25,6 +25,9 @@ python do_patch() { # count from the commit version count = re.findall("-(\d{1,4})-", version_id) + if not count: + return + release = re.findall("-r(\d{1,4})", version_id) if release: auxVer = count[0] + "{0:0>4}".format(release[0]) -- cgit v1.2.3