From b2ceafb02ff5dc4dc28a0a0cece85ca03d80bf23 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Mon, 23 Sep 2019 17:32:39 -0700 Subject: meta-intel: add intel suffix to recipes Add a suffix, "intel" to all common intel recipe changes. The suffix is defined in intel.inc, which is included already in the s2600wf machine conf and likely any platform including meta-intel. (From meta-intel rev: 4fc52d948f7549472683ae26a10d5c60abde1537) Signed-off-by: Patrick Venture Change-Id: I3561dc40115894d5aa6a08fe723bf214100daefa Signed-off-by: Brad Bishop --- .../recipes-core/systemd/obmc-targets.bbappend | 16 ++++++++-------- .../dbus/phosphor-mapper-config-native.bbappend | 2 +- .../fans/phosphor-pid-control_%.bbappend | 6 +++--- .../recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend | 2 +- .../sel-logger/phosphor-sel-logger_%.bbappend | 2 +- .../recipes-phosphor/webui/phosphor-webui_%.bbappend | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'meta-intel/meta-common') diff --git a/meta-intel/meta-common/recipes-core/systemd/obmc-targets.bbappend b/meta-intel/meta-common/recipes-core/systemd/obmc-targets.bbappend index 3fe1c3f38..090b40e40 100644 --- a/meta-intel/meta-common/recipes-core/systemd/obmc-targets.bbappend +++ b/meta-intel/meta-common/recipes-core/systemd/obmc-targets.bbappend @@ -1,9 +1,9 @@ # Remove these files since they are provided by obmc-intel-targets -SYSTEMD_SERVICE_${PN}_remove += " obmc-host-start@.target" -SYSTEMD_SERVICE_${PN}_remove += " obmc-host-stop@.target" -SYSTEMD_SERVICE_${PN}_remove += " obmc-host-reboot@.target" -SYSTEMD_SERVICE_${PN}_remove += " obmc-host-startmin@.target" -SYSTEMD_SERVICE_${PN}_remove += " obmc-chassis-poweron@.target" -SYSTEMD_SERVICE_${PN}_remove += " obmc-chassis-poweroff@.target" -SYSTEMD_SERVICE_${PN}_remove += " obmc-chassis-hard-poweroff@.target" -SYSTEMD_SERVICE_${PN}_remove += " obmc-chassis-powerreset@.target" +SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-start@.target" +SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-stop@.target" +SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-reboot@.target" +SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-startmin@.target" +SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-poweron@.target" +SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-poweroff@.target" +SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-hard-poweroff@.target" +SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-powerreset@.target" diff --git a/meta-intel/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend b/meta-intel/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend index 435531878..ef991a58b 100644 --- a/meta-intel/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend +++ b/meta-intel/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend @@ -1 +1 @@ -PHOSPHOR_MAPPER_CONFIGS_append = " intel-dbus-interfaces-mapper-config-native" +PHOSPHOR_MAPPER_CONFIGS_append_intel = " intel-dbus-interfaces-mapper-config-native" diff --git a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index 3e89746bf..4521fe8f8 100644 --- a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_intel := "${THISDIR}/${PN}:" inherit obmc-phosphor-systemd -SYSTEMD_SERVICE_${PN} = "phosphor-pid-control.service" -EXTRA_OECONF = "--enable-configure-dbus=yes" +SYSTEMD_SERVICE_${PN}_intel = "phosphor-pid-control.service" +EXTRA_OECONF_intel = "--enable-configure-dbus=yes" diff --git a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index e5f63fbda..876567f9a 100644 --- a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,4 +1,4 @@ -do_install_append(){ +do_install_append_intel(){ install -d ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/sensorhandler.hpp ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/selutility.hpp ${D}${includedir}/phosphor-ipmi-host diff --git a/meta-intel/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-intel/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index 4be8ddbd5..3e769e174 100644 --- a/meta-intel/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-intel/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1,2 +1,2 @@ # Enable threshold monitoring -EXTRA_OECMAKE += "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON" +EXTRA_OECMAKE_intel += "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON" diff --git a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend index ff1bfdb09..590e9e629 100644 --- a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend +++ b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_intel := "${THISDIR}/${PN}:" -SRC_URI_append = " file://config.json" +SRC_URI_append_intel = " file://config.json" -do_compile_prepend() { +do_compile_prepend_intel() { cp -r ${WORKDIR}/config.json ${S}/ } -- cgit v1.2.3