diff options
Diffstat (limited to 'poky/meta/conf')
-rw-r--r-- | poky/meta/conf/bitbake.conf | 31 | ||||
-rw-r--r-- | poky/meta/conf/distro/include/default-distrovars.inc | 2 | ||||
-rw-r--r-- | poky/meta/conf/distro/include/maintainers.inc | 10 | ||||
-rw-r--r-- | poky/meta/conf/distro/include/no-static-libs.inc | 3 | ||||
-rw-r--r-- | poky/meta/conf/distro/include/ptest-packagelists.inc | 77 | ||||
-rw-r--r-- | poky/meta/conf/distro/include/tcmode-default.inc | 3 | ||||
-rw-r--r-- | poky/meta/conf/layer.conf | 1 | ||||
-rw-r--r-- | poky/meta/conf/licenses.conf | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/qemux86.conf | 4 |
9 files changed, 110 insertions, 23 deletions
diff --git a/poky/meta/conf/bitbake.conf b/poky/meta/conf/bitbake.conf index 7f8b043cc..c5313ccd1 100644 --- a/poky/meta/conf/bitbake.conf +++ b/poky/meta/conf/bitbake.conf @@ -514,6 +514,9 @@ HOSTTOOLS_NONFATAL += "bzr" # Used by ssh fetcher HOSTTOOLS_NONFATAL += "scp" +# Link to git-lfs if present +HOSTTOOLS_NONFATAL += "git-lfs" + CCACHE ??= "" TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" @@ -628,28 +631,28 @@ BUILD_OPTIMIZATION[vardeps] += "DEBUG_BUILD" ################################################################## # Settings used by bitbake-layers. ################################################################## -BBLAYERS_LAYERINDEX_URL ??= "http://layers.openembedded.org/layerindex/" +BBLAYERS_LAYERINDEX_URL ??= "https://layers.openembedded.org/layerindex/" BBLAYERS_FETCH_DIR ??= "${COREBASE}" ################################################################## # Download locations and utilities. ################################################################## -APACHE_MIRROR = "http://archive.apache.org/dist" +APACHE_MIRROR = "https://archive.apache.org/dist" DEBIAN_MIRROR = "http://ftp.debian.org/debian/pool" GENTOO_MIRROR = "http://distfiles.gentoo.org/distfiles" GNOME_GIT = "git://gitlab.gnome.org/GNOME" -GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" -GNU_MIRROR = "http://ftp.gnu.org/gnu" +GNOME_MIRROR = "https://ftp.gnome.org/pub/GNOME/sources" +GNU_MIRROR = "https://ftp.gnu.org/gnu" GNUPG_MIRROR = "https://www.gnupg.org/ftp/gcrypt" GPE_MIRROR = "http://gpe.linuxtogo.org/download/source" -KERNELORG_MIRROR = "http://cdn.kernel.org/pub" -SOURCEFORGE_MIRROR = "http://downloads.sourceforge.net" -XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" +KERNELORG_MIRROR = "https://cdn.kernel.org/pub" +SOURCEFORGE_MIRROR = "https://downloads.sourceforge.net" +XLIBS_MIRROR = "https://xlibs.freedesktop.org/release" XORG_MIRROR = "http://xorg.freedesktop.org/releases" -SAVANNAH_GNU_MIRROR = "http://download.savannah.gnu.org/releases" -SAVANNAH_NONGNU_MIRROR = "http://download.savannah.nongnu.org/releases" -CPAN_MIRROR = "http://search.cpan.org/CPAN" +SAVANNAH_GNU_MIRROR = "https://download.savannah.gnu.org/releases" +SAVANNAH_NONGNU_MIRROR = "https://download.savannah.nongnu.org/releases" +CPAN_MIRROR = "https://search.cpan.org/CPAN" SRC_URI[vardepsexclude] += "\ APACHE_MIRROR \ @@ -845,7 +848,7 @@ COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" SERIAL_CONSOLE ??= "" SERIAL_CONSOLES ??= "${@d.getVar('SERIAL_CONSOLE').replace(' ', ';')}" -NO_RECOMMENDATIONS ?= "" +NO_RECOMMENDATIONS ??= "" BAD_RECOMMENDATIONS ?= "" # Make sure MACHINE isn't exported @@ -898,3 +901,9 @@ BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc deps depends \ MLPREFIX ??= "" MULTILIB_VARIANTS ??= "" + +# Older versions of bitbake (< 1.42) don't set BB_UNIHASH. For compatibility with these +# versions, set BB_UNIHASH equivalent to BB_TASKHASH if unspecified, which is +# what it would be anyway if the signature generator (e.g. OEEquivHash) doesn't +# support unihashes. +BB_UNIHASH ?= "${BB_TASKHASH}" diff --git a/poky/meta/conf/distro/include/default-distrovars.inc b/poky/meta/conf/distro/include/default-distrovars.inc index 7a0baf326..10d86cf7b 100644 --- a/poky/meta/conf/distro/include/default-distrovars.inc +++ b/poky/meta/conf/distro/include/default-distrovars.inc @@ -10,7 +10,7 @@ LOCALE_UTF8_ONLY ?= "0" LOCALE_UTF8_IS_DEFAULT ?= "1" LOCALE_UTF8_IS_DEFAULT_class-nativesdk = "0" -DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 ipv4 ipv6 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11" +DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 ipv4 ipv6 largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11" DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT}" IMAGE_FEATURES ?= "" diff --git a/poky/meta/conf/distro/include/maintainers.inc b/poky/meta/conf/distro/include/maintainers.inc index 950b8e895..a9a689fb0 100644 --- a/poky/meta/conf/distro/include/maintainers.inc +++ b/poky/meta/conf/distro/include/maintainers.inc @@ -122,6 +122,7 @@ RECIPE_MAINTAINER_pn-core-image-clutter = "Richard Purdie <richard.purdie@linuxf RECIPE_MAINTAINER_pn-core-image-weston = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-core-image-x11 = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-core-image-sato-dev = "Richard Purdie <richard.purdie@linuxfoundation.org>" +RECIPE_MAINTAINER_pn-core-image-sato-ptest-fast = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-core-image-sato-sdk-ptest = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-coreutils = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-cpio = "Denys Dmytriyenko <denys@ti.com>" @@ -165,6 +166,7 @@ RECIPE_MAINTAINER_pn-eglinfo-fb = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-eglinfo-x11 = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-eglinfo-wayland = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-elfutils = "Hongxu Jia <hongxu.jia@windriver.com>" +RECIPE_MAINTAINER_pn-ell = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" RECIPE_MAINTAINER_pn-enchant = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-encodings = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-epiphany = "Alexander Kanavin <alex.kanavin@gmail.com>" @@ -194,8 +196,8 @@ RECIPE_MAINTAINER_pn-gcc-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-gcc-crosssdk-initial-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-gcc-runtime = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-gcc-sanitizers = "Khem Raj <raj.khem@gmail.com>" -RECIPE_MAINTAINER_pn-gcc-source-7.3.0 = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-gcc-source-8.3.0 = "Khem Raj <raj.khem@gmail.com>" +RECIPE_MAINTAINER_pn-gcc-source-9.1.0 = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-gccmakedep = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-gconf = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-gcr = "Alexander Kanavin <alex.kanavin@gmail.com>" @@ -284,7 +286,6 @@ RECIPE_MAINTAINER_pn-intltool = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-iproute2 = "Changhyeok Bae <changhyeok.bae@gmail.com>" RECIPE_MAINTAINER_pn-iptables = "Changhyeok Bae <changhyeok.bae@gmail.com>" RECIPE_MAINTAINER_pn-iputils = "Changhyeok Bae <changhyeok.bae@gmail.com>" -RECIPE_MAINTAINER_pn-irda-utils = "Changhyeok Bae <changhyeok.bae@gmail.com>" RECIPE_MAINTAINER_pn-iso-codes = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-iw = "Changhyeok Bae <changhyeok.bae@gmail.com>" RECIPE_MAINTAINER_pn-libjpeg-turbo = "Anuj Mittal <anuj.mittal@intel.com>" @@ -536,7 +537,6 @@ RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-ofono = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-openssh = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-openssl = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-openssl10 = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-opkg = "Alejandro del Castillo <alejandro.delcastillo@ni.com>" RECIPE_MAINTAINER_pn-opkg-arch-config = "Alejandro del Castillo <alejandro.delcastillo@ni.com>" RECIPE_MAINTAINER_pn-opkg-keyrings = "Alejandro del Castillo <alejandro.delcastillo@ni.com>" @@ -555,8 +555,8 @@ RECIPE_MAINTAINER_pn-pbzip2 = "Denys Dmytriyenko <denys@ti.com>" RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield <bruce.ashfield@gmail.com>" -RECIPE_MAINTAINER_pn-perl = "Ross Burton <ross.burton@intel.com>" -RECIPE_MAINTAINER_pn-perl-native = "Ross Burton <ross.burton@intel.com>" +RECIPE_MAINTAINER_pn-perl = "Alexander Kanavin <alex.kanavin@gmail.com>" +RECIPE_MAINTAINER_pn-perl-native = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-piglit = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-pigz = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-pinentry = "Armin Kuster <akuster808@gmail.com>" diff --git a/poky/meta/conf/distro/include/no-static-libs.inc b/poky/meta/conf/distro/include/no-static-libs.inc index 712d858dc..4141ecb76 100644 --- a/poky/meta/conf/distro/include/no-static-libs.inc +++ b/poky/meta/conf/distro/include/no-static-libs.inc @@ -26,9 +26,6 @@ DISABLE_STATIC_pn-openjade-native = "" DISABLE_STATIC_pn-openssl = "" DISABLE_STATIC_pn-openssl-native = "" DISABLE_STATIC_pn-nativesdk-openssl = "" -DISABLE_STATIC_pn-openssl10 = "" -DISABLE_STATIC_pn-openssl10-native = "" -DISABLE_STATIC_pn-nativesdk-openssl10 = "" # libssp-static-dev included in build-appliance DISABLE_STATIC_pn-gcc-runtime = "" # libusb1-native is used to build static dfu-util-native diff --git a/poky/meta/conf/distro/include/ptest-packagelists.inc b/poky/meta/conf/distro/include/ptest-packagelists.inc new file mode 100644 index 000000000..ec7ed6fa4 --- /dev/null +++ b/poky/meta/conf/distro/include/ptest-packagelists.inc @@ -0,0 +1,77 @@ +# +# Lists of the ptests in OE-Core, sorted into two sets by the time they take +# +# ptests which take less than ~30s each +# +PTESTS_FAST = "\ + acl-ptest \ + apr-ptest \ + apr-util-ptest \ + attr-ptest \ + bluez5-ptest \ + bzip2-ptest \ + diffstat-ptest \ + diffutils-ptest \ + elfutils-ptest \ + ethtool-ptest \ + flex-ptest \ + gawk-ptest \ + gdbm-ptest \ + gdk-pixbuf-ptest \ + gettext-ptest \ + gzip-ptest \ + json-glib-ptest \ + kbd-ptest \ + libconvert-asn1-perl-ptest \ + liberror-perl-ptest \ + libpcre-ptest \ + libtimedate-perl-ptest \ + libtest-needs-perl-ptest \ + liburi-perl-ptest \ + libusb1-ptest \ + libxml-namespacesupport-perl-ptest \ + libxml-perl-ptest \ + libxml-parser-perl-ptest \ + libxml-sax-perl-ptest \ + libxml-sax-base-perl-ptest \ + libxml-simple-perl-ptest \ + libxml2-ptest \ + lzo-ptest \ + m4-ptest \ + nettle-ptest \ + openssl-ptest \ + opkg-ptest \ + pango-ptest \ + parted-ptest \ + quilt-ptest \ + sed-ptest \ + slang-ptest \ + zlib-ptest \ +" + +#PTESTS_PROBLEMS = "\ +# qemu-ptest \ # Doesn't run any tests? +# ruby-ptest \ # Timeout +# mdadm-ptest \ # Timeout +# clutter-1.0-ptest \ # Doesn't build due to depends on cogl-1.0 +#" + +PTESTS_SLOW = "\ + bash-ptest \ + busybox-ptest \ + dbus-test-ptest \ + e2fsprogs-ptest \ + glib-2.0-ptest \ + gstreamer1.0-ptest \ + libevent-ptest \ + lttng-tools-ptest \ + openssh-ptest \ + openssl-ptest \ + perl-ptest \ + python-ptest \ + python3-ptest \ + strace-ptest \ + tcl-ptest \ + util-linux-ptest \ + valgrind-ptest \ +" diff --git a/poky/meta/conf/distro/include/tcmode-default.inc b/poky/meta/conf/distro/include/tcmode-default.inc index 04373cc0a..daacfe28c 100644 --- a/poky/meta/conf/distro/include/tcmode-default.inc +++ b/poky/meta/conf/distro/include/tcmode-default.inc @@ -24,7 +24,7 @@ BINUVERSION ?= "2.32%" GDBVERSION ?= "8.2%" GLIBCVERSION ?= "2.29%" LINUXLIBCVERSION ?= "5.0%" -QEMUVERSION ?= "3.1%" +QEMUVERSION ?= "4.0%" GOVERSION ?= "1.12%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" @@ -39,6 +39,7 @@ PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" PREFERRED_VERSION_nativesdk-gcc-sanitizers ?= "${SDKGCCVERSION}" PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" PREFERRED_VERSION_libgcc-initial ?= "${GCCVERSION}" +PREFERRED_VERSION_libgfortran ?= "${GCCVERSION}" PREFERRED_VERSION_nativesdk-gcc ?= "${SDKGCCVERSION}" PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}" PREFERRED_VERSION_nativesdk-libgcc-initial ?= "${SDKGCCVERSION}" diff --git a/poky/meta/conf/layer.conf b/poky/meta/conf/layer.conf index 9d63b5b24..6590e8070 100644 --- a/poky/meta/conf/layer.conf +++ b/poky/meta/conf/layer.conf @@ -76,6 +76,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ weston->weston-conf \ weston-init->weston \ weston-init->kbd \ + connman->xl2tpd \ " # Avoid adding bison-native to the sysroot without a specific diff --git a/poky/meta/conf/licenses.conf b/poky/meta/conf/licenses.conf index 1058084d8..7b01c5763 100644 --- a/poky/meta/conf/licenses.conf +++ b/poky/meta/conf/licenses.conf @@ -16,7 +16,7 @@ SRC_DISTRIBUTE_LICENSES += "CC-BY-SA-1.0 CC-BY-SA-2.0 CC-BY-SA-2.5 CC-BY-SA-3.0 SRC_DISTRIBUTE_LICENSES += "CDDL-1.0 CECILL-1.0 CECILL-2.0 CECILL-B CECILL-C" SRC_DISTRIBUTE_LICENSES += "ClArtistic CPAL-1.0 CPL-1.0 CUA-OPL-1.0 DSSSL" SRC_DISTRIBUTE_LICENSES += "ECL-1.0 ECL-2.0 eCos-2.0 EDL-1.0 EFL-1.0 EFL-2.0" -SRC_DISTRIBUTE_LICENSES += "Elfutils-Exception Entessa EPL-1.0 EPL-2.0 ErlPL-1.1" +SRC_DISTRIBUTE_LICENSES += "Entessa EPL-1.0 EPL-2.0 ErlPL-1.1" SRC_DISTRIBUTE_LICENSES += "EUDatagrid EUPL-1.0 EUPL-1.1 Fair Frameworx-1.0" SRC_DISTRIBUTE_LICENSES += "FreeType GFDL-1.1 GFDL-1.2 GFDL-1.3 GPL-1.0" SRC_DISTRIBUTE_LICENSES += "GPL-2.0 GPL-2.0-with-autoconf-exception" diff --git a/poky/meta/conf/machine/qemux86.conf b/poky/meta/conf/machine/qemux86.conf index ae5187cbd..f2434a4b5 100644 --- a/poky/meta/conf/machine/qemux86.conf +++ b/poky/meta/conf/machine/qemux86.conf @@ -8,7 +8,9 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" require conf/machine/include/qemu.inc -require conf/machine/include/tune-i586.inc +DEFAULTTUNE ?= "i586" +X86ARCH32 ?= "i586" +require conf/machine/include/tune-corei7.inc require conf/machine/include/qemuboot-x86.inc UBOOT_MACHINE ?= "qemu-x86_defconfig" |