Remove ovp dependency and add oran-whitelist

Issue-ID: INF-4
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: Iccdefa047672c2dc93b3c463d75c7e9ba7f57b0e

diff --git a/meta-oran/conf/distro/include/oran-whitelist.conf b/meta-oran/conf/distro/include/oran-whitelist.conf
new file mode 100644 (file)
index 0000000..9d090e1
--- /dev/null
+++ b/meta-oran/conf/distro/include/oran-whitelist.conf
@@ -0,0 +1,121 @@
+#
+# Copyright (C) 2019 Wind River Systems, Inc.
+#
+# Explicitly allow these recipes in O-RAN
+#
+
+# Whitelist for meta-cloud-services
+PNWHITELIST_cloud-services-layer_append = " \
+    celt051 \
+    glusterfs \
+    librdmacm \
+    libibverbs \
+"
+
+# Whitelist for meta-openembedded/meta-filesystems
+PNWHITELIST_filesystems-layer_append = " \
+    aufs-util \
+    fuse \
+    xfsdump \
+    xfsprogs \
+"
+
+PNWHITELIST_dpdk_append = " \
+    dpdk \
+"
+
+PNWHITELIST_meta-python_append = " \
+    python3-automat \
+    python3-click \
+    python3-constantly \
+    python3-hyperlink \
+    python3-incremental \
+    python3-twisted \
+    python3-zopeinterface \
+    python-cython \
+    python-prettytable \
+    python-protobuf \
+    python-pyparsing \
+"
+
+PNWHITELIST_networking-layer_append = " \
+    bridge-utils \
+    ebtables \
+    netcf \
+    tunctl \
+    spice \
+    spice-protocol \
+"
+
+# Whitelist for meta-openembedded/meta-oe
+PNWHITELIST_openembedded-layer_append = " \
+    augeas \
+    gd \
+    gnulib \
+    hwloc \
+    libedit \
+    leveldb \
+    lua \
+    numactl \
+    protobuf \
+    protobuf-c \
+    rocksdb \
+    yajl \
+    libnet \
+    snappy \
+    zabbix \
+    openldap \
+    byacc \
+"
+
+# Whitelist for meta-realtime
+PNWHITELIST_realtime_append = " \
+    schedtool-dl \
+"
+
+# Whitelist for meta-virtualization
+PNWHITELIST_virtualization-layer_append = " \
+    ceph \
+    cgroup-lite \
+    compose-file \
+    containerd-opencontainers \
+    diod \
+    docker \
+    docker-distribution \
+    tini \
+    go-systemd \
+    go-capability \
+    grpc-go \
+    go-logrus \
+    go-pty \
+    go-mux \
+    go-distribution \
+    go-patricia \
+    go-fsnotify \
+    go-dbus \
+    go-context \
+    go-cli \
+    go-connections \
+    go-cross-x86_64 \
+    go-bootstrap-native \
+    libvirt \
+    lxc \
+    nagios-core \
+    nagios-nrpe \
+    nagios-nsca \
+    nagios-plugins \
+    notary \
+    oath \
+    openvswitch \
+    runc-docker \
+    libvmi \
+"
+
+# Whitelist for meta-webserver
+PNWHITELIST_webserver_append = " \
+    fcgi \
+"
+
+PNWHITELIST_security_append = " \
+    keyutils \
+"

diff --git a/meta-oran/conf/distro/oran-inf.conf b/meta-oran/conf/distro/oran-inf.conf
index 1f3a1b0..6766ae9 100644 (file)
--- a/meta-oran/conf/distro/oran-inf.conf
+++ b/meta-oran/conf/distro/oran-inf.conf
@@ -5,6 +5,9 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
 PREFERRED_VERSION_linux-yocto-rt = "4.18%"
 
+require conf/distro/wrlinux.conf
+require conf/distro/include/oran-whitelist.conf
+
 # Note that layer.conf will only add items to BBFILES for
 # the wrlinux-oran distro (this one).
 #
@@ -30,3 +33,5 @@ NON_MULTILIB_RECIPES_append = " ceph"
 # For images
 IMAGE_OVERHEAD_FACTOR="1.1"
 IMAGE_FSTYPES += "tar.bz2 live wic.vmdk wic.vdi wic.qcow2"
+
+

diff --git a/meta-oran/conf/layer.conf b/meta-oran/conf/layer.conf
index 8de21e7..92c091a 100644 (file)
--- a/meta-oran/conf/layer.conf
+++ b/meta-oran/conf/layer.conf
@@ -37,6 +37,6 @@ LAYERRECOMMENDS_meta-oran = " \
     meta-anaconda \
 "
 
-PNWHITELIST_LAYERS_remove = "meta-oran"
+PNWHITELIST_LAYERS_remove = "meta-oran wrlinux-distro"
 
 TEMPLATES_PATH = "${LAYER_PATH_meta-oran}/templates"

