Skip to contentSkip to conversation

build: remove sstrip

PATCH New Yann E. MORIN 2 participants 3 messages May 20, 2014

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH 1/1 build: remove sstrip

From: "Yann E. MORIN" <[email protected]>

Quoting Thomas on IRC:

Quoted 2 lines

sstrip is a piece of crap that we should exterminate from the surface of the planet

sstrip is now unmaintained, has a long history of generating butchered binaries in some cases, and does not gain that much space in the end.

Obliviate sstrip from the strip options, anihilate the sstrip package, scortch any reference in fire, and cleanse our tree free of any remnants...

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Maxime Hadjinlian <[email protected]>
---
 Config.in                            | 12 ------------
 configs/armadeus_apf9328_defconfig   |  1 -
 package/Config.in                    |  1 -
 package/Makefile.in                  |  8 --------
 package/sstrip/Config.in             |  7 -------
 package/sstrip/sstrip.mk             | 32 --------------------------------
 support/dependencies/dependencies.mk |  4 ----
 7 files changed, 65 deletions(-)
 delete mode 100644 package/sstrip/Config.in
 delete mode 100644 package/sstrip/sstrip.mk
Config.in +0 -12
index 79a455d..cccfd83 100644
@@ -352,18 +352,6 @@ config BR2_STRIP_strip
 	  symbols on the target are needed for native debugging, but
 	  not when remote debugging is used.
 
-config BR2_STRIP_sstrip
-	bool "sstrip"
-	select BR2_PACKAGE_SSTRIP_HOST
-	depends on !BR2_PACKAGE_HOST_ELF2FLT
-	help
-	  Binaries and libraries in the target filesystem will be
-	  stripped using the 'sstrip' command, which strips a little
-	  bit more than the traditional 'strip' command. This allows to
-	  save space, mainly by removing debugging symbols. Debugging
-	  symbols on the target are needed for native debugging, but
-	  not when remote debugging is used.
-
 config BR2_STRIP_none
 	bool "none"
 	help
configs/armadeus_apf9328_defconfig +0 -1
index b42f757..806e9a8 100644
@@ -3,7 +3,6 @@ BR2_arm=y
 BR2_arm920t=y
 
 # Toolchain
-BR2_STRIP_sstrip=y
 BR2_GCC_VERSION_4_4_X=y
 BR2_PACKAGE_GDB=y
 BR2_PACKAGE_HOST_GDB=y
package/Config.in +0 -1
index 3bc8d24..d09cba3 100644
@@ -119,7 +119,6 @@ source "package/pkgconf/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/sed/Config.in"
 endif
-source "package/sstrip/Config.in"
 source "package/subversion/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/tar/Config.in"
package/Makefile.in +0 -8
index 2fc3aa7..b8d1dad 100644
@@ -200,14 +200,6 @@ TARGET_STRIP=$(TARGET_CROSS)strip
 STRIPCMD=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
 KSTRIPCMD=$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)
 endif
-ifeq ($(BR2_STRIP_sstrip),y)
-STRIP_STRIP_DEBUG:=
-STRIP_STRIP_UNNEEDED:=
-STRIP_STRIP_ALL:=
-TARGET_STRIP=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-sstrip
-STRIPCMD=$(TARGET_STRIP)
-KSTRIPCMD=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note --strip-unneeded
-endif
 ifeq ($(BR2_STRIP_none),y)
 TARGET_STRIP=true
 STRIPCMD=$(TARGET_STRIP)
