diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/conf')
15 files changed, 40 insertions, 15 deletions
diff --git a/import-layers/yocto-poky/meta/conf/bitbake.conf b/import-layers/yocto-poky/meta/conf/bitbake.conf index 54a587f1b..6e767b1bc 100644 --- a/import-layers/yocto-poky/meta/conf/bitbake.conf +++ b/import-layers/yocto-poky/meta/conf/bitbake.conf @@ -408,6 +408,11 @@ OLDEST_KERNEL = "3.2.0" OLDEST_KERNEL_aarch64 = "3.14" OLDEST_KERNEL_nios2 = "3.19" +# SDK_OLDEST_KERNEL can't be set using overrides since there are +# none for the SDK architecture. Best to set it from a machine-sdk +# include file if you need an SDK arch-specific value +SDK_OLDEST_KERNEL = "3.2.0" + # Define where the kernel headers are installed on the target as well as where # they are staged. KERNEL_SRC_PATH = "/usr/src/kernel" @@ -580,7 +585,7 @@ BBLAYERS_FETCH_DIR ??= "${COREBASE}" ################################################################## APACHE_MIRROR = "http://archive.apache.org/dist" -DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool" +DEBIAN_MIRROR = "http://ftp.debian.org/debian/pool" GENTOO_MIRROR = "http://distfiles.gentoo.org/distfiles" GNOME_GIT = "git://git.gnome.org" GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" @@ -614,7 +619,7 @@ SRC_URI[vardepsexclude] += "\ " # You can use the mirror of your country to get faster downloads by putting -# export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool" +# export DEBIAN_MIRROR = "http://ftp.de.debian.org/debian/pool" # into your local.conf FETCHCMD_svn = "/usr/bin/env svn --non-interactive --trust-server-cert" @@ -705,6 +710,7 @@ require conf/abi_version.conf include conf/site.conf include conf/auto.conf include conf/local.conf +include conf/multiconfig/${BB_CURRENT_MC}.conf include conf/build/${BUILD_SYS}.conf include conf/target/${TARGET_SYS}.conf include conf/machine/${MACHINE}.conf diff --git a/import-layers/yocto-poky/meta/conf/distro/defaultsetup.conf b/import-layers/yocto-poky/meta/conf/distro/defaultsetup.conf index 71c65b146..aa21345a1 100644 --- a/import-layers/yocto-poky/meta/conf/distro/defaultsetup.conf +++ b/import-layers/yocto-poky/meta/conf/distro/defaultsetup.conf @@ -9,6 +9,8 @@ require conf/distro/include/tcmode-${TCMODE}.inc TCLIBC ?= "glibc" require conf/distro/include/tclibc-${TCLIBC}.inc +require conf/distro/include/uninative-flags.inc + # Allow single libc distros to disable this code TCLIBCAPPEND ?= "-${TCLIBC}" TMPDIR .= "${TCLIBCAPPEND}" @@ -20,4 +22,3 @@ PACKAGE_CLASSES ?= "package_ipk" INHERIT_BLACKLIST = "blacklist" INHERIT_DISTRO ?= "debian devshell sstate license" INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST}" - diff --git a/import-layers/yocto-poky/meta/conf/distro/include/uninative-flags.inc b/import-layers/yocto-poky/meta/conf/distro/include/uninative-flags.inc new file mode 100644 index 000000000..e9f82c39e --- /dev/null +++ b/import-layers/yocto-poky/meta/conf/distro/include/uninative-flags.inc @@ -0,0 +1,9 @@ +# https://wiki.debian.org/GCC5 +# We may see binaries built with gcc5 run or linked into gcc4 environment +# so use the older libstdc++ standard for now until we don't support gcc4 +# on the host system. +BUILD_CXXFLAGS_append = " -D_GLIBCXX_USE_CXX11_ABI=0" + +# icu configure defaults to CXX11 if no -std= option is passed in CXXFLAGS +# therefore pass one +BUILD_CXXFLAGS_append_pn-icu-native = " -std=c++98" diff --git a/import-layers/yocto-poky/meta/conf/distro/include/yocto-uninative.inc b/import-layers/yocto-poky/meta/conf/distro/include/yocto-uninative.inc index 975edec9c..839c19aa5 100644 --- a/import-layers/yocto-poky/meta/conf/distro/include/yocto-uninative.inc +++ b/import-layers/yocto-poky/meta/conf/distro/include/yocto-uninative.inc @@ -6,6 +6,6 @@ # to the distro running on the build machine. # -UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/1.4/" -UNINATIVE_CHECKSUM[i686] ?= "b4bc60511ce479736808273ffa043df4ed2a225407dd7ca150ae6220d9ce76d5" -UNINATIVE_CHECKSUM[x86_64] ?= "101ff8f2580c193488db9e76f9646fb6ed38b65fb76f403acb0e2178ce7127ca" +UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/1.7/" +UNINATIVE_CHECKSUM[i686] ?= "d7c341460035936c19d63fe02f354ef1bc993c62d694ae3a31458d1c6997f0c5" +UNINATIVE_CHECKSUM[x86_64] ?= "ed033c868b87852b07957a4400f3b744c00aef5d6470346ea1a59b6d3e03075e" diff --git a/import-layers/yocto-poky/meta/conf/machine-sdk/i586.conf b/import-layers/yocto-poky/meta/conf/machine-sdk/i586.conf index 41e5e159d..99083fb63 100644 --- a/import-layers/yocto-poky/meta/conf/machine-sdk/i586.conf +++ b/import-layers/yocto-poky/meta/conf/machine-sdk/i586.conf @@ -1,4 +1,5 @@ SDK_ARCH = "i586" SDK_CC_ARCH = "-march=i586" ABIEXTENSION_class-nativesdk = "" +SDK_OLDEST_KERNEL = "2.6.32" diff --git a/import-layers/yocto-poky/meta/conf/machine-sdk/i686.conf b/import-layers/yocto-poky/meta/conf/machine-sdk/i686.conf index fe406972c..cf22784e9 100644 --- a/import-layers/yocto-poky/meta/conf/machine-sdk/i686.conf +++ b/import-layers/yocto-poky/meta/conf/machine-sdk/i686.conf @@ -1,3 +1,4 @@ SDK_ARCH = "i686" SDK_CC_ARCH = "-march=i686" ABIEXTENSION_class-nativesdk = "" +SDK_OLDEST_KERNEL = "2.6.32" diff --git a/import-layers/yocto-poky/meta/conf/machine-sdk/x86_64.conf b/import-layers/yocto-poky/meta/conf/machine-sdk/x86_64.conf index 61439b4fb..7d2e71780 100644 --- a/import-layers/yocto-poky/meta/conf/machine-sdk/x86_64.conf +++ b/import-layers/yocto-poky/meta/conf/machine-sdk/x86_64.conf @@ -1,2 +1,3 @@ SDK_ARCH = "x86_64" ABIEXTENSION_class-nativesdk = "" +SDK_OLDEST_KERNEL = "2.6.32" diff --git a/import-layers/yocto-poky/meta/conf/machine/include/arm/arch-arm64.inc b/import-layers/yocto-poky/meta/conf/machine/include/arm/arch-arm64.inc index 944069836..9eeffac81 100644 --- a/import-layers/yocto-poky/meta/conf/machine/include/arm/arch-arm64.inc +++ b/import-layers/yocto-poky/meta/conf/machine/include/arm/arch-arm64.inc @@ -1,6 +1,6 @@ DEFAULTTUNE ?= "aarch64" -require conf/machine/include/arm/arch-armv7a.inc +require conf/machine/include/arm/arch-armv7ve.inc TUNEVALID[aarch64] = "Enable instructions for aarch64" diff --git a/import-layers/yocto-poky/meta/conf/machine/qemuarm.conf b/import-layers/yocto-poky/meta/conf/machine/qemuarm.conf index 17402ef3b..f9d6dd7e3 100644 --- a/import-layers/yocto-poky/meta/conf/machine/qemuarm.conf +++ b/import-layers/yocto-poky/meta/conf/machine/qemuarm.conf @@ -8,7 +8,7 @@ require conf/machine/include/tune-arm926ejs.inc KERNEL_IMAGETYPE = "zImage" -SERIAL_CONSOLES = "115200;ttyAMA0 115200;ttyAMA1" +SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1" # For runqemu QB_SYSTEM_NAME = "qemu-system-arm" diff --git a/import-layers/yocto-poky/meta/conf/machine/qemuarm64.conf b/import-layers/yocto-poky/meta/conf/machine/qemuarm64.conf index d0750624a..e70538aac 100644 --- a/import-layers/yocto-poky/meta/conf/machine/qemuarm64.conf +++ b/import-layers/yocto-poky/meta/conf/machine/qemuarm64.conf @@ -7,7 +7,7 @@ require conf/machine/include/qemu.inc KERNEL_IMAGETYPE = "Image" -SERIAL_CONSOLES = "38400;ttyAMA0 38400;hvc0" +SERIAL_CONSOLES ?= "38400;ttyAMA0 38400;hvc0" # For runqemu QB_SYSTEM_NAME = "qemu-system-aarch64" @@ -16,7 +16,7 @@ QB_MACHINE = "-machine virt" QB_CPU = "-cpu cortex-a57" QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,38400" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy -QB_OPT_APPEND = "-show-cursor -device virtio-rng-pci" +QB_OPT_APPEND = "-show-cursor -device virtio-rng-pci -monitor null" QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -device virtio-net-device,netdev=net0,mac=@MAC@" QB_SLIRP_OPT = "-netdev user,id=net0 -device virtio-net-device,netdev=net0" QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" diff --git a/import-layers/yocto-poky/meta/conf/machine/qemumips.conf b/import-layers/yocto-poky/meta/conf/machine/qemumips.conf index 3182ea1b5..986315a64 100644 --- a/import-layers/yocto-poky/meta/conf/machine/qemumips.conf +++ b/import-layers/yocto-poky/meta/conf/machine/qemumips.conf @@ -9,6 +9,6 @@ require conf/machine/include/qemuboot-mips.inc KERNEL_IMAGETYPE = "vmlinux" KERNEL_ALT_IMAGETYPE = "vmlinux.bin" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" diff --git a/import-layers/yocto-poky/meta/conf/machine/qemumips64.conf b/import-layers/yocto-poky/meta/conf/machine/qemumips64.conf index 9529f4c4f..3f91cbe17 100644 --- a/import-layers/yocto-poky/meta/conf/machine/qemumips64.conf +++ b/import-layers/yocto-poky/meta/conf/machine/qemumips64.conf @@ -9,6 +9,6 @@ require conf/machine/include/qemuboot-mips.inc KERNEL_IMAGETYPE = "vmlinux" KERNEL_ALT_IMAGETYPE = "vmlinux.bin" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" diff --git a/import-layers/yocto-poky/meta/conf/machine/qemuppc.conf b/import-layers/yocto-poky/meta/conf/machine/qemuppc.conf index 8703c2086..9d174bc43 100644 --- a/import-layers/yocto-poky/meta/conf/machine/qemuppc.conf +++ b/import-layers/yocto-poky/meta/conf/machine/qemuppc.conf @@ -9,7 +9,7 @@ TARGET_CC_KERNEL_ARCH = "-mno-spe" KERNEL_IMAGETYPE = "vmlinux" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" # For runqemu QB_SYSTEM_NAME = "qemu-system-ppc" diff --git a/import-layers/yocto-poky/meta/conf/machine/qemux86-64.conf b/import-layers/yocto-poky/meta/conf/machine/qemux86-64.conf index b191ddd3c..4f30033e5 100644 --- a/import-layers/yocto-poky/meta/conf/machine/qemux86-64.conf +++ b/import-layers/yocto-poky/meta/conf/machine/qemux86-64.conf @@ -14,7 +14,7 @@ require conf/machine/include/qemuboot-x86.inc KERNEL_IMAGETYPE = "bzImage" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" XSERVER = "xserver-xorg \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ @@ -31,3 +31,6 @@ XSERVER = "xserver-xorg \ MACHINE_FEATURES += "x86" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" + +WKS_FILE ?= "directdisk.wks" +do_image_wic[depends] += "syslinux:do_build syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" diff --git a/import-layers/yocto-poky/meta/conf/machine/qemux86.conf b/import-layers/yocto-poky/meta/conf/machine/qemux86.conf index 8555fd6bf..e232947ae 100644 --- a/import-layers/yocto-poky/meta/conf/machine/qemux86.conf +++ b/import-layers/yocto-poky/meta/conf/machine/qemux86.conf @@ -13,7 +13,7 @@ require conf/machine/include/qemuboot-x86.inc KERNEL_IMAGETYPE = "bzImage" -SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1" +SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" XSERVER = "xserver-xorg \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ @@ -30,3 +30,6 @@ XSERVER = "xserver-xorg \ MACHINE_FEATURES += "x86" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" + +WKS_FILE = "directdisk.wks" +do_image_wic[depends] += "syslinux:do_build syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" |