From 2198f8593ae0312add1bdccb49edfcb935e5f8a6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Dec 2024 02:07:26 +0000 Subject: gentoo auto-resync : 07:12:2024 - 02:07:26 --- eclass/Manifest.gz | Bin 39039 -> 39038 bytes eclass/dist-kernel-utils.eclass | 3 +- eclass/java-utils-2.eclass | 66 +++++++++++++++++++++++++--------------- eclass/kernel-build.eclass | 19 +++++++++--- eclass/linux-mod-r1.eclass | 3 +- eclass/llvm-r1.eclass | 2 +- 6 files changed, 61 insertions(+), 32 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index 9ea669df974c..ced86418d5cc 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/dist-kernel-utils.eclass b/eclass/dist-kernel-utils.eclass index 67ba459f0ebe..210c586c8c29 100644 --- a/eclass/dist-kernel-utils.eclass +++ b/eclass/dist-kernel-utils.eclass @@ -175,7 +175,8 @@ dist-kernel_get_module_suffix() { echo .ko elif [[ ! -r ${config} ]]; then die "Cannot find kernel config ${config}" - elif grep -q "CONFIG_MODULE_COMPRESS_NONE=y" "${config}"; then + elif grep -q "CONFIG_MODULE_COMPRESS_NONE=y" "${config}" || + grep -q "# CONFIG_MODULE_COMPRESS is not set" "${config}"; then echo .ko elif grep -q "CONFIG_MODULE_COMPRESS_GZIP=y" "${config}"; then echo .ko.gz diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index c0a900b35a00..e2af63819839 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -213,6 +213,48 @@ JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/com # ebuild foo.ebuild compile # @CODE +# @ECLASS_VARIABLE: EBUILD_DEATH_HOOKS +# @INTERNAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# Used internally. + +# @ECLASS_VARIABLE: JAVA_PKG_BUILD_DEPEND_FILE +# @INTERNAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# Used in ejunit_, java-pkg_do_write_ and java-pkg_record-jar_ + +# @ECLASS_VARIABLE: JAVA_PKG_DEPEND_FILE +# @INTERNAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# Used in ejunit_, java-pkg_do_write_ and java-pkg_record-jar_ + +# @ECLASS_VARIABLE: JAVA_PKG_EXTRA_ENV +# @INTERNAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# Used in java-pkg_register-environment-variable and java-pkg_do_write_, + +# @ECLASS_VARIABLE: JAVA_PKG_EXTRA_ENV_VARS +# @INTERNAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# Used in java-pkg_register-environment-variable and java-pkg_do_write_ + +# @ECLASS_VARIABLE: JAVA_PKG_OPTIONAL_DEPEND_FILE +# @INTERNAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# Used in java-pkg_do_write_ and java-pkg_record-jar_ + +# @ECLASS_VARIABLE: WANT_JAVA_CONFIG +# @INTERNAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# Gets exported to make sure we use java-config-2 + # @ECLASS_VARIABLE: JAVADOC_CLASSPATH # @DEFAULT_UNSET # @DESCRIPTION: @@ -253,9 +295,6 @@ JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/com # ) # @CODE -# TODO document me -JAVA_PKG_QA_VIOLATIONS=0 - # @FUNCTION: java-pkg_doexamples # @USAGE: [--subdir ] [ ...] # @DESCRIPTION: @@ -1942,7 +1981,6 @@ etestng() { -cp ${cp} -Djava.io.tmpdir="${T}" -Djava.awt.headless=true - -Dtest.resources.dir="${JAVA_TEST_RESOURCE_DIRS}" ${JAVA_TEST_EXTRA_ARGS[@]} ${runner} ${JAVA_TEST_RUNNER_EXTRA_ARGS[@]} @@ -2785,19 +2823,6 @@ java-pkg_die() { } -# TODO document -# List jars in the source directory, ${S} -java-pkg_jar-list() { - if [[ -n "${JAVA_PKG_DEBUG}" ]]; then - einfo "Linked Jars" - find "${S}" -type l -name '*.jar' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," - einfo "Jars" - find "${S}" -type f -name '*.jar' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," - einfo "Classes" - find "${S}" -type f -name '*.class' -print0 | xargs -0 -r -n 500 ls -ald | sed -e "s,${WORKDIR},\${WORKDIR}," - fi -} - # @FUNCTION: java-pkg_verify-classes # @INTERNAL # @DESCRIPTION: @@ -2959,16 +2984,9 @@ java-pkg_announce-qa-violation() { nodie="true" shift fi - echo "Java QA Notice: $@" >&2 - increment-qa-violations [[ -z "${nodie}" ]] && is-java-strict && die "${@}" } -increment-qa-violations() { - let "JAVA_PKG_QA_VIOLATIONS+=1" - export JAVA_PKG_QA_VIOLATIONS -} - # @FUNCTION: is-java-strict # @INTERNAL # @RETURN: 0: JAVA_PKG_STRICT is set diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index 376cebf3b1be..831027216321 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -371,8 +371,7 @@ kernel-build_src_install() { local compress=() if [[ ${KERNEL_IUSE_GENERIC_UKI} ]] && ! use modules-compress; then compress+=( - # force installing uncompressed modules even if compression - # is enabled via config + # Workaround for <6.12, does not have CONFIG_MODULE_COMPRESS_ALL suffix-y= ) fi @@ -656,12 +655,22 @@ kernel-build_merge_configs() { # Only semi-related but let's use that to avoid changing stable ebuilds. if [[ ${KERNEL_IUSE_GENERIC_UKI} ]]; then - # NB: we enable this even with USE=-modules-compress, in order - # to support both uncompressed and compressed modules in prebuilt - # kernels + # NB: we enable support for compressed modules even with + # USE=-modules-compress, in order to support both uncompressed and + # compressed modules in prebuilt kernels. cat <<-EOF > "${WORKDIR}/module-compress.config" || die + CONFIG_MODULE_COMPRESS=y CONFIG_MODULE_COMPRESS_XZ=y EOF + # CONFIG_MODULE_COMPRESS_ALL is supported only by >=6.12, for older + # versions we accomplish the same by overriding suffix-y= + if use modules-compress; then + echo "CONFIG_MODULE_COMPRESS_ALL=y" \ + >> "${WORKDIR}/module-compress.config" || die + else + echo "# CONFIG_MODULE_COMPRESS_ALL is not set" \ + >> "${WORKDIR}/module-compress.config" || die + fi merge_configs+=( "${WORKDIR}/module-compress.config" ) fi diff --git a/eclass/linux-mod-r1.eclass b/eclass/linux-mod-r1.eclass index f8a45c607dfd..4e5b17548b04 100644 --- a/eclass/linux-mod-r1.eclass +++ b/eclass/linux-mod-r1.eclass @@ -1263,7 +1263,8 @@ _modules_set_makeargs() { # these are only needed if using these arguments for installing, lets # eclass handle strip, sign, compress, and depmod (CONFIG_ should # have no impact on building, only used by Makefile.modinst) - CONFIG_MODULE_{SIG_ALL,COMPRESS_{GZIP,XZ,ZSTD}}= + # note: COMPRESS_ALL is enough for kernel >=6.12, rest is for compat + CONFIG_MODULE_{SIG_ALL,COMPRESS_{ALL,GZIP,XZ,ZSTD}}= DEPMOD=true #916587 STRIP=true ) diff --git a/eclass/llvm-r1.eclass b/eclass/llvm-r1.eclass index 7b9f26e17b58..f2bf0fffee09 100644 --- a/eclass/llvm-r1.eclass +++ b/eclass/llvm-r1.eclass @@ -61,7 +61,7 @@ _LLVM_OLDEST_SLOT=15 # @DESCRIPTION: # The newest stable LLVM version. Versions newer than that won't # be automatically enabled via USE defaults. -_LLVM_NEWEST_STABLE=18 +_LLVM_NEWEST_STABLE=19 # == control variables == -- cgit v1.2.3