diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:55:30 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
| commit | 706d5aacd7ab7b37c00df1a1b210e4ced06119e1 (patch) | |
| tree | ed0bec373424d01accfb2e9c895c177a3e2d7abe /poky/meta-selftest/recipes-test | |
| parent | ac970dd705934286df062e0f1501f776dc2ef01d (diff) | |
| download | openbmc-706d5aacd7ab7b37c00df1a1b210e4ced06119e1.tar.xz | |
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>
Diffstat (limited to 'poky/meta-selftest/recipes-test')
3 files changed, 1 insertions, 24 deletions
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" 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 12dc91a8f..000000000 --- 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 440471fe8..87bf9438b 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/*" |