From 1b984a9fec5e6e5892fad2f79e8587d06dd17641 Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Thu, 10 Aug 2017 10:14:21 +0200 Subject: support to copy kernel config in deploy folder moved Since it is not specific to an architecture it was moved into meta-enea-bsp-common repo. Signed-off-by: Adrian Calianu --- recipes-kernel/linux/linux-common.inc | 14 -------------- recipes-kernel/linux/linux-intel.inc | 2 +- recipes-kernel/linux/linux-yocto_4.9.bbappend | 2 +- 3 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 recipes-kernel/linux/linux-common.inc diff --git a/recipes-kernel/linux/linux-common.inc b/recipes-kernel/linux/linux-common.inc deleted file mode 100644 index 426b0ff..0000000 --- a/recipes-kernel/linux/linux-common.inc +++ /dev/null @@ -1,14 +0,0 @@ -kernel_do_deploy[vardepsexclude] = "DATETIME" -kernel_do_deploy_append () { - - # - # Drop the regular defconfig along side the others for consistency - # - cp ${B}/.config ${DEPLOYDIR}/config-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}.config - - # - # add symlink - # - ln -sf config-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}.config ${DEPLOYDIR}/config-${MACHINE}.config - -} diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index d9f563c..ec91f34 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -1,4 +1,4 @@ -require linux-common.inc +require recipes-kernel/linux/linux-deploy-kconfig.inc SRCREV_metaenea ?= "28da254d1c5ae012a6e064671aa14850c2a21a25" KENEABRANCH = "intel-4.9" diff --git a/recipes-kernel/linux/linux-yocto_4.9.bbappend b/recipes-kernel/linux/linux-yocto_4.9.bbappend index 42ba9f1..41e94c8 100644 --- a/recipes-kernel/linux/linux-yocto_4.9.bbappend +++ b/recipes-kernel/linux/linux-yocto_4.9.bbappend @@ -1,4 +1,4 @@ -require linux-common.inc +require recipes-kernel/linux/linux-deploy-kconfig.inc SRCREV_metaenea ?= "5057d9d3837fc35814a402b9c0384a064d260d05" KENEABRANCH = "yocto-4.9" -- cgit v1.2.3-54-g00ecf From 7a572a7ca2299f67237f870007fe4e547468c3fe Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Thu, 10 Aug 2017 11:40:10 +0200 Subject: move all dpdk changes into virtualization profile repo Signed-off-by: Adrian Calianu --- .../dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bbappend | 2 -- recipes-extended/dpdk/dpdk_17.02.bbappend | 27 ---------------------- 2 files changed, 29 deletions(-) delete mode 100644 recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bbappend delete mode 100644 recipes-extended/dpdk/dpdk_17.02.bbappend diff --git a/recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bbappend b/recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bbappend deleted file mode 100644 index 9963b86..0000000 --- a/recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -COMPATIBLE_MACHINE_inteld1521 = "inteld1521" -COMPATIBLE_MACHINE_qemux86-64 = "qemux86-64" diff --git a/recipes-extended/dpdk/dpdk_17.02.bbappend b/recipes-extended/dpdk/dpdk_17.02.bbappend deleted file mode 100644 index ca155d0..0000000 --- a/recipes-extended/dpdk/dpdk_17.02.bbappend +++ /dev/null @@ -1,27 +0,0 @@ -COMPATIBLE_MACHINE_inteld1521 = "inteld1521" -COMPATIBLE_MACHINE_qemux86-64 = "qemux86-64" - -# lspci - required by dpdk tools/scripts -RDEPENDS_${PN} += "pciutils" - -export RTE_TARGET="${@bb.utils.contains("TUNE_FEATURES", "m64", "x86_64-native-linuxapp-gcc", "i686-native-linuxapp-gcc", d)}" -export ETHTOOL_LIB_PATH = "${S}/examples/ethtool/lib/${RTE_TARGET}/lib/" - -# Overrides the default value set to DPDK_TARGET_MACH in dpdk.inc, -# with the purpose adding 'inteld1521' to 'multiarch_options' -export DPDK_TARGET_MACH = "${@get_dpdk_target(bb,d)}" - -def get_dpdk_target(bb, d): - target_arch = d.getVar('MACHINE_ARCH', True) - multiarch_options = { - "mohonpeak64":"atm", - "mohonpeak32":"atm", - "crystalforest": "ivb", - "intel_corei7_64": "hsw", - "inteld1521": "hsw", - "qemux86_64": "default", - } - - if target_arch in multiarch_options : - return multiarch_options[target_arch] - return "" -- cgit v1.2.3-54-g00ecf