diff mbox series

kernel-arch: Simplify strip support

Message ID 20240210142421.3518161-1-richard.purdie@linuxfoundation.org
State Accepted, archived
Commit 598e1db8e63c4224203cee27ed1941601ef9d19c
Headers show
Series kernel-arch: Simplify strip support | expand

Commit Message

Richard Purdie Feb. 10, 2024, 2:24 p.m. UTC
I think these options to strip were added to mirror the other kernel commandline
options. In the strip case, it breaks code such as runstrip() in package.py
since only a single command with no options is supported.

For that reason I find it unlikely anyone is using this. Drop the problematic
variables.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes-recipe/kernel-arch.bbclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Paul Gortmaker Feb. 10, 2024, 10:38 p.m. UTC | #1
[[PATCH] kernel-arch: Simplify strip support] On 10/02/2024 (Sat 14:24) Richard Purdie wrote:

> I think these options to strip were added to mirror the other kernel commandline
> options. In the strip case, it breaks code such as runstrip() in package.py
> since only a single command with no options is supported.
> 
> For that reason I find it unlikely anyone is using this. Drop the problematic
> variables.

Undid the temp patch from IRC yesterday and tested this on the usecase
that revealed the breakage, and it also seems fine (no surprise).

Guess we get to wait and see if it breaks any other use case....

Paul
--

> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/classes-recipe/kernel-arch.bbclass | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/classes-recipe/kernel-arch.bbclass b/meta/classes-recipe/kernel-arch.bbclass
> index 404f2e70612..b32f6137a2f 100644
> --- a/meta/classes-recipe/kernel-arch.bbclass
> +++ b/meta/classes-recipe/kernel-arch.bbclass
> @@ -70,12 +70,11 @@ TARGET_AR_KERNEL_ARCH ?= ""
>  HOST_AR_KERNEL_ARCH ?= "${TARGET_AR_KERNEL_ARCH}"
>  TARGET_OBJCOPY_KERNEL_ARCH ?= ""
>  HOST_OBJCOPY_KERNEL_ARCH ?= "${TARGET_OBJCOPY_KERNEL_ARCH}"
> -TARGET_STRIP_KERNEL_ARCH ?= ""
> -HOST_STRIP_KERNEL_ARCH ?= "${TARGET_STRIP_KERNEL_ARCH}"
>  
>  KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_KERNEL_ARCH} -fuse-ld=bfd ${DEBUG_PREFIX_MAP} -fdebug-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH} -fdebug-prefix-map=${STAGING_KERNEL_BUILDDIR}=${KERNEL_SRC_PATH}"
>  KERNEL_LD = "${HOST_PREFIX}ld.bfd ${HOST_LD_KERNEL_ARCH}"
>  KERNEL_AR = "${HOST_PREFIX}ar ${HOST_AR_KERNEL_ARCH}"
>  KERNEL_OBJCOPY = "${HOST_PREFIX}objcopy ${HOST_OBJCOPY_KERNEL_ARCH}"
> -KERNEL_STRIP = "${HOST_PREFIX}strip ${HOST_STRIP_KERNEL_ARCH}"
> +# Code in package.py can't handle options on KERNEL_STRIP
> +KERNEL_STRIP = "${HOST_PREFIX}strip"
>  TOOLCHAIN ?= "gcc"
> -- 
> 2.40.1
>
diff mbox series

Patch

diff --git a/meta/classes-recipe/kernel-arch.bbclass b/meta/classes-recipe/kernel-arch.bbclass
index 404f2e70612..b32f6137a2f 100644
--- a/meta/classes-recipe/kernel-arch.bbclass
+++ b/meta/classes-recipe/kernel-arch.bbclass
@@ -70,12 +70,11 @@  TARGET_AR_KERNEL_ARCH ?= ""
 HOST_AR_KERNEL_ARCH ?= "${TARGET_AR_KERNEL_ARCH}"
 TARGET_OBJCOPY_KERNEL_ARCH ?= ""
 HOST_OBJCOPY_KERNEL_ARCH ?= "${TARGET_OBJCOPY_KERNEL_ARCH}"
-TARGET_STRIP_KERNEL_ARCH ?= ""
-HOST_STRIP_KERNEL_ARCH ?= "${TARGET_STRIP_KERNEL_ARCH}"
 
 KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_KERNEL_ARCH} -fuse-ld=bfd ${DEBUG_PREFIX_MAP} -fdebug-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH} -fdebug-prefix-map=${STAGING_KERNEL_BUILDDIR}=${KERNEL_SRC_PATH}"
 KERNEL_LD = "${HOST_PREFIX}ld.bfd ${HOST_LD_KERNEL_ARCH}"
 KERNEL_AR = "${HOST_PREFIX}ar ${HOST_AR_KERNEL_ARCH}"
 KERNEL_OBJCOPY = "${HOST_PREFIX}objcopy ${HOST_OBJCOPY_KERNEL_ARCH}"
-KERNEL_STRIP = "${HOST_PREFIX}strip ${HOST_STRIP_KERNEL_ARCH}"
+# Code in package.py can't handle options on KERNEL_STRIP
+KERNEL_STRIP = "${HOST_PREFIX}strip"
 TOOLCHAIN ?= "gcc"