Merge pull request #74 from Intel-BMC/update2021-0.771-0.77

Update

4 files changed, 2 insertions, 81 deletions

diff --git a/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update.bb b/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update.bb
deleted file mode 100644
index b6ddfad80..000000000
--- a/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "Ampere Computing LLC Update MAC Address from FRU Inventory Information"
-DESCRIPTION = "Update MAC Address from FRU Inventory Information for Ampere systems"
-PR = "r1"
-
-LICENSE = "Apache-2.0"
-
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-inherit systemd
-inherit obmc-phosphor-systemd
-
-DEPENDS = "systemd"
-RDEPENDS:${PN} = "bash"
-
-FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"
-
-SRC_URI += " \
-            file://ampere_update_mac.sh \
-           "
-
-SYSTEMD_SERVICE:${PN} = "ampere_update_mac.service"
-
-do_install:append() {
-    install -d ${D}/${sbindir}
-    install -m 755 ${WORKDIR}/ampere_update_mac.sh ${D}/${sbindir}
-}
diff --git a/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update/ampere_update_mac.service b/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update/ampere_update_mac.service
deleted file mode 100644
index 86f7a0346..000000000
--- a/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update/ampere_update_mac.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Updating MAC Address Service From FRU inventory
-After=xyz.openbmc_project.Inventory.Manager.service
-
-[Service]
-ExecStart=/usr/sbin/ampere_update_mac.sh
-SyslogIdentifier=ampere_update_mac.sh
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update/ampere_update_mac.sh b/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update/ampere_update_mac.sh
deleted file mode 100644
index 5dbdde771..000000000
--- a/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update/ampere_update_mac.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-#
-# This script is used to get the MAC Address from FRU Inventory information
-
-ETHERNET_INTERFACE="eth0"
-ENV_ETH="eth1addr"
-ENV_MAC_ADDR=`fw_printenv`
-
-# Check if BMC MAC address is exported
-if [[ $ENV_MAC_ADDR =~ $ENV_ETH ]]; then
-    echo "WARNING: BMC MAC address already exist!"
-    exit 0
-fi
-
-# Read FRU Board Custom Field 1 to get the MAC address
-CUSTOM_FIELD_1=`busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system/chassis/motherboard xyz.openbmc_project.Inventory.Item.NetworkInterface MACAddress`
-MAC_ADDR=`echo $CUSTOM_FIELD_1 | cut -d "\"" -f 2`
-
-# Check if BMC MAC address is exported
-if [ -z "${MAC_ADDR}" ]; then
-    echo "ERROR: No BMC MAC address is detected from FRU Inventory information!"
-    # Return 1 so that systemd knows the service failed to start
-    exit 1
-fi
-
-# Request to update the MAC address
-fw_setenv ${ENV_ETH} ${MAC_ADDR}
-
-if [[ $? -ne 0 ]]; then
-   echo "ERROR: Fail to set MAC address to ${ENV_ETH}"
-   exit 1
-fi
-
-# Request to restart the service
-ifconfig ${ETHERNET_INTERFACE} down
-ifconfig ${ETHERNET_INTERFACE} hw ether ${MAC_ADDR}
-if [[ $? -ne 0 ]]; then
-   echo "ERROR: Can not update MAC ADDR to ${ETHERNET_INTERFACE}"
-   exit 1
-fi
-ifconfig ${ETHERNET_INTERFACE} up
-
-echo "Successfully update the MAC address ${MAC_ADDR} to ${ENV_ETH} and ${ETHERNET_INTERFACE}"
diff --git a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb
index 856d3dc0a..ede8d9db5 100644
--- a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb
+++ b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb
@@ -31,9 +31,11 @@ RDEPENDS:${PN}-chassis = " \
 
 SUMMARY:${PN}-system = "Ampere System"
 RDEPENDS:${PN}-system = " \
+        smbios-mdr \
         "
 
 SUMMARY:${PN}-flash = "Ampere Flash"
 RDEPENDS:${PN}-flash = " \
         ampere-flash-utils \
+        phosphor-software-manager \
         "