diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:55:30 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
commit | 706d5aacd7ab7b37c00df1a1b210e4ced06119e1 (patch) | |
tree | ed0bec373424d01accfb2e9c895c177a3e2d7abe /poky/meta/conf/distro | |
parent | ac970dd705934286df062e0f1501f776dc2ef01d (diff) | |
download | openbmc-706d5aacd7ab7b37c00df1a1b210e4ced06119e1.tar.xz |
Reset poky to before our libpam hacks
Things got a bit out of synch with openbmc-config due to the libpam
issues and the migration from the meta-* layers.
Revert the two previous commits and then put the latest poky in with the
libpam revert and get openbmc-config right again.
Revert "Revert "libpam: update 1.3.1 -> 1.5.1""
This reverts commit 87ddd3eab4df68e624b5350ccaab28b3b97547c0.
Revert "poky: subtree update:796be0593a..10c69538c0"
This reverts commit c723b72979bfac6362509cf1fe086900f6641f28.
Change-Id: I3a1f405193aee6a21fe0cd24be9927c143a23d9a
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/conf/distro')
-rw-r--r-- | poky/meta/conf/distro/include/maintainers.inc | 39 | ||||
-rw-r--r-- | poky/meta/conf/distro/include/tcmode-default.inc | 2 |
2 files changed, 20 insertions, 21 deletions
diff --git a/poky/meta/conf/distro/include/maintainers.inc b/poky/meta/conf/distro/include/maintainers.inc index b0ddfb89a..e9c69b2e6 100644 --- a/poky/meta/conf/distro/include/maintainers.inc +++ b/poky/meta/conf/distro/include/maintainers.inc @@ -31,14 +31,14 @@ RECIPE_MAINTAINER_pn-acl = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-acpica = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-acpid = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-adwaita-icon-theme = "Ross Burton <ross.burton@arm.com>" -RECIPE_MAINTAINER_pn-alsa-lib = "Unassigned <unassigned@yoctoproject.org>" -RECIPE_MAINTAINER_pn-alsa-plugins = "Unassigned <unassigned@yoctoproject.org>" -RECIPE_MAINTAINER_pn-alsa-state = "Unassigned <unassigned@yoctoproject.org>" -RECIPE_MAINTAINER_pn-alsa-tools = "Unassigned <unassigned@yoctoproject.org>" -RECIPE_MAINTAINER_pn-alsa-topology-conf = "Unassigned <unassigned@yoctoproject.org>" -RECIPE_MAINTAINER_pn-alsa-ucm-conf = "Unassigned <unassigned@yoctoproject.org>" -RECIPE_MAINTAINER_pn-alsa-utils = "Unassigned <unassigned@yoctoproject.org>" -RECIPE_MAINTAINER_pn-alsa-utils-scripts = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-alsa-lib = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-alsa-plugins = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-alsa-state = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-alsa-tools = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-alsa-topology-conf = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-alsa-ucm-conf = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-alsa-utils = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-alsa-utils-scripts = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-apmd = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-apr = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-apr-util = "Hongxu Jia <hongxu.jia@windriver.com>" @@ -175,7 +175,7 @@ RECIPE_MAINTAINER_pn-expect = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-ffmpeg = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-file = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-findutils = "Chen Qi <Qi.Chen@windriver.com>" -RECIPE_MAINTAINER_pn-flac = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-flac = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-flex = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-font-alias = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-font-util = "Armin Kuster <akuster808@gmail.com>" @@ -297,10 +297,10 @@ RECIPE_MAINTAINER_pn-kmod = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-kmod-native = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-kmscube = "Carlos Rafael Giani <dv@pseudoterminal.org>" RECIPE_MAINTAINER_pn-l3afpad = "Anuj Mittal <anuj.mittal@intel.com>" -RECIPE_MAINTAINER_pn-lame = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-lame = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-ldconfig-native = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-less = "Yi Zhao <yi.zhao@windriver.com>" -RECIPE_MAINTAINER_pn-liba52 = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-liba52 = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-libacpi = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libaio = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libarchive = "Otavio Salvador <otavio.salvador@ossystems.com.br>" @@ -343,7 +343,7 @@ RECIPE_MAINTAINER_pn-libgudev = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-libhandy = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libical = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-libice = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libid3tag = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libid3tag = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-libidn2 = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-libinput = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-libjitterentropy = "Ross Burton <ross.burton@arm.com>" @@ -374,11 +374,11 @@ RECIPE_MAINTAINER_pn-libpthread-stubs = "Alexander Kanavin <alex.kanavin@gmail.c RECIPE_MAINTAINER_pn-libpsl = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-librepo = "Wang Mingyu <wangmy@cn.fujitsu.com>" RECIPE_MAINTAINER_pn-librsvg = "Anuj Mittal <anuj.mittal@intel.com>" -RECIPE_MAINTAINER_pn-libsamplerate0 = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libsamplerate0 = "Tanu Kaskinen <tanuk@iki.fi>" 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>" -RECIPE_MAINTAINER_pn-libsndfile1 = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libsndfile1 = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-libsolv = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libsoup-2.4 = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libssp-nonshared = "Khem Raj <raj.khem@gmail.com>" @@ -577,8 +577,8 @@ RECIPE_MAINTAINER_pn-pseudo = "Richard Purdie <richard.purdie@linuxfoundation.or RECIPE_MAINTAINER_pn-psmisc = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-psplash = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-ptest-runner = "Ross Burton <ross.burton@arm.com>" -RECIPE_MAINTAINER_pn-pulseaudio = "Unassigned <unassigned@yoctoproject.org>" -RECIPE_MAINTAINER_pn-pulseaudio-client-conf-sato = "Unassigned <unassigned@yoctoproject.org>" +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-python3 = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" @@ -651,7 +651,7 @@ RECIPE_MAINTAINER_pn-ruby = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-run-postinsts = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-rxvt-unicode = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-sato-screenshot = "Ross Burton <ross.burton@arm.com>" -RECIPE_MAINTAINER_pn-sbc = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-sbc = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-screen = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-sed = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-serf = "Anuj Mittal <anuj.mittal@intel.com>" @@ -666,8 +666,8 @@ RECIPE_MAINTAINER_pn-shutdown-desktop = "Alexander Kanavin <alex.kanavin@gmail.c RECIPE_MAINTAINER_pn-signing-keys = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-slang = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-socat = "Hongxu Jia <hongxu.jia@windriver.com>" -RECIPE_MAINTAINER_pn-speex = "Unassigned <unassigned@yoctoproject.org>" -RECIPE_MAINTAINER_pn-speexdsp = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-speex = "Tanu Kaskinen <tanuk@iki.fi>" +RECIPE_MAINTAINER_pn-speexdsp = "Tanu Kaskinen <tanuk@iki.fi>" RECIPE_MAINTAINER_pn-spirv-tools = "Jose Quaresma <quaresma.jose@gmail.com>" RECIPE_MAINTAINER_pn-sqlite3 = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-squashfs-tools = "Robert Yang <liezhi.yang@windriver.com>" @@ -797,4 +797,3 @@ RECIPE_MAINTAINER_pn-xwininfo = "Armin Kuster <akuster808@gmail.com>" RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko <denys@ti.com>" RECIPE_MAINTAINER_pn-zip = "Denys Dmytriyenko <denys@ti.com>" RECIPE_MAINTAINER_pn-zlib = "Denys Dmytriyenko <denys@ti.com>" -RECIPE_MAINTAINER_pn-zstd = "Alexander Kanavin <alex.kanavin@gmail.com>" diff --git a/poky/meta/conf/distro/include/tcmode-default.inc b/poky/meta/conf/distro/include/tcmode-default.inc index fd4d760b3..75796a73f 100644 --- a/poky/meta/conf/distro/include/tcmode-default.inc +++ b/poky/meta/conf/distro/include/tcmode-default.inc @@ -21,7 +21,7 @@ SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.35%" GDBVERSION ?= "10.%" GLIBCVERSION ?= "2.32" -LINUXLIBCVERSION ?= "5.10%" +LINUXLIBCVERSION ?= "5.8%" QEMUVERSION ?= "5.1%" GOVERSION ?= "1.15%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote |