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-poky/conf/distro/include/gcsections.inc | 10 ---------- .../conf/distro/include/poky-distro-alt-test-config.inc | 2 +- poky/meta-poky/conf/distro/poky-tiny.conf | 2 +- poky/meta-poky/conf/distro/poky.conf | 4 ++-- poky/meta-poky/conf/local.conf.sample | 2 +- 5 files changed, 5 insertions(+), 15 deletions(-) (limited to 'poky/meta-poky') diff --git a/poky/meta-poky/conf/distro/include/gcsections.inc b/poky/meta-poky/conf/distro/include/gcsections.inc index 7157373aa8..dd98943acb 100644 --- a/poky/meta-poky/conf/distro/include/gcsections.inc +++ b/poky/meta-poky/conf/distro/include/gcsections.inc @@ -13,16 +13,6 @@ LDFLAGS_SECTION_REMOVAL_pn-grub-efi = "" CFLAGS_SECTION_REMOVAL_pn-grub = "" LDFLAGS_SECTION_REMOVAL_pn-grub = "" -# SDK packages with build problems using sections -CFLAGS_SECTION_REMOVAL_pn-nativesdk-glibc = "" -LDFLAGS_SECTION_REMOVAL_pn-nativesdk-glibc = "" -CFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-runtime = "" -LDFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-runtime = "" -CFLAGS_SECTION_REMOVAL_pn-nativesdk-perl = "" -LDFLAGS_SECTION_REMOVAL_pn-nativesdk-perl = "" -CFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-winpthreads = "" -LDFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-winpthreads = "" - # set default for target CFLAGS_append_class-target = " ${CFLAGS_SECTION_REMOVAL}" LDFLAGS_append_class-target = " ${LDFLAGS_SECTION_REMOVAL}" diff --git a/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc b/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc index 273ebfdfef..0b0412e60c 100644 --- a/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc +++ b/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc @@ -2,7 +2,7 @@ DISTRO_FEATURES_append = " pam" # Use the LTSI Kernel -PREFERRED_VERSION_linux-yocto = "5.4%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" # Ensure the kernel nfs server is enabled KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc" diff --git a/poky/meta-poky/conf/distro/poky-tiny.conf b/poky/meta-poky/conf/distro/poky-tiny.conf index 5a867b1de5..e125b23d46 100644 --- a/poky/meta-poky/conf/distro/poky-tiny.conf +++ b/poky/meta-poky/conf/distro/poky-tiny.conf @@ -43,7 +43,7 @@ FULL_OPTIMIZATION="-Os -pipe ${DEBUG_FLAGS}" # Distro config is evaluated after the machine config, so we have to explicitly # set the kernel provider to override a machine config. PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny" -PREFERRED_VERSION_linux-yocto-tiny ?= "5.10%" +PREFERRED_VERSION_linux-yocto-tiny ?= "5.8%" # We can use packagegroup-core-boot, but in the future we may need a new packagegroup-core-tiny #POKY_DEFAULT_EXTRA_RDEPENDS += "packagegroup-core-boot" diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index 623f39da66..b33df3c17f 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -19,8 +19,8 @@ POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" -PREFERRED_VERSION_linux-yocto ?= "5.10%" -PREFERRED_VERSION_linux-yocto-rt ?= "5.10%" +PREFERRED_VERSION_linux-yocto ?= "5.8%" +PREFERRED_VERSION_linux-yocto-rt ?= "5.4%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" diff --git a/poky/meta-poky/conf/local.conf.sample b/poky/meta-poky/conf/local.conf.sample index 096359ee8a..68e71b930b 100644 --- a/poky/meta-poky/conf/local.conf.sample +++ b/poky/meta-poky/conf/local.conf.sample @@ -112,7 +112,7 @@ PACKAGE_CLASSES ?= "package_rpm" # This variable specifies the architecture to build SDK items for and means # you can build the SDK packages for architectures other than the machine you are # running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686, x86_64, aarch64 +# Supported values are i686 and x86_64 #SDKMACHINE ?= "i686" # -- cgit v1.2.3