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 <geissonator@yahoo.com>

9 files changed, 2 insertions, 63 deletions

diff --git a/poky/meta-selftest/classes/test-mkimage-wrapper.bbclass b/poky/meta-selftest/classes/test-mkimage-wrapper.bbclass
deleted file mode 100644
index 7c98d7b71e..0000000000
--- a/poky/meta-selftest/classes/test-mkimage-wrapper.bbclass
+++ /dev/null
@@ -1,19 +0,0 @@
-# Class to test UBOOT_MKIMAGE and UBOOT_MKIMAGE_SIGN
-# (in conjunction with kernel-fitimage.bbclass)
-#
-# SPDX-License-Identifier: MIT
-#
-
-UBOOT_MKIMAGE = "test_mkimage_wrapper"
-UBOOT_MKIMAGE_SIGN = "test_mkimage_signing_wrapper"
-
-test_mkimage_wrapper() {
-    echo "### uboot-mkimage wrapper message"
-    uboot-mkimage "$@"
-}
-
-test_mkimage_signing_wrapper() {
-    echo "### uboot-mkimage signing wrapper message"
-    uboot-mkimage "$@"
-}
-
diff --git a/poky/meta-selftest/files/static-group b/poky/meta-selftest/files/static-group
index 892231b6e0..9213b8e9bc 100644
--- a/poky/meta-selftest/files/static-group
+++ b/poky/meta-selftest/files/static-group
@@ -11,11 +11,4 @@ avahi:x:509:
 avahi-autoipd:x:510:
 rpc:x:511:
 rpcuser:x:513:
-dhcpcd:x:514:
-sshd:x:516:
-lpadmin:x:517:
-crontab:x:518:
-tracing:x:519:
-pulse:x:520:
-bind:x:521:
-builder:x:522:
+
diff --git a/poky/meta-selftest/files/static-passwd b/poky/meta-selftest/files/static-passwd
index babbfbc9de..412f85d469 100644
--- a/poky/meta-selftest/files/static-passwd
+++ b/poky/meta-selftest/files/static-passwd
@@ -9,9 +9,3 @@ avahi-autoipd:x:510:510::/:/bin/nologin
 rpc:x:511:511::/:/bin/nologin
 distcc:x:512:nogroup::/:/bin/nologin
 rpcuser:x:513:513::/var/lib/nfs:/bin/nologin
-dhcpcd:x:514:514::/:/bin/nologin
-tester:x:515:515::/:/bin/nologin
-sshd:x:516:516::/:/bin/nologin
-pulse:x:520:520::/:/bin/nologin
-bind:x:521:521::/:/bin/nologin
-builder:x:522:522::/:/bin/nologin
diff --git a/poky/meta-selftest/lib/pseudo_pyc_test1.py b/poky/meta-selftest/lib/pseudo_pyc_test1.py
deleted file mode 100644
index b59abdd536..0000000000
--- a/poky/meta-selftest/lib/pseudo_pyc_test1.py
+++ /dev/null
@@ -1 +0,0 @@
-STRING = "pseudo_pyc_test1"
diff --git a/poky/meta-selftest/lib/pseudo_pyc_test2.py b/poky/meta-selftest/lib/pseudo_pyc_test2.py
deleted file mode 100644
index fb67a978e0..0000000000
--- a/poky/meta-selftest/lib/pseudo_pyc_test2.py
+++ /dev/null
@@ -1 +0,0 @@
-STRING = "pseudo_pyc_test2"
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 1cb019898d..e1da203b59 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"
 
diff --git a/poky/meta-selftest/recipes-test/pseudo-pyc-test/pseudo-pyc-test.bb b/poky/meta-selftest/recipes-test/pseudo-pyc-test/pseudo-pyc-test.bb
deleted file mode 100644
index 12dc91a8f3..0000000000
--- a/poky/meta-selftest/recipes-test/pseudo-pyc-test/pseudo-pyc-test.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "pseudo env test"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-INHIBIT_DEFAULT_DEPS = "1"
-
-python do_compile() {
-    import pseudo_pyc_test1
-    print(pseudo_pyc_test1.STRING)
-}
-
-python do_install() {
-    import pseudo_pyc_test2
-    print(pseudo_pyc_test2.STRING)
-}
diff --git a/poky/meta-selftest/recipes-test/selftest-chown/selftest-chown.bb b/poky/meta-selftest/recipes-test/selftest-chown/selftest-chown.bb
index 440471fe80..87bf9438b8 100644
--- a/poky/meta-selftest/recipes-test/selftest-chown/selftest-chown.bb
+++ b/poky/meta-selftest/recipes-test/selftest-chown/selftest-chown.bb
@@ -3,8 +3,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 LICENSE = "MIT"
 
-DEPENDS += "coreutils-native"
-
 S = "${WORKDIR}"
 
 inherit useradd allarch
@@ -18,13 +16,10 @@ do_install() {
 	install -d   ${TESTDIR}/dir
 	touch        ${TESTDIR}/file
 	ln -s ./file ${TESTDIR}/symlink
-	install -d   ${TESTDIR}/fifotest
-	mkfifo       ${TESTDIR}/fifotest/fifo
 
 	chown    test:test ${TESTDIR}/file
 	chown -R test:test ${TESTDIR}/dir
 	chown -h test:test ${TESTDIR}/symlink
-	chown -R test:test ${TESTDIR}/fifotest
 }
 
 FILES_${PN} = "${sysconfdir}/selftest-chown/*"
diff --git a/poky/meta-selftest/wic/test_empty_plugin.wks b/poky/meta-selftest/wic/test_empty_plugin.wks
deleted file mode 100644
index 4e91e04e19..0000000000
--- a/poky/meta-selftest/wic/test_empty_plugin.wks
+++ /dev/null
@@ -1,4 +0,0 @@
-# short-description: image for checking empty partition creation
-
-part / --source rootfs --fstype=ext4 --align 1024 --use-uuid
-part empty --source empty --ondisk sda --size 1024 --align 1024