Skip to content

Commit

Permalink
meta-phosphor: obmc-console: remove excess install for non-ssh
Browse files Browse the repository at this point in the history
When the "ssh" `PACKAGECONFIG` is disabled, we should not install
some configuration related to SSH:

    1. The `dropbear.env` file.
    2. The Avahi / SLP registration for the client console SSH port.

Utilize PACKAGECONFIG accordingly.

Signed-off-by: Patrick Williams <[email protected]>
Change-Id: I3ebb09c9b09c239c259697d361a5fe8f0c8c0f11
  • Loading branch information
williamspatrick committed Feb 7, 2024
1 parent 6fd62ea commit 206fa21
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions meta-phosphor/recipes-phosphor/console/obmc-console_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ do_install:append() {
# Install the server configuration
install -m 0755 -d ${D}${sysconfdir}/${BPN}

install -m 0644 ${WORKDIR}/dropbear.env ${D}${sysconfdir}/${BPN}/
if ${@bb.utils.contains('PACKAGECONFIG', 'ssh', 'true', 'false', d)} ; then
install -m 0644 ${WORKDIR}/dropbear.env ${D}${sysconfdir}/${BPN}/
fi

# If the OBMC_CONSOLE_TTYS variable is used without the default OBMC_CONSOLE_HOST_TTY
# the port specific config file should be provided. If it is just OBMC_CONSOLE_HOST_TTY,
Expand Down Expand Up @@ -80,7 +82,7 @@ FILES:${PN} += "${systemd_system_unitdir}"

TARGET_CFLAGS += "-fpic -O2"

REGISTERED_SERVICES:${PN} += "obmc_console:tcp:2200:"
REGISTERED_SERVICES:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'ssh', 'obmc_console:tcp:2200:', '', d)}"
OBMC_CONSOLE_HOST_TTY ?= "ttyVUART0"
# Support multiple TTY ports using space separated list.
# Ex. OBMC_CONSOLE_TTYS = "ttyS1 ttyS2"
Expand Down

0 comments on commit 206fa21

Please sign in to comment.