diff options
Diffstat (limited to 'poky/meta/conf/distro')
| -rw-r--r-- | poky/meta/conf/distro/include/distro_alias.inc | 2 | ||||
| -rw-r--r-- | poky/meta/conf/distro/include/maintainers.inc | 65 | ||||
| -rw-r--r-- | poky/meta/conf/distro/include/tcmode-default.inc | 9 |
3 files changed, 37 insertions, 39 deletions
diff --git a/poky/meta/conf/distro/include/distro_alias.inc b/poky/meta/conf/distro/include/distro_alias.inc index d2ccb1ee4..ab6ebdb89 100644 --- a/poky/meta/conf/distro/include/distro_alias.inc +++ b/poky/meta/conf/distro/include/distro_alias.inc @@ -181,7 +181,6 @@ DISTRO_PN_ALIAS_pn-libpcre2 = "Fedora=pcre2 Debian=pcre2 Clear=pcre2" DISTRO_PN_ALIAS_pn-libpng12 = "Debian=libpng12-0 Fedora=libpng" DISTRO_PN_ALIAS_pn-libpod-plainer-perl = "OSPDT" DISTRO_PN_ALIAS_pn-libsamplerate0 = "Meego=libsamplerate Fedora=libsamplerate OpenSuSE=libsamplerate Ubuntu=libsamplerate Mandriva=libsamplerate Debian=libsamplerate" -DISTRO_PN_ALIAS_pn-libsdl = "Fedora=SDL Opensuse=SDL" DISTRO_PN_ALIAS_pn-libsdl2 = "Fedora=sdl2 Opensuse=libsdl2 Ubuntu=libsdl2 Debian=libsdl2" DISTRO_PN_ALIAS_pn-libsndfile1 = "Meego=libsndfile Fedora=libsndfile OpenSuSE=libsndfile Ubuntu=libsndfile Mandriva=libsndfile Debian=libsndfile" DISTRO_PN_ALIAS_pn-libsoup-2.4 = "Meego=libsoup Fedora=libsoup OpenSuSE=libsoup Ubuntu=libsoup2.4 Mandriva=libsoup Debian=libsoup2.4" @@ -196,7 +195,6 @@ DISTRO_PN_ALIAS_pn-libxft = "Mandriva=libxft Debian=libxft2 Ubuntu=libxft2" DISTRO_PN_ALIAS_pn-libxi = "Ubuntu=libxi Fedora=libXi" DISTRO_PN_ALIAS_pn-libxkbcommon = "Fedora=libxkbcommon Debian=libxkbcommon" DISTRO_PN_ALIAS_pn-libxscrnsaver = "Fedora=libXScrnSaver Ubuntu=libxss1 Mandriva=libxscrnsaver" -DISTRO_PN_ALIAS_pn-libxxf86misc = "Mandriva=libxxf86misc Fedora=libXxf86misc" DISTRO_PN_ALIAS_pn-linux-dummy = "Intel" DISTRO_PN_ALIAS_pn-linux-firmware = "Fedora=linux-firmware Ubuntu=linux-firmware" DISTRO_PN_ALIAS_pn-linux-libc-headers = "Debian=linux-kernel-headers Ubuntu=linux-kernel-headers" diff --git a/poky/meta/conf/distro/include/maintainers.inc b/poky/meta/conf/distro/include/maintainers.inc index 77a753a5b..a59550794 100644 --- a/poky/meta/conf/distro/include/maintainers.inc +++ b/poky/meta/conf/distro/include/maintainers.inc @@ -28,7 +28,7 @@ # Please keep this list in alphabetical order. # RECIPE_MAINTAINER_pn-acl = "Chen Qi <Qi.Chen@windriver.com>" -RECIPE_MAINTAINER_pn-acpica = "Fathi Boudra <fathi.boudra@linaro.org>" +RECIPE_MAINTAINER_pn-acpica = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-acpid = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-adwaita-icon-theme = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-alsa-lib = "Tanu Kaskinen <tanuk@iki.fi>" @@ -326,6 +326,7 @@ RECIPE_MAINTAINER_pn-libdazzle = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libdmx = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-libdnf = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libdrm = "Otavio Salvador <otavio.salvador@ossystems.com.br>" +RECIPE_MAINTAINER_pn-libedit = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-libepoxy = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-liberation-fonts = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-liberror-perl = "Tim Orling <timothy.t.orling@linux.intel.com>" @@ -380,7 +381,6 @@ RECIPE_MAINTAINER_pn-libpsl = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-librepo = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-librsvg = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libsamplerate0 = "Tanu Kaskinen <tanuk@iki.fi>" -RECIPE_MAINTAINER_pn-libsdl = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-libsdl2 = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-libsecret = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libsm = "Armin Kuster <akuster808@gmail.com>" @@ -406,7 +406,6 @@ RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libvorbis = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-libwebp = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libx11 = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libx11-diet = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-libxau = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-libxcb = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-libxcomposite = "Armin Kuster <akuster808@gmail.com>" @@ -443,8 +442,6 @@ RECIPE_MAINTAINER_pn-libxt = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-libxtst = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-libxv = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-libxvmc = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxxf86dga = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxxf86misc = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-libxxf86vm = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-libyaml = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-lighttpd = "Alexander Kanavin <alex.kanavin@gmail.com>" @@ -588,38 +585,34 @@ RECIPE_MAINTAINER_pn-ptest-runner = "Ross Burton <ross.burton@intel.com>" RECIPE_MAINTAINER_pn-pulseaudio = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-pulseaudio-client-conf-sato = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-puzzles = "Anuj Mittal <anuj.mittal@intel.com>" -RECIPE_MAINTAINER_pn-python = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python-native = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python-nose = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python-numpy = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python-scons = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python-scons-native = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python-setuptools = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3 = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-async = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-dbus = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-docutils = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-extras = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-file-utils = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-git = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-gitdb = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-iniparse = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-mako = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-native = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-nose = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-numpy = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-pbr = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-pip = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-pycairo = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-pygments = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-pygobject = "Derek Straka <derek@asterius.io>" +RECIPE_MAINTAINER_pn-python = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python-native = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python-setuptools = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3 = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-dbus = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-docutils = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-extras = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-file-utils = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-git = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-gitdb = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-iniparse = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-mako = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-native = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-nose = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-numpy = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-pbr = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-pip = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-pycairo = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-pygments = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-pygobject = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" RECIPE_MAINTAINER_pn-python3-scons = "Tim Orling <timothy.t.orling@linux.intel.com>" RECIPE_MAINTAINER_pn-python3-scons-native = "Tim Orling <timothy.t.orling@linux.intel.com>" -RECIPE_MAINTAINER_pn-python3-setuptools = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-six = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-smmap = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-subunit = "Derek Straka <derek@asterius.io>" -RECIPE_MAINTAINER_pn-python3-testtools = "Derek Straka <derek@asterius.io>" +RECIPE_MAINTAINER_pn-python3-setuptools = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-six = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-smmap = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-subunit = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" +RECIPE_MAINTAINER_pn-python3-testtools = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" RECIPE_MAINTAINER_pn-qemu = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-qemu-helper-native = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-qemu-native = "Richard Purdie <richard.purdie@linuxfoundation.org>" @@ -662,7 +655,7 @@ RECIPE_MAINTAINER_pn-sqlite3 = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-squashfs-tools = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-startup-notification = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-strace = "Robert Yang <liezhi.yang@windriver.com>" -RECIPE_MAINTAINER_pn-stress = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER_pn-stress-ng = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-subversion = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-sudo = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-swig = "Anuj Mittal <anuj.mittal@intel.com>" diff --git a/poky/meta/conf/distro/include/tcmode-default.inc b/poky/meta/conf/distro/include/tcmode-default.inc index 32176dae4..1966dbd52 100644 --- a/poky/meta/conf/distro/include/tcmode-default.inc +++ b/poky/meta/conf/distro/include/tcmode-default.inc @@ -22,10 +22,13 @@ GCCVERSION ?= "9.%" SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.32%" GDBVERSION ?= "8.3%" -GLIBCVERSION ?= "2.29%" +GLIBCVERSION ?= "2.30%" LINUXLIBCVERSION ?= "5.0%" QEMUVERSION ?= "4.0%" GOVERSION ?= "1.12%" +# 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 +LLVMVERSION ?= "8.0.1" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" @@ -76,3 +79,7 @@ PREFERRED_VERSION_go-native ?= "${GOVERSION}" PREFERRED_VERSION_go-runtime ?= "${GOVERSION}" PREFERRED_VERSION_nativesdk-go ?= "${GOVERSION}" PREFERRED_VERSION_nativesdk-go-runtime ?= "${GOVERSION}" + +PREFERRED_VERSION_llvm = "${LLVMVERSION}" +PREFERRED_VERSION_llvm-native = "${LLVMVERSION}" +PREFERRED_VERSION_nativesdk-llvm = "${LLVMVERSION}" |