package/sstrip/Config.in deleted +0 -7
deleted file mode 100644
index 12a5941..0000000
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_SSTRIP
-	bool "sstrip"
-	help
-	  Small utility that removes a few bytes from an executable that
-	  strip leaves behind.
-
-	  http://www.muppetlabs.com/~breadbox/software/elfkickers.html
package/sstrip/sstrip.mk deleted +0 -32
deleted file mode 100644
index deab010..0000000
@@ -1,32 +0,0 @@
-################################################################################
-#
-# sstrip
-#
-################################################################################
-
-SSTRIP_SITE = svn://dev.openwrt.org/openwrt/trunk/tools/sstrip
-SSTRIP_VERSION = 20154
-HOST_SSTRIP_BINARY = $(GNU_TARGET_NAME)-sstrip
-
-define SSTRIP_BUILD_CMDS
-	cd $(@D) ; \
-	$(TARGET_CC) $(TARGET_CFLAGS) -include endian.h -include byteswap.h \
-		-o sstrip src/sstrip.c
-endef
-
-define SSTRIP_INSTALL_TARGET_CMDS
-	$(INSTALL) -D $(@D)/sstrip $(TARGET_DIR)/usr/bin/sstrip
-endef
-
-define HOST_SSTRIP_BUILD_CMDS
-	cd $(@D) ; \
-	$(HOSTCC) $(HOST_CFLAGS) -include endian.h -include byteswap.h \
-		-o sstrip src/sstrip.c
-endef
-
-define HOST_SSTRIP_INSTALL_CMDS
-	$(INSTALL) -D $(@D)/sstrip $(HOST_DIR)/usr/bin/$(HOST_SSTRIP_BINARY)
-endef
-
-$(eval $(generic-package))
-$(eval $(host-generic-package))
support/dependencies/dependencies.mk +0 -4
index 155a909..05d57ff 100644
@@ -16,10 +16,6 @@ $(shell support/dependencies/check-host-$(1).sh $(2))
 endef
 -include $(sort $(wildcard support/dependencies/check-host-*.mk))
 
-ifeq ($(BR2_STRIP_sstrip),y)
-DEPENDENCIES_HOST_PREREQ+=host-sstrip
-endif
-
 ifeq ($(BR2_CCACHE),y)
 DEPENDENCIES_HOST_PREREQ += host-ccache
 endif
Signature · 1 line
1.8.3.2
author
#1 lore raw

PATCH 1/1 build: remove sstrip

All,

On 2014-05-20 23:13 +0200, Yann E. MORIN spake thusly:

Quoted 11 lines

From: "Yann E. MORIN" <[email protected]>

Quoting Thomas on IRC:

Quoted 2 lines

sstrip is a piece of crap that we should exterminate from the surface of the planet

sstrip is now unmaintained, has a long history of generating butchered binaries in some cases, and does not gain that much space in the end.

Obliviate sstrip from the strip options, anihilate the sstrip package, scortch any reference in fire, and cleanse our tree free of any remnants...

Missing legacy option, though. Will respin a bit later...

Regards,
Yann E. MORIN.

Quoted 150 lines
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Maxime Hadjinlian <[email protected]>
---
 Config.in                            | 12 ------------
 configs/armadeus_apf9328_defconfig   |  1 -
 package/Config.in                    |  1 -
 package/Makefile.in                  |  8 --------
 package/sstrip/Config.in             |  7 -------
 package/sstrip/sstrip.mk             | 32 --------------------------------
 support/dependencies/dependencies.mk |  4 ----
 7 files changed, 65 deletions(-)
 delete mode 100644 package/sstrip/Config.in
 delete mode 100644 package/sstrip/sstrip.mk
Config.in +0 -12
index 79a455d..cccfd83 100644
@@ -352,18 +352,6 @@ config BR2_STRIP_strip
 	  symbols on the target are needed for native debugging, but
 	  not when remote debugging is used.
 
-config BR2_STRIP_sstrip
-	bool "sstrip"
-	select BR2_PACKAGE_SSTRIP_HOST
-	depends on !BR2_PACKAGE_HOST_ELF2FLT
-	help
-	  Binaries and libraries in the target filesystem will be
-	  stripped using the 'sstrip' command, which strips a little
-	  bit more than the traditional 'strip' command. This allows to
-	  save space, mainly by removing debugging symbols. Debugging
-	  symbols on the target are needed for native debugging, but
-	  not when remote debugging is used.
-
 config BR2_STRIP_none
 	bool "none"
 	help
configs/armadeus_apf9328_defconfig +0 -1
index b42f757..806e9a8 100644
@@ -3,7 +3,6 @@ BR2_arm=y
 BR2_arm920t=y
 
 # Toolchain
-BR2_STRIP_sstrip=y
 BR2_GCC_VERSION_4_4_X=y
 BR2_PACKAGE_GDB=y
 BR2_PACKAGE_HOST_GDB=y
package/Config.in +0 -1
index 3bc8d24..d09cba3 100644
@@ -119,7 +119,6 @@ source "package/pkgconf/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/sed/Config.in"
 endif
