- introduce TARGET_USR_* variables

make/bootstrap.mk

@@ -57,12 +57,12 @@ endif
 	mkdir -p $(TARGET_DIR)/srv
 	mkdir -p $(TARGET_DIR)/sys
 	mkdir -p $(TARGET_DIR)/tmp
-	mkdir -p $(TARGET_DIR)/usr/bin
 	mkdir -p $(TARGET_DIR)/var/bin
 	mkdir -p $(TARGET_DIR)/var/etc/init.d
 	mkdir -p $(TARGET_DIR)/var/keys
 	mkdir -p $(TARGET_DIR)/var/root
 	mkdir -p $(TARGET_DIR)/var/spool/cron/crontabs
+	mkdir -p $(TARGET_USR_BIN_DIR)
 	mkdir -p $(PKG_CONFIG_PATH)
 	make skeleton
 ifeq ($(PERSISTENT_VAR_PARTITION), yes)

make/environment-build.mk

@@ -154,6 +154,14 @@ TARGET_MODULES_DIR = $(TARGET_LIB_DIR)/modules/$(KERNEL_VER)
 TARGET_SBIN_DIR    = $(TARGET_DIR)/sbin
 TARGET_SHARE_DIR   = $(TARGET_DIR)/share
 
+TARGET_USR_DIR         = $(TARGET_DIR)/usr
+TARGET_USR_BIN_DIR     = $(TARGET_USR_DIR)/bin
+TARGET_USR_INCLUDE_DIR = $(TARGET_USR_DIR)/include
+TARGET_USR_LIB_DIR     = $(TARGET_USR_DIR)/lib
+TARGET_USR_MODULES_DIR = $(TARGET_USR_LIB_DIR)/modules/$(KERNEL_VER)
+TARGET_USR_SBIN_DIR    = $(TARGET_USR_DIR)/sbin
+TARGET_USR_SHARE_DIR   = $(TARGET_USR_DIR)/share
+
 TARGET_CFLAGS   = -pipe $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_ABI) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -I$(TARGET_INCLUDE_DIR)
 TARGET_CPPFLAGS = $(TARGET_CFLAGS)
 TARGET_CXXFLAGS = $(TARGET_CFLAGS)

make/target-blobs.mk

@@ -381,10 +381,10 @@ endif
 vuplus-platform-util: $(ARCHIVE)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_TMP)
 	$(UNTAR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE)
-	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(BOXMODEL-PLATFORM-UTIL_TMP)/* $(TARGET_DIR)/usr/bin
+	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(BOXMODEL-PLATFORM-UTIL_TMP)/* $(TARGET_USR_BIN_DIR)
 	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/vuplus-platform-util.init $(TARGET_DIR)/etc/init.d/vuplus-platform-util
 ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo4k))
-	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/bp3flash.sh $(TARGET_DIR)/usr/bin/bp3flash.sh
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/bp3flash.sh $(TARGET_USR_BIN_DIR)/bp3flash.sh
 endif
 	$(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_TMP)
 	$(TOUCH)

make/target-rootfs.mk

@@ -41,8 +41,6 @@ symbolic-links: | $(TARGET_DIR)
 	$(CD) $(TARGET_DIR); \
 		ln -sf /var/root root; \
 		ln -sf /var/root home
-	$(CD) $(TARGET_DIR)/usr; \
-		ln -sf /share share
 	$(CD) $(TARGET_DIR)/var; \
 		rm -rf run; ln -sf /tmp run; \
 		rm -rf tmp; ln -sf /tmp tmp
@@ -62,13 +60,15 @@ endif
 	mkdir -p $(TARGET_DIR)/var/tuxbox/config
 	$(CD) $(TARGET_DIR)/var/tuxbox/config; \
 		ln -sf /var/keys/SoftCam.Key SoftCam.Key
+	$(CD) $(TARGET_USR_DIR); \
+		ln -sf /share share
 
 # -----------------------------------------------------------------------------
 
 e2-multiboot: | $(TARGET_DIR)
-	mkdir -p $(TARGET_DIR)/usr/bin
-	echo -e "#!/bin/sh\necho Nope!" > $(TARGET_DIR)/usr/bin/enigma2
-	chmod 0755 $(TARGET_DIR)/usr/bin/enigma2
+	mkdir -p $(TARGET_USR_BIN_DIR)
+	echo -e "#!/bin/sh\necho Nope!" > $(TARGET_USR_BIN_DIR)/enigma2
+	chmod 0755 $(TARGET_USR_BIN_DIR)/enigma2
 	#
 	echo -e "NI $(IMAGE_VERSION) \\\n \\\l\n" > $(TARGET_DIR)/etc/issue
 	#