Resolve multiple conflicts of NXP layers with usrmerge

Signed-off-by: Eugene Smirnov <evgenii.smirnov@here.com>

9 files changed, 119 insertions, 0 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 035a46b..44db931 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -21,3 +21,14 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   aktualizr-shared-prov-creds->aktualizr \
   aktualizr-uboot-env-rollback->aktualizr \
 "
+
+BBFILES_DYNAMIC += " \
+    virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/*/*/*.bb \
+    virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/*/*/*.bbappend \
+    \
+    freescale-layer:${LAYERDIR}/dynamic-layers/freescale-layer/*/*/*.bb \
+    freescale-layer:${LAYERDIR}/dynamic-layers/freescale-layer/*/*/*.bbappend \
+    \
+    qoriq-demos:${LAYERDIR}/dynamic-layers/qoriq-demos/*/*/*.bb \
+    qoriq-demos:${LAYERDIR}/dynamic-layers/qoriq-demos/*/*/*.bbappend \
+"
diff --git a/dynamic-layers/freescale-layer/recipes-bsp/u-boot/u-boot-qoriq_%.bbappend b/dynamic-layers/freescale-layer/recipes-bsp/u-boot/u-boot-qoriq_%.bbappend
new file mode 100644
index 0000000..1b66418
--- /dev/null
+++ b/dynamic-layers/freescale-layer/recipes-bsp/u-boot/u-boot-qoriq_%.bbappend
@@ -0,0 +1,13 @@
+DEPENDS += "u-boot-mkimage-native"
+
+do_deploy_append_qoriq() {
+
+    cat > ${DEPLOYDIR}/ls1043ardb_boot.txt << EOF
+load mmc 0:2 \${load_addr} /boot/loader/uEnv.txt
+env import -t \${fileaddr} \${filesize}
+load mmc 0:2 \${load_addr} /boot\${kernel_image}
+bootm \${load_addr}
+EOF
+
+    mkimage -A arm64 -O linux -T script -d ${DEPLOYDIR}/ls1043ardb_boot.txt ${DEPLOYDIR}/ls1043ardb_boot.scr
+}
diff --git a/dynamic-layers/freescale-layer/recipes-dpaa2/dce/dce_%.bbappend b/dynamic-layers/freescale-layer/recipes-dpaa2/dce/dce_%.bbappend
new file mode 100644
index 0000000..85b55de
--- /dev/null
+++ b/dynamic-layers/freescale-layer/recipes-dpaa2/dce/dce_%.bbappend
@@ -0,0 +1,4 @@
+
+do_install () {
+  oe_runmake install DESTDIR=${D}${root_prefix}
+}
diff --git a/dynamic-layers/freescale-layer/recipes-extended/dpdk/dpdk_%.bbappend b/dynamic-layers/freescale-layer/recipes-extended/dpdk/dpdk_%.bbappend
new file mode 100644
index 0000000..994c6b2
--- /dev/null
+++ b/dynamic-layers/freescale-layer/recipes-extended/dpdk/dpdk_%.bbappend
@@ -0,0 +1,39 @@
+
+do_install() {
+    unset LDFLAGS TARGET_LDFLAGS BUILD_LDFLAGS
+
+    oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu"  WERROR_FLAGS="-w" V=1  T="${RTE_TARGET}" DESTDIR="${D}" install CONFIG_RTE_EAL_IGB_UIO=n CONFIG_RTE_KNI_KMOD=y CONFIG_RTE_LIBRTE_PMD_OPENSSL=y
+
+    # Build and install the DPDK examples
+    for APP in examples/l2fwd examples/l3fwd  examples/l2fwd-qdma examples/l2fwd-crypto examples/ipsec-secgw examples/kni examples/ip_fragmentation examples/ip_reassembly; do
+        temp=`basename ${APP}`
+        if [ ${temp} = "ipsec-secgw" ] || [ ${temp} = "l2fwd-crypto" ]; then
+            oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu"  -C ${APP} CONFIG_RTE_LIBRTE_PMD_OPENSSL=y
+        else
+            oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu" EXTRA_CFLAGS="--sysroot=${STAGING_DIR_HOST} -I${STAGING_INCDIR}" -C ${APP}
+        fi
+
+        [ ! -d ${D}/${bindir}/dpdk-example ] && install -d 0644 ${D}/${bindir}/dpdk-example
+        install -m 0755 ${S}/examples/`basename ${APP}`/build/`basename ${APP}` \
+            ${D}/${bindir}/dpdk-example/
+    done
+    oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu"  -C examples/vhost
+    install -m 0755 ${S}/examples/vhost/build/vhost-switch ${D}/${bindir}/dpdk-example/
+    oe_runmake EXTRA_LDFLAGS="-L${STAGING_LIBDIR} --hash-style=gnu"  -C examples/cmdif
+
+    install -d 0644 ${D}/usr/share/dpdk/cmdif/include
+    install -d 0644 ${D}/usr/share/dpdk/cmdif/lib
+    cp examples/cmdif/lib/client/fsl_cmdif_client.h examples/cmdif/lib/server/fsl_cmdif_server.h \
+        examples/cmdif/lib/shbp/fsl_shbp.h      ${D}/usr/share/dpdk/cmdif/include
+    cp examples/cmdif/lib/${RTE_TARGET}/librte_cmdif.a ${D}/usr/share/dpdk/cmdif/lib
+
+    install -m 0755 ${S}/${RTE_TARGET}/app/testpmd ${D}/${bindir}/dpdk-example/
+    rm -fr ${D}/lib
+    install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/dpdk
+    install -m 0755 ${S}/${RTE_TARGET}/kmod/rte_kni.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/dpdk
+    install -d ${D}/${bindir}/dpdk-example/extras
+    cp -rf  ${S}/nxp/* ${D}/${bindir}/dpdk-example/extras/
+    rm ${D}/${datadir}/${RTE_TARGET}/app/dpdk-pmdinfogen
+
+    chown root:root -R ${D}
+}
diff --git a/dynamic-layers/freescale-layer/recipes-security/optee/optee-os-qoriq_%.bbappend b/dynamic-layers/freescale-layer/recipes-security/optee/optee-os-qoriq_%.bbappend
new file mode 100644
index 0000000..20e6216
--- /dev/null
+++ b/dynamic-layers/freescale-layer/recipes-security/optee/optee-os-qoriq_%.bbappend
@@ -0,0 +1,24 @@
+
+do_install() {
+    #install core on boot directory
+    install -d ${D}/${libdir}/firmware/
+    if [ ${MACHINE} = ls1012afrwy ]; then
+        install -m 644 ${B}/out/arm-plat-ls/core/tee_512mb.bin ${D}/${libdir}/firmware/tee_${MACHINE}_512mb.bin
+    fi
+    install -m 644 ${B}/out/arm-plat-ls/core/tee.bin ${D}/${libdir}/firmware/tee_${MACHINE}.bin
+    #install TA devkit
+    install -d ${D}/usr/include/optee/export-user_ta/
+
+    for f in  ${B}/out/arm-plat-ls/export-ta_${OPTEE_ARCH}/* ; do
+        cp -aR  $f  ${D}/usr/include/optee/export-user_ta/
+    done
+}
+
+do_deploy() {
+    install -d ${DEPLOYDIR}/optee
+    for f in ${D}/${libdir}/firmware/*; do
+    cp $f ${DEPLOYDIR}/optee/
+    done
+}
+
+FILES_${PN} = "${libdir}/firmware/"
diff --git a/dynamic-layers/freescale-layer/recipes-security/optee/optee-test-qoriq_%.bbappend b/dynamic-layers/freescale-layer/recipes-security/optee/optee-test-qoriq_%.bbappend
new file mode 100644
index 0000000..81f1905
--- /dev/null
+++ b/dynamic-layers/freescale-layer/recipes-security/optee/optee-test-qoriq_%.bbappend
@@ -0,0 +1,11 @@
+
+do_install () {
+    install -D -p -m0755 ${S}/out/xtest/xtest ${D}${bindir}/xtest
+
+    # install path should match the value set in optee-client/tee-supplicant
+    # default TEEC_LOAD_PATH is /lib
+    mkdir -p ${D}/${libdir}/optee_armtz/
+    install -D -p -m0444 ${S}/out/ta/*/*.ta ${D}/${libdir}/optee_armtz/
+}
+
+FILES_${PN} += "${libdir}/optee_armtz/"
diff --git a/dynamic-layers/qoriq-demos/recipes-extended/crconf/crconf_%.bbappend b/dynamic-layers/qoriq-demos/recipes-extended/crconf/crconf_%.bbappend
new file mode 100644
index 0000000..911a20c
--- /dev/null
+++ b/dynamic-layers/qoriq-demos/recipes-extended/crconf/crconf_%.bbappend
@@ -0,0 +1,4 @@
+
+do_install () {
+       oe_runmake install  DESTDIR=${D}${root_prefix}
+}
diff --git a/dynamic-layers/virtualization-layer/recipes-containers/cgroup-lite/cgroup-lite_%.bbappend b/dynamic-layers/virtualization-layer/recipes-containers/cgroup-lite/cgroup-lite_%.bbappend
new file mode 100644
index 0000000..e6c843f
--- /dev/null
+++ b/dynamic-layers/virtualization-layer/recipes-containers/cgroup-lite/cgroup-lite_%.bbappend
@@ -0,0 +1,12 @@
+
+do_install() {
+        install -d ${D}/${bindir}
+        install -m 0755 ${S}/scripts/cgroups-mount ${D}/${bindir}
+        install -m 0755 ${S}/scripts/cgroups-umount ${D}/${bindir}
+
+        install -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${WORKDIR}/cgroups-init ${D}${sysconfdir}/init.d/cgroups-init
+
+        install -d ${D}${systemd_unitdir}/system
+        ln -sf /dev/null ${D}${systemd_unitdir}/system/cgroups-init.service
+}
diff --git a/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend b/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
new file mode 100644
index 0000000..5f29e63
--- /dev/null
+++ b/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
@@ -0,0 +1 @@
+SYSTEMTAP = ""