From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- poky/meta/conf/bitbake.conf | 44 +- poky/meta/conf/distro/include/as-needed.inc | 13 - .../conf/distro/include/default-distrovars.inc | 3 +- .../meta/conf/distro/include/default-providers.inc | 2 +- poky/meta/conf/distro/include/default-versions.inc | 3 - poky/meta/conf/distro/include/distro_alias.inc | 38 +- poky/meta/conf/distro/include/maintainers.inc | 798 ++++++++++----------- poky/meta/conf/distro/include/no-static-libs.inc | 3 +- poky/meta/conf/distro/include/security_flags.inc | 26 +- poky/meta/conf/distro/include/tclibc-baremetal.inc | 13 +- poky/meta/conf/distro/include/tclibc-glibc.inc | 2 - poky/meta/conf/distro/include/tclibc-musl.inc | 3 +- poky/meta/conf/distro/include/tclibc-newlib.inc | 48 ++ poky/meta/conf/distro/include/tcmode-default.inc | 17 +- poky/meta/conf/distro/include/yocto-uninative.inc | 1 + poky/meta/conf/documentation.conf | 4 +- poky/meta/conf/layer.conf | 22 +- poky/meta/conf/machine-sdk/aarch64.conf | 2 + poky/meta/conf/machine/include/arm/arch-armv7a.inc | 1 + poky/meta/conf/machine/include/m68k/arch-m68k.inc | 8 + .../conf/machine/include/mips/tune-mips-74k.inc | 37 + poky/meta/conf/machine/include/qemu.inc | 2 +- poky/meta/conf/machine/include/tune-core2.inc | 2 +- poky/meta/conf/machine/include/tune-corei7.inc | 11 +- poky/meta/conf/machine/include/tune-mcf5441x.inc | 13 + poky/meta/conf/machine/include/x86-base.inc | 9 +- poky/meta/conf/machine/qemuarm.conf | 2 +- poky/meta/conf/machine/qemumips.conf | 2 - poky/meta/conf/machine/qemumips64.conf | 2 - poky/meta/conf/machine/qemux86-64.conf | 4 + poky/meta/conf/machine/qemux86.conf | 4 + poky/meta/conf/multilib.conf | 4 + poky/meta/conf/sanity.conf | 2 +- 33 files changed, 582 insertions(+), 563 deletions(-) delete mode 100644 poky/meta/conf/distro/include/as-needed.inc create mode 100644 poky/meta/conf/distro/include/tclibc-newlib.inc create mode 100644 poky/meta/conf/machine-sdk/aarch64.conf create mode 100644 poky/meta/conf/machine/include/m68k/arch-m68k.inc create mode 100644 poky/meta/conf/machine/include/mips/tune-mips-74k.inc create mode 100644 poky/meta/conf/machine/include/tune-mcf5441x.inc (limited to 'poky/meta/conf') diff --git a/poky/meta/conf/bitbake.conf b/poky/meta/conf/bitbake.conf index ac403b188..dcf200788 100644 --- a/poky/meta/conf/bitbake.conf +++ b/poky/meta/conf/bitbake.conf @@ -93,7 +93,7 @@ VOLATILE_LOG_DIR ?= "yes" # Architecture-dependent build variables. ################################################################## -# Immediate expansion since there is no point in reapeatedly calling +# Immediate expansion since there is no point in repeatedly calling # os.uname() throughout parsing BUILD_ARCH := "${@os.uname()[4]}" BUILD_OS := "${@os.uname()[0].lower()}" @@ -308,7 +308,8 @@ FILES_SOLIBSDEV ?= "${base_libdir}/lib*${SOLIBSDEV} ${libdir}/lib*${SOLIBSDEV}" FILES_${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \ ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \ ${datadir}/aclocal ${base_libdir}/*.o \ - ${libdir}/${BPN}/*.la ${base_libdir}/*.la" + ${libdir}/${BPN}/*.la ${base_libdir}/*.la \ + ${libdir}/cmake ${datadir}/cmake" SECTION_${PN}-dev = "devel" ALLOW_EMPTY_${PN}-dev = "1" RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})" @@ -318,7 +319,6 @@ SECTION_${PN}-staticdev = "devel" RDEPENDS_${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})" FILES_${PN}-dbg = "/usr/lib/debug /usr/src/debug" - SECTION_${PN}-dbg = "devel" ALLOW_EMPTY_${PN}-dbg = "1" @@ -445,8 +445,9 @@ STAGING_KERNEL_BUILDDIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-build-artifac IMAGE_ROOTFS = "${WORKDIR}/rootfs" IMAGE_BASENAME = "${PN}" -IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}" -IMAGE_NAME[vardepsexclude] += "DATETIME" +IMAGE_VERSION_SUFFIX = "-${DATETIME}" +IMAGE_VERSION_SUFFIX[vardepsexclude] += "DATETIME" +IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}${IMAGE_VERSION_SUFFIX}" IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}" # This option allows for a percentage overage of the actual image size rather than a @@ -475,22 +476,23 @@ export PATH HOSTTOOLS_DIR = "${TMPDIR}/hosttools" # Tools needed to run builds with OE-Core +# python is special cased to point at python2 HOSTTOOLS += " \ [ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm cp cpio \ cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \ fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ head hostname id install ld ldd ln ls make makeinfo md5sum mkdir mknod \ - mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd python python2 \ + mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd python2 \ python2.7 python3 ranlib readelf readlink rm rmdir rpcgen sed sh sha256sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ uniq wc wget which xargs \ " # Tools needed to run testimage runtime image testing -HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.data.inherits_class('testimage', d) or d.getVar('TEST_IMAGE') == '1') else ''}" +HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.utils.contains_any('IMAGE_CLASSES', 'testimage testsdk', True, False, d) or any(x in (d.getVar("BBINCLUDED") or "") for x in ["testimage.bbclass", "testsdk.bbclass"])) else ''}" # Link to these if present -HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat ssh sudo" +HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc pigz sftp socat ssh sudo" # Temporary add few more detected in bitbake world HOSTTOOLS_NONFATAL += "join nl size yes zcat" @@ -585,8 +587,10 @@ LINKER_HASH_STYLE_mipsarch = "sysv" TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][d.getVar('LINKER_HASH_STYLE') != 'gnu']}" +ASNEEDED ?= "-Wl,--as-needed" + export LDFLAGS = "${TARGET_LDFLAGS}" -export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE}" +export TARGET_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE} ${ASNEEDED}" # Pass parallel make options to the compile task EXTRA_OEMAKE_prepend_task-compile = "${PARALLEL_MAKE} " @@ -607,9 +611,9 @@ DEBUG_FLAGS ?= "-g -feliminate-unused-debug-types ${DEBUG_PREFIX_MAP}" # Disabled until the option works properly -feliminate-dwarf2-dups FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}" DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe" -SELECTED_OPTIMIZATION = "${@d.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][d.getVar('DEBUG_BUILD') == '1'])}" +SELECTED_OPTIMIZATION = "${@d.getVar(oe.utils.vartrue('DEBUG_BUILD', 'DEBUG_OPTIMIZATION', 'FULL_OPTIMIZATION', d))}" SELECTED_OPTIMIZATION[vardeps] += "FULL_OPTIMIZATION DEBUG_OPTIMIZATION" -BUILD_OPTIMIZATION = "-O2 -pipe" +BUILD_OPTIMIZATION = "${@oe.utils.vartrue('DEBUG_BUILD', '-O -g -feliminate-unused-debug-types -fno-omit-frame-pointer', '-O2', d)} -pipe" ################################################################## # Settings used by bitbake-layers. @@ -719,20 +723,18 @@ export PKG_CONFIG_SYSTEM_INCLUDE_PATH = "${includedir}" # is a bad idea. Setting a dummy value is better than a ton of anonymous python. DISTRO ??= "nodistro" DISTRO_NAME ??= "OpenEmbedded" + # Overrides are processed left to right, so the ones that are named later take precedence. -# You generally want them to go from least to most specific. -# -# This means that an envionment variable named '_arm' overrides an -# environment variable '' (when ${TARGET_ARCH} is arm). -# An environment variable '_qemuarm' overrides '' and overrides -# '_arm' when ${MACHINE} is 'qemuarm'. +# You generally want them to go from least to most specific. This means that: +# A variable '_arm' overrides a variable '' when ${TARGET_ARCH} is arm. +# A variable '_qemuarm' overrides '' and overrides '_arm' when ${MACHINE} is 'qemuarm'. # If you use combination ie '_qemuarm_arm', then '_qemuarm_arm' will override # '_qemuarm' and then '' will be overriden with that value from '_qemuarm'. # And finally '_forcevariable' overrides any standard variable, with the highest priority. +# This works for functions as well, they are really just variables. # -# This works for functions as well, they are really just environment variables. -# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration. -OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}:forcevariable" +OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable" +LIBCOVERRIDE ?= "" CLASSOVERRIDE ?= "class-target" DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}" MACHINEOVERRIDES ?= "${MACHINE}" @@ -877,7 +879,7 @@ BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc deps depends \ file-checksums python func task export unexport noexec nostamp dirs cleandirs \ sstate-lockfile-shared prefuncs postfuncs export_func deptask rdeptask \ recrdeptask nodeprrecs stamp-extra-info sstate-outputdirs filename lineno \ - progress" + progress mcdepends" MLPREFIX ??= "" MULTILIB_VARIANTS ??= "" diff --git a/poky/meta/conf/distro/include/as-needed.inc b/poky/meta/conf/distro/include/as-needed.inc deleted file mode 100644 index 6a8ad9d62..000000000 --- a/poky/meta/conf/distro/include/as-needed.inc +++ /dev/null @@ -1,13 +0,0 @@ - -ASNEEDED = "-Wl,--as-needed" - -ASNEEDED_pn-babeltrace = "" -ASNEEDED_pn-console-tools = "" -ASNEEDED_pn-distcc = "" -ASNEEDED_pn-openobex = "" -ASNEEDED_pn-icu = "" -ASNEEDED_pn-pciutils = "" -ASNEEDED_pn-puzzles = "" -ASNEEDED_pn-rpm = "" - -TARGET_LDFLAGS += "${ASNEEDED}" diff --git a/poky/meta/conf/distro/include/default-distrovars.inc b/poky/meta/conf/distro/include/default-distrovars.inc index 9620ad48d..f5ec6cef9 100644 --- a/poky/meta/conf/distro/include/default-distrovars.inc +++ b/poky/meta/conf/distro/include/default-distrovars.inc @@ -14,7 +14,7 @@ DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 irda largefile pcmcia u DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \ libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \ libc-getlogin libc-idn libc-inet-anl libc-libm libc-locales libc-locale-code \ - libc-memusage libc-nis libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams libc-sunrpc \ + libc-memusage libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams \ libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \ libc-posix-wchar-io" DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}" @@ -24,7 +24,6 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}" IMAGE_FEATURES ?= "" WHITELIST_GPL-3.0 ?= "" -LGPLv2_WHITELIST_GPL-3.0 ?= "" COMMERCIAL_AUDIO_PLUGINS ?= "" # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" diff --git a/poky/meta/conf/distro/include/default-providers.inc b/poky/meta/conf/distro/include/default-providers.inc index e65c1ed32..019ceeb29 100644 --- a/poky/meta/conf/distro/include/default-providers.inc +++ b/poky/meta/conf/distro/include/default-providers.inc @@ -23,9 +23,9 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-opkg" VIRTUAL-RUNTIME_apm ?= "apm" VIRTUAL-RUNTIME_alsa-state ?= "alsa-state" VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt" -VIRTUAL-RUNTIME_wireless-tools ?= "iw wireless-tools" VIRTUAL-RUNTIME_base-utils ?= "busybox" VIRTUAL-RUNTIME_base-utils-hwclock ?= "busybox-hwclock" +VIRTUAL-RUNTIME_base-utils-syslog ?= "busybox-syslog" # # Default recipe providers diff --git a/poky/meta/conf/distro/include/default-versions.inc b/poky/meta/conf/distro/include/default-versions.inc index 3d88e8f65..a6f331350 100644 --- a/poky/meta/conf/distro/include/default-versions.inc +++ b/poky/meta/conf/distro/include/default-versions.inc @@ -2,6 +2,3 @@ # Default preferred versions # -PREFERRED_VERSION_openssl ?= "1.0.%" -PREFERRED_VERSION_openssl-native ?= "1.0.%" -PREFERRED_VERSION_nativesdk-openssl ?= "1.0.%" diff --git a/poky/meta/conf/distro/include/distro_alias.inc b/poky/meta/conf/distro/include/distro_alias.inc index 13c7e652b..7502542e8 100644 --- a/poky/meta/conf/distro/include/distro_alias.inc +++ b/poky/meta/conf/distro/include/distro_alias.inc @@ -15,7 +15,6 @@ DISTRO_PN_ALIAS_pn-alsa-utils-scripts = "OE-Core" DISTRO_PN_ALIAS_pn-atk = "Fedora=atk OpenSuSE=atk" DISTRO_PN_ALIAS_pn-avahi-ui = "Ubuntu=avahi-discover Debian=avahi-discover" DISTRO_PN_ALIAS_pn-babeltrace = "OSPDT" -DISTRO_PN_ALIAS_pn-bigreqsproto = "Meego=xorg-x11-proto-bigreqsproto" DISTRO_PN_ALIAS_pn-bjam = "OpenSuSE=boost-jam Debina=bjam" DISTRO_PN_ALIAS_pn-blktool = "Debian=blktool Mandriva=blktool" DISTRO_PN_ALIAS_pn-bluez5 = "Fedora=bluez Opensuse=bluez" @@ -25,7 +24,6 @@ DISTRO_PN_ALIAS_pn-build-appliance-image = "OSPDT" DISTRO_PN_ALIAS_pn-build-compare = "Opensuse=build-compare Fedora=build-compare" DISTRO_PN_ALIAS_pn-builder = "OE-Core" DISTRO_PN_ALIAS_pn-buildtools-tarball = "OE-Core" -DISTRO_PN_ALIAS_pn-calibrateproto = "OSPDT upstream=http://cgit.freedesktop.org/xorg/proto/calibrateproto" DISTRO_PN_ALIAS_pn-cdrtools = "OpenSUSE=cdrtools OSPDT" DISTRO_PN_ALIAS_pn-chkconfig-alternatives = "Mandriva=chkconfig Debian=chkconfig" DISTRO_PN_ALIAS_pn-clutter = "Fedora=clutter OpenSuse=clutter Ubuntu=clutter-1.0 Mandriva=clutter Debian=clutter" @@ -37,7 +35,6 @@ DISTRO_PN_ALIAS_pn-clutter-gtk-1.0 = "Debian=clutter-gtk Ubuntu=clutter-gtk Fedo DISTRO_PN_ALIAS_pn-clutter-gtk-1.8 = "Fedora=clutter-gtk OpenSuSE=clutter-gtk Ubuntu=clutter-gtk-0.10 Mandriva=clutter-gtk Debian=clutter-gtk" DISTRO_PN_ALIAS_pn-cogl-1.0 = "Debian=cogl Ubuntu=cogl Fedora=cogl" DISTRO_PN_ALIAS_pn-cogl = "Fedora=cogl OpenSuse=cogl Ubuntu=cogl Mandriva=cogl Debian=cogl" -DISTRO_PN_ALIAS_pn-compositeproto = "Meego=xorg-x11-proto-compositeproto" DISTRO_PN_ALIAS_pn-connman = "Meego=connman" DISTRO_PN_ALIAS_pn-connman-conf = "OE-Core" DISTRO_PN_ALIAS_pn-connman-gnome = "Intel" @@ -68,14 +65,12 @@ DISTRO_PN_ALIAS_pn-cryptodev-linux = "OE-Core" DISTRO_PN_ALIAS_pn-cryptodev-module = "OE-Core" DISTRO_PN_ALIAS_pn-cryptodev-tests = "OE-Core" DISTRO_PN_ALIAS_pn-cwautomacros = "OSPDT upstream=http://cwautomacros.berlios.de/" -DISTRO_PN_ALIAS_pn-damageproto = "Meego=xorg-x11-proto-damageproto" DISTRO_PN_ALIAS_pn-db = "Debian=db5.1 Ubuntu=db5.1" DISTRO_PN_ALIAS_pn-dbus-test = "Fedora=dbus Ubuntu=dbus" DISTRO_PN_ALIAS_pn-dbus-wait = "OpenedHand" DISTRO_PN_ALIAS_pn-depmodwrapper-cross = "OE-Core" DISTRO_PN_ALIAS_pn-distcc = "Debian=distcc Fedora=distcc" DISTRO_PN_ALIAS_pn-distcc-config = "OpenedHand" -DISTRO_PN_ALIAS_pn-dmxproto = "Meego=xorg-x11-proto-dmxproto Ubuntu=x11proto-dmx Debian=x11proto-dmx" DISTRO_PN_ALIAS_pn-docbook-dsssl-stylesheets = "Fedora=docbook-style-dsssl Ubuntu=docbook-dsssl" DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-3.1 = "Fedora=docbook-dtds Mandriva=docbook-dtd31-sgml" DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-4.1 = "Fedora=docbook-dtds Mandriva=docbook-dtd41-sgml" @@ -83,21 +78,14 @@ DISTRO_PN_ALIAS_pn-docbook-sgml-dtd-4.5 = "Fedora=docbook-dtds Mandriva=docbook- DISTRO_PN_ALIAS_pn-docbook-xml-dtd4 = "Ubuntu=docbook-xml Fedora=docbook-dtds" DISTRO_PN_ALIAS_pn-docbook-xml-dtd4-native = "Ubuntu=docbook-xml Fedora=docbook-dtds" DISTRO_PN_ALIAS_pn-docbook-xsl-stylesheets = "Fedora=docbook-xsl-stylesheets Opensuse=docbook-xsl-stylesheets" -DISTRO_PN_ALIAS_pn-dri2proto = "Meego=xorg-x11-proto-dri2proto" -DISTRO_PN_ALIAS_pn-dri3proto = "Fedora=dri3proto Opensuse=dri3proto-devel" DISTRO_PN_ALIAS_pn-dropbear = "Debian=dropbear Ubuntu=dropbear" DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc" -DISTRO_PN_ALIAS_pn-eee-acpi-scripts = "Debian=eeepc-acpi-scripts Ubuntu=eeepc-acpi-scripts" DISTRO_PN_ALIAS_pn-eglinfo-fb = "OE-Core" DISTRO_PN_ALIAS_pn-eglinfo-x11 = "OE-Core" DISTRO_PN_ALIAS_pn-encodings = "Ubuntu=xfonts-encodings Mandriva=x11-font-encodings Debian=xfonts-encodings" -DISTRO_PN_ALIAS_pn-fixesproto = "Meego=xorg-x11-proto-fixesproto" DISTRO_PN_ALIAS_pn-font-alias = "Fedora=xorg-x11-fonts-base Mandriva=x11-font-alias Meego=xorg-x11-fonts" -DISTRO_PN_ALIAS_pn-fontcacheproto = "Meego=xorg-x11-proto-fontcacheproto" -DISTRO_PN_ALIAS_pn-fontsproto = "Meego=xorg-x11-proto-fontsproto" DISTRO_PN_ALIAS_pn-font-util = "Meego=xorg-x11-font-utils Fedora=xorg-x11-font-utils Ubuntu=xfonts-utils Mandriva=x11-font-util Debian=xfonts-utils" DISTRO_PN_ALIAS_pn-formfactor = "OE-Core" -DISTRO_PN_ALIAS_pn-fstests = "OpenedHand" DISTRO_PN_ALIAS_pn-gcc-cross-initial = "OE-Core" DISTRO_PN_ALIAS_pn-gcc-cross-initial-i586 = "OE-Core" DISTRO_PN_ALIAS_pn-gcc-crosssdk-initial = "OE-Core" @@ -114,7 +102,6 @@ DISTRO_PN_ALIAS_pn-glib-2.0 = "Meego=glib2 Fedora=glib2 OpenSuSE=glib2 Ubuntu=gl DISTRO_PN_ALIAS_pn-glibc-locale = "OpenSuSE=glibc-locale Fedora=glibc-devel" DISTRO_PN_ALIAS_pn-glibc-mtrace = "Fedora=glibc-utils Ubuntu=libc-dev-bin" DISTRO_PN_ALIAS_pn-glibc-scripts = "Fedora=glibc Ubuntu=libc-bin" -DISTRO_PN_ALIAS_pn-glproto = "Meego=xorg-x11-proto-glproto" DISTRO_PN_ALIAS_pn-gnome-desktop-testing = "Debian=gnome-desktop-testing Fedora=gnome-desktop-testing" DISTRO_PN_ALIAS_pn-gnu-config = "OpenedHand" DISTRO_PN_ALIAS_pn-gptfdisk = "Fedora=gdisk Ubuntu=gdisk" @@ -149,12 +136,9 @@ DISTRO_PN_ALIAS_pn-initramfs-live-install-efi = "OE-Core" DISTRO_PN_ALIAS_pn-initramfs-live-install-efi-testfs = "OE-Core" DISTRO_PN_ALIAS_pn-initramfs-live-install-testfs = "OE-Core" DISTRO_PN_ALIAS_pn-initscripts = "Fedora=initscripts Mandravia=initscripts" -DISTRO_PN_ALIAS_pn-inputproto = "Meego=xorg-x11-proto-inputproto" DISTRO_PN_ALIAS_pn-iproute2 = "OSPDT" DISTRO_PN_ALIAS_pn-jpeg = "OpenSuSE=libjpeg Ubuntu=libjpeg62" -DISTRO_PN_ALIAS_pn-kbproto = "Meego=xorg-x11-proto-kbproto Ubuntu=x11proto-kb-dev Debian=x11proto-kb-dev" DISTRO_PN_ALIAS_pn-kernel-devsrc = "Debian=linux-base Ubuntu=linux" -DISTRO_PN_ALIAS_pn-kernelshark = "Mandriva=kernelshark Ubuntu=kernelshark" DISTRO_PN_ALIAS_pn-kern-tools-native = "Windriver" DISTRO_PN_ALIAS_pn-keymaps = "OE-Core" DISTRO_PN_ALIAS_pn-kf = "OSPDT" @@ -205,7 +189,6 @@ DISTRO_PN_ALIAS_pn-libtelepathy = "Debian=libtelepathy2 Ubuntu=libtelepathy2" DISTRO_PN_ALIAS_pn-libtimedate-perl = "Debian=libtimedate-perl Ubuntu=libtimedate-perl" DISTRO_PN_ALIAS_pn-liburcu = "Fedora=userspace-rcu Ubuntu=liburcu0" DISTRO_PN_ALIAS_pn-libusb1 = "Debian=libusb-1.0-0 Fedora=libusb1" -DISTRO_PN_ALIAS_pn-libusb-compat = "OSPDT" DISTRO_PN_ALIAS_pn-libx11 = "Debian=libx11-6 Fedora=libX11 Ubuntu=libx11-6 OpenSuSE=xorg-x11-libX11" DISTRO_PN_ALIAS_pn-libxcalibrate = "OSPDT upstream=http://cgit.freedesktop.org/xorg/lib/libXCalibrate/" DISTRO_PN_ALIAS_pn-libxfont2 = "Fedora=libXfont2 Clear=libXfont2" @@ -257,7 +240,6 @@ DISTRO_PN_ALIAS_pn-mini-x-session = "OSPDT" DISTRO_PN_ALIAS_pn-mkelfimage = "Ubuntu=mkelfimage Fedora=mkelfimage" DISTRO_PN_ALIAS_pn-mkfontdir = "Mandriva=mkfontdir Ubuntu=xfonts-utils Fedora=xorg-x11-font-utils" DISTRO_PN_ALIAS_pn-mkfontscale = "Mandriva=mkfontscale Ubuntu=xfonts-utils Fedora=xorg-x11-font-utils" -DISTRO_PN_ALIAS_pn-mktemp = "Mandriva=mktemp Fedora=mktemp" DISTRO_PN_ALIAS_pn-mmc-utils = "OE-Core" DISTRO_PN_ALIAS_pn-modutils-initscripts = "OE-Core" DISTRO_PN_ALIAS_pn-mtd-utils = "Debian=mtd-utils Ubuntu=mtd-utils" @@ -315,21 +297,18 @@ DISTRO_PN_ALIAS_pn-pong-clock = "OpenedHand" DISTRO_PN_ALIAS_pn-portmap = "Debian=rpcbind Fedora=rpcbind" DISTRO_PN_ALIAS_pn-powertop = "Meego=powertop Fedora=powertop Debian=powertop OpenSuSE=powertop Mandriva=powertop" DISTRO_PN_ALIAS_pn-ppp-dialin = "OE-Core" -DISTRO_PN_ALIAS_pn-presentproto = "Debian=x11proto-present-dev Fedora=xorg-x11-proto-devel" DISTRO_PN_ALIAS_pn-pseudo = "Windriver" DISTRO_PN_ALIAS_pn-psplash = "OpenedHand" DISTRO_PN_ALIAS_pn-ptest-runner = "OE-Core" DISTRO_PN_ALIAS_pn-pulseaudio-client-conf-sato = "OE-Core" DISTRO_PN_ALIAS_pn-puzzles = "Debian=sgt-puzzles Fedora=puzzles" DISTRO_PN_ALIAS_pn-python3 = "Fedora=python3 Debian=python3.2" -DISTRO_PN_ALIAS_pn-python3-distribute = "Debian=python3-setuptools Fedora=python3-setuptools" DISTRO_PN_ALIAS_pn-python3-iniparse = "Fedora=python-iniparse Debian=python-iniparse" DISTRO_PN_ALIAS_pn-python3-pip = "OpenSuSE=python3-pip Debian=python3-pip" DISTRO_PN_ALIAS_pn-python3-pycurl = "Fedora=python-pycurl Debian=pycurl" DISTRO_PN_ALIAS_pn-python3-pygpgme = "Fedora=python-pygpgme Debian=pygpgme" DISTRO_PN_ALIAS_pn-python3-setuptools = "OpenSuSE=python3-setuptools Debian=python3-setuptools" DISTRO_PN_ALIAS_pn-python-dbus = "Ubuntu=python-dbus Debian=python-dbus Mandriva=python-dbus" -DISTRO_PN_ALIAS_pn-python-distribute = "Opensuse=python-setuptools Fedora=python-setuptools" DISTRO_PN_ALIAS_pn-python-git = "Debian=python-git Fedora=GitPython" DISTRO_PN_ALIAS_pn-python-mako = "Fedora=python-mako Opensuse=python-Mako" DISTRO_PN_ALIAS_pn-python-pycairo = "Meego=pycairo Fedora=pycairo Ubuntu=pycairo Debian=pycairo" @@ -341,12 +320,8 @@ DISTRO_PN_ALIAS_pn-qemu-config = "OpenedHand" DISTRO_PN_ALIAS_pn-qemugl = "OpenedHand" DISTRO_PN_ALIAS_pn-qemu-helper = "OpenedHand" DISTRO_PN_ALIAS_pn-qemuwrapper-cross = "OE-Core" -DISTRO_PN_ALIAS_pn-randrproto = "Meego=xorg-x11-proto-randrproto" DISTRO_PN_ALIAS_pn-readline = "Fedora=readline Debian=readline-common" -DISTRO_PN_ALIAS_pn-recordproto = "Meego=xorg-x11-proto-recordproto" DISTRO_PN_ALIAS_pn-remake = "Mandriva=remake Debian=remake" -DISTRO_PN_ALIAS_pn-renderproto = "Meego=xorg-x11-proto-renderproto" -DISTRO_PN_ALIAS_pn-resourceproto = "Meego=xorg-x11-proto-resourceproto" DISTRO_PN_ALIAS_pn-rgb = "Fedora=xorg-X11-server-utils Debian=x11-xserver-utils" DISTRO_PN_ALIAS_pn-rpmresolve = "OSPDT" DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests" @@ -355,7 +330,6 @@ DISTRO_PN_ALIAS_pn-sato-icon-theme = "OpenedHand" DISTRO_PN_ALIAS_pn-sato-screenshot = "OpenedHand" DISTRO_PN_ALIAS_pn-sbc = "Fedora=sbc Debian=libsbc1" DISTRO_PN_ALIAS_pn-screenshot = "OpenedHand" -DISTRO_PN_ALIAS_pn-scrnsaverproto = "Meego=xorg-x11-proto-scrnsaverproto Ubuntu=x11proto-scrnsaver-dev Debian=x11proto-scrnsaver-dev" DISTRO_PN_ALIAS_pn-settings-daemon = "OpenedHand" DISTRO_PN_ALIAS_pn-sgml-common = "OpenSuSE=sgml-common Fedora=sgml-common" DISTRO_PN_ALIAS_pn-sgmlspl = "Debian=sgmlspl Ubuntu=sgmlspl" @@ -376,7 +350,6 @@ DISTRO_PN_ALIAS_pn-tar-replacement = "Fedora=tar Ubuntu=tar" DISTRO_PN_ALIAS_pn-tcf-agent = "Windriver upstream=http://www.eclipse.org/dsdp/tm/" DISTRO_PN_ALIAS_pn-texinfo-dummy-native = "OE-Core" DISTRO_PN_ALIAS_pn-tiny-init = "OSPDT" -DISTRO_PN_ALIAS_pn-trace-cmd = "Mandriva=trace-cmd Ubuntu=trace-cmd" DISTRO_PN_ALIAS_pn-tremor = "OSPDT upstream=http://www.xiph.org/vorbis/" DISTRO_PN_ALIAS_pn-ttf-bitstream-vera = "Debian=ttf-bitstream-vera Ubuntu=ttf-bitstream-vera" DISTRO_PN_ALIAS_pn-tzcode = "OSPDT" @@ -392,7 +365,6 @@ DISTRO_PN_ALIAS_pn-update-rc.d = "OE-Core" DISTRO_PN_ALIAS_pn-usbinit = "OE-Core" DISTRO_PN_ALIAS_pn-util-macros = "Meego=xorg-x11-util-macros Fedora=xorg-x11-util-macros Mandriva=x11-util-macros" DISTRO_PN_ALIAS_pn-v86d = "Debian=v86d Ubuntu=v86d" -DISTRO_PN_ALIAS_pn-videoproto = "Meego=xorg-x11-proto-videoproto" DISTRO_PN_ALIAS_pn-waffle = "OE-Core" DISTRO_PN_ALIAS_pn-watchdog = "Debian=watchdog Ubuntu=watchdog Mandriva=watchdog" DISTRO_PN_ALIAS_pn-webkitgtk = "Fedora=webkitgtk Ubuntu=libwebkit" @@ -404,21 +376,15 @@ DISTRO_PN_ALIAS_pn-x11perf = "Fedora=xorg-x11-apps Ubuntu=x11-apps" DISTRO_PN_ALIAS_pn-xcb-util-image = "Debian=xcb-util Fedora=xcb-util" DISTRO_PN_ALIAS_pn-xcb-util-keysyms = "Debian=xcb-util Fedora=xcb-util" DISTRO_PN_ALIAS_pn-xcb-util-wm = "Debian=xcb-util Fedora=xcb-util" -DISTRO_PN_ALIAS_pn-xcmiscproto = "Meego=xorg-x11-proto-xcmiscproto" DISTRO_PN_ALIAS_pn-xcursor-transparent-theme = "OpenedHand" DISTRO_PN_ALIAS_pn-xdpyinfo = "Fedora=xorg-x11-utils Ubuntu=x11-utils" DISTRO_PN_ALIAS_pn-xev = "Fedora=xorg-x11-utils Ubuntu=x11-utils" -DISTRO_PN_ALIAS_pn-xextproto = "Meego=xorg-x11-proto-xextproto" DISTRO_PN_ALIAS_pn-xeyes = "Ubuntu=x11-apps Fedora=xorg-x11-apps" -DISTRO_PN_ALIAS_pn-xf86bigfontproto = "Meego=xorg-x11-proto-xf86bigfontproto" -DISTRO_PN_ALIAS_pn-xf86dgaproto = "Meego=xorg-x11-proto-xf86dgaproto" -DISTRO_PN_ALIAS_pn-xf86driproto = "Meego=xorg-x11-proto-xf86driproto" DISTRO_PN_ALIAS_pn-xf86-input-evdev = "Ubuntu=xserver-xorg-input-evdev Mandriva=x11-driver-input-evdev Debian=xserver-xorg-input-evdev Fedora=xorg-x11-drv-evdev Meego=xorg-x11-drv-evdev" DISTRO_PN_ALIAS_pn-xf86-input-keyboard = "Meego=xorg-x11-drv-keyboard Fedora=xorg-x11-drv-keyboard Mandriva=x11-driver-input-keyboard Debian=xserver-xorg-input-keyboard" DISTRO_PN_ALIAS_pn-xf86-input-mouse = "Ubuntu=xserver-xorg-input-mouse Mandriva=x11-driver-input-mouse Debian=xserver-xorg-input-mouse" DISTRO_PN_ALIAS_pn-xf86-input-synaptics = "Meego=xorg-x11-drv-synaptics Fedora=xorg-x11-drv-synaptics Ubuntu=xserver-xorg-input-synaptics Mandriva=x11-driver-input-synaptics Debian=xfree86-driver-synaptics" DISTRO_PN_ALIAS_pn-xf86-input-vmmouse = "Fedora=xorg-x11-drv-vmmouse Ubuntu=xserver-xorg-input-vmmouse Mandriva=x11-driver-input-vmmouse Debian=xserver-xorg-input-vmmouse" -DISTRO_PN_ALIAS_pn-xf86miscproto = "Meego=xorg-x11-proto-xf86miscproto" DISTRO_PN_ALIAS_pn-xf86-video-cirrus = "Opensuse=xf86-video-cirrus Debian=xserver-xorg-video-cirrus" DISTRO_PN_ALIAS_pn-xf86-video-fbdev = "Ubuntu=xserver-xorg-video-fbdev Debian=xserver-xorg-video-fbdev" DISTRO_PN_ALIAS_pn-xf86-video-intel = "Debian=xserver-xorg-video-intel Fedora=xorg-x11-drv-intel Mandriva=x11-driver-video-intel Meego=xorg-x11-drv-intel Ubuntu=xserver-xorg-video-intel" @@ -427,15 +393,13 @@ DISTRO_PN_ALIAS_pn-xf86-video-omap = "Ubuntu=xf86-video-omap Debian=xf86-video-o DISTRO_PN_ALIAS_pn-xf86-video-omapfb = "OSPDT" DISTRO_PN_ALIAS_pn-xf86-video-vesa = "Debian=xserver-xorg-video-vesa Fedora=xorg-x11-drv-vesa Mandriva=x11-driver-video-vesa Ubuntu=xserver-xorg-video-vesa" DISTRO_PN_ALIAS_pn-xf86-video-vmware = "Debian=xserver-xorg-video-vmware Fedora=xorg-x11-drv-vmware Mandriva=x11-driver-video-vmware Ubuntu=xserver-xorg-video-vmware" -DISTRO_PN_ALIAS_pn-xf86vidmodeproto = "Meego=xorg-x11-proto-xf86vidmodeproto Ubuntu=x11proto-xf86vidmode Debian=x11proto-xf86vidmode" DISTRO_PN_ALIAS_pn-xhost = "Ubuntu=x11-xserver-utils Fedora=xorg-x11-server-utils" -DISTRO_PN_ALIAS_pn-xineramaproto = "Meego=xorg-x11-proto-xineramaproto Ubuntu=x11proto-xinerama Debian=x11proto-xinerama" DISTRO_PN_ALIAS_pn-xinput-calibrator = "Fedora=xinput-calibrator Mandravia=xinput-calibrator Ubuntu=xinput-calibrator" DISTRO_PN_ALIAS_pn-xkbcomp = "Ubuntu=x11-xkb-utils Fedora=xorg-x11-xkb-utils" DISTRO_PN_ALIAS_pn-xmodmap = "Meego=xorg-x11-utils-xmodmap Fedora=xorg-x11-server-utils Ubuntu=x11-xserver-utils" DISTRO_PN_ALIAS_pn-xorg-minimal-fonts = "Ubuntu=xfonts-base Fedora=xorg-x11-fonts-base" +DISTRO_PN_ALIAS_pn-xorgproto = "OSPDT upstream=http://cgit.freedesktop.org/xorg/proto/xorgproto" DISTRO_PN_ALIAS_pn-xprop = "Meego=xorg-x11-utils-xprop Fedora=xorg-x11-utils Ubuntu=x11-utils" -DISTRO_PN_ALIAS_pn-xproto = "Meego=xorg-x11-proto-xproto Fedora=xorg-x11-proto-devel Ubuntu=x11proto-core-dev Debian=x11proto-core-dev Opensuse=xorg-x11-proto-devel Mandriva=x11-proto-devel" DISTRO_PN_ALIAS_pn-xproxymanagementprotocol = "Meego=xorg-x11-proto-xproxymanagementprotocol" DISTRO_PN_ALIAS_pn-xrandr = "Ubuntu=x11-xserver-utils Fedora=xorg-x11-server-utils" DISTRO_PN_ALIAS_pn-xrdb = "Ubuntu=x11-xserver-utils Fedora=xorg-x11-server-utils" diff --git a/poky/meta/conf/distro/include/maintainers.inc b/poky/meta/conf/distro/include/maintainers.inc index 48aff9537..12785934a 100644 --- a/poky/meta/conf/distro/include/maintainers.inc +++ b/poky/meta/conf/distro/include/maintainers.inc @@ -29,102 +29,94 @@ # RECIPE_MAINTAINER_pn-acl = "Chen Qi " RECIPE_MAINTAINER_pn-acpica = "Fathi Boudra " -RECIPE_MAINTAINER_pn-acpid = "Maxin B. John " -RECIPE_MAINTAINER_pn-acpitests = "Fathi Boudra " -RECIPE_MAINTAINER_pn-adwaita-icon-theme = "Maxin B. John " +RECIPE_MAINTAINER_pn-acpid = "Ross Burton " +RECIPE_MAINTAINER_pn-adwaita-icon-theme = "Ross Burton " RECIPE_MAINTAINER_pn-alsa-lib = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-alsa-plugins = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-alsa-state = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-alsa-tools = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-alsa-utils = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-alsa-utils-scripts = "Tanu Kaskinen " -RECIPE_MAINTAINER_pn-apmd = "Maxin B. John " +RECIPE_MAINTAINER_pn-apmd = "Ross Burton " RECIPE_MAINTAINER_pn-apr = "Hongxu Jia " RECIPE_MAINTAINER_pn-apr-util = "Hongxu Jia " RECIPE_MAINTAINER_pn-apt = "Aníbal Limón " RECIPE_MAINTAINER_pn-apt-native = "Aníbal Limón " RECIPE_MAINTAINER_pn-argp-standalone = "Khem Raj " RECIPE_MAINTAINER_pn-asciidoc = "Yi Zhao " -RECIPE_MAINTAINER_pn-aspell = "Jose Lamego " -RECIPE_MAINTAINER_pn-assimp = "Maxin B. John " +RECIPE_MAINTAINER_pn-aspell = "Ross Burton " +RECIPE_MAINTAINER_pn-assimp = "Ross Burton " RECIPE_MAINTAINER_pn-at = "Chen Qi " -RECIPE_MAINTAINER_pn-at-spi2-atk = "Maxin B. John " -RECIPE_MAINTAINER_pn-at-spi2-core = "Maxin B. John " -RECIPE_MAINTAINER_pn-atk = "Maxin B. John " +RECIPE_MAINTAINER_pn-at-spi2-atk = "Ross Burton " +RECIPE_MAINTAINER_pn-at-spi2-core = "Ross Burton " +RECIPE_MAINTAINER_pn-atk = "Ross Burton " RECIPE_MAINTAINER_pn-attr = "Chen Qi " RECIPE_MAINTAINER_pn-autoconf = "Robert Yang " RECIPE_MAINTAINER_pn-autoconf-archive = "Robert Yang " -RECIPE_MAINTAINER_pn-autogen-native = "Robert Yang " RECIPE_MAINTAINER_pn-automake = "Robert Yang " RECIPE_MAINTAINER_pn-avahi = "Yi Zhao " RECIPE_MAINTAINER_pn-avahi-ui = "Yi Zhao " -RECIPE_MAINTAINER_pn-babeltrace = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-base-files = "Chang Rebecca Swee Fun " -RECIPE_MAINTAINER_pn-base-passwd = "Chang Rebecca Swee Fun " +RECIPE_MAINTAINER_pn-babeltrace = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-base-files = "Ross Burton " +RECIPE_MAINTAINER_pn-base-passwd = "Ross Burton " RECIPE_MAINTAINER_pn-bash = "Hongxu Jia " -RECIPE_MAINTAINER_pn-bash-completion = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-bc = "Jose Lamego " -RECIPE_MAINTAINER_pn-bdwgc = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-beecrypt = "Armin Kuster " -RECIPE_MAINTAINER_pn-bigreqsproto = "Armin Kuster " -RECIPE_MAINTAINER_pn-bind = "Armin Kuster " +RECIPE_MAINTAINER_pn-bash-completion = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-bc = "Ross Burton " +RECIPE_MAINTAINER_pn-bind = "Armin Kuster " RECIPE_MAINTAINER_pn-binutils = "Khem Raj " RECIPE_MAINTAINER_pn-binutils-cross = "Khem Raj " RECIPE_MAINTAINER_pn-binutils-cross-canadian = "Khem Raj " RECIPE_MAINTAINER_pn-binutils-crosssdk = "Khem Raj " RECIPE_MAINTAINER_pn-bison = "Chen Qi " -RECIPE_MAINTAINER_pn-bjam-native = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-bjam-native = "Alexander Kanavin " RECIPE_MAINTAINER_pn-blktool = "Yi Zhao " -RECIPE_MAINTAINER_pn-blktrace = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-bluez5 = "Maxin B. John " -RECIPE_MAINTAINER_pn-bmap-tools = "Chang Rebecca Swee Fun " -RECIPE_MAINTAINER_pn-boost = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-bootchart2 = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-blktrace = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-bluez5 = "Ross Burton " +RECIPE_MAINTAINER_pn-bmap-tools = "Ross Burton " +RECIPE_MAINTAINER_pn-boost = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-bootchart2 = "Alexander Kanavin " RECIPE_MAINTAINER_pn-bsd-headers = "Khem Raj " -RECIPE_MAINTAINER_pn-btrfs-tools = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-build-appliance-image = "Cristian Iorga " -RECIPE_MAINTAINER_pn-build-compare = "Randy Witt " +RECIPE_MAINTAINER_pn-btrfs-tools = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-build-appliance-image = "Richard Purdie " +RECIPE_MAINTAINER_pn-build-compare = "Paul Eggleton " RECIPE_MAINTAINER_pn-build-sysroots = "Richard Purdie " -RECIPE_MAINTAINER_pn-builder = "Cristian Iorga " -RECIPE_MAINTAINER_pn-buildtools-tarball = "Cristian Iorga " -RECIPE_MAINTAINER_pn-busybox = "Armin Kuster " +RECIPE_MAINTAINER_pn-builder = "Richard Purdie " +RECIPE_MAINTAINER_pn-buildtools-tarball = "Richard Purdie " +RECIPE_MAINTAINER_pn-busybox = "Andrej Valek " RECIPE_MAINTAINER_pn-busybox-inittab = "Denys Dmytriyenko " RECIPE_MAINTAINER_pn-bzip2 = "Denys Dmytriyenko " -RECIPE_MAINTAINER_pn-ca-certificates = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-cairo = "Maxin B. John " -RECIPE_MAINTAINER_pn-calibrateproto = "Armin Kuster " -RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-ca-certificates = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-cairo = "Ross Burton " +RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin " RECIPE_MAINTAINER_pn-ccache = "Robert Yang " RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao " RECIPE_MAINTAINER_pn-chkconfig = "Yi Zhao " RECIPE_MAINTAINER_pn-chkconfig-alternatives-native = "Yi Zhao " RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao " -RECIPE_MAINTAINER_pn-clutter-1.0 = "Maxin B. John " -RECIPE_MAINTAINER_pn-clutter-gst-3.0 = "Maxin B. John " -RECIPE_MAINTAINER_pn-clutter-gtk-1.0 = "Maxin B. John " -RECIPE_MAINTAINER_pn-cmake = "Otavio Salvador " -RECIPE_MAINTAINER_pn-cmake-native = "Otavio Salvador " -RECIPE_MAINTAINER_pn-cogl-1.0 = "Maxin B. John " -RECIPE_MAINTAINER_pn-compositeproto = "Armin Kuster " +RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton " +RECIPE_MAINTAINER_pn-clutter-gst-3.0 = "Ross Burton " +RECIPE_MAINTAINER_pn-clutter-gtk-1.0 = "Ross Burton " +RECIPE_MAINTAINER_pn-cmake = "Pascal Bach " +RECIPE_MAINTAINER_pn-cmake-native = "Pascal Bach " +RECIPE_MAINTAINER_pn-cogl-1.0 = "Ross Burton " RECIPE_MAINTAINER_pn-connman = "Changhyeok Bae " -RECIPE_MAINTAINER_pn-connman-conf = "Maxin B. John " -RECIPE_MAINTAINER_pn-connman-gnome = "Maxin B. John " +RECIPE_MAINTAINER_pn-connman-conf = "Ross Burton " +RECIPE_MAINTAINER_pn-connman-gnome = "Ross Burton " RECIPE_MAINTAINER_pn-console-tools = "Chen Qi " RECIPE_MAINTAINER_pn-consolekit = "Chen Qi " RECIPE_MAINTAINER_pn-coreutils = "Chen Qi " RECIPE_MAINTAINER_pn-cpio = "Denys Dmytriyenko " -RECIPE_MAINTAINER_pn-cracklib = "Armin Kuster " -RECIPE_MAINTAINER_pn-createrepo-c = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-cronie = "Maxin B. John " +RECIPE_MAINTAINER_pn-cracklib = "Armin Kuster " +RECIPE_MAINTAINER_pn-createrepo-c = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-cronie = "Ross Burton " RECIPE_MAINTAINER_pn-cross-localedef-native = "Khem Raj " RECIPE_MAINTAINER_pn-cryptodev-linux = "Robert Yang " RECIPE_MAINTAINER_pn-cryptodev-module = "Robert Yang " RECIPE_MAINTAINER_pn-cryptodev-tests = "Robert Yang " RECIPE_MAINTAINER_pn-cups = "Chen Qi " -RECIPE_MAINTAINER_pn-curl = "Armin Kuster " +RECIPE_MAINTAINER_pn-curl = "Armin Kuster " RECIPE_MAINTAINER_pn-cve-check-tool = "Ross Burton " -RECIPE_MAINTAINER_pn-cwautomacros = "Maxin B. John " -RECIPE_MAINTAINER_pn-damageproto = "Armin Kuster " +RECIPE_MAINTAINER_pn-cwautomacros = "Ross Burton " RECIPE_MAINTAINER_pn-db = "Mark Hatle " RECIPE_MAINTAINER_pn-dbus = "Chen Qi " RECIPE_MAINTAINER_pn-dbus-glib = "Chen Qi " @@ -132,55 +124,46 @@ RECIPE_MAINTAINER_pn-dbus-test = "Chen Qi " RECIPE_MAINTAINER_pn-dbus-wait = "Chen Qi " RECIPE_MAINTAINER_pn-debianutils = "Yi Zhao " RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Mark Hatle " -RECIPE_MAINTAINER_pn-desktop-file-utils-native = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin " RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia " RECIPE_MAINTAINER_pn-diffstat = "Chen Qi " RECIPE_MAINTAINER_pn-diffutils = "Chen Qi " -RECIPE_MAINTAINER_pn-directfb = "Hongxu Jia " -RECIPE_MAINTAINER_pn-directfb-examples = "Hongxu Jia " RECIPE_MAINTAINER_pn-distcc = "Hongxu Jia " RECIPE_MAINTAINER_pn-distcc-config = "Yi Zhao " -RECIPE_MAINTAINER_pn-dmidecode = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-dmxproto = "Armin Kuster " -RECIPE_MAINTAINER_pn-dnf = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-dmidecode = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-dnf = "Alexander Kanavin " RECIPE_MAINTAINER_pn-docbook-xml-dtd4 = "Yi Zhao " RECIPE_MAINTAINER_pn-docbook-xsl-stylesheets = "Yi Zhao " +RECIPE_MAINTAINER_pn-dos2unix = "Khem Raj " RECIPE_MAINTAINER_pn-dosfstools = "Yi Zhao " RECIPE_MAINTAINER_pn-dpkg = "Aníbal Limón " -RECIPE_MAINTAINER_pn-dri2proto = "Armin Kuster " -RECIPE_MAINTAINER_pn-dri3proto = "Armin Kuster " RECIPE_MAINTAINER_pn-dropbear = "Yi Zhao " -RECIPE_MAINTAINER_pn-dtc = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-dwarfsrcfiles = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-dtc = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-dwarfsrcfiles = "Alexander Kanavin " RECIPE_MAINTAINER_pn-e2fsprogs = "Robert Yang " -RECIPE_MAINTAINER_pn-ed = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-eee-acpi-scripts = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-efilinux = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-eglinfo-fb = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-eglinfo-x11 = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-efilinux = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-ed = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-eglinfo-fb = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-eglinfo-x11 = "Alexander Kanavin " RECIPE_MAINTAINER_pn-elfutils = "Hongxu Jia " -RECIPE_MAINTAINER_pn-enchant = "Maxin B. John " -RECIPE_MAINTAINER_pn-encodings = "Armin Kuster " -RECIPE_MAINTAINER_pn-epiphany = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-enchant = "Ross Burton " +RECIPE_MAINTAINER_pn-encodings = "Armin Kuster " +RECIPE_MAINTAINER_pn-epiphany = "Alexander Kanavin " RECIPE_MAINTAINER_pn-ethtool = "Changhyeok Bae " -RECIPE_MAINTAINER_pn-eudev = "Chang Rebecca Swee Fun " +RECIPE_MAINTAINER_pn-eudev = "Ross Burton " RECIPE_MAINTAINER_pn-expat = "Yi Zhao " -RECIPE_MAINTAINER_pn-expect = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-ffmpeg = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-expect = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-ffmpeg = "Alexander Kanavin " RECIPE_MAINTAINER_pn-file = "Yi Zhao " RECIPE_MAINTAINER_pn-findutils = "Chen Qi " -RECIPE_MAINTAINER_pn-fixesproto = "Armin Kuster " RECIPE_MAINTAINER_pn-flac = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-flex = "Chen Qi " -RECIPE_MAINTAINER_pn-font-alias = "Armin Kuster " -RECIPE_MAINTAINER_pn-font-util = "Armin Kuster " -RECIPE_MAINTAINER_pn-fontconfig = "Maxin B. John " -RECIPE_MAINTAINER_pn-fontsproto = "Armin Kuster " +RECIPE_MAINTAINER_pn-font-alias = "Armin Kuster " +RECIPE_MAINTAINER_pn-font-util = "Armin Kuster " +RECIPE_MAINTAINER_pn-fontconfig = "Ross Burton " RECIPE_MAINTAINER_pn-foomatic-filters = "Chen Qi " -RECIPE_MAINTAINER_pn-formfactor = "Maxin B. John " -RECIPE_MAINTAINER_pn-freetype = "Maxin B. John " -RECIPE_MAINTAINER_pn-fstests = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-formfactor = "Ross Burton " +RECIPE_MAINTAINER_pn-freetype = "Ross Burton " +RECIPE_MAINTAINER_pn-fribidi = "Ross Burton " RECIPE_MAINTAINER_pn-fts = "Khem Raj " RECIPE_MAINTAINER_pn-gawk = "Chen Qi " RECIPE_MAINTAINER_pn-gcc = "Khem Raj " @@ -193,52 +176,48 @@ RECIPE_MAINTAINER_pn-gcc-runtime = "Khem Raj " RECIPE_MAINTAINER_pn-gcc-sanitizers = "Khem Raj " RECIPE_MAINTAINER_pn-gcc-source = "Khem Raj " RECIPE_MAINTAINER_pn-gccmakedep = "Khem Raj " -RECIPE_MAINTAINER_pn-gconf = "Maxin B. John " -RECIPE_MAINTAINER_pn-gcr = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-gconf = "Ross Burton " +RECIPE_MAINTAINER_pn-gcr = "Alexander Kanavin " RECIPE_MAINTAINER_pn-gdb = "Khem Raj " RECIPE_MAINTAINER_pn-gdb-cross = "Khem Raj " RECIPE_MAINTAINER_pn-gdb-cross-canadian = "Khem Raj " -RECIPE_MAINTAINER_pn-gdbm = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-gdk-pixbuf = "Maxin B. John " +RECIPE_MAINTAINER_pn-gdbm = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-gdk-pixbuf = "Ross Burton " RECIPE_MAINTAINER_pn-gettext = "Robert Yang " RECIPE_MAINTAINER_pn-gettext-minimal-native = "Robert Yang " RECIPE_MAINTAINER_pn-ghostscript = "Hongxu Jia " RECIPE_MAINTAINER_pn-git = "Robert Yang " -RECIPE_MAINTAINER_pn-glew = "Maxin B. John " -RECIPE_MAINTAINER_pn-glib-2.0 = "Maxin B. John " -RECIPE_MAINTAINER_pn-glib-networking = "Maxin B. John " +RECIPE_MAINTAINER_pn-glew = "Ross Burton " +RECIPE_MAINTAINER_pn-glib-2.0 = "Ross Burton " +RECIPE_MAINTAINER_pn-glib-networking = "Ross Burton " RECIPE_MAINTAINER_pn-glibc = "Khem Raj " RECIPE_MAINTAINER_pn-glibc-initial = "Khem Raj " RECIPE_MAINTAINER_pn-glibc-locale = "Khem Raj " RECIPE_MAINTAINER_pn-glibc-mtrace = "Khem Raj " RECIPE_MAINTAINER_pn-glibc-scripts = "Khem Raj " RECIPE_MAINTAINER_pn-glide = "Otavio Salvador " -RECIPE_MAINTAINER_pn-glproto = "Armin Kuster " RECIPE_MAINTAINER_pn-gmp = "Khem Raj " -RECIPE_MAINTAINER_pn-gnome-common = "Maxin B. John " -RECIPE_MAINTAINER_pn-gnome-desktop-testing = "Maxin B. John " -RECIPE_MAINTAINER_pn-gnome-desktop3 = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-gnome-doc-utils = "Maxin B. John " -RECIPE_MAINTAINER_pn-gnome-themes-standard = "Maxin B. John " +RECIPE_MAINTAINER_pn-gnome-desktop-testing = "Ross Burton " +RECIPE_MAINTAINER_pn-gnome-themes-standard = "Ross Burton " RECIPE_MAINTAINER_pn-gnu-config = "Robert Yang " RECIPE_MAINTAINER_pn-gnu-efi = "Yi Zhao " RECIPE_MAINTAINER_pn-gnupg = "Hongxu Jia " -RECIPE_MAINTAINER_pn-gnutls = "Armin Kuster " +RECIPE_MAINTAINER_pn-gnutls = "Armin Kuster " RECIPE_MAINTAINER_pn-go = "Khem Raj " RECIPE_MAINTAINER_pn-go-cross = "Khem Raj " RECIPE_MAINTAINER_pn-go-dep = "Otavio Salvador " RECIPE_MAINTAINER_pn-go-helloworld = "Khem Raj " RECIPE_MAINTAINER_pn-go-native = "Khem Raj " -RECIPE_MAINTAINER_pn-gobject-introspection = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-gperf = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-gobject-introspection = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-gperf = "Alexander Kanavin " RECIPE_MAINTAINER_pn-gpgme = "Hongxu Jia " -RECIPE_MAINTAINER_pn-gptfdisk = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-gptfdisk = "Alexander Kanavin " RECIPE_MAINTAINER_pn-grep = "Denys Dmytriyenko " RECIPE_MAINTAINER_pn-groff = "Hongxu Jia " -RECIPE_MAINTAINER_pn-grub = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-grub-bootconf = "California Sullivan " -RECIPE_MAINTAINER_pn-grub-efi = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-gsettings-desktop-schemas = "Maxin B. John " +RECIPE_MAINTAINER_pn-grub = "Anuj Mittal " +RECIPE_MAINTAINER_pn-grub-bootconf = "Anuj Mittal " +RECIPE_MAINTAINER_pn-grub-efi = "Anuj Mittal " +RECIPE_MAINTAINER_pn-gsettings-desktop-schemas = "Ross Burton " RECIPE_MAINTAINER_pn-gst-examples = "Anuj Mittal " RECIPE_MAINTAINER_pn-gst-validate = "Anuj Mittal " RECIPE_MAINTAINER_pn-gstreamer1.0 = "Anuj Mittal " @@ -252,177 +231,162 @@ RECIPE_MAINTAINER_pn-gstreamer1.0-plugins-ugly = "Anuj Mittal " RECIPE_MAINTAINER_pn-libxml-simple-perl = "Tim Orling " RECIPE_MAINTAINER_pn-libxml2 = "Hongxu Jia " -RECIPE_MAINTAINER_pn-libxmu = "Armin Kuster " -RECIPE_MAINTAINER_pn-libxpm = "Armin Kuster " -RECIPE_MAINTAINER_pn-libxrandr = "Armin Kuster " -RECIPE_MAINTAINER_pn-libxrender = "Armin Kuster " -RECIPE_MAINTAINER_pn-libxres = "Armin Kuster " -RECIPE_MAINTAINER_pn-libxscrnsaver = "Armin Kuster " -RECIPE_MAINTAINER_pn-libxsettings-client = "Maxin B. John " -RECIPE_MAINTAINER_pn-libxshmfence = "Armin Kuster " -RECIPE_MAINTAINER_pn-libxslt = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-libxt = "Armin Kuster " -RECIPE_MAINTAINER_pn-libxtst = "Armin Kuster " -RECIPE_MAINTAINER_pn-libxv = "Armin Kuster " -RECIPE_MAINTAINER_pn-libxvmc = "Armin Kuster " -RECIPE_MAINTAINER_pn-libxxf86dga = "Armin Kuster " -RECIPE_MAINTAINER_pn-libxxf86misc = "Armin Kuster " -RECIPE_MAINTAINER_pn-libxxf86vm = "Armin Kuster " -RECIPE_MAINTAINER_pn-libyaml = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-lighttpd = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-linux-dummy = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-libxmu = "Armin Kuster " +RECIPE_MAINTAINER_pn-libxpm = "Armin Kuster " +RECIPE_MAINTAINER_pn-libxrandr = "Armin Kuster " +RECIPE_MAINTAINER_pn-libxrender = "Armin Kuster " +RECIPE_MAINTAINER_pn-libxres = "Armin Kuster " +RECIPE_MAINTAINER_pn-libxscrnsaver = "Armin Kuster " +RECIPE_MAINTAINER_pn-libxshmfence = "Armin Kuster " +RECIPE_MAINTAINER_pn-libxslt = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-libxt = "Armin Kuster " +RECIPE_MAINTAINER_pn-libxtst = "Armin Kuster " +RECIPE_MAINTAINER_pn-libxv = "Armin Kuster " +RECIPE_MAINTAINER_pn-libxvmc = "Armin Kuster " +RECIPE_MAINTAINER_pn-libxxf86dga = "Armin Kuster " +RECIPE_MAINTAINER_pn-libxxf86misc = "Armin Kuster " +RECIPE_MAINTAINER_pn-libxxf86vm = "Armin Kuster " +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 " @@ -457,11 +420,11 @@ RECIPE_MAINTAINER_pn-linux-yocto-rt = "Bruce Ashfield Y -> binutils-cross -> bison-native) no longer meet the +# dependency incidentally. This improves determinism and avoids build +# failures when people switch to external toolchains. +SSTATE_EXCLUDEDEPS_SYSROOT += ".*->bison-native" +# Nothing needs to depend on libc-initial/gcc-cross-initial +# base-passwd/shadow-sysroot don't need their dependencies +SSTATE_EXCLUDEDEPS_SYSROOT += "\ + .*->.*-initial.* \ + .*(base-passwd|shadow-sysroot)->.* \ +" +# Avoid adding autoconf-archive-native to sysroot without a specific +# dependency in the recipe. +SSTATE_EXCLUDEDEPS_SYSROOT += ".*->autoconf-archive-native" + # We need to keep bitbake tools in PATH PATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}:${HOSTTOOLS_DIR}" diff --git a/poky/meta/conf/machine-sdk/aarch64.conf b/poky/meta/conf/machine-sdk/aarch64.conf new file mode 100644 index 000000000..98d8380ec --- /dev/null +++ b/poky/meta/conf/machine-sdk/aarch64.conf @@ -0,0 +1,2 @@ +SDK_ARCH = "aarch64" +ABIEXTENSION_class-nativesdk = "" diff --git a/poky/meta/conf/machine/include/arm/arch-armv7a.inc b/poky/meta/conf/machine/include/arm/arch-armv7a.inc index bad1c2705..a2663d800 100644 --- a/poky/meta/conf/machine/include/arm/arch-armv7a.inc +++ b/poky/meta/conf/machine/include/arm/arch-armv7a.inc @@ -1,4 +1,5 @@ DEFAULTTUNE ?= "armv7athf" +ARM_INSTRUCTION_SET ?= "thumb" TUNEVALID[armv7a] = "Enable instructions for ARMv7-a" TUNECONFLICTS[armv7a] = "armv4 armv5 armv6 armv7" diff --git a/poky/meta/conf/machine/include/m68k/arch-m68k.inc b/poky/meta/conf/machine/include/m68k/arch-m68k.inc new file mode 100644 index 000000000..3ff8a3a5b --- /dev/null +++ b/poky/meta/conf/machine/include/m68k/arch-m68k.inc @@ -0,0 +1,8 @@ +# m68k Architecture definitions + +DEFAULTTUNE ?= "m68k" + +# Architecture name +TUNE_ARCH = "m68k" + +TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" diff --git a/poky/meta/conf/machine/include/mips/tune-mips-74k.inc b/poky/meta/conf/machine/include/mips/tune-mips-74k.inc new file mode 100644 index 000000000..94afee34b --- /dev/null +++ b/poky/meta/conf/machine/include/mips/tune-mips-74k.inc @@ -0,0 +1,37 @@ +DEFAULTTUNE ?= "mips32r2-74kc" + +MIPSPKGSFX_MIPS16E ??= "" + +require conf/machine/include/tune-mips32r2.inc +require conf/machine/include/mips/feature-mips-mips16e.inc + + +TUNEVALID[74kc] = "Enable MIPS 74K with DSPr2 processor optimizations" +TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "74kc", " -mtune=74kc", "", d)}" + +AVAILTUNES += "mips32r2-74kc mips32r2-74kc-m16" +AVAILTUNES += "mips32r2el-74kc mips32r2el-74kc-m16" + +# big endian: kc+dsp2=kc, kc+dsp2+mips16e=kc-m16 +TUNE_FEATURES_tune-mips32r2-74kc = "${TUNE_FEATURES_tune-mips32r2-nf} 74kc" +TUNE_FEATURES_tune-mips32r2-74kc-m16 = "${TUNE_FEATURES_tune-mips32r2-74kc} mips16e" + +MIPSPKGSFX_VARIANT_tune-mips32r2-74kc = "mips32r2-74kc" +PACKAGE_EXTRA_ARCHS_tune-mips32r2-74kc = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2-nf} mips32r2-74kc-nf" +QEMU_EXTRAOPTIONS_mips32r2-74kc-nf = " -cpu 24Kc" + +MIPSPKGSFX_VARIANT_tune-mips32r2-74kc-m16 = "mips32r2-74kc${MIPSPKGSFX_MIPS16E}" +PACKAGE_EXTRA_ARCHS_tune-mips32r2-74kc-m16 = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2-74kc} mips32r2-74kc-m16-nf" +QEMU_EXTRAOPTIONS_mips32r2-74kc-m16-nf = " -cpu 24KEc" + +# little endian: kc+dsp2=kc, kc+dsp2+mips16e=kc-m16 +TUNE_FEATURES_tune-mips32r2el-74kc = "${TUNE_FEATURES_tune-mips32r2el-nf} 74kc" +TUNE_FEATURES_tune-mips32r2el-74kc-m16 = "${TUNE_FEATURES_tune-mips32r2el-74kc} mips16e" + +MIPSPKGSFX_VARIANT_tune-mips32r2el-74kc = "mips32r2el-74kc" +PACKAGE_EXTRA_ARCHS_tune-mips32r2el-74kc = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2el-nf} mips32r2el-74kc-nf" +QEMU_EXTRAOPTIONS_mips32r2el-74kc-nf = " -cpu 24Kc" + +MIPSPKGSFX_VARIANT_tune-mips32r2el-74kc-m16 = "mips32r2el-74kc${MIPSPKGSFX_MIPS16E}" +PACKAGE_EXTRA_ARCHS_tune-mips32r2el-74kc-m16 = "${PACKAGE_EXTRA_ARCHS_tune-mips32r2el-74kc} mips32r2el-74kc-m16-nf" +QEMU_EXTRAOPTIONS_mips32r2el-74kc-m16-nf = " -cpu 24KEc" diff --git a/poky/meta/conf/machine/include/qemu.inc b/poky/meta/conf/machine/include/qemu.inc index aa332fecc..5050e4106 100644 --- a/poky/meta/conf/machine/include/qemu.inc +++ b/poky/meta/conf/machine/include/qemu.inc @@ -19,7 +19,7 @@ IMAGE_FSTYPES += "tar.bz2 ext4" RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" # Use a common kernel recipe for all QEMU machines -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" +PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" diff --git a/poky/meta/conf/machine/include/tune-core2.inc b/poky/meta/conf/machine/include/tune-core2.inc index c686bb468..ddde719bd 100644 --- a/poky/meta/conf/machine/include/tune-core2.inc +++ b/poky/meta/conf/machine/include/tune-core2.inc @@ -21,7 +21,7 @@ TUNE_FEATURES_tune-core2-32 = "${TUNE_FEATURES_tune-x86} core2" BASE_LIB_tune-core2-32 = "lib" TUNE_PKGARCH_tune-core2-32 = "core2-32" PACKAGE_EXTRA_ARCHS_tune-core2-32 = "${PACKAGE_EXTRA_ARCHS_tune-i686} core2-32" -QEMU_EXTRAOPTIONS_core2-32 = " -cpu core2duo" +QEMU_EXTRAOPTIONS_core2-32 = " -cpu n270" AVAILTUNES += "core2-64" TUNE_FEATURES_tune-core2-64 = "${TUNE_FEATURES_tune-x86-64} core2" diff --git a/poky/meta/conf/machine/include/tune-corei7.inc b/poky/meta/conf/machine/include/tune-corei7.inc index 6edfb680e..d06af47b8 100644 --- a/poky/meta/conf/machine/include/tune-corei7.inc +++ b/poky/meta/conf/machine/include/tune-corei7.inc @@ -1,20 +1,19 @@ -# Settings for the GCC(1) cpu-type "corei7": +# Settings for the GCC(1) cpu-type "nehalem": # -# Intel Core i7 CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1 -# and SSE4.2 instruction set support. +# Intel Nehalem CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1, +# SSE4.2 and POPCNT instruction set support. # # This tune is recommended for Intel Nehalem and Silvermont (e.g. Bay Trail) CPUs # (and beyond). # DEFAULTTUNE ?= "corei7-64" -# Pull in the previous tune in to pull in PACKAGE_EXTRA_ARCHS +# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS require conf/machine/include/tune-core2.inc - # Extra tune features TUNEVALID[corei7] = "Enable corei7 specific processor optimizations" -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'corei7', ' -march=corei7 -mtune=corei7 -mfpmath=sse -msse4.2', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'corei7', ' -march=nehalem -mtune=generic -mfpmath=sse -msse4.2', '', d)}" # Extra tune selections AVAILTUNES += "corei7-32" diff --git a/poky/meta/conf/machine/include/tune-mcf5441x.inc b/poky/meta/conf/machine/include/tune-mcf5441x.inc new file mode 100644 index 000000000..11a41a7c5 --- /dev/null +++ b/poky/meta/conf/machine/include/tune-mcf5441x.inc @@ -0,0 +1,13 @@ +DEFAULTTUNE ?= "mcf5441x" + +require conf/machine/include/m68k/arch-m68k.inc + +TUNEVALID[mcf5441x] = "Enable coldfire specific processor optimizations" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mcf5441x', ' -mcpu=54418', '', d)}" + +AVAILTUNES += "mcf5441x" +TUNE_FEATURES_tune-mcf5441x = "mcf5441x" +TUNE_ARCH_tune-mcf5441x = "mcf5441x" +TUNE_PKGARCH_tune-mcf5441x = "mcf5441x" +PACKAGE_EXTRA_ARCHS_tune-mcf5441x = "m68k mcf5441x" + diff --git a/poky/meta/conf/machine/include/x86-base.inc b/poky/meta/conf/machine/include/x86-base.inc index f8aacea64..c29279209 100644 --- a/poky/meta/conf/machine/include/x86-base.inc +++ b/poky/meta/conf/machine/include/x86-base.inc @@ -8,20 +8,17 @@ MACHINE_FEATURES += "screen keyboard pci usbhost ext2 ext3 x86 \ acpi serial usbgadget alsa" -MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" - -IMAGE_FSTYPES ?= "live" -NOISO ?= "1" +IMAGE_FSTYPES ?= "hddimg" KERNEL_IMAGETYPE ?= "bzImage" -SERIAL_CONSOLE ?= "115200 ttyS0" +SERIAL_CONSOLES ?= "115200;ttyS0" # # kernel-related variables # PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -PREFERRED_VERSION_linux-yocto ??= "4.15%" +PREFERRED_VERSION_linux-yocto ??= "4.18%" # # XSERVER subcomponents, used to build the XSERVER variable diff --git a/poky/meta/conf/machine/qemuarm.conf b/poky/meta/conf/machine/qemuarm.conf index 9403b1e7e..d2f2c85c3 100644 --- a/poky/meta/conf/machine/qemuarm.conf +++ b/poky/meta/conf/machine/qemuarm.conf @@ -16,5 +16,5 @@ QB_MACHINE = "-machine versatilepb" QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet -device virtio-rng-pci" -PREFERRED_VERSION_linux-yocto ??= "4.15%" +PREFERRED_VERSION_linux-yocto ??= "4.18%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" diff --git a/poky/meta/conf/machine/qemumips.conf b/poky/meta/conf/machine/qemumips.conf index 986315a64..a60f67aa8 100644 --- a/poky/meta/conf/machine/qemumips.conf +++ b/poky/meta/conf/machine/qemumips.conf @@ -10,5 +10,3 @@ KERNEL_IMAGETYPE = "vmlinux" KERNEL_ALT_IMAGETYPE = "vmlinux.bin" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" - -MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" diff --git a/poky/meta/conf/machine/qemumips64.conf b/poky/meta/conf/machine/qemumips64.conf index 3f91cbe17..a166a1031 100644 --- a/poky/meta/conf/machine/qemumips64.conf +++ b/poky/meta/conf/machine/qemumips64.conf @@ -10,5 +10,3 @@ KERNEL_IMAGETYPE = "vmlinux" KERNEL_ALT_IMAGETYPE = "vmlinux.bin" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" - -MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" diff --git a/poky/meta/conf/machine/qemux86-64.conf b/poky/meta/conf/machine/qemux86-64.conf index 2330c7d86..9966d1a04 100644 --- a/poky/meta/conf/machine/qemux86-64.conf +++ b/poky/meta/conf/machine/qemux86-64.conf @@ -12,6 +12,8 @@ DEFAULTTUNE ?= "core2-64" require conf/machine/include/tune-core2.inc require conf/machine/include/qemuboot-x86.inc +UBOOT_MACHINE ?= "qemu-x86_64_defconfig" + KERNEL_IMAGETYPE = "bzImage" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" @@ -29,6 +31,8 @@ MACHINE_FEATURES += "x86 pci" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" + KERNEL_MODULE_AUTOLOAD += "uvesafb" KERNEL_MODULE_PROBECONF += "uvesafb" module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" diff --git a/poky/meta/conf/machine/qemux86.conf b/poky/meta/conf/machine/qemux86.conf index 811e3ef7c..e78fb6e87 100644 --- a/poky/meta/conf/machine/qemux86.conf +++ b/poky/meta/conf/machine/qemux86.conf @@ -11,6 +11,8 @@ require conf/machine/include/qemu.inc require conf/machine/include/tune-i586.inc require conf/machine/include/qemuboot-x86.inc +UBOOT_MACHINE ?= "qemu-x86_defconfig" + KERNEL_IMAGETYPE = "bzImage" SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" @@ -28,6 +30,8 @@ MACHINE_FEATURES += "x86 pci" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" + KERNEL_MODULE_AUTOLOAD += "uvesafb" KERNEL_MODULE_PROBECONF += "uvesafb" module_conf_uvesafb = "options uvesafb mode_option=${UVESA_MODE}" diff --git a/poky/meta/conf/multilib.conf b/poky/meta/conf/multilib.conf index e74dec81a..65a28ddbd 100644 --- a/poky/meta/conf/multilib.conf +++ b/poky/meta/conf/multilib.conf @@ -26,3 +26,7 @@ OPKG_ARGS_append = " --force-maintainer --force-overwrite" PKG_CONFIG_PATH .= ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig" PKG_CONFIG_PATH[vardepsexclude] = "datadir WORKDIR" PKG_CONFIG_PATH[vardepvalueexclude] = ":${WORKDIR}/recipe-sysroot/${datadir}/pkgconfig" + +# These recipes don't need multilib variants, the ${BPN} PROVDES/RPROVDES +# ${MLPREFIX}${BPN} +NON_MULTILIB_RECIPES = "grub grub-efi make-mod-scripts" diff --git a/poky/meta/conf/sanity.conf b/poky/meta/conf/sanity.conf index 390d3427a..45e675251 100644 --- a/poky/meta/conf/sanity.conf +++ b/poky/meta/conf/sanity.conf @@ -3,7 +3,7 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "1.35.0" +BB_MIN_VERSION = "1.39.1" SANITY_ABIFILE = "${TMPDIR}/abi_version" -- cgit v1.2.3