From 697f17de7a71b3dd9a6a0f37a2394b5525970c1c Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 13 Sep 2019 14:07:33 -0400 Subject: meta-inspur: Remove references to INSPURBASE INSPURBASE is only used for pointing at licenses...point at the licenses in oe-core in meta/files/common-licenses instead. to match the defacto convention used in other oe layers like meta-openembedded. (From meta-inspur rev: 052786ad38fa172500a9f641ed26e95e25e6fbc6) Change-Id: I5394fc045042a30bdc958a6e528d9a7f947d49b9 Signed-off-by: Brad Bishop --- .../recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb | 2 +- .../recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-inspur/meta-fp5280g2/recipes-phosphor/vpd') diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb index 915af76c7..f731bfe54 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Inspur FP5280G2 Inventory config for openpower-vpd-parser" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INSPURBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-fru-vpd diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb index 46611fa55..ba684fb88 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Inspur FP5280G2 VPD layout for openpower-fru-vpd" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INSPURBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-fru-vpd -- cgit v1.2.3 From 998598716f733d524a036a8102737e160b42cd4c Mon Sep 17 00:00:00 2001 From: George Liu Date: Mon, 23 Sep 2019 17:29:46 +0800 Subject: sync MAC from VPD to shared NIC There are two MACs on the fp5280g2 machine. eth0 is the shared NIC and eth1 is the dedicated NIC. Testd: Correctly read MAC for eth0 and eth1 from eeprom and expose it to D-BUS interface. (From meta-inspur rev: 18417299bbe04a1728ff58f588f26c6a16d06bb8) Signed-off-by: George Liu Change-Id: Id2c7a9551e5c0fc2115a7021a103095439dc242f Signed-off-by: Brad Bishop --- .../recipes-phosphor/network/first-boot-set-mac_%.bbappend | 2 +- .../recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory | 4 ++-- .../vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'meta-inspur/meta-fp5280g2/recipes-phosphor/vpd') diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend index 11c52952e..934b328c7 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend @@ -1 +1 @@ -SYSTEMD_SERVICE_${PN} += "first-boot-set-mac@eth1.service" +SYSTEMD_SERVICE_${PN} += " first-boot-set-mac@eth0.service first-boot-set-mac@eth1.service" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory index 2e6b39198..c4ba3ad2c 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-inventory/inventory @@ -1,3 +1,3 @@ -FRUS=BMC,ETHERNET -PATHS=/system/chassis/motherboard/bmc,/system/chassis/motherboard/bmc/ethernet +FRUS=BMC,ETHERNET,ETHERNET1 +PATHS=/system/chassis/motherboard/bmc,/system/chassis/motherboard/bmc/eth0,/system/chassis/motherboard/bmc/eth1 EEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a080.i2c-bus/i2c-1/1-0050/eeprom diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml index aab99dbe2..c26af4fdc 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/vpd/fp5280g2-openpower-fru-vpd-layout/layout.yaml @@ -10,3 +10,7 @@ ETHERNET: xyz.openbmc_project.Inventory.Item.NetworkInterface: OPFR,B1: MACAddress xyz.openbmc_project.Inventory.Item.Ethernet: +ETHERNET1: + xyz.openbmc_project.Inventory.Item.NetworkInterface: + VINI,B1: MACAddress + xyz.openbmc_project.Inventory.Item.Ethernet: -- cgit v1.2.3