diff options
Diffstat (limited to 'meta-agl-core/conf/distro')
| -rw-r--r-- | meta-agl-core/conf/distro/include/aarch64-tune.inc | 2 | ||||
| -rw-r--r-- | meta-agl-core/conf/distro/include/x86_64-tune.inc | 40 | ||||
| -rw-r--r-- | meta-agl-core/conf/distro/poky-agl.conf | 14 |
3 files changed, 28 insertions, 28 deletions
diff --git a/meta-agl-core/conf/distro/include/aarch64-tune.inc b/meta-agl-core/conf/distro/include/aarch64-tune.inc index 553bb5a64..320b4f1ac 100644 --- a/meta-agl-core/conf/distro/include/aarch64-tune.inc +++ b/meta-agl-core/conf/distro/include/aarch64-tune.inc @@ -4,7 +4,7 @@ # A double inclusion would produce a warning. This include line is just for reference # include conf/machine/include/arm/arch-armv8.inc -DEFAULTTUNE_poky-agl := "aarch64" +DEFAULTTUNE:poky-agl := "aarch64" # not yet ready #QB_SYSTEM_NAME ?= "qemu-system-aarch" #QB_DEFAULT_KERNEL ?= "zImage" diff --git a/meta-agl-core/conf/distro/include/x86_64-tune.inc b/meta-agl-core/conf/distro/include/x86_64-tune.inc index 9f2bdc867..a0b5abdfb 100644 --- a/meta-agl-core/conf/distro/include/x86_64-tune.inc +++ b/meta-agl-core/conf/distro/include/x86_64-tune.inc @@ -15,41 +15,41 @@ TUNE_CCARGS = "${@bb.utils.contains('TUNE_FEATURES', 'corei7', ' -march=corei7 - # Extra tune selections AVAILTUNES += "corei7-32" -TUNE_FEATURES_tune-corei7-32 = "${TUNE_FEATURES_tune-x86} corei7" -BASE_LIB_tune-corei7-32 = "lib" -TUNE_PKGARCH_tune-corei7-32 = "corei7-32" -PACKAGE_EXTRA_ARCHS_tune-corei7-32 = "${PACKAGE_EXTRA_ARCHS_tune-core2-32} corei7-32" +TUNE_FEATURES:tune-corei7-32 = "${TUNE_FEATURES:tune-x86} corei7" +BASE_LIB:tune-corei7-32 = "lib" +TUNE_PKGARCH:tune-corei7-32 = "corei7-32" +PACKAGE_EXTRA_ARCHS:tune-corei7-32 = "${PACKAGE_EXTRA_ARCHS:tune-core2-32} corei7-32" QEMU_EXTRAOPTIONS_corei7-32 = " -cpu Nehalem,check=false" AVAILTUNES += "corei7-64" -TUNE_FEATURES_tune-corei7-64 = "${TUNE_FEATURES_tune-x86-64} corei7" -BASE_LIB_tune-corei7-64 = "lib64" -TUNE_PKGARCH_tune-corei7-64 = "corei7-64" -PACKAGE_EXTRA_ARCHS_tune-corei7-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} corei7-64" +TUNE_FEATURES:tune-corei7-64 = "${TUNE_FEATURES:tune-x86-64} corei7" +BASE_LIB:tune-corei7-64 = "lib64" +TUNE_PKGARCH:tune-corei7-64 = "corei7-64" +PACKAGE_EXTRA_ARCHS:tune-corei7-64 = "${PACKAGE_EXTRA_ARCHS:tune-core2-64} corei7-64" QEMU_EXTRAOPTIONS_corei7-64 = " -cpu Nehalem,check=false" AVAILTUNES += "corei7-64-x32" -TUNE_FEATURES_tune-corei7-64-x32 = "${TUNE_FEATURES_tune-x86-64-x32} corei7" -BASE_LIB_tune-corei7-64-x32 = "libx32" -TUNE_PKGARCH_tune-corei7-64-x32 = "corei7-64-x32" -PACKAGE_EXTRA_ARCHS_tune-corei7-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64-x32} corei7-64-x32" +TUNE_FEATURES:tune-corei7-64-x32 = "${TUNE_FEATURES:tune-x86-64-x32} corei7" +BASE_LIB:tune-corei7-64-x32 = "libx32" +TUNE_PKGARCH:tune-corei7-64-x32 = "corei7-64-x32" +PACKAGE_EXTRA_ARCHS:tune-corei7-64-x32 = "${PACKAGE_EXTRA_ARCHS:tune-core2-64-x32} corei7-64-x32" QEMU_EXTRAOPTIONS_corei7-64-x32 = " -cpu Nehalem,check=false" TUNE_ARCH = "${@bb.utils.contains('TUNE_FEATURES', 'm64', '${X86ARCH64}', '' ,d)}" # Bump qemux86-64 up to corei7 AVAILTUNES += "qemux86-64" -TUNE_FEATURES_tune-qemux86-64 = "${TUNE_FEATURES_tune-x86-64} corei7" -BASE_LIB_tune-qemux86-64 = "lib64" -TUNE_PKGARCH_tune-qemux86-64 = "corei7-64" -PACKAGE_EXTRA_ARCHS_tune-qemux86-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} corei7-64" -QEMU_EXTRAOPTIONS_qemux86-64 = " -cpu Nehalem,check=false" +TUNE_FEATURES:tune-qemux86-64 = "${TUNE_FEATURES:tune-x86-64} corei7" +BASE_LIB:tune-qemux86-64 = "lib64" +TUNE_PKGARCH:tune-qemux86-64 = "corei7-64" +PACKAGE_EXTRA_ARCHS:tune-qemux86-64 = "${PACKAGE_EXTRA_ARCHS:tune-core2-64} corei7-64" +QEMU_EXTRAOPTIONS:qemux86-64 = " -cpu Nehalem,check=false" # QEMU / runqemu options (partly overrides qemuboot-x86.inc) QB_MACHINE = "-machine q35" -QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64" -QB_CPU_x86-64 = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt" -QB_CPU_KVM_x86-64 = "-cpu kvm64 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt" +QB_SYSTEM_NAME:x86-64 = "qemu-system-x86_64" +QB_CPU:x86-64 = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt" +QB_CPU_KVM:x86-64 = "-cpu kvm64 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet -device virtio-rng-pci" diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf index e13dff4ee..973eb94f9 100644 --- a/meta-agl-core/conf/distro/poky-agl.conf +++ b/meta-agl-core/conf/distro/poky-agl.conf @@ -54,7 +54,7 @@ AGL_DEFAULT_DISTRO_FEATURES = "largefile opengl wayland pam bluetooth bluez5 3g POKY_DEFAULT_DISTRO_FEATURES := "${AGL_DEFAULT_DISTRO_FEATURES}" OVERRIDES .= ":${DISTRO_CODENAME}" -DISTRO_FEATURES_remove = "x11" +DISTRO_FEATURES:remove = "x11" DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" INIT_MANAGER = "systemd" @@ -107,7 +107,7 @@ CONNECTIVITY_CHECK_URIS ?= "" #BB_DANGLINGAPPENDS_WARNONLY = "1" # Not yet upstreamed; should be submitted. -SECURITY_CFLAGS_pn-qtwebengine = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS:pn-qtwebengine = "${SECURITY_NO_PIE_CFLAGS}" #Redefined USER_CLASSES #Disable prelink. It is unmaintained and likely will go away. @@ -118,7 +118,7 @@ USER_CLASSES = "buildstats image-mklibs" # 2 for ARM 32bit # - a high and a medium setting for the CCARGS # - the high setting is default (needs >= cortex-a15) -# - the medium setting is enabled with: DISTRO_FEATURES_append = " agl-medium-arm-compiler " +# - the medium setting is enabled with: DISTRO_FEATURES:append = " agl-medium-arm-compiler " # 1 for ARM 64bit / AARCH64 # 1 for x86-64 # 1 for RISC-V 64-bit @@ -140,8 +140,8 @@ AGL_EXTRA_INITRAMFS_FSTYPES ??= "" # # Default IMAGE FSTYPES wic.xz AGL_DEFAULT_IMAGE_FSTYPES ?= "wic.xz wic.bmap wic.xz.sha256sum" -AGL_DEFAULT_IMAGE_FSTYPES_qemuall ?= "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}" -AGL_DEFAULT_IMAGE_FSTYPES_append_netboot = " ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}" +AGL_DEFAULT_IMAGE_FSTYPES:qemuall ?= "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}" +AGL_DEFAULT_IMAGE_FSTYPES:append:netboot = " ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}" AGL_DEFAULT_INITRAMFS_FSTYPES ?= "ext4.gz" # DEFAULT IMAGE_FSTYPES for AGL (no - BSPs should not set this) @@ -150,7 +150,7 @@ IMAGE_FSTYPES = "${AGL_DEFAULT_IMAGE_FSTYPES} ${AGL_EXTRA_IMAGE_FSTYPES}" INITRAMFS_FSTYPES = "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FSTYPES}" # # THE FUTURE is 'wic' -# IMAGE_FSTYPES_append = " wic" +# IMAGE_FSTYPES:append = " wic" # Complementary package definitions for agl-test-wgt and agl-devel-wgt # image features @@ -159,7 +159,7 @@ COMPLEMENTARY_GLOB[agl-devel-wgt] = '*-coverage *-debug' # Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools # (revalidate after 2017-10-15, 2018-06-12: still required) -DIRFILES_pn-nativesdk-cmake = "1" +DIRFILES:pn-nativesdk-cmake = "1" # For https://jira.automotivelinux.org/browse/SPEC-1629 : # We exclude the conflicting vars from the sstate task hash. |