diff --git a/make/target-tools.mk b/make/target-tools.mk index bd4a3f84..dbe4ed77 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -1799,9 +1799,6 @@ $(ARCHIVE)/$(SYSVINIT_SOURCE): SYSVINIT_PATCH = crypt-lib.patch SYSVINIT_PATCH += change-INIT_FIFO.patch -ifeq ($(BOXSERIES), hd2) - SYSVINIT_PATCH += remove-fstack-protector-strong.patch -endif define SYSVINIT_INSTALL for sbin in halt init shutdown killall5; do \ diff --git a/patches/sysvinit/remove-fstack-protector-strong.patch b/patches/sysvinit/remove-fstack-protector-strong.patch deleted file mode 100644 index b4d18535..00000000 --- a/patches/sysvinit/remove-fstack-protector-strong.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index 9ae35df..814b0bd 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -10,7 +10,7 @@ - - CPPFLAGS = - CFLAGS ?= -O2 --override CFLAGS += -ansi -fomit-frame-pointer -fstack-protector-strong -W -Wall -Wunreachable-code -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -D_XOPEN_SOURCE -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" -+override CFLAGS += -ansi -fomit-frame-pointer -W -Wall -Wunreachable-code -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -D_XOPEN_SOURCE -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" - override CFLAGS += $(shell getconf LFS_CFLAGS) - STATIC = - MANDB := s@^\('\\\\\"\)[^\*-]*-\*- coding: [^[:blank:]]\+ -\*-@\1@