diff --git a/meta-oran/recipes-base/images/oran-image-inf-guest.bb b/meta-oran/recipes-base/images/oran-image-inf-guest.bb
index 247e2e3..5e77467 100644 (file)
--- a/meta-oran/recipes-base/images/oran-image-inf-guest.bb
+++ b/meta-oran/recipes-base/images/oran-image-inf-guest.bb
@@ -15,12 +15,9 @@ IMAGE_INSTALL += " \
     hwloc \
     kernel-modules \
     packagegroup-base-extended \
-    packagegroup-containers \
     packagegroup-oran-trace-tools \
     packagegroup-wr-base \
     packagegroup-wr-base-net \
-    packagegroup-wr-boot \
-    system-report \
 "
 IMAGE_INSTALL_append_qemux86-64 = " dpdk"
 

diff --git a/meta-oran/recipes-base/images/oran-image-inf-host.bb b/meta-oran/recipes-base/images/oran-image-inf-host.bb
index 5160882..efef37b 100644 (file)
--- a/meta-oran/recipes-base/images/oran-image-inf-host.bb
+++ b/meta-oran/recipes-base/images/oran-image-inf-host.bb
@@ -10,33 +10,24 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 require recipes-base/images/oran-image-inf-minimal.bb
 
-IMAGE_INSTALL += " \
-    kernel-modules \
-    packagegroup-base-extended \
-    packagegroup-wr-base \
-    packagegroup-wr-base-net \
-    packagegroup-wr-boot \
-"
-
 IMAGE_INSTALL += " \
     aufs-util \
     celt051 \
     ceph \
     dpdk \
     hwloc \
+    kernel-modules \
     openvswitch \
-    packagegroup-containers \
-    packagegroup-glusterfs \
-    packagegroup-oran-criu \
-    packagegroup-oran-debug \
-    packagegroup-oran-default-monitoring \
+    packagegroup-base-extended \
     packagegroup-oran-docker \
+    packagegroup-oran-glusterfs \
     packagegroup-oran-lttng-toolchain \
+    packagegroup-wr-base \
+    packagegroup-wr-base-net \
     python-pyparsing \
     rt-tests \
     schedtool-dl \
     spice \
-    system-report \
 "
 
 IMAGE_FEATURES += " \

diff --git a/meta-oran/recipes-base/images/oran-image-inf-minimal.bb b/meta-oran/recipes-base/images/oran-image-inf-minimal.bb
index 0fe8e20..005d077 100644 (file)
--- a/meta-oran/recipes-base/images/oran-image-inf-minimal.bb
+++ b/meta-oran/recipes-base/images/oran-image-inf-minimal.bb
@@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 IMAGE_INSTALL = " \
    packagegroup-core-boot \
-   packagegroup-containers \
    packagegroup-oran-vm \
 "
 

diff --git a/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb b/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb
index 4114b8d..4f92365 100644 (file)
--- a/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb
+++ b/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb
@@ -18,9 +18,9 @@ PACKAGES = " \
     ${PN}-docker \
     ${PN}-k8s \
     ${PN}-vm \
-    ${PN}-criu \
     ${PN}-trace-tools \
     ${PN}-lttng-toolchain \
+    ${PN}-glusterfs \
 "
 
 RDEPENDS_${PN} = "\
@@ -28,9 +28,9 @@ RDEPENDS_${PN} = "\
     ${PN}-docker \
     ${PN}-k8s \
     ${PN}-vm \
-    ${PN}-criu \
     ${PN}-trace-tools \
     ${PN}-lttng-toolchain \
+    ${PN}-glusterfs \
 "
 
 RDEPENDS_${PN}-base = "\
@@ -66,18 +66,27 @@ RRECOMMENDS_${PN}-vm = "\
     kernel-module-kvm-amd \
 "
 
-RDEPENDS_${PN}-criu = "\
-    criu \
-    protobuf-c \
-"
-
 RDEPENDS_${PN}-trace-tools = "\
-    diod \
     socat \
 "
+# It's blacklisted becasue of build failure
+#    diod
 
-RDEPENDS_${PN}-trace-tools = "\
+RDEPENDS_${PN}-lttng-toolchain = "\
     babeltrace \
     lttng-tools \
     lttng-ust \
 "
+
+RDEPENDS_${PN}-glusterfs = "\
+    fuse \
+    fuse-utils \
+    libulockmgr \
+    glusterfs \
+    glusterfs-rdma \
+    glusterfs-geo-replication \
+    glusterfs-fuse \
+    glusterfs-server \
+    xfsdump \
+    xfsprogs \
+"

diff --git a/scripts/build_oran.sh b/scripts/build_oran.sh
index ef5cbb5..311f1c2 100755 (executable)
--- a/scripts/build_oran.sh
+++ b/scripts/build_oran.sh
@@ -84,4 +84,4 @@ EOF
 # Build the oran-inf-host image
 mkdir -p logs
 TIMESTAMP=`date +"%Y%m%d_%H%M%S"`
-bitbake wrlinux-image-oran-host 2>&1|tee logs/bitbake_wrlinux-image-oran-host_${TIMESTAMP}.log
+bitbake oran-image-inf-host 2>&1|tee logs/bitbake_oran-image-inf-host_${TIMESTAMP}.log