Update the version of ltp-ddt to 2025.10. In order to work towards Yocto compliance for this repository we need to address the manner in which ltp-ddt was setup. Copying in the ltp recipe can create a situation where we are providing an alternative and maybe newer version of ltp that would violate the compliance checks. We also do not want to copy all of the settings from the ltp recipe. So we can change it from a .bb to a .inc file which we can still require and maintain the ltp-ddt recipe as an overlay on top the ltp settings.
Additionally, remove the PROVIDES for ltp since technically we are not ltp proper. Signed-off-by: Ryan Eatmon <[email protected]> --- v2: Rebase patch off of current master/scarthgap layout. Fix branch back to master post testing. .../{ltp-ddt_20240129.bb => ltp-ddt_20250130.bb} | 6 ++---- .../ltp-ddt/ltp_20250130.inc} | 15 ++++++--------- 2 files changed, 8 insertions(+), 13 deletions(-) copy meta-arago-test/recipes-devtools/ltp-ddt/{ltp-ddt_20240129.bb => ltp-ddt_20250130.bb} (90%) copy meta-arago-test/{recipes-extended/ltp/ltp_20240129.bb => recipes-devtools/ltp-ddt/ltp_20250130.inc} (88%) diff --git a/meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt_20240129.bb b/meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt_20250130.bb similarity index 90% copy from meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt_20240129.bb copy to meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt_20250130.bb index f6861e0c..e78c40ac 100644 --- a/meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt_20240129.bb +++ b/meta-arago-test/recipes-devtools/ltp-ddt/ltp-ddt_20250130.bb @@ -1,20 +1,18 @@ FILESEXTRAPATHS:prepend := "${COREBASE}/meta/recipes-extended/ltp/ltp:" FILESEXTRAPATHS:prepend := "${TITESTBASE}/recipes-extended/ltp/ltp:" -require recipes-extended/ltp/ltp_${PV}.bb +require ltp_${PV}.inc SUMMARY = "Embedded Linux Device Driver Tests based on Linux Test Project" HOMEPAGE = "https://git.ti.com/cgit/test-automation/ltp-ddt/"; -PROVIDES += "ltp" - DEPENDS += "alsa-lib" PE = "1" PR = "r1" PV:append = "+git" -SRCREV = "34602e4308a8c276bddfc0b4984b387037574f5c" +SRCREV = "551467bce4c38af24c9c98843770fdfe45e1e253" BRANCH ?= "master" SRC_URI:remove = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https" diff --git a/meta-arago-test/recipes-extended/ltp/ltp_20240129.bb b/meta-arago-test/recipes-devtools/ltp-ddt/ltp_20250130.inc similarity index 88% copy from meta-arago-test/recipes-extended/ltp/ltp_20240129.bb copy to meta-arago-test/recipes-devtools/ltp-ddt/ltp_20250130.inc index f8e6d398..1a353a19 100644 --- a/meta-arago-test/recipes-extended/ltp/ltp_20240129.bb +++ b/meta-arago-test/recipes-devtools/ltp-ddt/ltp_20250130.inc @@ -24,31 +24,28 @@ TUNE_CCARGS:remove:x86-64 = "-mfpmath=sse" CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "68737d20556d37364c95776044b1119c0912a36a" +SRCREV = "a7c31dff7edc089a32e990765e12952cc4d7666a" SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \ file://0001-Remove-OOM-tests-from-runtest-mm.patch \ - file://0001-scenario_groups-default-remove-connectors.patch \ - file://0001-sched_stress-Use-time_t-instead-of-long-for-type.patch \ " S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig -# Version 20220527 added KVM test infrastructure which currently fails to build with gold due to +# Version 20220527 added KVM test infrastructure which currently fails to build with lld due to # SORT_NONE in linker script which isn't supported by gold: # https://sourceware.org/bugzilla/show_bug.cgi?id=18097 # https://github.com/linux-test-project/ltp/commit/3fce2064b54843218d085aae326c8f7ecf3a8c41#diff-39268f0855c634ca48c8993fcd2c95b12a65b79e8d9fa5ccd6b0f5a8785c0dd6R36 -LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd', '', d)}" -LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -fuse-ld=bfd', '', d)}" +LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', '-fuse-ld=bfd', '', d)}" # After 0002-kvm-use-LD-instead-of-hardcoding-ld.patch # https://github.com/linux-test-project/ltp/commit/f94e0ef3b7280f886384703ef9019aaf2f2dfebb -# it fails with gold also a bit later when trying to use *-payload.bin +# it fails with lld also a bit later when trying to use *-payload.bin # http://errors.yoctoproject.org/Errors/Details/663094/ -# work around this by forcing .bfd linked in LD when ld-is-gold is in DISTRO_FEATURES -KVM_LD = "${@bb.utils.contains_any('DISTRO_FEATURES', 'ld-is-gold ld-is-lld', '${HOST_PREFIX}ld.bfd${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', '${LD}', d)}" +# work around this by forcing .bfd linked in LD when ld-is-lld is in DISTRO_FEATURES +KVM_LD = "${@bb.utils.contains_any('DISTRO_FEATURES', 'ld-is-lld', '${HOST_PREFIX}ld.bfd${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', '${LD}', d)}" TARGET_CC_ARCH += "${LDFLAGS}" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#15845): https://lists.yoctoproject.org/g/meta-arago/message/15845 Mute This Topic: https://lists.yoctoproject.org/mt/111163816/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
