core: change the strip command from a choice to a boolean

Curently, we have a choice to select between stripping and not
stripping. This is legacy code from back when we had a third option,
sstrip (super-strip).

Since we removed sstrip, stripping or not stripping is now just a
boolean rather than a choice.

Make it so.

We make BR2_STRIP_strip default to 'y' to keep the current behaviour of
defaulting to stripping.

Move BR2_STIP_none to legacy, and instruct the user to review the new
setting.

Drop any reference to BR2_STRIP_none in comments.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2017-07-01 14:51:21 +02:00 committed by Thomas Petazzoni
parent 4480d40cc9
commit 0d643fd3e8
4 changed files with 12 additions and 13 deletions

View File

@ -414,13 +414,10 @@ config BR2_DEBUG_3
endchoice endchoice
endif endif
choice
prompt "strip command for binaries on target"
default BR2_STRIP_strip
config BR2_STRIP_strip config BR2_STRIP_strip
bool "strip" bool "strip target binaries"
depends on !BR2_PACKAGE_HOST_ELF2FLT depends on !BR2_PACKAGE_HOST_ELF2FLT
default y
help help
Binaries and libraries in the target filesystem will be Binaries and libraries in the target filesystem will be
stripped using the normal 'strip' command. This allows to save stripped using the normal 'strip' command. This allows to save
@ -428,12 +425,6 @@ config BR2_STRIP_strip
on the target are needed for native debugging, but not when on the target are needed for native debugging, but not when
remote debugging is used. remote debugging is used.
config BR2_STRIP_none
bool "none"
help
Do not strip binaries and libraries in the target filesystem.
endchoice
config BR2_STRIP_EXCLUDE_FILES config BR2_STRIP_EXCLUDE_FILES
string "executables that should not be stripped" string "executables that should not be stripped"
depends on BR2_STRIP_strip depends on BR2_STRIP_strip

View File

@ -145,6 +145,14 @@ endif
############################################################################### ###############################################################################
comment "Legacy options removed in 2017.08" comment "Legacy options removed in 2017.08"
config BR2_STRIP_none
bool "Strip command 'none' has been removed"
select BR2_LEGACY
help
The strip command choice has been changed into a single
boolean option. Please check that the new setting is
correct (in the "Build options" sub-menu)
config BR2_PACKAGE_BEECRYPT_CPP config BR2_PACKAGE_BEECRYPT_CPP
bool "C++ support removed in beecrypt" bool "C++ support removed in beecrypt"
select BR2_LEGACY select BR2_LEGACY

View File

@ -46,7 +46,7 @@ endif
# bootloader itself; none of these are used to build the native # bootloader itself; none of these are used to build the native
# tools. # tools.
# #
# NOTE: TARGET_STRIP is overridden by BR2_STRIP_none, so always # NOTE: TARGET_STRIP is overridden by !BR2_STRIP_strip, so always
# use the cross compile variant to ensure grub2 builds # use the cross compile variant to ensure grub2 builds
GRUB2_CONF_ENV = \ GRUB2_CONF_ENV = \

View File

@ -10,7 +10,7 @@ KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec
KEXEC_LICENSE = GPL-2.0 KEXEC_LICENSE = GPL-2.0
KEXEC_LICENSE_FILES = COPYING KEXEC_LICENSE_FILES = COPYING
# Makefile expects $STRIP -o to work, so needed for BR2_STRIP_none # Makefile expects $STRIP -o to work, so needed for !BR2_STRIP_strip
KEXEC_MAKE_OPTS = STRIP="$(TARGET_CROSS)strip" KEXEC_MAKE_OPTS = STRIP="$(TARGET_CROSS)strip"
ifeq ($(BR2_PACKAGE_KEXEC_ZLIB),y) ifeq ($(BR2_PACKAGE_KEXEC_ZLIB),y)