diff --git a/meta-ibm/recipes-phosphor/ips-asset-tag/ips-asset-tag.bb b/meta-ibm/recipes-phosphor/ips-asset-tag/ips-asset-tag.bb deleted file mode 100644 index 51f3be2b4c..0000000000 --- a/meta-ibm/recipes-phosphor/ips-asset-tag/ips-asset-tag.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Add persistent configuration of AssetTag for IPS" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" - -inherit allarch obmc-phosphor-systemd - -SRC_URI:append:p10bmc = " \ - file://ips-asset-tag.path \ - file://ips-update-asset-tag.service \ - file://ips-recover-asset-tag.service \ - file://ips-asset-tag.sh \ - " - -SYSTEMD_SERVICE:${PN}:append:p10bmc = " ips-asset-tag.path" -SYSTEMD_SERVICE:${PN}:append:p10bmc = " ips-update-asset-tag.service" -SYSTEMD_SERVICE:${PN}:append:p10bmc = " ips-recover-asset-tag.service" - -do_install:append:p10bmc() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/ips-asset-tag.sh ${D}${bindir}/ips-asset-tag.sh -} diff --git a/meta-ibm/recipes-phosphor/ips-asset-tag/ips-asset-tag/ips-asset-tag.path b/meta-ibm/recipes-phosphor/ips-asset-tag/ips-asset-tag/ips-asset-tag.path deleted file mode 100644 index 967718c664..0000000000 --- a/meta-ibm/recipes-phosphor/ips-asset-tag/ips-asset-tag/ips-asset-tag.path +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Monitor the AssetTag file for IPS -After=system-vpd.service - -[Path] -PathModified=/var/lib/phosphor-inventory-manager/xyz/openbmc_project/inventory/system/xyz.openbmc_project.Inventory.Decorator.AssetTag -Unit=ips-update-asset-tag.service - -[Install] -WantedBy=multi-user.target diff --git a/meta-ibm/recipes-phosphor/ips-asset-tag/ips-asset-tag/ips-asset-tag.sh b/meta-ibm/recipes-phosphor/ips-asset-tag/ips-asset-tag/ips-asset-tag.sh deleted file mode 100644 index d81e067062..0000000000 --- a/meta-ibm/recipes-phosphor/ips-asset-tag/ips-asset-tag/ips-asset-tag.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -subModel=($(busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system xyz.openbmc_project.Inventory.Decorator.Asset SubModel)) - -if [ "${subModel[1]}" = '"J0"' ]; then - echo "Loading ibm-asset-tag.sh: "$1 - if [ "$1" == "update" ]; then - assetTag=($(busctl get-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system xyz.openbmc_project.Inventory.Decorator.AssetTag AssetTag)) - assetTag=`echo ${assetTag[1]} | sed 's/\"//g'` - /sbin/fw_setenv ipsAssetTag ${assetTag} - elif [ "$1" == "recover" ]; then - assetTag=($(/sbin/fw_printenv ipsAssetTag | awk -F= '{print $2}')) - busctl set-property xyz.openbmc_project.Inventory.Manager /xyz/openbmc_project/inventory/system xyz.openbmc_project.Inventory.Decorator.AssetTag AssetTag s ${assetTag} - fi -fi diff --git a/meta-ibm/recipes-phosphor/ips-asset-tag/ips-asset-tag/ips-recover-asset-tag.service b/meta-ibm/recipes-phosphor/ips-asset-tag/ips-asset-tag/ips-recover-asset-tag.service deleted file mode 100644 index 1ef18f7244..0000000000 --- a/meta-ibm/recipes-phosphor/ips-asset-tag/ips-asset-tag/ips-recover-asset-tag.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Reset the AssetTag file for IPS -After=system-vpd.service - -[Service] -ExecStart=/usr/bin/ips-asset-tag.sh recover -Restart=no -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/meta-ibm/recipes-phosphor/ips-asset-tag/ips-asset-tag/ips-update-asset-tag.service b/meta-ibm/recipes-phosphor/ips-asset-tag/ips-asset-tag/ips-update-asset-tag.service deleted file mode 100644 index e28bf507cf..0000000000 --- a/meta-ibm/recipes-phosphor/ips-asset-tag/ips-asset-tag/ips-update-asset-tag.service +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=Copy the AssetTag file for IPS - -[Service] -ExecStart=/usr/bin/ips-asset-tag.sh update diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index da82502136..9b94097d97 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -36,7 +36,7 @@ RDEPENDS:${PN}-extras:append:ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVE RDEPENDS:${PN}-extras:append:p10bmc = " ${POWER_SERVICE_PACKAGES_P10} webui-vue dbus-sensors phosphor-virtual-sensor" RDEPENDS:${PN}-extras:append:p10bmc = " pldm openpower-hw-diags srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd debug-trigger libmctp panel mux-workarounds phosphor-boot-indicator" RDEPENDS:${PN}-extras:append:p10bmc = " platform-fru-detect" -RDEPENDS:${PN}-extras:append:p10bmc = " gdbserver strace opkg ips-asset-tag" +RDEPENDS:${PN}-extras:append:p10bmc = " gdbserver strace opkg" RDEPENDS:${PN}-extras:append:mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem ${POWER_SERVICE_PACKAGES_AC_SERVER}" RDEPENDS:${PN}-extras:append:witherspoon-tacoma = " pldm srvcfg-manager webui-vue biosconfig-manager phosphor-post-code-manager phosphor-host-postd kexec-tools makedumpfile kdump vmcore-dmesg debug-trigger" RDEPENDS:${PN}-extras:append:witherspoon-tacoma = " openpower-hw-diags panel"