From 4ca41ed08de60e35a556827c135caf5d7436b0b4 Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Wed, 14 Sep 2016 11:12:04 -0500 Subject: Revert "Create Palmetto inventory recipe." Don't need this anymore now that inventory.json is generated dynamically. This reverts commit 38a21ef5b470dac705ff0c05dd883518eeb4d2e2. Change-Id: I10ff6b9a30f79de236c1d6186e4e2a3868ea5656 Signed-off-by: Matt Spinler --- .../workbook/palmetto-inventory.bb | 19 --- .../palmetto-inventory/palmetto_inventory.json | 138 --------------------- 2 files changed, 157 deletions(-) delete mode 100644 meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-inventory.bb delete mode 100644 meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-inventory/palmetto_inventory.json (limited to 'meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor') diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-inventory.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-inventory.bb deleted file mode 100644 index 0133c87fc..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-inventory.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Palmetto System Inventory" -DESCRIPTION = "Provides the inventory file for Palmetto" -PR = "r1" - -inherit obmc-phosphor-license -inherit allarch - -RPROVIDES_${PN} = "virtual-system-inventory-data" - -SRC_URI += "file://palmetto_inventory.json" - -FILES_${PN} += "${datadir}/inventory" - -do_install() { - install -d ${D}${datadir}/inventory - install -m 0644 palmetto_inventory.json ${D}${datadir}/inventory/inventory.json -} - -S = "${WORKDIR}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-inventory/palmetto_inventory.json b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-inventory/palmetto_inventory.json deleted file mode 100644 index bcc4fcceb..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-inventory/palmetto_inventory.json +++ /dev/null @@ -1,138 +0,0 @@ -{ - "/system" : { - "is_fru" : 1, - "fru_type" : "SYSTEM" - }, - "/system/chassis" : { - "is_fru" : 1, - "fru_type" : "SYSTEM" - }, - "/system/chassis/motherboard" : { - "is_fru" : 1, - "fru_type" : "MAIN_PLANAR" - }, - "/system/chassis/motherboard/bmc" : { - "is_fru" : 0, - "fru_type" : "BMC" - }, - "/system/chassis/motherboard/cpu" : { - "is_fru" : 1, - "fru_type" : "CPU" - }, - "/system/chassis/motherboard/cpu/core0" : { - "is_fru" : 0, - "fru_type" : "CORE" - }, - "/system/chassis/motherboard/cpu/core1" : { - "is_fru" : 0, - "fru_type" : "CORE" - }, - "/system/chassis/motherboard/cpu/core10" : { - "is_fru" : 0, - "fru_type" : "CORE" - }, - "/system/chassis/motherboard/cpu/core11" : { - "is_fru" : 0, - "fru_type" : "CORE" - }, - "/system/chassis/motherboard/cpu/core2" : { - "is_fru" : 0, - "fru_type" : "CORE" - }, - "/system/chassis/motherboard/cpu/core3" : { - "is_fru" : 0, - "fru_type" : "CORE" - }, - "/system/chassis/motherboard/cpu/core4" : { - "is_fru" : 0, - "fru_type" : "CORE" - }, - "/system/chassis/motherboard/cpu/core5" : { - "is_fru" : 0, - "fru_type" : "CORE" - }, - "/system/chassis/motherboard/cpu/core6" : { - "is_fru" : 0, - "fru_type" : "CORE" - }, - "/system/chassis/motherboard/cpu/core7" : { - "is_fru" : 0, - "fru_type" : "CORE" - }, - "/system/chassis/motherboard/cpu/core8" : { - "is_fru" : 0, - "fru_type" : "CORE" - }, - "/system/chassis/motherboard/cpu/core9" : { - "is_fru" : 0, - "fru_type" : "CORE" - }, - "/system/chassis/motherboard/dimm0" : { - "is_fru" : 1, - "fru_type" : "DIMM" - }, - "/system/chassis/motherboard/dimm1" : { - "is_fru" : 1, - "fru_type" : "DIMM" - }, - "/system/chassis/motherboard/dimm2" : { - "is_fru" : 1, - "fru_type" : "DIMM" - }, - "/system/chassis/motherboard/dimm3" : { - "is_fru" : 1, - "fru_type" : "DIMM" - }, - "/system/chassis/motherboard/fan0" : { - "is_fru" : 0, - "fru_type" : "FAN" - }, - "/system/chassis/motherboard/fan1" : { - "is_fru" : 0, - "fru_type" : "FAN" - }, - "/system/chassis/motherboard/fan2" : { - "is_fru" : 0, - "fru_type" : "FAN" - }, - "/system/chassis/motherboard/fan3" : { - "is_fru" : 0, - "fru_type" : "FAN" - }, - "/system/chassis/motherboard/fan4" : { - "is_fru" : 0, - "fru_type" : "FAN" - }, - "/system/chassis/motherboard/membuf" : { - "is_fru" : 0, - "fru_type" : "MEMBUF" - }, - "/system/chassis/io_board/pcie_slot0" : { - "is_fru" : 1, - "fru_type" : "PCIE_CARD" - }, - "/system/chassis/io_board/pcie_slot1" : { - "is_fru" : 1, - "fru_type" : "PCIE_CARD" - }, - "/system/chassis/motherboard/pcieclock" : { - "is_fru" : 0, - "fru_type" : "CLOCK" - }, - "/system/chassis/motherboard/refclock" : { - "is_fru" : 0, - "fru_type" : "CLOCK" - }, - "/system/chassis/motherboard/todclock" : { - "is_fru" : 0, - "fru_type" : "CLOCK" - }, - "/system/chassis/motherboard/apss" : { - "is_fru" : 0, - "fru_type" : "APSS" - }, - "/system/systemevent" : { - "is_fru" : 0, - "fru_type" : "SYSTEM_EVENT" - } -} -- cgit v1.2.1