From c4596d223cc72682b4b356b5b4ed9f0bd36f497f Mon Sep 17 00:00:00 2001 From: Willy Tu Date: Thu, 9 Jun 2022 17:42:03 +0000 Subject: Revert "meta-google- ipmi-config: Add google-version support" This reverts commit e5ffc52b405319038480c826d0ed8c76edef7338. Reason for revert: The gbmc_version task does not always get triggered properly due to bitbake cache. This may cause failure in the version check and be problematic. Change-Id: I783ad8563ad16a1e6ed3e7f4d92323655e97afac Signed-off-by: Willy Tu --- .../ipmi/phosphor-ipmi-config.bbappend | 35 ---------------------- 1 file changed, 35 deletions(-) (limited to 'meta-google') diff --git a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 1ae745908e..2f2d9e0881 100644 --- a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -41,38 +41,3 @@ do_install:append:gbmc() { echo "[]" > ${D}${datadir}/ipmi-providers/entity-map.json fi } - -python do_gbmc_version () { - import json - - if d.getVar('GBMC_VERSION') is None: - return - - version = d.getVar('GBMC_VERSION').split('.') - major = min(int(version[0]), 0x7F) & 0x7F - minor = min(int(version[1]), 99) - minor = int(minor / 10) * 16 + minor % 10; - point = int(version[2]) - subpoint = int(version[3]) - - dev_id = { - "id": 0, - "revision": 0, - "addn_dev_support": 0, - "firmware_revision": { - "major": major, - "minor": minor - }, - "manuf_id": 11129, - "prod_id": 14426, - "aux": subpoint << 16 | (0xFFFF & point) - } - - dir = d.getVar('WORKDIR') - os.makedirs(dir, exist_ok=True) - path = os.path.join(dir, 'dev_id.json') - with open(path, 'w') as f: - json.dump(dev_id, f, sort_keys=True, indent=4) -} - -addtask gbmc_version before do_install -- cgit v1.2.3