* [gentoo-dev] [PATCH 1/2] linux-info.eclass: Drop temporary fix for powerpc @ 2024-07-01 21:36 Ulrich Müller 2024-07-01 21:36 ` [gentoo-dev] [PATCH 2/2] linux-info.eclass: Drop support for EAPI 6 Ulrich Müller 2024-07-02 5:35 ` [gentoo-dev] [PATCH 1/2] linux-info.eclass: Drop temporary fix for powerpc Ionen Wolkens 0 siblings, 2 replies; 8+ messages in thread From: Ulrich Müller @ 2024-07-01 21:36 UTC (permalink / raw To: gentoo-dev; +Cc: Ulrich Müller Apparently there is no reference to a .tmp_gas_check file or to a TOUT variable in Linux sources any more. Bug: https://bugs.gentoo.org/75034#c14 Signed-off-by: Ulrich Müller <ulm@gentoo.org> --- eclass/linux-info.eclass | 6 ------ 1 file changed, 6 deletions(-) diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index 9449a6359d2a..90982445fdab 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.eclass @@ -170,12 +170,6 @@ KERNEL_DIR="${KERNEL_DIR:-${ROOT%/}/usr/src/linux}" inherit toolchain-funcs [[ ${EAPI} == 6 ]] && inherit eapi7-ver -# bug #75034 -case ${ARCH} in - ppc) BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";; - ppc64) BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";; -esac - # @FUNCTION: set_arch_to_kernel # @DESCRIPTION: # Set the env ARCH to match what the kernel expects. -- 2.45.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-dev] [PATCH 2/2] linux-info.eclass: Drop support for EAPI 6 2024-07-01 21:36 [gentoo-dev] [PATCH 1/2] linux-info.eclass: Drop temporary fix for powerpc Ulrich Müller @ 2024-07-01 21:36 ` Ulrich Müller 2024-07-02 5:35 ` [gentoo-dev] [PATCH 1/2] linux-info.eclass: Drop temporary fix for powerpc Ionen Wolkens 1 sibling, 0 replies; 8+ messages in thread From: Ulrich Müller @ 2024-07-01 21:36 UTC (permalink / raw To: gentoo-dev; +Cc: Ulrich Müller Signed-off-by: Ulrich Müller <ulm@gentoo.org> --- eclass/linux-info.eclass | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index 90982445fdab..154be2a46888 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.eclass @@ -6,7 +6,7 @@ # kernel@gentoo.org # @AUTHOR: # Original author: John Mylchreest <johnm@gentoo.org> -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: eclass used for accessing kernel related information # @DESCRIPTION: # This eclass is used as a central eclass for accessing kernel @@ -28,7 +28,7 @@ # get_running_version case ${EAPI} in - 6|7|8) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -38,7 +38,6 @@ _LINUX_INFO_ECLASS=1 # A Couple of env vars are available to effect usage of this eclass # These are as follows: - # @ECLASS_VARIABLE: CHECKCONFIG_DONOTHING # @USER_VARIABLE # @DEFAULT_UNSET @@ -51,7 +50,7 @@ _LINUX_INFO_ECLASS=1 # @DESCRIPTION: # A string containing the directory of the target kernel sources. The default value is # "/usr/src/linux" -KERNEL_DIR="${KERNEL_DIR:-${ROOT%/}/usr/src/linux}" +KERNEL_DIR="${KERNEL_DIR:-${ROOT}/usr/src/linux}" # @ECLASS_VARIABLE: CONFIG_CHECK # @DEFAULT_UNSET @@ -88,7 +87,6 @@ KERNEL_DIR="${KERNEL_DIR:-${ROOT%/}/usr/src/linux}" # CONFIG_CHECK="~CFG" with ERROR_<CFG>="Error Message" calls eerror without dying # CONFIG_CHECK="~CFG" with WARNING_<CFG>="Warning Message" calls ewarn without dying - # @ECLASS_VARIABLE: KBUILD_OUTPUT # @DEFAULT_UNSET # @DESCRIPTION: @@ -168,7 +166,6 @@ KERNEL_DIR="${KERNEL_DIR:-${ROOT%/}/usr/src/linux}" # And to ensure all the weirdness with crosscompile inherit toolchain-funcs -[[ ${EAPI} == 6 ]] && inherit eapi7-ver # @FUNCTION: set_arch_to_kernel # @DESCRIPTION: @@ -636,7 +633,7 @@ get_version() { # caught before this if they are. if [[ -z ${OUTPUT_DIR} ]] ; then # Try to locate a kernel that is most relevant for us. - for OUTPUT_DIR in "${SYSROOT}" "${ROOT%/}" "" ; do + for OUTPUT_DIR in "${SYSROOT}" "${ROOT}" "" ; do OUTPUT_DIR+="/lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}${KV_LOCAL}/build" if [[ -e ${OUTPUT_DIR} ]] ; then break @@ -664,10 +661,10 @@ get_running_version() { local kv=$(uname -r) - if [[ -f ${ROOT%/}/lib/modules/${kv}/source/Makefile ]]; then - KERNEL_DIR=$(readlink -f "${ROOT%/}/lib/modules/${kv}/source") - if [[ -f ${ROOT%/}/lib/modules/${kv}/build/Makefile ]]; then - KBUILD_OUTPUT=$(readlink -f "${ROOT%/}/lib/modules/${kv}/build") + if [[ -f ${ROOT}/lib/modules/${kv}/source/Makefile ]]; then + KERNEL_DIR=$(readlink -f "${ROOT}/lib/modules/${kv}/source") + if [[ -f ${ROOT}/lib/modules/${kv}/build/Makefile ]]; then + KBUILD_OUTPUT=$(readlink -f "${ROOT}/lib/modules/${kv}/build") fi get_version && return 0 fi @@ -712,7 +709,6 @@ linux-info_get_any_version() { fi } - # ebuild check functions # --------------------------------------- -- 2.45.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [gentoo-dev] [PATCH 1/2] linux-info.eclass: Drop temporary fix for powerpc 2024-07-01 21:36 [gentoo-dev] [PATCH 1/2] linux-info.eclass: Drop temporary fix for powerpc Ulrich Müller 2024-07-01 21:36 ` [gentoo-dev] [PATCH 2/2] linux-info.eclass: Drop support for EAPI 6 Ulrich Müller @ 2024-07-02 5:35 ` Ionen Wolkens 2024-07-02 7:38 ` Ulrich Mueller 1 sibling, 1 reply; 8+ messages in thread From: Ionen Wolkens @ 2024-07-02 5:35 UTC (permalink / raw To: gentoo-dev; +Cc: Ulrich Müller [-- Attachment #1: Type: text/plain, Size: 1545 bytes --] On Mon, Jul 01, 2024 at 11:36:01PM +0200, Ulrich Müller wrote: > Apparently there is no reference to a .tmp_gas_check file or to a TOUT > variable in Linux sources any more. > > Bug: https://bugs.gentoo.org/75034#c14 > Signed-off-by: Ulrich Müller <ulm@gentoo.org> > --- > eclass/linux-info.eclass | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass > index 9449a6359d2a..90982445fdab 100644 > --- a/eclass/linux-info.eclass > +++ b/eclass/linux-info.eclass > @@ -170,12 +170,6 @@ KERNEL_DIR="${KERNEL_DIR:-${ROOT%/}/usr/src/linux}" > inherit toolchain-funcs > [[ ${EAPI} == 6 ]] && inherit eapi7-ver > > -# bug #75034 > -case ${ARCH} in > - ppc) BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";; > - ppc64) BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";; > -esac On a side-note, it was further a no-op for linux-mod-r1 which opted to intentionally ignore BUILD_FIXES (variable is currently read by kernel-2 and linux-mod-r0) and nobody complained. If wanted, technically all references of BUILD_FIXES could probably be removed from eclasses given (normally) nothing sets that variable beside that ppc workaround. It was also undocumented and more like a private variable. Albeit some ebuilds (like the pre-linux-mod-r1 lttng-modules ebuild) and users have wrongly used it, so it could break some spacebar heating. No real need to bother with linux-mod.eclass either way given it's due for eventual removal. -- ionen [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [gentoo-dev] [PATCH 1/2] linux-info.eclass: Drop temporary fix for powerpc 2024-07-02 5:35 ` [gentoo-dev] [PATCH 1/2] linux-info.eclass: Drop temporary fix for powerpc Ionen Wolkens @ 2024-07-02 7:38 ` Ulrich Mueller 2024-07-03 15:42 ` [gentoo-dev] [PATCH v2 1/4] " Ulrich Müller 0 siblings, 1 reply; 8+ messages in thread From: Ulrich Mueller @ 2024-07-02 7:38 UTC (permalink / raw To: gentoo-dev; +Cc: Ionen Wolkens [-- Attachment #1: Type: text/plain, Size: 1070 bytes --] >>>>> On Tue, 02 Jul 2024, Ionen Wolkens wrote: > On a side-note, it was further a no-op for linux-mod-r1 which opted to > intentionally ignore BUILD_FIXES (variable is currently read by kernel-2 > and linux-mod-r0) and nobody complained. > If wanted, technically all references of BUILD_FIXES could probably be > removed from eclasses given (normally) nothing sets that variable beside > that ppc workaround. It was also undocumented and more like a private > variable. > Albeit some ebuilds (like the pre-linux-mod-r1 lttng-modules ebuild) > and users have wrongly used it, so it could break some spacebar heating. > No real need to bother with linux-mod.eclass either way given it's due > for eventual removal. A follow-up patch removing the two remaining references to BUILD_FIXES (in getfilevar(), both in linux-info.eclass and in kernel-2.eclass) would be trivial. The variable was originally added by commit [1]. Any other opinions on this? Ulrich [1] https://gitweb.gentoo.org/archive/repo/gentoo-2.git/commit/?id=c3d67d556962a79e055053f7cb88c67c46df293f [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 507 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-dev] [PATCH v2 1/4] linux-info.eclass: Drop temporary fix for powerpc 2024-07-02 7:38 ` Ulrich Mueller @ 2024-07-03 15:42 ` Ulrich Müller 2024-07-03 15:42 ` [gentoo-dev] [PATCH v2 2/4] linux-info.eclass: Drop support for EAPI 6 Ulrich Müller ` (2 more replies) 0 siblings, 3 replies; 8+ messages in thread From: Ulrich Müller @ 2024-07-03 15:42 UTC (permalink / raw To: gentoo-dev; +Cc: Ulrich Müller Apparently there is no reference to a .tmp_gas_check file or to a TOUT variable in Linux sources any more. Bug: https://bugs.gentoo.org/75034#c14 Signed-off-by: Ulrich Müller <ulm@gentoo.org> --- eclass/linux-info.eclass | 6 ------ 1 file changed, 6 deletions(-) diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index 9449a6359d2a..90982445fdab 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.eclass @@ -170,12 +170,6 @@ KERNEL_DIR="${KERNEL_DIR:-${ROOT%/}/usr/src/linux}" inherit toolchain-funcs [[ ${EAPI} == 6 ]] && inherit eapi7-ver -# bug #75034 -case ${ARCH} in - ppc) BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";; - ppc64) BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";; -esac - # @FUNCTION: set_arch_to_kernel # @DESCRIPTION: # Set the env ARCH to match what the kernel expects. -- 2.45.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-dev] [PATCH v2 2/4] linux-info.eclass: Drop support for EAPI 6 2024-07-03 15:42 ` [gentoo-dev] [PATCH v2 1/4] " Ulrich Müller @ 2024-07-03 15:42 ` Ulrich Müller 2024-07-03 15:42 ` [gentoo-dev] [PATCH v2 3/4] linux-info.eclass: Drop reference to BUILD_FIXES variable Ulrich Müller 2024-07-03 15:42 ` [gentoo-dev] [PATCH v2 4/4] kernel-2.eclass: " Ulrich Müller 2 siblings, 0 replies; 8+ messages in thread From: Ulrich Müller @ 2024-07-03 15:42 UTC (permalink / raw To: gentoo-dev; +Cc: Ulrich Müller Signed-off-by: Ulrich Müller <ulm@gentoo.org> --- eclass/linux-info.eclass | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index 90982445fdab..154be2a46888 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.eclass @@ -6,7 +6,7 @@ # kernel@gentoo.org # @AUTHOR: # Original author: John Mylchreest <johnm@gentoo.org> -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: eclass used for accessing kernel related information # @DESCRIPTION: # This eclass is used as a central eclass for accessing kernel @@ -28,7 +28,7 @@ # get_running_version case ${EAPI} in - 6|7|8) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -38,7 +38,6 @@ _LINUX_INFO_ECLASS=1 # A Couple of env vars are available to effect usage of this eclass # These are as follows: - # @ECLASS_VARIABLE: CHECKCONFIG_DONOTHING # @USER_VARIABLE # @DEFAULT_UNSET @@ -51,7 +50,7 @@ _LINUX_INFO_ECLASS=1 # @DESCRIPTION: # A string containing the directory of the target kernel sources. The default value is # "/usr/src/linux" -KERNEL_DIR="${KERNEL_DIR:-${ROOT%/}/usr/src/linux}" +KERNEL_DIR="${KERNEL_DIR:-${ROOT}/usr/src/linux}" # @ECLASS_VARIABLE: CONFIG_CHECK # @DEFAULT_UNSET @@ -88,7 +87,6 @@ KERNEL_DIR="${KERNEL_DIR:-${ROOT%/}/usr/src/linux}" # CONFIG_CHECK="~CFG" with ERROR_<CFG>="Error Message" calls eerror without dying # CONFIG_CHECK="~CFG" with WARNING_<CFG>="Warning Message" calls ewarn without dying - # @ECLASS_VARIABLE: KBUILD_OUTPUT # @DEFAULT_UNSET # @DESCRIPTION: @@ -168,7 +166,6 @@ KERNEL_DIR="${KERNEL_DIR:-${ROOT%/}/usr/src/linux}" # And to ensure all the weirdness with crosscompile inherit toolchain-funcs -[[ ${EAPI} == 6 ]] && inherit eapi7-ver # @FUNCTION: set_arch_to_kernel # @DESCRIPTION: @@ -636,7 +633,7 @@ get_version() { # caught before this if they are. if [[ -z ${OUTPUT_DIR} ]] ; then # Try to locate a kernel that is most relevant for us. - for OUTPUT_DIR in "${SYSROOT}" "${ROOT%/}" "" ; do + for OUTPUT_DIR in "${SYSROOT}" "${ROOT}" "" ; do OUTPUT_DIR+="/lib/modules/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${KV_EXTRA}${KV_LOCAL}/build" if [[ -e ${OUTPUT_DIR} ]] ; then break @@ -664,10 +661,10 @@ get_running_version() { local kv=$(uname -r) - if [[ -f ${ROOT%/}/lib/modules/${kv}/source/Makefile ]]; then - KERNEL_DIR=$(readlink -f "${ROOT%/}/lib/modules/${kv}/source") - if [[ -f ${ROOT%/}/lib/modules/${kv}/build/Makefile ]]; then - KBUILD_OUTPUT=$(readlink -f "${ROOT%/}/lib/modules/${kv}/build") + if [[ -f ${ROOT}/lib/modules/${kv}/source/Makefile ]]; then + KERNEL_DIR=$(readlink -f "${ROOT}/lib/modules/${kv}/source") + if [[ -f ${ROOT}/lib/modules/${kv}/build/Makefile ]]; then + KBUILD_OUTPUT=$(readlink -f "${ROOT}/lib/modules/${kv}/build") fi get_version && return 0 fi @@ -712,7 +709,6 @@ linux-info_get_any_version() { fi } - # ebuild check functions # --------------------------------------- -- 2.45.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-dev] [PATCH v2 3/4] linux-info.eclass: Drop reference to BUILD_FIXES variable 2024-07-03 15:42 ` [gentoo-dev] [PATCH v2 1/4] " Ulrich Müller 2024-07-03 15:42 ` [gentoo-dev] [PATCH v2 2/4] linux-info.eclass: Drop support for EAPI 6 Ulrich Müller @ 2024-07-03 15:42 ` Ulrich Müller 2024-07-03 15:42 ` [gentoo-dev] [PATCH v2 4/4] kernel-2.eclass: " Ulrich Müller 2 siblings, 0 replies; 8+ messages in thread From: Ulrich Müller @ 2024-07-03 15:42 UTC (permalink / raw To: gentoo-dev; +Cc: Ulrich Müller Undocumented, and not used by any ebuilds inheriting this eclass. Signed-off-by: Ulrich Müller <ulm@gentoo.org> --- eclass/linux-info.eclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index 154be2a46888..0f6138150144 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.eclass @@ -239,8 +239,7 @@ getfilevar() { # Pass dot-config=0 to avoid the config check in kernels prior to 5.4. echo -e "e:\\n\\t@echo \$(${1})\\ninclude ${basefname}" | \ nonfatal emake -C "${basedname}" --no-print-directory M="${T}" \ - dot-config=0 need-config= need-compiler= \ - ${BUILD_FIXES} -s -f - 2>/dev/null + dot-config=0 need-config= need-compiler= -s -f - 2>/dev/null ARCH=${myARCH} fi -- 2.45.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-dev] [PATCH v2 4/4] kernel-2.eclass: Drop reference to BUILD_FIXES variable 2024-07-03 15:42 ` [gentoo-dev] [PATCH v2 1/4] " Ulrich Müller 2024-07-03 15:42 ` [gentoo-dev] [PATCH v2 2/4] linux-info.eclass: Drop support for EAPI 6 Ulrich Müller 2024-07-03 15:42 ` [gentoo-dev] [PATCH v2 3/4] linux-info.eclass: Drop reference to BUILD_FIXES variable Ulrich Müller @ 2024-07-03 15:42 ` Ulrich Müller 2 siblings, 0 replies; 8+ messages in thread From: Ulrich Müller @ 2024-07-03 15:42 UTC (permalink / raw To: gentoo-dev; +Cc: Ulrich Müller Undocumented, and not used by any ebuilds inheriting this eclass. Signed-off-by: Ulrich Müller <ulm@gentoo.org> --- eclass/kernel-2.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index ffbe986f3e87..c60fcb04dd73 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1332,7 +1332,7 @@ getfilevar() { unset ARCH echo -e "include ${basefname}\ne:\n\t@echo \$(${1})" | - make -C "${basedname}" ${BUILD_FIXES} -s -f - e 2>/dev/null + make -C "${basedname}" -s -f - e 2>/dev/null ARCH=${xarch} fi -- 2.45.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-07-03 15:44 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-07-01 21:36 [gentoo-dev] [PATCH 1/2] linux-info.eclass: Drop temporary fix for powerpc Ulrich Müller 2024-07-01 21:36 ` [gentoo-dev] [PATCH 2/2] linux-info.eclass: Drop support for EAPI 6 Ulrich Müller 2024-07-02 5:35 ` [gentoo-dev] [PATCH 1/2] linux-info.eclass: Drop temporary fix for powerpc Ionen Wolkens 2024-07-02 7:38 ` Ulrich Mueller 2024-07-03 15:42 ` [gentoo-dev] [PATCH v2 1/4] " Ulrich Müller 2024-07-03 15:42 ` [gentoo-dev] [PATCH v2 2/4] linux-info.eclass: Drop support for EAPI 6 Ulrich Müller 2024-07-03 15:42 ` [gentoo-dev] [PATCH v2 3/4] linux-info.eclass: Drop reference to BUILD_FIXES variable Ulrich Müller 2024-07-03 15:42 ` [gentoo-dev] [PATCH v2 4/4] kernel-2.eclass: " Ulrich Müller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox