summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-04-10 22:14:39 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-04-11 05:59:59 +0200
commit7a0263525fe723c2f4bb2d4e78eaf785137ebbdd (patch)
tree734536e076dbfc1e140820e7d10ec711c2c8186f /package
parente7b72e11dc2fb7d15440dca32cff59869dc1c2c3 (diff)
Remove BR2_PREFER_IMA
This option is barely used, no-one is maintaining it or extending it. So let's remove it. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package')
-rw-r--r--package/busybox/busybox.mk8
-rw-r--r--package/busybox/initramfs.mk8
-rw-r--r--package/microcom/microcom.mk7
-rw-r--r--package/setserial/setserial.mk4
4 files changed, 0 insertions, 27 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index cc2097e18..c93f33a01 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -107,14 +107,6 @@ $(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.config
CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
ARCH=$(KERNEL_ARCH) \
EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR)
-ifeq ($(BR2_PREFER_IMA)$(BR2_PACKAGE_BUSYBOX_SNAPSHOT),yy)
- rm -f $@
- $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
- CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
- ARCH=$(KERNEL_ARCH) STRIP="$(STRIPCMD)" \
- EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR) \
- -f scripts/Makefile.IMA
-endif
$(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox
ifeq ($(BR2_PACKAGE_BUSYBOX_FULLINSTALL),y)
diff --git a/package/busybox/initramfs.mk b/package/busybox/initramfs.mk
index 394f483e5..2f1e34cdc 100644
--- a/package/busybox/initramfs.mk
+++ b/package/busybox/initramfs.mk
@@ -86,14 +86,6 @@ $(BUSYBOX_INITRAMFS_DIR)/busybox: $(BUSYBOX_INITRAMFS_DIR)/.configured
ARCH=$(KERNEL_ARCH) \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \
busybox.links busybox
-ifeq ($(BR2_PREFER_IMA)$(BR2_PACKAGE_BUSYBOX_SNAPSHOT),yy)
- rm -f $@
- $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
- CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
- ARCH=$(KERNEL_ARCH) STRIP="$(STRIPCMD)" \
- EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \
- -f scripts/Makefile.IMA
-endif
$(BR2_INITRAMFS_DIR)/bin/busybox: $(BUSYBOX_INITRAMFS_DIR)/busybox
$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
diff --git a/package/microcom/microcom.mk b/package/microcom/microcom.mk
index d171be9aa..f6917236d 100644
--- a/package/microcom/microcom.mk
+++ b/package/microcom/microcom.mk
@@ -46,14 +46,7 @@ $(MICROCOM_DIR)/.configured: $(MICROCOM_DIR)/.unpacked
touch $@
$(MICROCOM_DIR)/microcom: $(MICROCOM_DIR)/.configured
-ifeq ($(BR2_PREFER_IMA),y)
- (cd $(MICROCOM_DIR); \
- $(TARGET_CC) $(TARGET_CFLAGS) $(CFLAGS_COMBINE) \
- $(CFLAGS_WHOLE_PROGRAM) -o $@ $(wildcard $(MICROCOM_DIR)/*.c); \
- )
-else
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(MICROCOM_DIR)
-endif
$(STRIPCMD) $(STRIP_STRIP_ALL) $@
$(TARGET_DIR)/usr/bin/microcom: $(MICROCOM_DIR)/microcom
diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk
index a1d5ab7d2..966763721 100644
--- a/package/setserial/setserial.mk
+++ b/package/setserial/setserial.mk
@@ -36,10 +36,6 @@ endif
touch $(SETSERIAL_DIR)/gorhack.h
touch $@
-ifeq ($(BR2_PREFER_IMA),y)
-SETSERIAL_CFLAGS=$(CFLAGS_COMBINE) $(CFLAGS_WHOLE_PROGRAM)
-endif
-
$(SETSERIAL_DIR)/.configured: $(SETSERIAL_DIR)/.unpacked
(cd $(SETSERIAL_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \