diff options
Diffstat (limited to 'poky/meta/conf')
-rw-r--r-- | poky/meta/conf/bitbake.conf | 2 | ||||
-rw-r--r-- | poky/meta/conf/distro/include/distro_alias.inc | 2 | ||||
-rw-r--r-- | poky/meta/conf/distro/include/maintainers.inc | 3 | ||||
-rw-r--r-- | poky/meta/conf/distro/include/ptest-packagelists.inc | 3 | ||||
-rw-r--r-- | poky/meta/conf/distro/include/security_flags.inc | 4 | ||||
-rw-r--r-- | poky/meta/conf/distro/include/tcmode-default.inc | 6 | ||||
-rw-r--r-- | poky/meta/conf/machine/include/qemuboot-mips.inc | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/include/qemuboot-x86.inc | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/qemuarm.conf | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/qemuarm64.conf | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/qemuarmv5.conf | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/qemuppc.conf | 2 | ||||
-rw-r--r-- | poky/meta/conf/sanity.conf | 2 |
13 files changed, 18 insertions, 16 deletions
diff --git a/poky/meta/conf/bitbake.conf b/poky/meta/conf/bitbake.conf index f7700f119..89717a713 100644 --- a/poky/meta/conf/bitbake.conf +++ b/poky/meta/conf/bitbake.conf @@ -875,7 +875,7 @@ BB_CONSOLELOG ?= "${LOG_DIR}/cooker/${MACHINE}/${DATETIME}.log" # Setup our default hash policy BB_SIGNATURE_HANDLER ?= "OEBasicHash" BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DIR \ - SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM \ + SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL \ USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST \ STAMPS_DIR PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE \ CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE CCACHE_NOHASHDIR LICENSE_PATH SDKPKGSUFFIX \ diff --git a/poky/meta/conf/distro/include/distro_alias.inc b/poky/meta/conf/distro/include/distro_alias.inc index 0e4a9a9f8..2f9e1b113 100644 --- a/poky/meta/conf/distro/include/distro_alias.inc +++ b/poky/meta/conf/distro/include/distro_alias.inc @@ -102,8 +102,6 @@ DISTRO_PN_ALIAS_pn-gnome-desktop-testing = "Debian=gnome-desktop-testing Fedora= DISTRO_PN_ALIAS_pn-gnu-config = "OpenedHand" DISTRO_PN_ALIAS_pn-gptfdisk = "Fedora=gdisk Ubuntu=gdisk" DISTRO_PN_ALIAS_pn-grub-efi = "Debian=grub-efi Fedora=grub2-efi" -DISTRO_PN_ALIAS_pn-grub-efi-i586 = "Debian=grub-efi Fedora=grub2-efi" -DISTRO_PN_ALIAS_pn-grub-efi-x86-64 = "Debian=grub-efi Fedora=grub2-efi" DISTRO_PN_ALIAS_pn-gst-player = "Ubuntu=gst-player Fedora=gstreamer-player" DISTRO_PN_ALIAS_pn-gst-plugin-bluetooth = "Ubuntu=libgstreamer-plugins-base Fedora=gstreamer-plugins-base" DISTRO_PN_ALIAS_pn-gstreamer1.0 = "Debian=gstreamer1.0 Ubuntu=gstreamer1.0" diff --git a/poky/meta/conf/distro/include/maintainers.inc b/poky/meta/conf/distro/include/maintainers.inc index 6496a48e4..e8d42db12 100644 --- a/poky/meta/conf/distro/include/maintainers.inc +++ b/poky/meta/conf/distro/include/maintainers.inc @@ -220,6 +220,7 @@ RECIPE_MAINTAINER_pn-gnu-efi = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-gnupg = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-gnutls = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-go = "Khem Raj <raj.khem@gmail.com>" +RECIPE_MAINTAINER_pn-go-binary-native = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-go-cross-${TUNE_PKGARCH} = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-go-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-go-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>" @@ -262,6 +263,7 @@ RECIPE_MAINTAINER_pn-i2c-tools = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-icecc-create-env = "Joshua Watt <JPEWhacker@gmail.com>" RECIPE_MAINTAINER_pn-icu = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-ifupdown = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-igt-gpu-tools = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-inetutils = "Tom Rini <trini@konsulko.com>" RECIPE_MAINTAINER_pn-init-ifupdown = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-init-system-helpers = "Anuj Mittal <anuj.mittal@intel.com>" @@ -393,6 +395,7 @@ RECIPE_MAINTAINER_pn-liburcu = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-liburi-perl = "Tim Orling <timothy.t.orling@linux.intel.com>" RECIPE_MAINTAINER_pn-libusb1 = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libubootenv = "Stefano Babic <sbabic@denx.de>" +RECIPE_MAINTAINER_pn-libuv = "Armin Kuster <akuster@mvista.com>" RECIPE_MAINTAINER_pn-libva = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libva-initial = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal <anuj.mittal@intel.com>" diff --git a/poky/meta/conf/distro/include/ptest-packagelists.inc b/poky/meta/conf/distro/include/ptest-packagelists.inc index ab44757a1..1e99d4fa4 100644 --- a/poky/meta/conf/distro/include/ptest-packagelists.inc +++ b/poky/meta/conf/distro/include/ptest-packagelists.inc @@ -44,15 +44,16 @@ PTESTS_FAST = "\ opkg-ptest \ pango-ptest \ parted-ptest \ + qemu-ptest \ quilt-ptest \ sed-ptest \ slang-ptest \ wayland-ptest \ zlib-ptest \ " +PTESTS_FAST_remove_mips64 = "qemu-ptest" #PTESTS_PROBLEMS = "\ -# qemu-ptest \ # Doesn't run any tests? # ruby-ptest \ # Timeout # clutter-1.0-ptest \ # Doesn't build due to depends on cogl-1.0 # lz4-ptest \ # Needs a rewrite diff --git a/poky/meta/conf/distro/include/security_flags.inc b/poky/meta/conf/distro/include/security_flags.inc index a9e5b311a..4e64eb99f 100644 --- a/poky/meta/conf/distro/include/security_flags.inc +++ b/poky/meta/conf/distro/include/security_flags.inc @@ -40,10 +40,6 @@ SECURITY_CFLAGS_pn-glibc-testsuite = "" SECURITY_CFLAGS_pn-gcc-runtime = "" SECURITY_CFLAGS_pn-grub = "" SECURITY_CFLAGS_pn-grub-efi = "" -SECURITY_CFLAGS_pn-grub-efi-native = "" -SECURITY_CFLAGS_pn-grub-efi-x86-native = "" -SECURITY_CFLAGS_pn-grub-efi-i586-native = "" -SECURITY_CFLAGS_pn-grub-efi-x86-64-native = "" SECURITY_CFLAGS_pn-mkelfimage_x86 = "" SECURITY_CFLAGS_pn-valgrind = "${SECURITY_NOPIE_CFLAGS}" diff --git a/poky/meta/conf/distro/include/tcmode-default.inc b/poky/meta/conf/distro/include/tcmode-default.inc index ab4333144..054985c6a 100644 --- a/poky/meta/conf/distro/include/tcmode-default.inc +++ b/poky/meta/conf/distro/include/tcmode-default.inc @@ -22,7 +22,7 @@ BINUVERSION ?= "2.34%" GDBVERSION ?= "9.%" GLIBCVERSION ?= "2.31%" LINUXLIBCVERSION ?= "5.4%" -QEMUVERSION ?= "4.2%" +QEMUVERSION ?= "5.0%" GOVERSION ?= "1.14%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote # llvm version being used, so always bump it with llvm recipe version bump @@ -66,6 +66,10 @@ PREFERRED_VERSION_qemu ?= "${QEMUVERSION}" PREFERRED_VERSION_qemu-native ?= "${QEMUVERSION}" PREFERRED_VERSION_nativesdk-qemu ?= "${QEMUVERSION}" +# Bootstrap Go using a binary release from golang.org. If you want to bootstrap +# from source using the C-implemented Go 1.4 (only supports x86-64 hosts) then use +# go-native. +PREFERRED_PROVIDER_go-native ?= "go-binary-native" PREFERRED_VERSION_virtual/${TARGET_PREFIX}go ?= "${GOVERSION}" PREFERRED_VERSION_go-cross-${TUNE_PKGARCH} ?= "${GOVERSION}" PREFERRED_VERSION_go-crosssdk-${SDK_ARCH} ?= "${GOVERSION}" diff --git a/poky/meta/conf/machine/include/qemuboot-mips.inc b/poky/meta/conf/machine/include/qemuboot-mips.inc index f1f7c2ae2..e99bade2e 100644 --- a/poky/meta/conf/machine/include/qemuboot-mips.inc +++ b/poky/meta/conf/machine/include/qemuboot-mips.inc @@ -2,7 +2,7 @@ IMAGE_CLASSES += "qemuboot" QB_MACHINE = "-machine malta" QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" -QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" +QB_OPT_APPEND = "-usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" diff --git a/poky/meta/conf/machine/include/qemuboot-x86.inc b/poky/meta/conf/machine/include/qemuboot-x86.inc index 5dcc8b6f6..ccc6dcd3b 100644 --- a/poky/meta/conf/machine/include/qemuboot-x86.inc +++ b/poky/meta/conf/machine/include/qemuboot-x86.inc @@ -9,7 +9,7 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" QB_AUDIO_DRV = "alsa" QB_AUDIO_OPT = "-soundhw ac97,es1370" QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1" -QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" +QB_OPT_APPEND = "-usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" diff --git a/poky/meta/conf/machine/qemuarm.conf b/poky/meta/conf/machine/qemuarm.conf index 4e605d3a9..44e73a307 100644 --- a/poky/meta/conf/machine/qemuarm.conf +++ b/poky/meta/conf/machine/qemuarm.conf @@ -17,7 +17,7 @@ QB_CPU = "-cpu cortex-a15" # Standard Serial console QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" # For graphics to work we need to define the VGA device as well as the necessary USB devices -QB_OPT_APPEND = "-show-cursor -device VGA,edid=on" +QB_OPT_APPEND = "-device VGA,edid=on" QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" # Add the virtio RNG QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" diff --git a/poky/meta/conf/machine/qemuarm64.conf b/poky/meta/conf/machine/qemuarm64.conf index e8aac3847..d0d6f38e4 100644 --- a/poky/meta/conf/machine/qemuarm64.conf +++ b/poky/meta/conf/machine/qemuarm64.conf @@ -18,7 +18,7 @@ QB_CPU_KVM = "-cpu host -machine gic-version=3" # Standard Serial console QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" # For graphics to work we need to define the VGA device as well as the necessary USB devices -QB_OPT_APPEND = "-show-cursor -device VGA,edid=on" +QB_OPT_APPEND = "-device VGA,edid=on" QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" diff --git a/poky/meta/conf/machine/qemuarmv5.conf b/poky/meta/conf/machine/qemuarmv5.conf index e7f24fe1e..6940efe46 100644 --- a/poky/meta/conf/machine/qemuarmv5.conf +++ b/poky/meta/conf/machine/qemuarmv5.conf @@ -13,7 +13,7 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1" QB_SYSTEM_NAME = "qemu-system-arm" QB_MACHINE = "-machine versatilepb" QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" -QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" +QB_OPT_APPEND = "-usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" PREFERRED_VERSION_linux-yocto ??= "5.4%" diff --git a/poky/meta/conf/machine/qemuppc.conf b/poky/meta/conf/machine/qemuppc.conf index bd88eeb12..9733b5e85 100644 --- a/poky/meta/conf/machine/qemuppc.conf +++ b/poky/meta/conf/machine/qemuppc.conf @@ -16,7 +16,7 @@ QB_SYSTEM_NAME = "qemu-system-ppc" QB_MACHINE = "-machine mac99" QB_CPU = "-cpu G4" QB_KERNEL_CMDLINE_APPEND = "console=tty console=ttyS0" -QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" +QB_OPT_APPEND = "-usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" diff --git a/poky/meta/conf/sanity.conf b/poky/meta/conf/sanity.conf index 8b2f65539..8ae548941 100644 --- a/poky/meta/conf/sanity.conf +++ b/poky/meta/conf/sanity.conf @@ -3,7 +3,7 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "1.43.2" +BB_MIN_VERSION = "1.47.0" SANITY_ABIFILE = "${TMPDIR}/abi_version" |