Browse Source

- add TARGET_BIN_DIR target

master
vanhofen 6 years ago
parent
commit
c465810c00
  1. 9
      make/bootstrap.mk
  2. 1
      make/environment-build.mk
  3. 1
      make/environment-target.mk

9
make/bootstrap.mk

@ -11,6 +11,7 @@ BOOTSTRAP += $(IMAGE_DIR)
BOOTSTRAP += $(UPDATE_DIR) BOOTSTRAP += $(UPDATE_DIR)
BOOTSTRAP += $(HOST_DIR)/bin BOOTSTRAP += $(HOST_DIR)/bin
BOOTSTRAP += cross-libs BOOTSTRAP += cross-libs
BOOTSTRAP += bins
BOOTSTRAP += includes BOOTSTRAP += includes
BOOTSTRAP += libs BOOTSTRAP += libs
BOOTSTRAP += firmware BOOTSTRAP += firmware
@ -35,7 +36,6 @@ skeleton: | $(TARGET_DIR)
target-dir: target-dir:
mkdir -p $(TARGET_DIR) mkdir -p $(TARGET_DIR)
mkdir -p $(TARGET_DIR)/bin
ifeq ($(BOXSERIES), hd51) ifeq ($(BOXSERIES), hd51)
mkdir -p $(TARGET_DIR)/boot mkdir -p $(TARGET_DIR)/boot
endif endif
@ -78,6 +78,9 @@ $(HOST_DIR):
$(HOST_DIR)/bin: $(HOST_DIR) $(HOST_DIR)/bin: $(HOST_DIR)
mkdir -p $@ mkdir -p $@
$(TARGET_BIN_DIR): | $(TARGET_DIR)
mkdir -p $@
$(TARGET_INCLUDE_DIR): | $(TARGET_DIR) $(TARGET_INCLUDE_DIR): | $(TARGET_DIR)
mkdir -p $@ mkdir -p $@
ifeq ($(BOXTYPE), armbox) ifeq ($(BOXTYPE), armbox)
@ -140,6 +143,8 @@ ifeq ($(BOXSERIES), hd51)
ln -sf ld-2.23.so ld-linux.so.3 ln -sf ld-2.23.so ld-linux.so.3
endif endif
bins: $(TARGET_BIN_DIR)
includes: $(TARGET_INCLUDE_DIR) includes: $(TARGET_INCLUDE_DIR)
libs: $(TARGET_LIB_DIR) static-libs $(STATIC_LIB_DIR) libs: $(TARGET_LIB_DIR) static-libs $(STATIC_LIB_DIR)
@ -153,6 +158,7 @@ var-update: $(TARGET_DIR)/var/update
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# hack to make sure they are always copied # hack to make sure they are always copied
PHONY += $(TARGET_BIN_DIR)
PHONY += $(TARGET_INCLUDE_DIR) PHONY += $(TARGET_INCLUDE_DIR)
PHONY += $(TARGET_LIB_DIR) PHONY += $(TARGET_LIB_DIR)
PHONY += $(TARGET_LIB_DIR)/firmware PHONY += $(TARGET_LIB_DIR)/firmware
@ -166,6 +172,7 @@ PHONY += bootstrap
PHONY += skeleton PHONY += skeleton
PHONY += target-dir PHONY += target-dir
PHONY += cross-libs PHONY += cross-libs
PHONY += bins
PHONY += includes PHONY += includes
PHONY += libs PHONY += libs
PHONY += firmware PHONY += firmware

1
make/environment-build.mk

@ -237,6 +237,7 @@ else ifeq ($(BOXSERIES), hd51)
endif endif
STATIC_LIB_DIR = $(STATIC_DIR)/lib STATIC_LIB_DIR = $(STATIC_DIR)/lib
TARGET_BIN_DIR = $(TARGET_DIR)/bin
TARGET_LIB_DIR = $(TARGET_DIR)/lib TARGET_LIB_DIR = $(TARGET_DIR)/lib
TARGET_MODULES_DIR = $(TARGET_LIB_DIR)/modules/$(KERNEL_VERSION_FULL) TARGET_MODULES_DIR = $(TARGET_LIB_DIR)/modules/$(KERNEL_VERSION_FULL)
TARGET_INCLUDE_DIR = $(TARGET_DIR)/include TARGET_INCLUDE_DIR = $(TARGET_DIR)/include

1
make/environment-target.mk

@ -17,7 +17,6 @@ VARCONFIG = $(TARGET_DIR)/var/tuxbox/config
VARINITD = $(TARGET_DIR)/var/etc/init.d VARINITD = $(TARGET_DIR)/var/etc/init.d
VARPLUGINS = $(TARGET_DIR)/var/tuxbox/plugins VARPLUGINS = $(TARGET_DIR)/var/tuxbox/plugins
$(BIN) \
$(ETCINITD) \ $(ETCINITD) \
$(LIBPLUGINS) \ $(LIBPLUGINS) \
$(SBIN) \ $(SBIN) \

Loading…
Cancel
Save