diff options
5 files changed, 8 insertions, 10 deletions
diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend index 60a26cea62..38040f42e6 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend @@ -20,7 +20,7 @@ SYSTEMD_SERVICE:${PN}:remove = "obmc-console-ssh.socket" FILES:${PN}:remove = "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf" -EXTRA_OECONF:append = " --enable-concurrent-servers" +PACKAGECONFIG:append = " concurrent-servers" do_install:append() { # Install the console client configurations diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console_%.bbappend index 3d98840957..a715f28355 100644 --- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console_%.bbappend @@ -20,7 +20,7 @@ SYSTEMD_SERVICE:${PN}:remove = "obmc-console-ssh.socket" FILES:${PN}:remove = "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf" -EXTRA_OECONF:append = " --enable-concurrent-servers" +PACKAGECONFIG:append = " concurrent-servers" do_install:append() { # Install the console client configurations diff --git a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend index 0253c39e0a..c6eb07c412 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend @@ -35,7 +35,7 @@ SRC_URI:remove = "file://${BPN}.conf" SYSTEMD_SERVICE:${PN}:remove:fb-compute-multihost = "obmc-console-ssh.socket" SYSTEMD_SERVICE:${PN}:remove:fb-compute-multihost = "obmc-console-ssh@.service" -EXTRA_OECONF:append:fb-compute-multihost = " --enable-concurrent-servers" +PACKAGECONFIG:append:fb-compute-multihost = " concurrent-servers" do_install:append() { # Install the server configuration diff --git a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend index 436be4d741..b318c88dac 100644 --- a/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend @@ -39,7 +39,7 @@ SYSTEMD_SERVICE:${PN}:remove:p10bmc = "obmc-console-ssh.socket" FILES:${PN}:remove:p10bmc = "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf" -EXTRA_OECONF:append:p10bmc = " --enable-concurrent-servers" +PACKAGECONFIG:append:p10bmc = " concurrent-servers" do_install:append:p10bmc() { install_concurrent_console_config diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb index 742fcef73d..719ce963bd 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb +++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb @@ -7,11 +7,9 @@ DEPENDS += "autoconf-archive-native \ systemd \ " SRCREV = "86e3fd70f003264a05a09452c60ea8b9da6be287" -PACKAGECONFIG ??= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[udev] = "--with-udevdir=`pkg-config --variable=udevdir udev`,\ - --without-udevdir,udev" -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, \ - --without-systemdsystemunitdir" +PACKAGECONFIG ??= "udev" +PACKAGECONFIG[udev] = "-Dudev=enabled,-Dudev=disabled,udev" +PACKAGECONFIG[concurrent-servers] = "-Dconcurrent-servers=true,-Dconcurrent-servers=false," PV = "1.0+git${SRCPV}" PR = "r1" @@ -25,7 +23,7 @@ SYSTEMD_SERVICE:${PN} += "obmc-console-ssh@.service \ obmc-console@.service \ " -inherit autotools pkgconfig +inherit meson pkgconfig inherit obmc-phosphor-discovery-service inherit systemd |