diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-09-03 12:28:20 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-09-03 12:28:20 +0100 |
| commit | 3f559ef486314f9b3b48d48eb303d6be68463af9 (patch) | |
| tree | 3b70212f31ce4d000911c001ce13363d0909dfd1 /eclass | |
| parent | 20b6ab983b55b022c6e4af317154089e18ad41cb (diff) | |
gentoo auto-resync : 03:09:2024 - 12:28:20
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39867 -> 39872 bytes | |||
| -rw-r--r-- | eclass/kernel-build.eclass | 15 | ||||
| -rw-r--r-- | eclass/qt6-build.eclass | 3 |
3 files changed, 16 insertions, 2 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 0cbc59492a02..e26725b85606 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index 10fd0cca2cc5..3836bef1276b 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -296,7 +296,13 @@ kernel-build_src_configure() { kernel-build_src_compile() { debug-print-function ${FUNCNAME} "${@}" - emake O="${WORKDIR}"/build "${MAKEARGS[@]}" all + local targets=( all ) + + if grep -q "CONFIG_CTF=y" "${WORKDIR}/modprep/.config"; then + targets+=( ctf ) + fi + + emake O="${WORKDIR}"/build "${MAKEARGS[@]}" "${targets[@]}" } # @FUNCTION: kernel-build_src_test @@ -315,7 +321,7 @@ kernel-build_src_test() { emake O="${WORKDIR}"/build "${MAKEARGS[@]}" \ INSTALL_MOD_PATH="${T}" INSTALL_MOD_STRIP="${strip_args}" \ - modules_install + modules_install ctf_install kernel-install_test "${KV_FULL}" \ "${WORKDIR}/build/$(dist-kernel_get_image_path)" \ @@ -337,6 +343,10 @@ kernel-build_src_install() { targets+=( dtbs_install ) fi + if grep -q "CONFIG_CTF=y" "${WORKDIR}/modprep/.config"; then + targets+=( ctf_install ) + fi + # Use the kernel build system to strip, this ensures the modules # are stripped *before* they are signed or compressed. local strip_args @@ -430,6 +440,7 @@ kernel-build_src_install() { mv "build/vmlinux" "${ED}${kernel_dir}/vmlinux" || die fi dostrip -x "${kernel_dir}/vmlinux" + dostrip -x "${kernel_dir}/vmlinux.ctfa" fi # strip empty directories diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass index 24b857dab53f..3cd8b606c235 100644 --- a/eclass/qt6-build.eclass +++ b/eclass/qt6-build.eclass @@ -147,6 +147,9 @@ qt6-build_src_configure() { fi local defaultcmakeargs=( + # cmake defaults to "STATUS" but Qt changes that to "NOTICE" which + # hides a lot of information that is useful for bug reports + --log-level=STATUS # see _qt6-build_create_user_facing_links -DINSTALL_PUBLICBINDIR="${QT6_PREFIX}"/bin # note that if qtbase was built with tests, this is default ON |