systemtap is split into a .bb and .inc file. Whilst I'd normally merge these as there is currently no need for this, it might be sensible in the future to create subrecipes that build specific parts of systemtap.
So, rationalise the contents of the .inc and .bb so the inc is just the fetching and other common variables: - Move HOMEPAGE to the .inc - Move patches to the .bb - Move the build exclusion to the .bb Signed-off-by: Ross Burton <[email protected]> --- meta/recipes-kernel/systemtap/systemtap_5.6.bb | 11 ++++++++++- meta/recipes-kernel/systemtap/systemtap_git.inc | 15 +++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta/recipes-kernel/systemtap/systemtap_5.6.bb b/meta/recipes-kernel/systemtap/systemtap_5.6.bb index f0b14ef90ac..b58bb1543b4 100644 --- a/meta/recipes-kernel/systemtap/systemtap_5.6.bb +++ b/meta/recipes-kernel/systemtap/systemtap_5.6.bb @@ -2,11 +2,13 @@ SUMMARY = "Script-directed dynamic tracing and performance analysis tool for Lin DESCRIPTION = "It provides free software infrastructure to simplify the \ gathering of information about the running Linux system. This assists \ diagnosis of a performance or functional problem." -HOMEPAGE = "https://sourceware.org/systemtap/"; require systemtap_git.inc SRC_URI += " \ + file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ + file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ + file://readline.patch \ file://0001-improve-reproducibility-for-c-compiling.patch \ file://0001-staprun-address-ncurses-6.3-failures.patch \ file://0001-python3.stpm-record-the-installed-libpython-path.patch \ @@ -112,3 +114,10 @@ BBCLASSEXTEND = "nativesdk" # Emits lot of warning which are treated as errors # They must be looked into before disabling TOOLCHAIN = "gcc" + +# systemtap can't be built without optimization, if someone tries to compile an +# entire image as -O0, break with fatal. +python () { + if bb.utils.contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x": + bb.fatal("systemtap can't be built with -O0, using -O1 -Wno-error or -O1 instead.") +} diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index 9a12050e003..a725a15ec10 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -1,20 +1,11 @@ +HOMEPAGE = "https://sourceware.org/systemtap/"; + LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=https;branch=master;tag=release-${PV} \ - file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ - file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ - file://readline.patch \ - " +SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=https;branch=master;tag=release-${PV}" SRCREV = "211e84349504077f0c84f759601b02f946465d29" COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64|riscv32).*-linux' COMPATIBLE_HOST:libc-musl = 'null' - -# systemtap can't be built without optimization, if someone tries to compile an -# entire image as -O0, break with fatal. -python () { - if bb.utils.contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x": - bb.fatal("systemtap can't be built with -O0, using -O1 -Wno-error or -O1 instead.") -} -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#246973): https://lists.openembedded.org/g/openembedded-core/message/246973 Mute This Topic: https://lists.openembedded.org/mt/121508954/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
