From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- poky/meta/conf/distro/include/maintainers.inc | 108 +++++++++++++++++--------- 1 file changed, 73 insertions(+), 35 deletions(-) (limited to 'poky/meta/conf/distro/include/maintainers.inc') diff --git a/poky/meta/conf/distro/include/maintainers.inc b/poky/meta/conf/distro/include/maintainers.inc index 672f06779..950b8e895 100644 --- a/poky/meta/conf/distro/include/maintainers.inc +++ b/poky/meta/conf/distro/include/maintainers.inc @@ -64,9 +64,9 @@ RECIPE_MAINTAINER_pn-bash-completion = "Alexander Kanavin " RECIPE_MAINTAINER_pn-initscripts = "Anuj Mittal " RECIPE_MAINTAINER_pn-intltool = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-iproute2 = "Changhyeok Bae " -RECIPE_MAINTAINER_pn-iptables = "Changhyeok Bae " -RECIPE_MAINTAINER_pn-iputils = "Changhyeok Bae " -RECIPE_MAINTAINER_pn-irda-utils = "Changhyeok Bae " +RECIPE_MAINTAINER_pn-iproute2 = "Changhyeok Bae " +RECIPE_MAINTAINER_pn-iptables = "Changhyeok Bae " +RECIPE_MAINTAINER_pn-iputils = "Changhyeok Bae " +RECIPE_MAINTAINER_pn-irda-utils = "Changhyeok Bae " RECIPE_MAINTAINER_pn-iso-codes = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-iw = "Changhyeok Bae " +RECIPE_MAINTAINER_pn-iw = "Changhyeok Bae " RECIPE_MAINTAINER_pn-libjpeg-turbo = "Anuj Mittal " RECIPE_MAINTAINER_pn-json-c = "Yi Zhao " RECIPE_MAINTAINER_pn-json-glib = "Yi Zhao " RECIPE_MAINTAINER_pn-kbd = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield " -RECIPE_MAINTAINER_pn-kernel-devsrc = "Bruce Ashfield " +RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield " +RECIPE_MAINTAINER_pn-kernel-devsrc = "Bruce Ashfield " RECIPE_MAINTAINER_pn-kexec-tools = "Armin Kuster " RECIPE_MAINTAINER_pn-keymaps = "Alexander Kanavin " RECIPE_MAINTAINER_pn-kmod = "Chen Qi " @@ -281,7 +306,6 @@ RECIPE_MAINTAINER_pn-liba52 = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-libacpi = "Anuj Mittal " RECIPE_MAINTAINER_pn-libaio = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libarchive = "Otavio Salvador " -RECIPE_MAINTAINER_pn-libart-lgpl = "Anuj Mittal " RECIPE_MAINTAINER_pn-libassuan = "Armin Kuster " RECIPE_MAINTAINER_pn-libatomic-ops = "Anuj Mittal " RECIPE_MAINTAINER_pn-libbsd = "Yi Zhao " @@ -293,6 +317,7 @@ RECIPE_MAINTAINER_pn-libcomps = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libconvert-asn1-perl = "Tim Orling " RECIPE_MAINTAINER_pn-libcroco = "Anuj Mittal " RECIPE_MAINTAINER_pn-libdaemon = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-libdazzle = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libdmx = "Armin Kuster " RECIPE_MAINTAINER_pn-libdnf = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libdrm = "Otavio Salvador " @@ -321,10 +346,12 @@ RECIPE_MAINTAINER_pn-libid3tag = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-libidn = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libidn2 = "Ross Burton " RECIPE_MAINTAINER_pn-libinput = "Ross Burton " +RECIPE_MAINTAINER_pn-libjitterentropy = "Ross Burton " RECIPE_MAINTAINER_pn-libksba = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libmatchbox = "Ross Burton " RECIPE_MAINTAINER_pn-libmnl = "Khem Raj " RECIPE_MAINTAINER_pn-libmpc = "Khem Raj " +RECIPE_MAINTAINER_pn-libmodulemd = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia " RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia " RECIPE_MAINTAINER_pn-libnl = "Alexander Kanavin " @@ -343,6 +370,7 @@ RECIPE_MAINTAINER_pn-libpipeline = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libpng = "Anuj Mittal " RECIPE_MAINTAINER_pn-libproxy = "Anuj Mittal " RECIPE_MAINTAINER_pn-libpthread-stubs = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-libpsl = "Anuj Mittal " RECIPE_MAINTAINER_pn-librepo = "Alexander Kanavin " RECIPE_MAINTAINER_pn-librsvg = "Anuj Mittal " RECIPE_MAINTAINER_pn-libsamplerate0 = "Tanu Kaskinen " @@ -362,7 +390,7 @@ RECIPE_MAINTAINER_pn-libtool = "Robert Yang " RECIPE_MAINTAINER_pn-libtool-cross = "Robert Yang " RECIPE_MAINTAINER_pn-libtool-native = "Robert Yang " RECIPE_MAINTAINER_pn-libunistring = "Anuj Mittal " -RECIPE_MAINTAINER_pn-libunwind = "Bruce Ashfield " +RECIPE_MAINTAINER_pn-libunwind = "Bruce Ashfield " RECIPE_MAINTAINER_pn-liburcu = "Alexander Kanavin " RECIPE_MAINTAINER_pn-liburi-perl = "Tim Orling " RECIPE_MAINTAINER_pn-libusb1 = "Anuj Mittal " @@ -376,6 +404,7 @@ RECIPE_MAINTAINER_pn-libxau = "Armin Kuster " RECIPE_MAINTAINER_pn-libxcb = "Armin Kuster " RECIPE_MAINTAINER_pn-libxcomposite = "Armin Kuster " RECIPE_MAINTAINER_pn-libxcursor = "Armin Kuster " +RECIPE_MAINTAINER_pn-libxcrypt = "Khem Raj " RECIPE_MAINTAINER_pn-libxdamage = "Armin Kuster " RECIPE_MAINTAINER_pn-libxdmcp = "Armin Kuster " RECIPE_MAINTAINER_pn-libxext = "Armin Kuster " @@ -413,11 +442,11 @@ RECIPE_MAINTAINER_pn-libyaml = "Alexander Kanavin " RECIPE_MAINTAINER_pn-lighttpd = "Alexander Kanavin " RECIPE_MAINTAINER_pn-linux-dummy = "Alexander Kanavin " RECIPE_MAINTAINER_pn-linux-firmware = "Otavio Salvador " -RECIPE_MAINTAINER_pn-linux-libc-headers = "Bruce Ashfield " -RECIPE_MAINTAINER_pn-linux-yocto = "Bruce Ashfield " -RECIPE_MAINTAINER_pn-linux-yocto-dev = "Bruce Ashfield " -RECIPE_MAINTAINER_pn-linux-yocto-rt = "Bruce Ashfield " -RECIPE_MAINTAINER_pn-linux-yocto-tiny = "Bruce Ashfield " +RECIPE_MAINTAINER_pn-linux-libc-headers = "Bruce Ashfield " +RECIPE_MAINTAINER_pn-linux-yocto = "Bruce Ashfield " +RECIPE_MAINTAINER_pn-linux-yocto-dev = "Bruce Ashfield " +RECIPE_MAINTAINER_pn-linux-yocto-rt = "Bruce Ashfield " +RECIPE_MAINTAINER_pn-linux-yocto-tiny = "Bruce Ashfield " RECIPE_MAINTAINER_pn-llvm = "Khem Raj " RECIPE_MAINTAINER_pn-logrotate = "Yi Zhao " RECIPE_MAINTAINER_pn-lrzsz = "Anuj Mittal " @@ -438,7 +467,7 @@ RECIPE_MAINTAINER_pn-m4-native = "Robert Yang " RECIPE_MAINTAINER_pn-make = "Robert Yang " RECIPE_MAINTAINER_pn-makedepend = "Robert Yang " RECIPE_MAINTAINER_pn-makedevs = "Chen Qi " -RECIPE_MAINTAINER_pn-make-mod-scripts = "Bruce Ashfield " +RECIPE_MAINTAINER_pn-make-mod-scripts = "Bruce Ashfield " RECIPE_MAINTAINER_pn-man-db = "Hongxu Jia " RECIPE_MAINTAINER_pn-man-pages = "Hongxu Jia " RECIPE_MAINTAINER_pn-matchbox-config-gtk = "Ross Burton " @@ -457,9 +486,10 @@ RECIPE_MAINTAINER_pn-mesa = "Otavio Salvador " RECIPE_MAINTAINER_pn-mesa-demos = "Otavio Salvador " RECIPE_MAINTAINER_pn-mesa-gl = "Otavio Salvador " RECIPE_MAINTAINER_pn-meson = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-meta-environment = "Richard Purdie " -RECIPE_MAINTAINER_pn-meta-environment-extsdk = "Richard Purdie " +RECIPE_MAINTAINER_pn-meta-environment-${MACHINE} = "Richard Purdie " +RECIPE_MAINTAINER_pn-meta-environment-extsdk-${MACHINE} = "Richard Purdie " RECIPE_MAINTAINER_pn-meta-extsdk-toolchain = "Richard Purdie " +RECIPE_MAINTAINER_pn-meta-go-toolchain = "Richard Purdie " RECIPE_MAINTAINER_pn-meta-ide-support = "Richard Purdie " RECIPE_MAINTAINER_pn-meta-toolchain = "Richard Purdie " RECIPE_MAINTAINER_pn-meta-world-pkgdata = "Richard Purdie " @@ -484,9 +514,12 @@ RECIPE_MAINTAINER_pn-musl-utils = "Khem Raj " RECIPE_MAINTAINER_pn-mx-1.0 = "Anuj Mittal " RECIPE_MAINTAINER_pn-nasm = "Richard Purdie " RECIPE_MAINTAINER_pn-nativesdk-buildtools-perl-dummy = "Richard Purdie " +RECIPE_MAINTAINER_pn-nativesdk-icecc-toolchain = "Joshua Watt " RECIPE_MAINTAINER_pn-nativesdk-libtool = "Richard Purdie " +RECIPE_MAINTAINER_pn-nativesdk-meson = "Alexander Kanavin " RECIPE_MAINTAINER_pn-nativesdk-packagegroup-sdk-host = "Ross Burton " RECIPE_MAINTAINER_pn-nativesdk-qemu-helper = "Richard Purdie " +RECIPE_MAINTAINER_pn-nativesdk-sdk-provides-dummy = "Richard Purdie " RECIPE_MAINTAINER_pn-newlib = "Alejandro Hernandez " RECIPE_MAINTAINER_pn-ncurses = "Hongxu Jia " RECIPE_MAINTAINER_pn-neard = "Anuj Mittal " @@ -521,7 +554,7 @@ RECIPE_MAINTAINER_pn-patchelf = "Richard Purdie