summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Carriere <etienne.carriere@linaro.org>2019-05-14 17:15:04 +0200
committerJérôme Forissier <jerome@forissier.org>2020-05-29 10:56:18 +0200
commitbb1adeff1261bb7705de5ecdff369ee1140f896a (patch)
tree46a19c8809b8eaf5ecf27b7cae4d9219c64971fd
parent3768a2b82413075024658f7f914a5d4ea6d9232c (diff)
Remove deprecated busybox rules
Busybox is no more built as a single package but built as part of the buildroot environment. This change removes busybox rules and resources from Makefile scripts. Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
-rw-r--r--common.mk25
-rw-r--r--rpi3.mk11
-rw-r--r--ti/ti-common.mk2
3 files changed, 1 insertions, 37 deletions
diff --git a/common.mk b/common.mk
index 64d0911..3107a30 100644
--- a/common.mk
+++ b/common.mk
@@ -168,31 +168,6 @@ cc-option = $(strip $(call _cc-option,$(1),$(2),$(3)))
all:
################################################################################
-# Busybox
-################################################################################
-BUSYBOX_COMMON_TARGET ?= TOBEDEFINED
-BUSYBOX_CLEAN_COMMON_TARGET ?= TOBEDEFINED
-
-.PHONY: busybox-common
-busybox-common: linux
- cd $(GEN_ROOTFS_PATH) && \
- CROSS_COMPILE=$(CROSS_COMPILE_NS_USER) \
- PATH=${PATH}:$(LINUX_PATH)/usr \
- $(GEN_ROOTFS_PATH)/generate-cpio-rootfs.sh \
- $(BUSYBOX_COMMON_TARGET)
-
-.PHONY: busybox-clean-common
-busybox-clean-common:
- cd $(GEN_ROOTFS_PATH) && \
- $(GEN_ROOTFS_PATH)/generate-cpio-rootfs.sh \
- $(BUSYBOX_CLEAN_COMMON_TARGET)
-
-.PHONY: busybox-cleaner-common
-busybox-cleaner-common:
- rm -rf $(GEN_ROOTFS_PATH)/build
- rm -rf $(GEN_ROOTFS_PATH)/filelist-final.txt
-
-################################################################################
# Build root
################################################################################
BUILDROOT_ARCH=aarch$(COMPILE_NS_USER)
diff --git a/rpi3.mk b/rpi3.mk
index 417afb5..b27e69c 100644
--- a/rpi3.mk
+++ b/rpi3.mk
@@ -112,17 +112,6 @@ u-boot-defconfig-clean:
rm -f $(U-BOOT_PATH)/.config
################################################################################
-# Busybox
-################################################################################
-BUSYBOX_COMMON_TARGET = rpi3
-BUSYBOX_CLEAN_COMMON_TARGET = rpi3 clean
-
-busybox: busybox-common
-
-busybox-clean: busybox-clean-common
-
-busybox-cleaner: busybox-cleaner-common
-################################################################################
# Linux kernel
################################################################################
LINUX_DEFCONFIG_COMMON_ARCH := arm64
diff --git a/ti/ti-common.mk b/ti/ti-common.mk
index 3e8ecfa..f4cbff7 100644
--- a/ti/ti-common.mk
+++ b/ti/ti-common.mk
@@ -5,7 +5,7 @@
all: u-boot linux optee-os build-fit buildroot
clean: linux-clean u-boot-clean optee-os-clean build-fit-clean buildroot-clean
-cleaner: clean prepare-cleaner busybox-cleaner linux-cleaner
+cleaner: clean prepare-cleaner linux-cleaner
include toolchain.mk