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>

10 files changed, 9 insertions, 19 deletions

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 a9e5e4429e..dfc754567c 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 78ea5bfa01..8fd12bccca 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 2bcc641a46..dc1dc747f5 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 59bdb866e3..6d16d6d0fa 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 2af30d51cc..a8d9dffc3b 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 7b5d4358a3..c0542d4ed7 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 dbcdcd9f3e..9ec7d84d16 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 006f6be188..91f1b0560d 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 5716c4a60e..fc919e042a 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 c38571c38d..540dc5d5fe 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_INST_CNT = "${@sum([1 for item in d.getVar('HOST_LOGGER_INST', True)
 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
-}