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-selftest/recipes-test/images/wic-image-minimal.bb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'poky/meta-selftest/recipes-test/images') diff --git a/poky/meta-selftest/recipes-test/images/wic-image-minimal.bb b/poky/meta-selftest/recipes-test/images/wic-image-minimal.bb index 1cb019898..e1da203b5 100644 --- a/poky/meta-selftest/recipes-test/images/wic-image-minimal.bb +++ b/poky/meta-selftest/recipes-test/images/wic-image-minimal.bb @@ -6,10 +6,7 @@ IMAGE_INSTALL = "packagegroup-core-boot" IMAGE_FSTYPES = "wic" -WKS_FILE_DEPENDS = "dosfstools-native mtools-native gptfdisk-native" -WKS_FILE_DEPENDS_append_x86 = " syslinux-native syslinux" -WKS_FILE_DEPENDS_append_x86-64 = " syslinux-native syslinux" -WKS_FILE_DEPENDS_append_x86-x32 = " syslinux-native syslinux" +WKS_FILE_DEPENDS = "syslinux syslinux-native dosfstools-native mtools-native gptfdisk-native" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -- cgit v1.2.3