diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-31 13:25:51 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-09-06 14:44:12 +0300 |
commit | ff075f6ee795a590b244d70a90cc312ba1f2d83d (patch) | |
tree | a617790bdbfdeef960665ba0242e1f0c93e5301a /meta-phosphor/recipes-phosphor/console | |
parent | 3e4da38c127bb7e7641adc2fc41f4c33744cb918 (diff) | |
download | openbmc-ff075f6ee795a590b244d70a90cc312ba1f2d83d.tar.xz |
meta-phosphor: Move layer content from common/
Adopt a more conventional directory hierarchy. meta-phosphor is still
a _long_ way from suitable for hosting on yoctoproject.org but things
like this don't help.
(From meta-phosphor rev: 471cfcefa74b8c7ceb704cb670e6d915cf27c63b)
Change-Id: I3f106b2f6cdc6cec734be28a6090800546f362eb
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/recipes-phosphor/console')
5 files changed, 73 insertions, 0 deletions
diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket new file mode 100644 index 0000000000..3174489efe --- /dev/null +++ b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket @@ -0,0 +1,10 @@ +[Unit] +Description=Phosphor Host Console SSH Per-Connection socket +Wants=obmc-console@{OBMC_CONSOLE_HOST_TTY}.service + +[Socket] +ListenStream=2200 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service new file mode 100644 index 0000000000..82ffe7919a --- /dev/null +++ b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service @@ -0,0 +1,12 @@ +[Unit] +Description=Phosphor Host Console SSH Per-Connection +Wants=obmc-console@{OBMC_CONSOLE_HOST_TTY}.service + +[Service] +Environment="DROPBEAR_RSAKEY_DIR=/etc/dropbear" +EnvironmentFile={envfiledir}/dropbear +ExecStart=-/usr/bin/env dropbear -i -r ${{DROPBEAR_RSAKEY_DIR}}/dropbear_rsa_host_key -c "/usr/bin/env obmc-console-client" $DROPBEAR_EXTRA_ARGS +SyslogIdentifier=dropbear +ExecReload={base_bindir}/kill -HUP $MAINPID +StandardInput=socket +KillMode=process diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console.conf new file mode 100644 index 0000000000..d42caa9355 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -0,0 +1,2 @@ +lpc-address = 0x3f8 +sirq = 4 diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console@.service b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console@.service new file mode 100644 index 0000000000..26e452c3cb --- /dev/null +++ b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console@.service @@ -0,0 +1,12 @@ +[Unit] +Description=Phosphor Console Muxer listening on device /dev/%I +BindsTo=dev-%i.device +After=dev-%i.device + +[Service] +ExecStart=/usr/bin/env obmc-console-server --config {sysconfdir}/obmc-console.conf %i +SyslogIdentifier=obmc-console-server +Restart=always + +[Install] +WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb new file mode 100644 index 0000000000..d4d6e616c7 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb @@ -0,0 +1,37 @@ +SUMMARY = "OpenBMC console daemon" +DESCRIPTION = "Daemon to handle UART console connections" +HOMEPAGE = "http://github.com/openbmc/obmc-console" +PR = "r1" + +inherit obmc-phosphor-license +inherit obmc-phosphor-systemd +inherit autotools +inherit obmc-phosphor-discovery-service + +TARGET_CFLAGS += "-fpic -O2" + +DEPENDS += "autoconf-archive-native" + +SRC_URI += "git://github.com/openbmc/obmc-console" +SRC_URI += "file://${PN}.conf" + +SRCREV = "3c89b263484128071343bdaf0b5f3a8dace32799" +PV = "1.0+git${SRCPV}" + +REGISTERED_SERVICES_${PN} += "obmc_console:tcp:2200" +OBMC_CONSOLE_HOST_TTY ?= "ttyVUART0" +SYSTEMD_SUBSTITUTIONS += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service" +SYSTEMD_SUBSTITUTIONS += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket" + +SYSTEMD_SERVICE_${PN} = " \ + ${PN}@.service \ + ${PN}@${OBMC_CONSOLE_HOST_TTY}.service \ + ${PN}-ssh.socket \ + ${PN}-ssh@.service \ + " +do_install_append() { + install -m 0755 -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/${PN}.conf ${D}${sysconfdir}/${PN}.conf +} + +S = "${WORKDIR}/git" |