diff options
Diffstat (limited to 'meta-inspur/meta-fp5280g2')
6 files changed, 20 insertions, 2 deletions
diff --git a/meta-inspur/meta-fp5280g2/conf/local.conf.sample b/meta-inspur/meta-fp5280g2/conf/local.conf.sample index 189fcb3d2..33fd6fd42 100644 --- a/meta-inspur/meta-fp5280g2/conf/local.conf.sample +++ b/meta-inspur/meta-fp5280g2/conf/local.conf.sample @@ -3,7 +3,7 @@ DISTRO ?= "openbmc-fp5280g2" PACKAGE_CLASSES ?= "package_rpm" SANITY_TESTED_DISTROS_append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" -USER_CLASSES ?= "buildstats image-mklibs image-prelink" +USER_CLASSES ?= "buildstats image-prelink" PATCHRESOLVE = "noop" BB_DISKMON_DIRS = "\ STOPTASKS,${TMPDIR},1G,100K \ 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 deleted file mode 100644 index 934b328c7..000000000 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/first-boot-set-mac_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -SYSTEMD_SERVICE_${PN} += " first-boot-set-mac@eth0.service first-boot-set-mac@eth1.service" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network/config.json b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network/config.json new file mode 100644 index 000000000..1df4eda7d --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network/config.json @@ -0,0 +1,4 @@ +{ + "eth0":"eth0", + "eth1":"eth1" +} diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network_%.bbappend new file mode 100644 index 000000000..e8ac0e29c --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network_%.bbappend @@ -0,0 +1,12 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +PACKAGECONFIG_append = " sync-mac" + +SRC_URI += "file://config.json" + +FILES_${PN} += "${datadir}/network" + +do_install_append() { + install -d ${D}${datadir}/network + install -m 0644 ${WORKDIR}/config.json ${D}${datadir}/network/ +} diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend index 9075cd38f..b9c22beb4 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend @@ -3,6 +3,8 @@ inherit obmc-phosphor-systemd SRC_URI += "file://psu.json" +PACKAGECONFIG_append = " monitor" + PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor_append_fp5280g2 = " ${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf index b629dfc4c..e6cec3b93 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf @@ -67,3 +67,4 @@ LABEL_power2 = "hdd" LABEL_power3 = "gpu_01" LABEL_power4 = "gpu_23" LABEL_power5 = "standby" +LABEL_power16 = "total_power" |