From 4fe91aacc358b690fae06a994001113213f1905b Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 26 Sep 2017 09:17:57 -0700 Subject: Removal of meta-intel content to make meta-intel-qat standalone Signed-off-by: Saul Wold --- conf/include/maintainers.inc | 24 ++---------- conf/layer.conf | 22 +++++------ conf/machine/include/intel-common-pkgarch.inc | 15 ------- conf/machine/include/intel-core2-32-common.inc | 7 ---- conf/machine/include/intel-corei7-64-common.inc | 7 ---- conf/machine/include/intel-quark-common.inc | 12 ------ conf/machine/include/meta-intel.inc | 52 ------------------------- conf/machine/include/qemu-intel.inc | 19 --------- conf/machine/include/qemuboot-intel.inc | 19 --------- conf/machine/intel-core2-32.conf | 35 ----------------- conf/machine/intel-corei7-64.conf | 46 ---------------------- conf/machine/intel-quark.conf | 33 ---------------- 12 files changed, 12 insertions(+), 279 deletions(-) delete mode 100644 conf/machine/include/intel-common-pkgarch.inc delete mode 100644 conf/machine/include/intel-core2-32-common.inc delete mode 100644 conf/machine/include/intel-corei7-64-common.inc delete mode 100644 conf/machine/include/intel-quark-common.inc delete mode 100644 conf/machine/include/meta-intel.inc delete mode 100644 conf/machine/include/qemu-intel.inc delete mode 100644 conf/machine/include/qemuboot-intel.inc delete mode 100644 conf/machine/intel-core2-32.conf delete mode 100644 conf/machine/intel-corei7-64.conf delete mode 100644 conf/machine/intel-quark.conf (limited to 'conf') diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc index 995ff33..9f4c2e3 100644 --- a/conf/include/maintainers.inc +++ b/conf/include/maintainers.inc @@ -1,23 +1,5 @@ # This file contains a list of recipe maintainers for meta-intel -RECIPE_MAINTAINER_pn-core-image-rt = "Swee Aun Khor " -RECIPE_MAINTAINER_pn-core-image-rt-sdk = "Swee Aun Khor " -RECIPE_MAINTAINER_pn-efilinux = "Swee Aun Khor " -RECIPE_MAINTAINER_pn-gma500-gfx-check = "Wei Tee Ng " -RECIPE_MAINTAINER_pn-intel-gpu-tools = "Wei Tee Ng " -RECIPE_MAINTAINER_pn-intel-microcode = "Swee Aun Khor " -RECIPE_MAINTAINER_pn-intel-minimal-initramfs = "Swee Aun Khor " -RECIPE_MAINTAINER_pn-iucode-tool = "Swee Aun Khor " -RECIPE_MAINTAINER_pn-libva-intel-driver = "Wei Tee Ng " -RECIPE_MAINTAINER_pn-libyami = "Wei Tee Ng " -RECIPE_MAINTAINER_pn-libyami-utils = "Wei Tee Ng " -RECIPE_MAINTAINER_pn-linux-intel = "Swee Aun Khor " -RECIPE_MAINTAINER_pn-linux-intel-rt = "Swee Aun Khor " -RECIPE_MAINTAINER_pn-lms7 = "TBD" -RECIPE_MAINTAINER_pn-lms8 = "TBD" -RECIPE_MAINTAINER_pn-rmc = "Wei Tee Ng " -RECIPE_MAINTAINER_pn-rmc-db = "Wei Tee Ng " -RECIPE_MAINTAINER_pn-thermald = "Swee Aun Khor " -RECIPE_MAINTAINER_pn-va-intel = "Wei Tee Ng " -RECIPE_MAINTAINER_pn-xf86-video-ast = "Wei Tee Ng " -RECIPE_MAINTAINER_pn-xf86-video-mga = "Wei Tee Ng " +RECIPE_MAINTAINER_pn-openssl-qat = "TBD DPDK Flex Team" +RECIPE_MAINTAINER_pn-qat16 = "TBD DPDK Flex Team" +RECIPE_MAINTAINER_pn-zlib-qat = "TBD DPDK Flex Team" diff --git a/conf/layer.conf b/conf/layer.conf index 53f831e..2e3aa84 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -1,24 +1,20 @@ # We have a conf and classes directory, add to BBPATH -BBPATH .= ":${LAYERDIR}:${LAYERDIR}/common" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \ - ${LAYERDIR}/common/recipes-*/*/*.bbappend" +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS += "intel" -BBFILE_PATTERN_intel := "^${LAYERDIR}/common/" -BBFILE_PRIORITY_intel = "5" +BBFILE_COLLECTIONS += "intel-qat" +BBFILE_PATTERN_intel-qat := "^${LAYERDIR}/" +BBFILE_PRIORITY_intel-qat = "5" -# Additional license directories. -LICENSE_PATH += "${LAYERDIR}/common/custom-licenses" - -LAYERDEPENDS_intel = "core" -LAYERRECOMMENDS_intel = "dpdk intel-qat" +LAYERDEPENDS_intel-qat = "core intel" # This should only be incremented on significant changes that will # cause compatibility issues with other layers -LAYERVERSION_intel = "4" -LAYERSERIES_COMPAT_intel = "rocko" +LAYERVERSION_intel-qat = "1" +LAYERSERIES_COMPAT_intel-qat = "rocko" require ${LAYERDIR}/conf/include/maintainers.inc diff --git a/conf/machine/include/intel-common-pkgarch.inc b/conf/machine/include/intel-common-pkgarch.inc deleted file mode 100644 index d0f208b..0000000 --- a/conf/machine/include/intel-common-pkgarch.inc +++ /dev/null @@ -1,15 +0,0 @@ -INTEL_COMMON_PACKAGE_ARCH ?= "${TUNE_PKGARCH}-intel-common" -PACKAGE_ARCH_pn-linux-intel = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-linux-intel-rt = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-linux-intel-tiny = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-linux-intel-dev = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-linux-yocto = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-linux-yocto-rt = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-linux-yocto-tiny = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-linux-yocto-dev = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-intel-microcode = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-backport-iwlwifi = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-ixgbe = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_ARCH_pn-ixgbevf = "${INTEL_COMMON_PACKAGE_ARCH}" -PACKAGE_EXTRA_ARCHS_append += "${INTEL_COMMON_PACKAGE_ARCH}" -MACHINEOVERRIDES =. "${INTEL_COMMON_PACKAGE_ARCH}:" diff --git a/conf/machine/include/intel-core2-32-common.inc b/conf/machine/include/intel-core2-32-common.inc deleted file mode 100644 index 8c46949..0000000 --- a/conf/machine/include/intel-core2-32-common.inc +++ /dev/null @@ -1,7 +0,0 @@ -# -# Common configuration for all MACHINEs of the intel-core2 type -# - -DEFAULTTUNE ?= "core2-32" -require conf/machine/include/tune-core2.inc -require conf/machine/include/x86-base.inc diff --git a/conf/machine/include/intel-corei7-64-common.inc b/conf/machine/include/intel-corei7-64-common.inc deleted file mode 100644 index 0028256..0000000 --- a/conf/machine/include/intel-corei7-64-common.inc +++ /dev/null @@ -1,7 +0,0 @@ -# -# Common configuration for all MACHINES of the intel-corei7-64 type -# - -DEFAULTTUNE ?= "corei7-64" -require conf/machine/include/tune-corei7.inc -require conf/machine/include/x86-base.inc diff --git a/conf/machine/include/intel-quark-common.inc b/conf/machine/include/intel-quark-common.inc deleted file mode 100644 index f7cfe14..0000000 --- a/conf/machine/include/intel-quark-common.inc +++ /dev/null @@ -1,12 +0,0 @@ -# -# Common configuration for all MACHINES of the intel-quark type -# - -DEFAULTTUNE ?= "i586-nlp-32" -require conf/machine/include/tune-i586-nlp.inc -require conf/machine/include/x86-base.inc - -# gnutls padlock code uses CMOV instruction in assembly which -# is not valid for Quark. -EXTRA_OECONF_append_pn-gnutls_intel-quark = " --disable-padlock" -EXTRA_OECONF_append_pn-openssl_intel-quark = " no-asm" diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc deleted file mode 100644 index 34a672c..0000000 --- a/conf/machine/include/meta-intel.inc +++ /dev/null @@ -1,52 +0,0 @@ -# -# BSP variables and settings specific to the meta-intel layer. -# You must include the meta-intel layer in your bblayers.conf -# to use them. -# - -# -# XSERVER subcomponents, used to build the XSERVER variable -# - -# Soft set linux-yocto as preferred kernel like x86-base.inc -PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel" -PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel" -PREFERRED_PROVIDER_virtual/kernel_linuxstdbase ?= "linux-yocto" -PREFERRED_VERSION_linux-intel ?= "4.9%" - -# for Xserver older than 1.13.0 -OLD_XSERVER_X86_EXT = "xserver-xorg-extension-dri \ - xserver-xorg-extension-dri2 \ - xserver-xorg-extension-extmod \ - xserver-xorg-extension-dbe \ - " - -XSERVER_X86_MATROX_MGA = "xf86-video-mga \ - " - -XSERVER_X86_ASPEED_AST = "xf86-video-ast \ - " - -# include the user space intel microcode loading support in the generated images. -MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', ' intel-microcode', '', d)} thermald" - -# recommended extra packages common to all intel machines -MACHINE_EXTRA_RRECOMMENDS_append = " kernel-modules linux-firmware" - -# for the early boot time kernel microcode loading support, -# merge the microcode data in the final initrd image. -INITRD_LIVE_prepend = "${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', '${DEPLOY_DIR_IMAGE}/microcode.cpio ', '', d)}" - -DISK_SIGNATURE_UUID ??= "deadbeef-dead-beef-dead-beefdeadbeef" - -EFI_PROVIDER ?= "rmc-boot" - -# Add general MACHINEOVERRIDE for meta-intel -MACHINEOVERRIDES =. "intel-x86-common:" - -# Definition of (more or less) suitable virtual machines. -require conf/machine/include/qemuboot-intel.inc - -# Ensure that the extra tools needed by qemu are built when building images -# and tweak machine definition to make the result more usable under qemu. -require conf/machine/include/qemu-intel.inc diff --git a/conf/machine/include/qemu-intel.inc b/conf/machine/include/qemu-intel.inc deleted file mode 100644 index 8151040..0000000 --- a/conf/machine/include/qemu-intel.inc +++ /dev/null @@ -1,19 +0,0 @@ -# Similar to meta/conf/machine/include/qemu.inc but influences the -# distro content (in particular the kernel) less than qemu.inc. - -# Ensure that qemu gets built when building images. -EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" - -# Build ovmf firmware for uefi support in qemu. -EXTRA_IMAGEDEPENDS += "ovmf" - -# runqemu uses virtio, so we have to enable the corresponding -# kernel drivers. -KERNEL_FEATURES_INTEL_COMMON += "cfg/virtio.scc" - -# Other useful extensions which are not enabled by default: -# rng-tools to take advantage of qemu's virtio-rng-pci device. -# MACHINE_EXTRA_RRECOMMENDS += "rng-tools" - -# Creates the necessary .qemuboot.conf file for each image. -IMAGE_CLASSES += "qemuboot" diff --git a/conf/machine/include/qemuboot-intel.inc b/conf/machine/include/qemuboot-intel.inc deleted file mode 100644 index cb52330..0000000 --- a/conf/machine/include/qemuboot-intel.inc +++ /dev/null @@ -1,19 +0,0 @@ -# For runqemu -IMAGE_CLASSES += "qemuboot" -QB_SYSTEM_NAME_intel-core2-32 = "qemu-system-i386" -QB_CPU_intel-core2-32 = "-cpu coreduo" -QB_CPU_KVM_intel-core2-32 = "-cpu kvm32" - -QB_SYSTEM_NAME_intel-corei7-64 = "qemu-system-x86_64" -QB_CPU_intel-corei7-64 = "-cpu Nehalem" -QB_CPU_KVM_intel-corei7-64 = "-cpu kvm64" - -QB_SYSTEM_NAME_intel-quark = "qemu-system-i386" -QB_CPU_intel-quark = "-cpu coreduo" -QB_CPU_KVM_intel-quark = "-cpu kvm32" - -QB_AUDIO_DRV = "alsa" -QB_AUDIO_OPT = "-soundhw ac97,es1370" -QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1" -# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy -QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet -device virtio-rng-pci" diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf deleted file mode 100644 index abe6f90..0000000 --- a/conf/machine/intel-core2-32.conf +++ /dev/null @@ -1,35 +0,0 @@ -#@TYPE: Machine -#@NAME: intel-core2-32 - -#@DESCRIPTION: Machine configuration for 32 bit Intel Core 2 CPU (and later) with MMX, SSE, SSE2, SSE3, and SSSE3 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. - -require conf/machine/include/meta-intel.inc -require conf/machine/include/intel-core2-32-common.inc -require conf/machine/include/intel-common-pkgarch.inc - -MACHINE_FEATURES += "pcbios efi" -MACHINE_FEATURES += "va-impl-intel" -MACHINE_FEATURES += "wifi 3g nfc" -MACHINE_FEATURES += "intel-ucode" - -MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi" - -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "gma500-gfx-check" - -XSERVER ?= "${XSERVER_X86_BASE} \ - ${XSERVER_X86_EXT} \ - ${XSERVER_X86_FBDEV} \ - ${XSERVER_X86_I915} \ - ${XSERVER_X86_I965} \ - ${XSERVER_X86_MODESETTING} \ - ${XSERVER_X86_VESA} \ - ${XSERVER_X86_ASPEED_AST} \ - " - -SYSLINUX_OPTS = "serial 0 115200" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyPCH0" -APPEND += "rootwait console=ttyS0,115200 console=ttyPCH0,115200 console=tty0" - -IMAGE_FSTYPES += "wic" -WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" -do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf deleted file mode 100644 index 78a1f6e..0000000 --- a/conf/machine/intel-corei7-64.conf +++ /dev/null @@ -1,46 +0,0 @@ -#@TYPE: Machine -#@NAME: intel-corei7-64 - -#@DESCRIPTION: Machine configuration for 64 bit Intel Core i7 CPU (and later) with MMX, SSE, SSE2, SSE3, and SSSE3 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. - -require conf/machine/include/meta-intel.inc -require conf/machine/include/intel-corei7-64-common.inc -require conf/machine/include/intel-common-pkgarch.inc - -MACHINE_FEATURES += "pcbios efi" -MACHINE_FEATURES += "va-impl-intel" -MACHINE_FEATURES += "wifi 3g nfc" -MACHINE_FEATURES += "intel-ucode" - -MACHINE_HWCODECS ?= "va-intel gstreamer1.0-vaapi" - -MACHINE_EXTRA_RRECOMMENDS += "lms8" - -# Enable optional dpdk: -COMPATIBLE_MACHINE_pn-dpdk = "intel-corei7-64" -COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = "intel-corei7-64" -DPDK_TARGET_MACHINE ?= "atm" - -# Enable optional QAT items: -COMPATIBLE_MACHINE_pn-openssl-qat = "intel-corei7-64" -COMPATIBLE_MACHINE_pn-qat16 = "intel-corei7-64" -COMPATIBLE_MACHINE_pn-zlib-qat = "intel-corei7-64" - -XSERVER ?= "${XSERVER_X86_BASE} \ - ${XSERVER_X86_EXT} \ - ${XSERVER_X86_FBDEV} \ - ${XSERVER_X86_I915} \ - ${XSERVER_X86_I965} \ - ${XSERVER_X86_MATROX_MGA} \ - ${XSERVER_X86_MODESETTING} \ - ${XSERVER_X86_VESA} \ - ${XSERVER_X86_ASPEED_AST} \ - " - -SYSLINUX_OPTS = "serial 0 115200" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2" -APPEND += "rootwait console=ttyS0,115200 console=tty0" - -IMAGE_FSTYPES += "wic" -WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot rmc-boot", "systemd-bootdisk.wks", "mkefidisk.wks", d)}" -do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" diff --git a/conf/machine/intel-quark.conf b/conf/machine/intel-quark.conf deleted file mode 100644 index 17e8c52..0000000 --- a/conf/machine/intel-quark.conf +++ /dev/null @@ -1,33 +0,0 @@ -#@TYPE: Machine -#@NAME: quark - -#@DESCRIPTION: Machine configuration for Quark systems - -require conf/machine/include/meta-intel.inc -require conf/machine/include/intel-quark-common.inc -require conf/machine/include/intel-common-pkgarch.inc - -#Avoid pulling in GRUB -MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "" - -MACHINE_FEATURES = "efi usb" -MACHINE_FEATURES += "intel-ucode" - -SERIAL_CONSOLE = "115200 ttyS1" -APPEND += "rootwait console=ttyS1,115200 console=tty0" - -# Bypass the default labels which also has "install" option in OE. -# -# We don't need to do this when constructing direct-boot image with -# wic. But EFI installer in hddimg image doesn't work on quark now, -# so we only provide a live-boot entry in boot menu for images in -# hddimg format. - -LABELS_LIVE = "boot" - -# Ensure that the Lock prefix is omitted for the kernel" -KERNEL_EXTRA_ARGS = "EXTRA_CFLAGS=-Wa,-momit-lock-prefix=yes" - -IMAGE_FSTYPES += "wic" -WKS_FILE ?= "galileodisk-sd.wks" -do_image_wic[depends] += "gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" -- cgit v1.2.3-54-g00ecf