diff options
14 files changed, 25 insertions, 19 deletions
diff --git a/meta-phosphor/classes/phosphor-software-manager-mmc.bbclass b/meta-phosphor/classes/phosphor-software-manager-mmc.bbclass index 479619c34..0590a835e 100644 --- a/meta-phosphor/classes/phosphor-software-manager-mmc.bbclass +++ b/meta-phosphor/classes/phosphor-software-manager-mmc.bbclass @@ -2,9 +2,11 @@ PACKAGECONFIG:append = " mmc_layout" -EXTRA_OEMESON += "-Dactive-bmc-max-allowed=2" -EXTRA_OEMESON += "-Dmedia-dir='/media'" -EXTRA_OEMESON += "-Doptional-images='image-hostfw'" +EXTRA_OEMESON:append = " \ + -Dactive-bmc-max-allowed=2 \ + -Dmedia-dir='/media' \ + -Doptional-images='image-hostfw' \ +" RDEPENDS:phosphor-software-manager-updater-mmc += " \ gptfdisk \ diff --git a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass index 71f8c6f76..9d38adaf7 100644 --- a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass +++ b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass @@ -7,8 +7,10 @@ RDEPENDS:phosphor-software-manager-updater-ubi += " \ " # Add ubi-fs configs -EXTRA_OEMESON += "-Dactive-bmc-max-allowed=2" -EXTRA_OEMESON += "-Dmedia-dir='/media'" +EXTRA_OEMESON:append = " \ + -Dactive-bmc-max-allowed=2 \ + -Dmedia-dir='/media' \ +" SYSTEMD_SERVICE:phosphor-software-manager-updater-ubi += " \ obmc-flash-bmc-ubirw.service \ diff --git a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend index 9d4dfc7b4..074dced6c 100644 --- a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend +++ b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend @@ -21,7 +21,7 @@ PACKAGECONFIG = "\ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-sd-bus-Don-t-automatically-add-ObjectManager.patch" -EXTRA_OEMESON += "-Ddns-servers=''" +EXTRA_OEMESON:append = " -Ddns-servers=''" ALTERNATIVE:${PN} += "init" ALTERNATIVE_TARGET[init] = "${rootlibexecdir}/systemd/systemd" diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb index 208b4f3af..b4b101936 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb @@ -18,7 +18,7 @@ DEPENDS += " \ systemd \ " -EXTRA_OEMESON += " \ +EXTRA_OEMESON:append = " \ -Dtests=disabled \ -Dexamples=disabled \ " diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb index fbc6d4bff..f51319adf 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -84,7 +84,7 @@ SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'flash_b S = "${WORKDIR}/git" -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" do_install:append() { install -d ${D}/usr/local diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb index 1a8022c8a..a1ea91354 100644 --- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb @@ -47,4 +47,4 @@ SRC_URI += "git://github.com/openbmc/phosphor-gpio-monitor" SRCREV = "b08a0f691740ef21e28547a57981b1043d46d8ce" S = "${WORKDIR}/git" -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" diff --git a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb index 7ff4b2cdf..e68960d1d 100644 --- a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb +++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb @@ -29,9 +29,11 @@ SERVICE_FILE = "lpcsnoop.service" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} += "${SERVICE_FILE}" -EXTRA_OEMESON += "-Dsnoop-device=${SNOOP_DEVICE}" -EXTRA_OEMESON += "-Dpost-code-bytes=${POST_CODE_BYTES}" -EXTRA_OEMESON += "-Dsystemd-target=multi-user.target" +EXTRA_OEMESON:append = " \ + -Dsnoop-device=${SNOOP_DEVICE} \ + -Dpost-code-bytes=${POST_CODE_BYTES} \ + -Dsystemd-target=multi-user.target \ +" POSTCODE_SEVENSEG_DEVICE ?= "seven_seg_disp_val" SERVICE_FILE_7SEG = " \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb index 70de28c2d..b989ef78c 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb @@ -20,7 +20,7 @@ SRCREV = "f39e668c2b87c9453e0e28d5a8886b81ed80c50e" FILES:${PN} += "${libdir}/ipmid-providers" -EXTRA_OEMESON += " \ +EXTRA_OEMESON:append = " \ -Dtests=disabled \ -Dexamples=false \ " diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb index b834b6b19..341c5f73b 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -52,7 +52,7 @@ SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'FMT', 'CHASSIS_TARGETS', 'STATES' # Install the override to set up a Conflicts relation SYSTEMD_OVERRIDE_${PN} += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" do_compile:prepend() { if [ -f "${LED_YAML_PATH}/led.yaml" ]; then diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb index 684e41c3a..e1f7f259f 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb @@ -16,7 +16,7 @@ DEPENDS += "boost" DBUS_SERVICE:${PN} += "xyz.openbmc_project.led.controller@.service" -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" SRC_URI += "git://github.com/openbmc/phosphor-led-sysfs" SRC_URI += "file://70-leds.rules" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb index 5e81a0d7f..244f3ea1b 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb @@ -25,7 +25,7 @@ SRC_URI = "git://github.com/openbmc/phosphor-hostlogger" SRCREV = "042b5ba8438d1423f807feb5ef739cda063ea8d2" # Disable unit tests -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" # Systemd service template SYSTEMD_PACKAGES = "${PN}" diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb index d1bdc0f2d..9a6585849 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb @@ -37,4 +37,4 @@ FILES:${PN} += "${datadir}/dbus-1/system.d" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.Network.service" -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index dbf5c9664..68338c6cf 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -28,7 +28,7 @@ DEPENDS += " \ cli11 \ " -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" FILES:${PN} += "${base_libdir}/systemd/system/xyz.openbmc_project.Hwmon@.service" RDEPENDS:${PN} += "\ diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 6b527c3cb..83939c468 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -57,7 +57,7 @@ DEPENDS += "cli11" RDEPENDS:${PN}-chassis += "bash" -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" FILES:${PN}-host = "${bindir}/phosphor-host-state-manager" DBUS_SERVICE:${PN}-host += "xyz.openbmc_project.State.Host.service" |