From: Jackie Huang Date: Mon, 30 Sep 2019 06:33:27 +0000 (+0800) Subject: image: re-org the image and distro X-Git-Tag: bronze-rc0~143 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=da071f80b8756ce948ae54cfee514969d7c13f39;p=pti%2Frtp.git image: re-org the image and distro * Rename images to oran-image-inf-XYZ * Add corresponding packagegroups * Do not depend on wrlinux-ovp Issue-ID: INF-4 Signed-off-by: Jackie Huang Change-Id: I74a978ee0a95b95578202478f25928529c3e1f45 --- diff --git a/meta-oran/conf/distro/oran-inf.conf b/meta-oran/conf/distro/oran-inf.conf index b49b4e2..1f3a1b0 100644 --- a/meta-oran/conf/distro/oran-inf.conf +++ b/meta-oran/conf/distro/oran-inf.conf @@ -5,8 +5,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt" PREFERRED_VERSION_linux-yocto-rt = "4.18%" -require conf/distro/wrlinux-ovp.conf - # Note that layer.conf will only add items to BBFILES for # the wrlinux-oran distro (this one). # @@ -28,3 +26,7 @@ MONITORING_FEATURES ?= "nagios core" DISTRO_FEATURES_append = " virtualization kvm" 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 34e906f..8de21e7 100644 --- a/meta-oran/conf/layer.conf +++ b/meta-oran/conf/layer.conf @@ -9,7 +9,7 @@ BBPATH =. "${LAYERDIR}:" BBFILES += " \ ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend \ - " +" BBFILE_COLLECTIONS += "meta-oran" BBFILE_PATTERN_meta-oran = "^${LAYERDIR}/" @@ -23,20 +23,19 @@ LAYERSERIES_COMPAT_meta-oran = "thud wrl" LAYER_PATH_meta-oran = "${LAYERDIR}" LAYERDEPENDS_meta-oran = " \ + cloud-services-layer \ core \ + dpdk \ + realtime \ + virtualization-layer \ wr-template \ wrlinux \ wrlinux-distro \ - wrlinux-ovp \ - virtualization-layer \ - cloud-services-layer \ - realtime \ - dpdk \ - " +" LAYERRECOMMENDS_meta-oran = " \ meta-anaconda \ - " +" PNWHITELIST_LAYERS_remove = "meta-oran" diff --git a/meta-oran/recipes-base/images/wrlinux-image-oran-guest.bb b/meta-oran/recipes-base/images/oran-image-inf-guest.bb similarity index 80% rename from meta-oran/recipes-base/images/wrlinux-image-oran-guest.bb rename to meta-oran/recipes-base/images/oran-image-inf-guest.bb index 1d8d162..247e2e3 100644 --- a/meta-oran/recipes-base/images/wrlinux-image-oran-guest.bb +++ b/meta-oran/recipes-base/images/oran-image-inf-guest.bb @@ -1,33 +1,28 @@ # # Copyright (C) 2019 Wind River Systems, Inc. # -DESCRIPTION = "An image suitable for a O-RAN guest." +DESCRIPTION = "An image suitable for a O-RAN INF guest." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -require recipes-base/images/wrlinux-image-oran-minimal.bb +require recipes-base/images/oran-image-inf-minimal.bb -# OVP specific packages IMAGE_INSTALL += " \ - packagegroup-ovp-trace-tools \ - hwloc \ - system-report \ acpid-default-scripts \ -" - -IMAGE_INSTALL_append_qemux86-64 = " dpdk" - -IMAGE_INSTALL += " \ + hwloc \ kernel-modules \ packagegroup-base-extended \ - packagegroup-wr-base \ packagegroup-containers \ + packagegroup-oran-trace-tools \ + packagegroup-wr-base \ packagegroup-wr-base-net \ packagegroup-wr-boot \ - " + system-report \ +" +IMAGE_INSTALL_append_qemux86-64 = " dpdk" IMAGE_FEATURES += " \ nfs-server \ @@ -40,6 +35,6 @@ IMAGE_FEATURES += " \ wr-core-sys-util \ wr-core-util \ wr-core-mail \ - " +" COMPATIBLE_MACHINE = "qemux86|qemux86-64" diff --git a/meta-oran/recipes-base/images/wrlinux-image-oran-host.bb b/meta-oran/recipes-base/images/oran-image-inf-host.bb similarity index 54% rename from meta-oran/recipes-base/images/wrlinux-image-oran-host.bb rename to meta-oran/recipes-base/images/oran-image-inf-host.bb index 5c78446..5160882 100644 --- a/meta-oran/recipes-base/images/wrlinux-image-oran-host.bb +++ b/meta-oran/recipes-base/images/oran-image-inf-host.bb @@ -1,14 +1,14 @@ # # Copyright (C) 2019 Wind River Systems, Inc. # -DESCRIPTION = "An image suitable for a O-RAN host." +DESCRIPTION = "An image suitable for a O-RAN INF host." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -require recipes-base/images/wrlinux-image-oran-minimal.bb +require recipes-base/images/oran-image-inf-minimal.bb IMAGE_INSTALL += " \ kernel-modules \ @@ -16,36 +16,28 @@ IMAGE_INSTALL += " \ packagegroup-wr-base \ packagegroup-wr-base-net \ packagegroup-wr-boot \ - " +" IMAGE_INSTALL += " \ - qemu \ - tunctl \ - udev \ - udev-extraconf \ - libvirt \ - libvirt-virsh \ - libvirt-libvirtd \ - socat \ - openvswitch \ - hwloc \ - aufs-util \ - packagegroup-ovp-debug \ - packagegroup-ovp-lttng-toolchain \ - packagegroup-containers \ - packagegroup-ovp-default-monitoring \ - packagegroup-ovp-criu \ - packagegroup-glusterfs \ - packagegroup-ovp-docker \ - spice \ - celt051 \ - python-pyparsing \ - schedtool-dl \ - dpdk \ - system-report \ - ceph \ - rt-tests \ - " + aufs-util \ + celt051 \ + ceph \ + dpdk \ + hwloc \ + openvswitch \ + packagegroup-containers \ + packagegroup-glusterfs \ + packagegroup-oran-criu \ + packagegroup-oran-debug \ + packagegroup-oran-default-monitoring \ + packagegroup-oran-docker \ + packagegroup-oran-lttng-toolchain \ + python-pyparsing \ + rt-tests \ + schedtool-dl \ + spice \ + system-report \ +" IMAGE_FEATURES += " \ nfs-server \ @@ -58,7 +50,7 @@ IMAGE_FEATURES += " \ wr-core-sys-util \ wr-core-util \ wr-core-mail \ - " +" # enable build out .ext3 image file, shall be useful for qemu IMAGE_FSTYPES += "ext3" diff --git a/meta-oran/recipes-base/images/wrlinux-image-oran-minimal.bb b/meta-oran/recipes-base/images/oran-image-inf-minimal.bb similarity index 94% rename from meta-oran/recipes-base/images/wrlinux-image-oran-minimal.bb rename to meta-oran/recipes-base/images/oran-image-inf-minimal.bb index 0a493cc..0fe8e20 100644 --- a/meta-oran/recipes-base/images/wrlinux-image-oran-minimal.bb +++ b/meta-oran/recipes-base/images/oran-image-inf-minimal.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda IMAGE_INSTALL = " \ packagegroup-core-boot \ - packagegroup-ovp-vm \ packagegroup-containers \ + packagegroup-oran-vm \ " inherit wrlinux-image diff --git a/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb b/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb new file mode 100644 index 0000000..4114b8d --- /dev/null +++ b/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb @@ -0,0 +1,83 @@ +# +# Copyright (C) 2019 Wind River Systems, Inc. +# + +DESCRIPTION = "Packagegroup for ORAN packages" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit packagegroup + +PROVIDES = "${PACKAGES}" +PACKAGES = " \ + ${PN}-base \ + ${PN}-docker \ + ${PN}-k8s \ + ${PN}-vm \ + ${PN}-criu \ + ${PN}-trace-tools \ + ${PN}-lttng-toolchain \ +" + +RDEPENDS_${PN} = "\ + ${PN}-base \ + ${PN}-docker \ + ${PN}-k8s \ + ${PN}-vm \ + ${PN}-criu \ + ${PN}-trace-tools \ + ${PN}-lttng-toolchain \ +" + +RDEPENDS_${PN}-base = "\ + vim \ + rt-tests \ + tunctl \ + udev \ + udev-extraconf \ +" + +RDEPENDS_${PN}-docker = "\ + docker \ + docker-registry \ +" + +RDEPENDS_${PN}-k8s = "\ + cni \ + iproute2-tc \ + kubernetes \ +" + +RDEPENDS_${PN}-vm = "\ + qemu \ + libvirt \ + libvirt-libvirtd \ + libvirt-virsh \ + libvmi \ +" + +RRECOMMENDS_${PN}-vm = "\ + kernel-module-kvm \ + kernel-module-kvm-intel \ + kernel-module-kvm-amd \ +" + +RDEPENDS_${PN}-criu = "\ + criu \ + protobuf-c \ +" + +RDEPENDS_${PN}-trace-tools = "\ + diod \ + socat \ +" + +RDEPENDS_${PN}-trace-tools = "\ + babeltrace \ + lttng-tools \ + lttng-ust \ +" diff --git a/meta-oran/recipes-base/packagegroups/packagegroup-self-hosted.bbappend b/meta-oran/recipes-base/packagegroups/packagegroup-self-hosted.bbappend new file mode 100644 index 0000000..890928c --- /dev/null +++ b/meta-oran/recipes-base/packagegroups/packagegroup-self-hosted.bbappend @@ -0,0 +1,4 @@ +REQUIRED_DISTRO_FEATURES_remove = "x11 opengl" +PACKAGES_remove = "packagegroup-self-hosted-graphics" +RDEPENDS_packagegroup-self-hosted_remove = "packagegroup-self-hosted-graphics" +RDEPENDS_packagegroup-self-hosted-extended_remove = "settings-daemon" diff --git a/scripts/build_oran.sh b/scripts/build_oran.sh index ee1e1d2..ef5cbb5 100755 --- a/scripts/build_oran.sh +++ b/scripts/build_oran.sh @@ -50,7 +50,7 @@ echo_cmd "Cloning wrlinux 1018 source from github:" cd ${SRC_WRL_DIR} ${RUN_CMD} -RUN_CMD="./wrlinux-x/setup.sh --machines intel-x86-64 --layers wrlinux-ovp meta-cloud-services" +RUN_CMD="./wrlinux-x/setup.sh --machines intel-x86-64 --layers meta-cloud-services" echo_cmd "Setup wrlinux build project:" ${RUN_CMD}