From 4565b8cb4572a3389a61f9355bef5a4809974959 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 18 Nov 2018 00:08:28 +0100 Subject: [PATCH] - reduce usage of BOXTYPE_SC variable to avoid mistakes with BOXARCH variable * BOXTYPE_SC is now only use to reduce length of image/kernel output filenames --- Makefile | 4 +-- ...rm.patch => links-2.17-input-armbox.patch} | 0 ...atch => links-2.17-input-coolstream.patch} | 0 make/{ffmpeg-arm.mk => ffmpeg-armbox.mk} | 0 make/{ffmpeg-cst.mk => ffmpeg-coolstream.mk} | 0 make/images.mk | 22 ++++++------ make/{kernel-arm.mk => kernel-armbox.mk} | 8 ++--- make/{kernel-cst.mk => kernel-coolstream.mk} | 34 +++++++++---------- make/ni.mk | 2 +- make/plugins.mk | 2 +- 10 files changed, 36 insertions(+), 36 deletions(-) rename archive-patches/{links-2.17-input-arm.patch => links-2.17-input-armbox.patch} (100%) rename archive-patches/{links-2.17-input-cst.patch => links-2.17-input-coolstream.patch} (100%) rename make/{ffmpeg-arm.mk => ffmpeg-armbox.mk} (100%) rename make/{ffmpeg-cst.mk => ffmpeg-coolstream.mk} (100%) rename make/{kernel-arm.mk => kernel-armbox.mk} (92%) rename make/{kernel-cst.mk => kernel-coolstream.mk} (85%) diff --git a/Makefile b/Makefile index 828a181a..d8c2bdbb 100755 --- a/Makefile +++ b/Makefile @@ -92,12 +92,12 @@ include make/bootstrap.mk include make/clean.mk include make/crosstool.mk include make/development-tools.mk -include make/ffmpeg-$(BOXTYPE_SC).mk +include make/ffmpeg-$(BOXTYPE).mk include make/gstreamer.mk include make/host-tools.mk include make/image-update.mk include make/images.mk -include make/kernel-$(BOXTYPE_SC).mk +include make/kernel-$(BOXTYPE).mk include make/neutrino.mk include make/plugins-extra.mk include make/plugins.mk diff --git a/archive-patches/links-2.17-input-arm.patch b/archive-patches/links-2.17-input-armbox.patch similarity index 100% rename from archive-patches/links-2.17-input-arm.patch rename to archive-patches/links-2.17-input-armbox.patch diff --git a/archive-patches/links-2.17-input-cst.patch b/archive-patches/links-2.17-input-coolstream.patch similarity index 100% rename from archive-patches/links-2.17-input-cst.patch rename to archive-patches/links-2.17-input-coolstream.patch diff --git a/make/ffmpeg-arm.mk b/make/ffmpeg-armbox.mk similarity index 100% rename from make/ffmpeg-arm.mk rename to make/ffmpeg-armbox.mk diff --git a/make/ffmpeg-cst.mk b/make/ffmpeg-coolstream.mk similarity index 100% rename from make/ffmpeg-cst.mk rename to make/ffmpeg-coolstream.mk diff --git a/make/images.mk b/make/images.mk index 3cc52433..6ae3da12 100644 --- a/make/images.mk +++ b/make/images.mk @@ -51,17 +51,17 @@ devtable-remove: flash-image: ifeq ($(BOXMODEL), nevis) - make flash-image-cst ERASE_SIZE=0x20000 BOXNAME="HD1, BSE, Neo, Neo², Zee" + make flash-image-coolstream ERASE_SIZE=0x20000 BOXNAME="HD1, BSE, Neo, Neo², Zee" endif ifeq ($(BOXFAMILY), apollo) - make flash-image-cst ERASE_SIZE=0x40000 BOXNAME="Tank" IMAGE_SUFFIX=$(BOXTYPE_SC)-apollo - make flash-image-cst ERASE_SIZE=0x20000 BOXNAME="Trinity" IMAGE_SUFFIX=$(BOXTYPE_SC)-shiner + make flash-image-coolstream ERASE_SIZE=0x40000 BOXNAME="Tank" IMAGE_SUFFIX=$(BOXTYPE_SC)-apollo + make flash-image-coolstream ERASE_SIZE=0x20000 BOXNAME="Trinity" IMAGE_SUFFIX=$(BOXTYPE_SC)-shiner endif ifeq ($(BOXMODEL), kronos) - make flash-image-cst ERASE_SIZE=0x20000 BOXNAME="Zee², Trinity V2" + make flash-image-coolstream ERASE_SIZE=0x20000 BOXNAME="Zee², Trinity V2" endif ifeq ($(BOXMODEL), kronos_v2) - make flash-image-cst ERASE_SIZE=0x20000 BOXNAME="Link, Trinity Duo" + make flash-image-coolstream ERASE_SIZE=0x20000 BOXNAME="Link, Trinity Duo" endif ifeq ($(BOXMODEL), hd51) make flash-image-arm @@ -70,11 +70,11 @@ endif # ----------------------------------------------------------------------------- -flash-image-cst: IMAGE_NAME=$(IMAGE_PREFIX)-$(IMAGE_SUFFIX) -flash-image-cst: IMAGE_DESC="$(BOXNAME) [$(IMAGE_SUFFIX)][$(BOXSERIES)] $(shell echo $(IMAGE_TYPE_STRING) | sed 's/.*/\u&/')" -flash-image-cst: IMAGE_MD5FILE=$(IMAGE_TYPE_STRING)-$(IMAGE_SUFFIX).txt -flash-image-cst: IMAGE_DATE=$(shell cat $(ROOTFS)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-) -flash-image-cst: +flash-image-coolstream: IMAGE_NAME=$(IMAGE_PREFIX)-$(IMAGE_SUFFIX) +flash-image-coolstream: IMAGE_DESC="$(BOXNAME) [$(IMAGE_SUFFIX)][$(BOXSERIES)] $(shell echo $(IMAGE_TYPE_STRING) | sed 's/.*/\u&/')" +flash-image-coolstream: IMAGE_MD5FILE=$(IMAGE_TYPE_STRING)-$(IMAGE_SUFFIX).txt +flash-image-coolstream: IMAGE_DATE=$(shell cat $(ROOTFS)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-) +flash-image-coolstream: make devtable mkfs.jffs2 -e $(ERASE_SIZE) $(MKFSFLAGS) -o $(IMAGE_DIR)/$(IMAGE_NAME).img make devtable-remove @@ -214,7 +214,7 @@ flash-image-arm-multi: PHONY += devtable PHONY += devtable-remove PHONY += images -PHONY += flash-image-cst +PHONY += flash-image-coolstream PHONY += check-image-size PHONY += flash-image-arm PHONY += flash-image-arm-multi diff --git a/make/kernel-arm.mk b/make/kernel-armbox.mk similarity index 92% rename from make/kernel-arm.mk rename to make/kernel-armbox.mk index 1d9e584c..f461b3e9 100644 --- a/make/kernel-arm.mk +++ b/make/kernel-armbox.mk @@ -10,7 +10,7 @@ MODULES_DIR = $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules/lib/modules/$(KERNEL_ TARGET_MODULES_DIR = $(TARGET_LIB_DIR)/modules/$(KERNEL_VERSION_FULL) -$(D)/kernel-arm: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR) +$(D)/kernel-armbox: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR) $(REMOVE)/linux-$(KERNEL_VERSION) cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL); \ git checkout $(KERNEL_BRANCH) @@ -29,11 +29,11 @@ $(D)/kernel-arm: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR) $(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules modules_install $(TOUCH) -kernel-arm-modules: $(D)/kernel-arm +kernel-armbox-modules: $(D)/kernel-armbox cp -a $(MODULES_DIR)/kernel $(TARGET_MODULES_DIR) cp -a $(MODULES_DIR)/modules.builtin $(TARGET_MODULES_DIR) cp -a $(MODULES_DIR)/modules.order $(TARGET_MODULES_DIR) - make depmod-arm + make depmod-armbox -depmod-arm: +depmod-armbox: PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGET_DIR) $(KERNEL_VERSION_FULL) diff --git a/make/kernel-cst.mk b/make/kernel-coolstream.mk similarity index 85% rename from make/kernel-cst.mk rename to make/kernel-coolstream.mk index 724a991d..6bbadfdf 100644 --- a/make/kernel-cst.mk +++ b/make/kernel-coolstream.mk @@ -16,21 +16,21 @@ else KERNEL_DESTDIR = $(SKEL_ROOT)/var/update endif -kernel-cst: kernel-cst-$(BOXSERIES) -kernel-cst-install: kernel-cst-install-$(BOXSERIES) +kernel-coolstream: kernel-coolstream-$(BOXSERIES) +kernel-coolstream-install: kernel-coolstream-install-$(BOXSERIES) -kernel-cst-install-all: +kernel-coolstream-install-all: make clean BOXFAMILY=nevis - make -j$(NUM_CPUS) kernel-cst-hd1 BOXFAMILY=nevis - make kernel-cst-install-hd1 BOXFAMILY=nevis + make -j$(NUM_CPUS) kernel-coolstream-hd1 BOXFAMILY=nevis + make kernel-coolstream-install-hd1 BOXFAMILY=nevis # make clean BOXFAMILY=apollo - make -j$(NUM_CPUS) kernel-cst-hd2 BOXFAMILY=apollo - make kernel-cst-install-hd2 BOXFAMILY=apollo + make -j$(NUM_CPUS) kernel-coolstream-hd2 BOXFAMILY=apollo + make kernel-coolstream-install-hd2 BOXFAMILY=apollo # make clean BOXFAMILY=kronos - make -j$(NUM_CPUS) kernel-cst-hd2 BOXFAMILY=kronos - make kernel-cst-install-hd2 BOXFAMILY=kronos + make -j$(NUM_CPUS) kernel-coolstream-hd2 BOXFAMILY=kronos + make kernel-coolstream-install-hd2 BOXFAMILY=kronos # make clean BOXFAMILY=nevis > /dev/null 2>&1 make get-update-info-hd1 BOXFAMILY=nevis @@ -43,7 +43,7 @@ kernel-cst-install-all: # make clean > /dev/null 2>&1 -$(D)/kernel-cst-hd2: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) $(SOURCE_DIR)/$(NI_DRIVERS-BIN) | $(TARGET_DIR) +$(D)/kernel-coolstream-hd2: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) $(SOURCE_DIR)/$(NI_DRIVERS-BIN) | $(TARGET_DIR) $(REMOVE)/linux-$(KERNEL_VERSION) cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL); \ git checkout $(KERNEL_BRANCH) @@ -70,10 +70,10 @@ ifeq ($(BOXFAMILY), apollo) endif $(TOUCH) -kernel-cst-install-hd2: $(D)/kernel-cst-hd2 +kernel-coolstream-install-hd2: $(D)/kernel-coolstream-hd2 cp -af $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(KERNEL_DESTDIR)/vmlinux.ub.gz -$(D)/kernel-cst-hd1: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR) +$(D)/kernel-coolstream-hd1: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR) $(REMOVE)/linux-$(KERNEL_VERSION) cd $(SOURCE_DIR)/$(NI_LINUX-KERNEL); \ git checkout $(KERNEL_BRANCH) @@ -93,12 +93,12 @@ $(D)/kernel-cst-hd1: $(SOURCE_DIR)/$(NI_LINUX-KERNEL) | $(TARGET_DIR) mkimage -A arm -O linux -T kernel -C none -a 0x48000 -e 0x48000 -n "$(KERNEL_NAME)" -d $(ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img $(TOUCH) -kernel-cst-install-hd1: $(D)/kernel-cst-hd1 +kernel-coolstream-install-hd1: $(D)/kernel-coolstream-hd1 cp -af $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-zImage.img $(KERNEL_DESTDIR)/zImage -kernel-cst-modules: kernel-cst-modules-$(BOXSERIES) +kernel-coolstream-modules: kernel-coolstream-modules-$(BOXSERIES) -kernel-cst-modules-hd1: kernel-cst +kernel-coolstream-modules-hd1: kernel-coolstream $(TARGET)-objcopy --strip-unneeded $(MODULES_DIR)/kernel/drivers/mtd/devices/mtdram.ko cp -af $(MODULES_DIR)/kernel/drivers/mtd/devices/mtdram.ko $(TARGET_MODULES_DIR) $(TARGET)-objcopy --strip-unneeded $(MODULES_DIR)/kernel/drivers/mtd/devices/block2mtd.ko @@ -122,8 +122,8 @@ kernel-cst-modules-hd1: kernel-cst rm -rf $(TARGET_MODULES_DIR)/usb-storage.ko # builtin already make depmod-hd1 -kernel-cst-modules-hd2: kernel-cst - rm -rf $(TARGET_MODULES_DIR)/kernel # nuke cst kernel-drivers but leave cst extra-drivers +kernel-coolstream-modules-hd2: kernel-coolstream + rm -rf $(TARGET_MODULES_DIR)/kernel # nuke coolstream kernel-drivers but leave coolstream extra-drivers cp -a $(MODULES_DIR)/kernel $(TARGET_MODULES_DIR) # copy own kernel-drivers cp -a $(MODULES_DIR)/modules.builtin $(TARGET_MODULES_DIR) cp -a $(MODULES_DIR)/modules.order $(TARGET_MODULES_DIR) diff --git a/make/ni.mk b/make/ni.mk index d48a19d2..25fa7b27 100644 --- a/make/ni.mk +++ b/make/ni.mk @@ -76,7 +76,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51)) make -j$(NUM_CPUS) gdb endif endif - make -j$(NUM_CPUS) kernel-$(BOXTYPE_SC)-modules + make -j$(NUM_CPUS) kernel-$(BOXTYPE)-modules make autofs5 make scripts make init-scripts diff --git a/make/plugins.mk b/make/plugins.mk index 839f6291..1daf370f 100644 --- a/make/plugins.mk +++ b/make/plugins.mk @@ -561,7 +561,7 @@ $(LIBPLUGINS)/shellexec.so: $(D)/freetype $(LIBPLUGINS) $(SHAREFLEX) $(VARCONFIG LINKS_PATCH = links-$(LINKS_VER).patch LINKS_PATCH += links-$(LINKS_VER)-ac-prog-cxx.patch -LINKS_PATCH += links-$(LINKS_VER)-input-$(BOXTYPE_SC).patch +LINKS_PATCH += links-$(LINKS_VER)-input-$(BOXTYPE).patch $(D)/links: $(D)/libpng $(D)/libjpeg $(D)/openssl $(ARCHIVE)/links-$(LINKS_VER).tar.bz2 $(LIBPLUGINS) | $(TARGET_DIR) $(REMOVE)/links-$(LINKS_VER)