meta-facebook: correct SOCKET_ID of hostlogger
1. The socket ID should match obmc-console.
2. Remove unused/incorrect do_install; The config files are
already installed by phosphor-hostlogger_git.bb
Tested:
Check if hostlogger services started successfully.
Change-Id: I39a8cc914172398eac11fba619f399912460856d
Signed-off-by: Cosmo Chou <cosmo.chou@quantatw.com>
diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS0.conf b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS0.conf
index a9e5e44..dfc7545 100644
--- a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS0.conf
+++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS0.conf
@@ -1,4 +1,4 @@
-SOCKET_ID=host0
+SOCKET_ID=host1
BUF_MAXSIZE=3000
BUF_MAXTIME=0
FLUSH_FULL=false
diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS1.conf b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS1.conf
index 78ea5bf..8fd12bc 100644
--- a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS1.conf
+++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS1.conf
@@ -1,4 +1,4 @@
-SOCKET_ID=host1
+SOCKET_ID=host2
BUF_MAXSIZE=3000
BUF_MAXTIME=0
FLUSH_FULL=false
diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS2.conf b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS2.conf
index 2bcc641..dc1dc74 100644
--- a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS2.conf
+++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS2.conf
@@ -1,4 +1,4 @@
-SOCKET_ID=host2
+SOCKET_ID=host3
BUF_MAXSIZE=3000
BUF_MAXTIME=0
FLUSH_FULL=false
diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS3.conf b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS3.conf
index 59bdb86..6d16d6d 100644
--- a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS3.conf
+++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS3.conf
@@ -1,4 +1,4 @@
-SOCKET_ID=host3
+SOCKET_ID=host4
BUF_MAXSIZE=3000
BUF_MAXTIME=0
FLUSH_FULL=false
diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS5.conf b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS5.conf
index 2af30d5..a8d9dff 100644
--- a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS5.conf
+++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS5.conf
@@ -1,4 +1,4 @@
-SOCKET_ID=host4
+SOCKET_ID=host5
BUF_MAXSIZE=3000
BUF_MAXTIME=0
FLUSH_FULL=false
diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS6.conf b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS6.conf
index 7b5d435..c0542d4 100644
--- a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS6.conf
+++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS6.conf
@@ -1,4 +1,4 @@
-SOCKET_ID=host5
+SOCKET_ID=host6
BUF_MAXSIZE=3000
BUF_MAXTIME=0
FLUSH_FULL=false
diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS7.conf b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS7.conf
index dbcdcd9..9ec7d84 100644
--- a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS7.conf
+++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS7.conf
@@ -1,4 +1,4 @@
-SOCKET_ID=host6
+SOCKET_ID=host7
BUF_MAXSIZE=3000
BUF_MAXTIME=0
FLUSH_FULL=false
diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS8.conf b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS8.conf
index 006f6be..91f1b05 100644
--- a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS8.conf
+++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-multihost/ttyS8.conf
@@ -1,4 +1,4 @@
-SOCKET_ID=host7
+SOCKET_ID=host8
BUF_MAXSIZE=3000
BUF_MAXTIME=0
FLUSH_FULL=false
diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-singlehost/ttyS2.conf b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-singlehost/ttyS2.conf
index 5716c4a..fc919e0 100644
--- a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-singlehost/ttyS2.conf
+++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger/fb-compute-singlehost/ttyS2.conf
@@ -1,4 +1,4 @@
-SOCKET_ID=
+SOCKET_ID=host0
BUF_MAXSIZE=3000
BUF_MAXTIME=0
FLUSH_FULL=false
diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend
index c38571c..540dc5d 100644
--- a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend
+++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend
@@ -8,13 +8,3 @@
HOST_LOGGER_CONFS = "${@' '.join(['file://ttyS{}.conf'.format(i) for i in range(int(d.getVar('HOST_LOGGER_INST_CNT', True)) + 1) if 'ttyS{}'.format(i) != d.getVar('OBMC_BMC_TTY', True)])}"
SRC_URI:append:fb-compute-multihost = " ${HOST_LOGGER_CONFS}"
-
-do_install:append() {
-
- # Install the configurations
- install -m 0755 -d ${D}${sysconfdir}/${BPN}
- install -m 0644 ${WORKDIR}/*.conf ${D}${sysconfdir}/${BPN}/
-
- # Remove upstream-provided default configuration
- rm -f ${D}${sysconfdir}/${BPN}/ttyVUART0.conf
-}