-source "package/sstrip/Config.in"
 source "package/subversion/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/tar/Config.in"
package/Makefile.in +0 -8
index 2fc3aa7..b8d1dad 100644
@@ -200,14 +200,6 @@ TARGET_STRIP=$(TARGET_CROSS)strip
 STRIPCMD=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
 KSTRIPCMD=$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)
 endif
-ifeq ($(BR2_STRIP_sstrip),y)
-STRIP_STRIP_DEBUG:=
-STRIP_STRIP_UNNEEDED:=
-STRIP_STRIP_ALL:=
-TARGET_STRIP=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-sstrip
-STRIPCMD=$(TARGET_STRIP)
-KSTRIPCMD=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note --strip-unneeded
-endif
 ifeq ($(BR2_STRIP_none),y)
 TARGET_STRIP=true
 STRIPCMD=$(TARGET_STRIP)
package/sstrip/Config.in deleted +0 -7
deleted file mode 100644
index 12a5941..0000000
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_SSTRIP
-	bool "sstrip"
-	help
-	  Small utility that removes a few bytes from an executable that
-	  strip leaves behind.
-
-	  http://www.muppetlabs.com/~breadbox/software/elfkickers.html
package/sstrip/sstrip.mk deleted +0 -32
deleted file mode 100644
index deab010..0000000
@@ -1,32 +0,0 @@
-################################################################################
-#
-# sstrip
-#
-################################################################################
-
-SSTRIP_SITE = svn://dev.openwrt.org/openwrt/trunk/tools/sstrip
-SSTRIP_VERSION = 20154
-HOST_SSTRIP_BINARY = $(GNU_TARGET_NAME)-sstrip
-
-define SSTRIP_BUILD_CMDS
-	cd $(@D) ; \
-	$(TARGET_CC) $(TARGET_CFLAGS) -include endian.h -include byteswap.h \
-		-o sstrip src/sstrip.c
-endef
-
-define SSTRIP_INSTALL_TARGET_CMDS
-	$(INSTALL) -D $(@D)/sstrip $(TARGET_DIR)/usr/bin/sstrip
-endef
-
-define HOST_SSTRIP_BUILD_CMDS
-	cd $(@D) ; \
-	$(HOSTCC) $(HOST_CFLAGS) -include endian.h -include byteswap.h \
-		-o sstrip src/sstrip.c
-endef
-
-define HOST_SSTRIP_INSTALL_CMDS
-	$(INSTALL) -D $(@D)/sstrip $(HOST_DIR)/usr/bin/$(HOST_SSTRIP_BINARY)
-endef
-
-$(eval $(generic-package))
-$(eval $(host-generic-package))
support/dependencies/dependencies.mk +0 -4
index 155a909..05d57ff 100644
@@ -16,10 +16,6 @@ $(shell support/dependencies/check-host-$(1).sh $(2))
 endef
 -include $(sort $(wildcard support/dependencies/check-host-*.mk))
 
-ifeq ($(BR2_STRIP_sstrip),y)
-DEPENDENCIES_HOST_PREREQ+=host-sstrip
-endif
-
 ifeq ($(BR2_CCACHE),y)
 DEPENDENCIES_HOST_PREREQ += host-ccache
 endif
Signature · 1 line
1.8.3.2
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 build: remove sstrip

Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

All,
On 2014-05-20 23:13 +0200, Yann E. MORIN spake thusly:

Quoted 6 lines

From: "Yann E. MORIN" <[email protected]>

Quoting Thomas on IRC:

Quoted 2 lines

sstrip is a piece of crap that we should exterminate from the surface of the planet

Quoted 7 lines
Quoted 5 lines

sstrip is now unmaintained, has a long history of generating butchered binaries in some cases, and does not gain that much space in the end.

Obliviate sstrip from the strip options, anihilate the sstrip package, scortch any reference in fire, and cleanse our tree free of any remnants...

Missing legacy option, though. Will respin a bit later...

Thanks. As mentioned on IRC I would prefer to see two patches:

- One to mark it as deprecated for 2014.05 (BR2_DEPRECATED_SINCE_2014_05)
- And another to remove it. This we can normally only merge for 205.05.

Signature · 1 line
Bye, Peter Korsgaard