Merge "lighttpd: prepare chroot enviroment for lighttpd"

diff --git a/meta-stx/conf/distro/poky-stx.conf b/meta-stx/conf/distro/poky-stx.conf
index 119c416..0331580 100644 (file)
--- a/meta-stx/conf/distro/poky-stx.conf
+++ b/meta-stx/conf/distro/poky-stx.conf
@@ -46,7 +46,6 @@ VOLATILE_LOG_DIR = "no"
 IMAGE_OVERHEAD_FACTOR = "1.05"
 
 # Add extra users and groups for stx
-INHERIT += " extrausers-config"
 SYSADMIN_P = "4SuW8cnXFyxsk"
 
 EXTRA_USERS_PARAMS_CONFIG = "\
@@ -54,9 +53,6 @@ EXTRA_USERS_PARAMS_CONFIG = "\
        useradd -m -g sys_protected -G root \
            -d /home/sysadmin -p ${SYSADMIN_P} \
            -s /bin/sh sysadmin; \
-       useradd -p '' sysinv; \
-       groupadd sysinv; \
-       usermod -a -G sysinv sysinv; \
        useradd -p '' ceph; \
        groupadd ceph; \
        usermod -a -G ceph ceph; \

diff --git a/meta-stx/recipes-core/images/stx-image-aio.bb b/meta-stx/recipes-core/images/stx-image-aio.bb
index a55adc7..b83f354 100644 (file)
--- a/meta-stx/recipes-core/images/stx-image-aio.bb
+++ b/meta-stx/recipes-core/images/stx-image-aio.bb
@@ -52,6 +52,7 @@ IMAGE_FEATURES += " \
        "
 
 inherit stx-postrun
+inherit extrausers-config
 inherit core-image
 inherit distro_features_check
 inherit openstack-base

diff --git a/meta-stx/recipes-core/stx-config/sysinv.inc b/meta-stx/recipes-core/stx-config/sysinv.inc
index 34fbb25..70e4eff 100644 (file)
--- a/meta-stx/recipes-core/stx-config/sysinv.inc
+++ b/meta-stx/recipes-core/stx-config/sysinv.inc
@@ -18,7 +18,11 @@ PACKAGES += " sysinv"
 RDEPENDS_sysinv += " python"
 RDEPENDS_sysinv += " bash"
 
-inherit setuptools distutils python-dir systemd
+inherit setuptools distutils python-dir systemd useradd
+
+USERADD_PACKAGES = "sysinv"
+USERADD_PARAM_sysinv = "-r -g sysinv -u 168 -d /var/lib/sysinv -s /sbin/nologin -c 'sysinv Daemons' sysinv"
+GROUPADD_PARAM_sysinv = "-r -g 168 sysinv"
 
 DEPENDS += " \
        python-pbr-native \

diff --git a/meta-stx/recipes-core/stx-nfv/nfv-vim.inc b/meta-stx/recipes-core/stx-nfv/nfv-vim.inc
index 553de70..922e2b9 100644 (file)
--- a/meta-stx/recipes-core/stx-nfv/nfv-vim.inc
+++ b/meta-stx/recipes-core/stx-nfv/nfv-vim.inc
@@ -19,6 +19,13 @@ inherit setuptools
 
 do_configure_prepend () {
        cd ${S}/nfv/nfv-vim
+       sed -i -e 's|@SYSCONFDIR@|${sysconfdir}|g' \
+               scripts/vim \
+               scripts/vim-api \
+               scripts/vim-webserver \
+               nfv_vim/config.ini
+       sed -i -e 's|@PYTHONROOT@|${libdir}/python2.7/site-packages|g' nfv_vim/config.ini
+
        distutils_do_configure
 } 
 

diff --git a/meta-stx/recipes-extended/rpcbind/rpcbind_%.bbappend b/meta-stx/recipes-extended/rpcbind/rpcbind_%.bbappend
new file mode 100644 (file)
index 0000000..a0f0523
--- /dev/null
+++ b/meta-stx/recipes-extended/rpcbind/rpcbind_%.bbappend
@@ -0,0 +1,17 @@
+#
+## Copyright (C) 2019 Wind River Systems, Inc.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+USERADD_PARAM_${PN} = "-r -g rpc -u 32 -d /var/lib/rpcbind -s /sbin/nologin -c 'Rpcbind Daemons' rpc"
+GROUPADD_PARAM_${PN} = "-r -g 32 rpc"

diff --git a/meta-stx/recipes-networking/net-snmp/net-snmp_%.bbappend b/meta-stx/recipes-networking/net-snmp/net-snmp_%.bbappend
index 6ef67f5..889b8b5 100644 (file)
--- a/meta-stx/recipes-networking/net-snmp/net-snmp_%.bbappend
+++ b/meta-stx/recipes-networking/net-snmp/net-snmp_%.bbappend
@@ -16,5 +16,5 @@
 inherit useradd
 
 USERADD_PACKAGES = "net-snmp-server-snmpd"
-USERADD_PARAM_net-snmp-server-snmpd = "-r -g snmpd -u 169 -d /usr/share/snmp -s /sbin/nologin -c 'net-snmp' snmpd"
-GROUPADD_PARAM_net-snmp-server-snmpd = "-r -g 169 snmpd"
+USERADD_PARAM_net-snmp-server-snmpd = "-r -g snmpd -d /usr/share/snmp -s /sbin/nologin -c 'net-snmp' snmpd"
+GROUPADD_PARAM_net-snmp-server-snmpd = "-r snmpd"