From 706d5aacd7ab7b37c00df1a1b210e4ced06119e1 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 12 Feb 2021 15:55:30 -0600 Subject: 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 --- poky/meta/conf/bitbake.conf | 12 +++---- poky/meta/conf/distro/include/maintainers.inc | 39 +++++++++++----------- poky/meta/conf/distro/include/tcmode-default.inc | 2 +- poky/meta/conf/image-uefi.conf | 13 +++----- poky/meta/conf/machine/include/riscv/qemuriscv.inc | 1 - poky/meta/conf/machine/include/x86-base.inc | 2 +- poky/meta/conf/machine/qemuarm.conf | 2 +- poky/meta/conf/machine/qemuarmv5.conf | 4 +-- 8 files changed, 35 insertions(+), 40 deletions(-) (limited to 'poky/meta/conf') diff --git a/poky/meta/conf/bitbake.conf b/poky/meta/conf/bitbake.conf index be94b78eb..0d38eac09 100644 --- a/poky/meta/conf/bitbake.conf +++ b/poky/meta/conf/bitbake.conf @@ -136,7 +136,7 @@ TARGET_CC_ARCH = "${TUNE_CCARGS}" TARGET_LD_ARCH = "${TUNE_LDARGS}" TARGET_AS_ARCH = "${TUNE_ASARGS}" -SDKMACHINE ??= "${BUILD_ARCH}" +SDKMACHINE ??= "x86_64" SDK_OS = "${BUILD_OS}" SDK_VENDOR = "-oesdk" SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}" @@ -486,7 +486,7 @@ 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 iconv id install ld ldd ln ls make md5sum mkdir mkfifo mknod \ + head hostname iconv id install ld ldd ln ls make md5sum mkdir mknod \ mktemp mv nm objcopy objdump od patch perl pr printf pwd \ python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh \ sha1sum sha224sum sha256sum sha384sum sha512sum \ @@ -498,7 +498,7 @@ HOSTTOOLS += " \ 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 pigz sftp socat ssh sudo" +HOSTTOOLS_NONFATAL += "aws 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" @@ -685,15 +685,15 @@ SRC_URI = "" PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/" PSEUDO_PASSWD ?= "${STAGING_DIR_TARGET}:${PSEUDO_SYSROOT}" PSEUDO_SYSROOT = "${COMPONENTS_DIR}/${BUILD_ARCH}/pseudo-native" -PSEUDO_IGNORE_PATHS = "/usr/,/etc/,/lib,/dev/,/run/,${T},${WORKDIR}/recipe-sysroot,${SSTATE_DIR},${STAMPS_DIR},${WORKDIR}/pkgdata-sysroot,${TMPDIR}/sstate-control,${DEPLOY_DIR},${WORKDIR}/deploy-,${TMPDIR}/buildstats,${WORKDIR}/sstate-build-package_,${WORKDIR}/sstate-install-package_,${WORKDIR}/sstate-build-image_complete,${TMPDIR}/sysroots-components,${BUILDHISTORY_DIR},${TMPDIR}/pkgdata,${TOPDIR}/cache,${COREBASE}/scripts,${CCACHE_DIR}" +PSEUDO_IGNORE_PATHS = "/usr/,/etc/,/lib,/dev/,${T},${WORKDIR}/recipe-sysroot,${SSTATE_DIR},${STAMPS_DIR},${WORKDIR}/pkgdata-sysroot,${TMPDIR}/sstate-control,${DEPLOY_DIR},${WORKDIR}/deploy-,${TMPDIR}/buildstats,${WORKDIR}/sstate-build-package_,${WORKDIR}/sstate-install-package_,${WORKDIR}/sstate-build-image_complete,${TMPDIR}/sysroots-components,${BUILDHISTORY_DIR},${TMPDIR}/pkgdata,${TOPDIR}/cache,${COREBASE}/scripts,${COREBASE}/meta,${CCACHE_DIR}" export PSEUDO_DISABLED = "1" #export PSEUDO_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}" #export PSEUDO_BINDIR = "${STAGING_DIR_NATIVE}${bindir_native}" #export PSEUDO_LIBDIR = "${STAGING_DIR_NATIVE}$PSEUDOBINDIR/../lib/pseudo/lib -FAKEROOTBASEENV = "PSEUDO_BINDIR=${PSEUDO_SYSROOT}${bindir_native} PSEUDO_LIBDIR=${PSEUDO_SYSROOT}${prefix_native}/lib/pseudo/lib PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_IGNORE_PATHS=${@oe.path.canonicalize(d.getVar('PSEUDO_IGNORE_PATHS'))} PSEUDO_DISABLED=1 PYTHONDONTWRITEBYTECODE=1" +FAKEROOTBASEENV = "PSEUDO_BINDIR=${PSEUDO_SYSROOT}${bindir_native} PSEUDO_LIBDIR=${PSEUDO_SYSROOT}${prefix_native}/lib/pseudo/lib PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_IGNORE_PATHS=${PSEUDO_IGNORE_PATHS} PSEUDO_DISABLED=1" FAKEROOTCMD = "${PSEUDO_SYSROOT}${bindir_native}/pseudo" -FAKEROOTENV = "PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${PSEUDO_PASSWD} PSEUDO_NOSYMLINKEXP=1 PSEUDO_IGNORE_PATHS=${@oe.path.canonicalize(d.getVar('PSEUDO_IGNORE_PATHS'))} PSEUDO_DISABLED=0" +FAKEROOTENV = "PSEUDO_PREFIX=${PSEUDO_SYSROOT}${prefix_native} PSEUDO_LOCALSTATEDIR=${PSEUDO_LOCALSTATEDIR} PSEUDO_PASSWD=${PSEUDO_PASSWD} PSEUDO_NOSYMLINKEXP=1 PSEUDO_IGNORE_PATHS=${PSEUDO_IGNORE_PATHS} PSEUDO_DISABLED=0" FAKEROOTNOENV = "PSEUDO_UNLOAD=1" FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" 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 " RECIPE_MAINTAINER_pn-acpica = "Ross Burton " RECIPE_MAINTAINER_pn-acpid = "Ross Burton " RECIPE_MAINTAINER_pn-adwaita-icon-theme = "Ross Burton " -RECIPE_MAINTAINER_pn-alsa-lib = "Unassigned " -RECIPE_MAINTAINER_pn-alsa-plugins = "Unassigned " -RECIPE_MAINTAINER_pn-alsa-state = "Unassigned " -RECIPE_MAINTAINER_pn-alsa-tools = "Unassigned " -RECIPE_MAINTAINER_pn-alsa-topology-conf = "Unassigned " -RECIPE_MAINTAINER_pn-alsa-ucm-conf = "Unassigned " -RECIPE_MAINTAINER_pn-alsa-utils = "Unassigned " -RECIPE_MAINTAINER_pn-alsa-utils-scripts = "Unassigned " +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-topology-conf = "Tanu Kaskinen " +RECIPE_MAINTAINER_pn-alsa-ucm-conf = "Tanu Kaskinen " +RECIPE_MAINTAINER_pn-alsa-utils = "Tanu Kaskinen " +RECIPE_MAINTAINER_pn-alsa-utils-scripts = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-apmd = "Anuj Mittal " RECIPE_MAINTAINER_pn-apr = "Hongxu Jia " RECIPE_MAINTAINER_pn-apr-util = "Hongxu Jia " @@ -175,7 +175,7 @@ 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-flac = "Unassigned " +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 " @@ -297,10 +297,10 @@ RECIPE_MAINTAINER_pn-kmod = "Chen Qi " RECIPE_MAINTAINER_pn-kmod-native = "Chen Qi " RECIPE_MAINTAINER_pn-kmscube = "Carlos Rafael Giani " RECIPE_MAINTAINER_pn-l3afpad = "Anuj Mittal " -RECIPE_MAINTAINER_pn-lame = "Unassigned " +RECIPE_MAINTAINER_pn-lame = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-ldconfig-native = "Khem Raj " RECIPE_MAINTAINER_pn-less = "Yi Zhao " -RECIPE_MAINTAINER_pn-liba52 = "Unassigned " +RECIPE_MAINTAINER_pn-liba52 = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-libacpi = "Anuj Mittal " RECIPE_MAINTAINER_pn-libaio = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libarchive = "Otavio Salvador " @@ -343,7 +343,7 @@ RECIPE_MAINTAINER_pn-libgudev = "Ross Burton " RECIPE_MAINTAINER_pn-libhandy = "Alexander Kanavin " RECIPE_MAINTAINER_pn-libical = "Ross Burton " RECIPE_MAINTAINER_pn-libice = "Armin Kuster " -RECIPE_MAINTAINER_pn-libid3tag = "Unassigned " +RECIPE_MAINTAINER_pn-libid3tag = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-libidn2 = "Ross Burton " RECIPE_MAINTAINER_pn-libinput = "Ross Burton " RECIPE_MAINTAINER_pn-libjitterentropy = "Ross Burton " @@ -374,11 +374,11 @@ RECIPE_MAINTAINER_pn-libpthread-stubs = "Alexander Kanavin " RECIPE_MAINTAINER_pn-psplash = "Yi Zhao " RECIPE_MAINTAINER_pn-ptest-runner = "Ross Burton " -RECIPE_MAINTAINER_pn-pulseaudio = "Unassigned " -RECIPE_MAINTAINER_pn-pulseaudio-client-conf-sato = "Unassigned " +RECIPE_MAINTAINER_pn-pulseaudio = "Tanu Kaskinen " +RECIPE_MAINTAINER_pn-pulseaudio-client-conf-sato = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-puzzles = "Anuj Mittal " RECIPE_MAINTAINER_pn-python3 = "Oleksandr Kravchuk " RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk " @@ -651,7 +651,7 @@ RECIPE_MAINTAINER_pn-ruby = "Ross Burton " RECIPE_MAINTAINER_pn-run-postinsts = "Ross Burton " RECIPE_MAINTAINER_pn-rxvt-unicode = "Armin Kuster " RECIPE_MAINTAINER_pn-sato-screenshot = "Ross Burton " -RECIPE_MAINTAINER_pn-sbc = "Unassigned " +RECIPE_MAINTAINER_pn-sbc = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-screen = "Anuj Mittal " RECIPE_MAINTAINER_pn-sed = "Chen Qi " RECIPE_MAINTAINER_pn-serf = "Anuj Mittal " @@ -666,8 +666,8 @@ RECIPE_MAINTAINER_pn-shutdown-desktop = "Alexander Kanavin