testimage.bbclass: Fixes about suites and dependencies
There are some missing suites on sato-sdk and lsb-sdk images so add it. The createrepo-native needs to be built before run testimage in order to create a repository from install packages. The DL_DIR data also needs to be updated from the current bitbake environment instead of use the value from testdata file. [YOCTO #10964] (From OE-Core rev: 42f3026b39519ba98ae3153329622ce670d57c09) Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
5582b67f6d
commit
3eef8f7955
|
@ -49,11 +49,11 @@ DEFAULT_TEST_SUITES_pn-core-image-x11 = "${MINTESTSUITE}"
|
|||
DEFAULT_TEST_SUITES_pn-core-image-lsb = "${NETTESTSUITE} pam parselogs ${RPMTESTSUITE}"
|
||||
DEFAULT_TEST_SUITES_pn-core-image-sato = "${NETTESTSUITE} connman xorg parselogs ${RPMTESTSUITE} \
|
||||
${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python', '', d)}"
|
||||
DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${NETTESTSUITE} connman xorg perl python \
|
||||
${DEVTESTSUITE} parselogs ${RPMTESTSUITE}"
|
||||
DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${NETTESTSUITE} buildcvs buildiptables buildgalculator \
|
||||
connman ${DEVTESTSUITE} logrotate perl parselogs python ${RPMTESTSUITE} xorg"
|
||||
DEFAULT_TEST_SUITES_pn-core-image-lsb-dev = "${NETTESTSUITE} pam perl python parselogs ${RPMTESTSUITE}"
|
||||
DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "${NETTESTSUITE} buildcvs buildiptables buildgalculator \
|
||||
connman ${DEVTESTSUITE} pam perl python parselogs ${RPMTESTSUITE}"
|
||||
connman ${DEVTESTSUITE} logrotate pam parselogs perl python ${RPMTESTSUITE}"
|
||||
DEFAULT_TEST_SUITES_pn-meta-toolchain = "auto"
|
||||
|
||||
# aarch64 has no graphics
|
||||
|
@ -79,13 +79,14 @@ TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python-smartp
|
|||
TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'ipk', 'opkg-utils-native:do_populate_sysroot', '', d)}"
|
||||
TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'deb', 'apt-native:do_populate_sysroot', '', d)}"
|
||||
TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python-smartpm-native:do_populate_sysroot', '', d)}"
|
||||
TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'createrepo-native:do_populate_sysroot', '', d)}"
|
||||
|
||||
TESTIMAGELOCK = "${TMPDIR}/testimage.lock"
|
||||
TESTIMAGELOCK_qemuall = ""
|
||||
|
||||
TESTIMAGE_DUMP_DIR ?= "/tmp/oe-saved-tests/"
|
||||
|
||||
TESTIMAGE_UPDATE_VARS ?= "WORKDIR DEPLOY_DIR"
|
||||
TESTIMAGE_UPDATE_VARS ?= "DL_DIR WORKDIR DEPLOY_DIR"
|
||||
|
||||
testimage_dump_target () {
|
||||
top -bn1
|
||||
|
|
Loading…
Reference in New Issue