diff --git a/Makefile b/Makefile index 734ef760..0dbb546d 100755 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # ----------------------------------------------------------------------------- UID := $(shell id -u) -ifeq ($(UID), 0) +ifeq ($(UID),0) warn: @echo "You are running as root. Don't do this, it's dangerous." @echo "Refusing to build. Good bye." diff --git a/make/bootstrap.mk b/make/bootstrap.mk index 679b5018..cf7ce94a 100644 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -18,7 +18,7 @@ BOOTSTRAP += target-dir BOOTSTRAP += libs-static BOOTSTRAP += libs-cross -ifeq ($(BOXTYPE), $(filter $(BOXTYPE), coolstream)) +ifeq ($(BOXTYPE),$(filter $(BOXTYPE),coolstream)) BOOTSTRAP += var-update endif @@ -52,7 +52,7 @@ target-dir: mkdir -p $(TARGET_localstatedir)/keys mkdir -p $(TARGET_localstatedir)/root mkdir -p $(TARGET_localstatedir)/spool/cron/crontabs -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) mkdir -p $(TARGET_DIR)/boot endif mkdir -p $(TARGET_DIR)/dev @@ -65,8 +65,8 @@ endif mkdir -p $(TARGET_DIR)/tmp mkdir -p $(PKG_CONFIG_PATH) make skeleton -ifeq ($(PERSISTENT_VAR_PARTITION), yes) - ifeq ($(IMAGE_NEW), yes) +ifeq ($(PERSISTENT_VAR_PARTITION),yes) + ifeq ($(IMAGE_NEW),yes) touch -f $(TARGET_localstatedir)/etc/.newimage endif endif @@ -99,7 +99,7 @@ libs-cross: | $(TARGET_DIR) else \ false; \ fi -ifeq ($(BOXSERIES), hd2) +ifeq ($(BOXSERIES),hd2) $(CD) $(TARGET_base_libdir); \ ln -sf libuClibc-$(UCLIBC_VER).so libcrypt.so.0; \ ln -sf libuClibc-$(UCLIBC_VER).so libdl.so.0; \ @@ -107,25 +107,25 @@ ifeq ($(BOXSERIES), hd2) ln -sf libuClibc-$(UCLIBC_VER).so libpthread.so.0; \ ln -sf libuClibc-$(UCLIBC_VER).so librt.so.0 endif -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) $(CD) $(TARGET_base_libdir); \ ln -sf ld-2.23.so ld-linux.so.3 endif # ----------------------------------------------------------------------------- -ifeq ($(BOXTYPE), $(filter $(BOXTYPE), coolstream)) +ifeq ($(BOXTYPE),$(filter $(BOXTYPE),coolstream)) var-update: $(TARGET_localstatedir)/update $(TARGET_localstatedir)/update: | $(TARGET_DIR) mkdir -p $(@) -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1)) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1)) $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/zImage $(@) -else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2)) +else ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2)) $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/vmlinux.ub.gz $(@) $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/uldr.bin $(@) - ifeq ($(BOXMODEL), kronos_v2) + ifeq ($(BOXMODEL),kronos_v2) $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/u-boot.bin.kronos_v2 $(@)/u-boot.bin else $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/u-boot.bin $(@) diff --git a/make/crosstool.mk b/make/crosstool.mk index ceb74c96..4f04197c 100644 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -62,7 +62,7 @@ CROSSTOOL-NG_SITE = https://github.com/neutrino-images CROSSTOOL-NG_PATCH = crosstool-ng-bash-version.patch CROSSTOOL-NG_CONFIG = $(CONFIGS)/ct-ng-$(BOXTYPE).config -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2)) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) CROSSTOOL-NG_CONFIG = $(CONFIGS)/ct-ng-$(BOXTYPE)-$(BOXSERIES).config endif @@ -87,11 +87,11 @@ $(CROSS_DIR): | $(BUILD_DIR) $(REMOVE)/$(CROSSTOOL-NG_DIR) $(GET-GIT-SOURCE) $(CROSSTOOL-NG_SITE)/$(CROSSTOOL-NG_SOURCE) $(DL_DIR)/$(CROSSTOOL-NG_SOURCE) $(CPDIR)/$(CROSSTOOL-NG_SOURCE) -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2)) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) $(CHDIR)/$(CROSSTOOL-NG_DIR); \ git checkout 1dbb06f2; \ - $(call apply_patches, $(CROSSTOOL-NG_PATCH)) - ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2)) + $(call apply_patches,$(CROSSTOOL-NG_PATCH)) + ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2)) $(CHDIR)/$(CROSSTOOL-NG_DIR); \ $(INSTALL_COPY) $(PATCHES)/crosstool-ng/gcc/* patches/gcc/linaro-6.3-2017.02 endif @@ -112,7 +112,7 @@ endif chmod 0755 ct-ng; \ ./ct-ng oldconfig; \ ./ct-ng build -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2)) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) test -e $(CROSS_DIR)/$(TARGET)/lib && mv $(CROSS_DIR)/$(TARGET)/lib $(CROSS_DIR)/$(TARGET)/lib.x endif test -e $(CROSS_DIR)/$(TARGET)/lib || ln -sf sys-root/lib $(CROSS_DIR)/$(TARGET)/ diff --git a/make/environment-box.mk b/make/environment-box.mk index f742c37b..1f251cbc 100644 --- a/make/environment-box.mk +++ b/make/environment-box.mk @@ -37,51 +37,51 @@ # assign by given BOXSERIES ifneq ($(BOXSERIES),) - ifeq ($(BOXSERIES), hd1) + ifeq ($(BOXSERIES),hd1) BOXTYPE = coolstream BOXFAMILY = nevis BOXMODEL = nevis - else ifeq ($(BOXSERIES), hd2) + else ifeq ($(BOXSERIES),hd2) BOXTYPE = coolstream BOXFAMILY = apollo BOXMODEL = apollo - else ifeq ($(BOXSERIES), hd5x) + else ifeq ($(BOXSERIES),hd5x) BOXTYPE = armbox BOXFAMILY = bcm7251s BOXMODEL = hd51 - else ifeq ($(BOXSERIES), hd6x) + else ifeq ($(BOXSERIES),hd6x) BOXTYPE = armbox BOXFAMILY = hi3798m BOXMODEL = hd61 - else ifeq ($(BOXSERIES), vusolo4k) + else ifeq ($(BOXSERIES),vusolo4k) BOXTYPE = armbox BOXFAMILY = bcm7376 BOXMODEL = vusolo4k - else ifeq ($(BOXSERIES), vuduo4k) + else ifeq ($(BOXSERIES),vuduo4k) BOXTYPE = armbox BOXFAMILY = bcm7278 BOXMODEL = vuduo4k - else ifeq ($(BOXSERIES), vuduo4kse) + else ifeq ($(BOXSERIES),vuduo4kse) BOXTYPE = armbox BOXFAMILY = bcm7444s BOXMODEL = vuduo4kse - else ifeq ($(BOXSERIES), vuultimo4k) + else ifeq ($(BOXSERIES),vuultimo4k) BOXTYPE = armbox BOXFAMILY = bcm7444s BOXMODEL = vuultimo4k - else ifeq ($(BOXSERIES), vuzero4k) + else ifeq ($(BOXSERIES),vuzero4k) BOXTYPE = armbox BOXFAMILY = bcm72604 BOXMODEL = vuzero4k - else ifeq ($(BOXSERIES), vuuno4k) + else ifeq ($(BOXSERIES),vuuno4k) BOXTYPE = armbox BOXFAMILY = bcm7252s BOXMODEL = vuuno4k - else ifeq ($(BOXSERIES), vuuno4kse) + else ifeq ($(BOXSERIES),vuuno4kse) BOXTYPE = armbox BOXFAMILY = bcm7252s BOXMODEL = vuuno4kse - else ifeq ($(BOXSERIES), vuduo) + else ifeq ($(BOXSERIES),vuduo) BOXTYPE = mipsbox BOXFAMILY = bcm7335 BOXMODEL = vuduo @@ -91,47 +91,47 @@ ifneq ($(BOXSERIES),) # assign by given BOXFAMILY else ifneq ($(BOXFAMILY),) - ifeq ($(BOXFAMILY), nevis) + ifeq ($(BOXFAMILY),nevis) BOXTYPE = coolstream BOXSERIES = hd1 BOXMODEL = nevis - else ifeq ($(BOXFAMILY), apollo) + else ifeq ($(BOXFAMILY),apollo) BOXTYPE = coolstream BOXSERIES = hd2 BOXMODEL = apollo - else ifeq ($(BOXFAMILY), kronos) + else ifeq ($(BOXFAMILY),kronos) BOXTYPE = coolstream BOXSERIES = hd2 BOXMODEL = kronos - else ifeq ($(BOXFAMILY), bcm7251s) + else ifeq ($(BOXFAMILY),bcm7251s) BOXTYPE = armbox BOXSERIES = hd5x BOXMODEL = hd51 - else ifeq ($(BOXFAMILY), hi3798m) + else ifeq ($(BOXFAMILY),hi3798m) BOXTYPE = armbox BOXSERIES = hd6x BOXMODEL = hd61 - else ifeq ($(BOXFAMILY), bcm7376) + else ifeq ($(BOXFAMILY),bcm7376) BOXTYPE = armbox BOXSERIES = vusolo4k BOXMODEL = vusolo4k - else ifeq ($(BOXFAMILY), bcm7278) + else ifeq ($(BOXFAMILY),bcm7278) BOXTYPE = armbox BOXSERIES = vuduo4k BOXMODEL = vuduo4k - else ifeq ($(BOXFAMILY), bcm7444s) + else ifeq ($(BOXFAMILY),bcm7444s) BOXTYPE = armbox BOXSERIES = vuultimo4k BOXMODEL = vuultimo4k - else ifeq ($(BOXFAMILY), bcm72604) + else ifeq ($(BOXFAMILY),bcm72604) BOXTYPE = armbox BOXSERIES = vuzero4k BOXMODEL = vuzero4k - else ifeq ($(BOXFAMILY), bcm7252s) + else ifeq ($(BOXFAMILY),bcm7252s) BOXTYPE = armbox BOXSERIES = vuuno4kse BOXMODEL = vuuno4kse - else ifeq ($(BOXFAMILY), bcm7335) + else ifeq ($(BOXFAMILY),bcm7335) BOXTYPE = mipsbox BOXSERIES = vuduo BOXMODEL = vuduo @@ -141,55 +141,55 @@ else ifneq ($(BOXFAMILY),) # assign by given BOXMODEL else ifneq ($(BOXMODEL),) - ifeq ($(BOXMODEL), $(filter $(BOXMODEL), nevis)) + ifeq ($(BOXMODEL),$(filter $(BOXMODEL),nevis)) BOXTYPE = coolstream BOXSERIES = hd1 BOXFAMILY = nevis - else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner)) + else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner)) BOXTYPE = coolstream BOXSERIES = hd2 BOXFAMILY = apollo - else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), kronos kronos_v2)) + else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),kronos kronos_v2)) BOXTYPE = coolstream BOXSERIES = hd2 BOXFAMILY = kronos - else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7)) + else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7)) BOXTYPE = armbox BOXSERIES = hd5x BOXFAMILY = bcm7251s - else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60 hd61)) + else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60 hd61)) BOXTYPE = armbox BOXSERIES = hd6x BOXFAMILY = hi3798m - else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k)) + else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vusolo4k)) BOXTYPE = armbox BOXSERIES = vusolo4k BOXFAMILY = bcm7376 - else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo4k)) + else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuduo4k)) BOXTYPE = armbox BOXSERIES = vuduo4k BOXFAMILY = bcm7278 - else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo4kse)) + else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuduo4kse)) BOXTYPE = armbox BOXSERIES = vuduo4kse BOXFAMILY = bcm7444s - else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuultimo4k)) + else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuultimo4k)) BOXTYPE = armbox BOXSERIES = vuultimo4k BOXFAMILY = bcm7444s - else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuzero4k)) + else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuzero4k)) BOXTYPE = armbox BOXSERIES = vuzero4k BOXFAMILY = bcm72604 - else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuuno4k)) + else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuuno4k)) BOXTYPE = armbox BOXSERIES = vuuno4k BOXFAMILY = bcm7252s - else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuuno4kse)) + else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuuno4kse)) BOXTYPE = armbox BOXSERIES = vuuno4kse BOXFAMILY = bcm7252s - else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo)) + else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuduo)) BOXTYPE = mipsbox BOXSERIES = vuduo BOXFAMILY = bcm7335 @@ -201,54 +201,54 @@ endif # ----------------------------------------------------------------------------- -ifeq ($(BOXTYPE), coolstream) +ifeq ($(BOXTYPE),coolstream) BOXTYPE_SC = cst BOXARCH = arm -else ifeq ($(BOXTYPE), armbox) +else ifeq ($(BOXTYPE),armbox) BOXTYPE_SC = arm BOXARCH = arm -else ifeq ($(BOXTYPE), mipsbox) +else ifeq ($(BOXTYPE),mipsbox) BOXTYPE_SC = mips BOXARCH = mips endif # ----------------------------------------------------------------------------- -ifeq ($(BOXMODEL), nevis) +ifeq ($(BOXMODEL),nevis) BOXNAME="HD1, BSE, Neo, Neo², Zee" -else ifeq ($(BOXMODEL), apollo) +else ifeq ($(BOXMODEL),apollo) BOXNAME="Tank" -else ifeq ($(BOXMODEL), shiner) +else ifeq ($(BOXMODEL),shiner) BOXNAME="Trinity" -else ifeq ($(BOXMODEL), kronos) +else ifeq ($(BOXMODEL),kronos) BOXNAME="Zee², Trinity V2" -else ifeq ($(BOXMODEL), kronos_v2) +else ifeq ($(BOXMODEL),kronos_v2) BOXNAME="Link, Trinity Duo" -else ifeq ($(BOXMODEL), hd51) +else ifeq ($(BOXMODEL),hd51) BOXNAME="AX/Mut@nt HD51" -else ifeq ($(BOXMODEL), bre2ze4k) +else ifeq ($(BOXMODEL),bre2ze4k) BOXNAME="WWIO BRE2ZE4K" -else ifeq ($(BOXMODEL), h7) +else ifeq ($(BOXMODEL),h7) BOXNAME="Air Digital Zgemma H7S/C" -else ifeq ($(BOXMODEL), hd60) +else ifeq ($(BOXMODEL),hd60) BOXNAME="AX/Mut@nt HD60" -else ifeq ($(BOXMODEL), hd61) +else ifeq ($(BOXMODEL),hd61) BOXNAME="AX/Mut@nt HD61" -else ifeq ($(BOXMODEL), vusolo4k) +else ifeq ($(BOXMODEL),vusolo4k) BOXNAME="VU+ Solo 4K" -else ifeq ($(BOXMODEL), vuduo4k) +else ifeq ($(BOXMODEL),vuduo4k) BOXNAME="VU+ Duo 4K" -else ifeq ($(BOXMODEL), vuduo4kse) +else ifeq ($(BOXMODEL),vuduo4kse) BOXNAME="VU+ Duo 4K SE" -else ifeq ($(BOXMODEL), vuultimo4k) +else ifeq ($(BOXMODEL),vuultimo4k) BOXNAME="VU+ Ultimo 4K" -else ifeq ($(BOXMODEL), vuzero4k) +else ifeq ($(BOXMODEL),vuzero4k) BOXNAME="VU+ Zero 4K" -else ifeq ($(BOXMODEL), vuuno4k) +else ifeq ($(BOXMODEL),vuuno4k) BOXNAME="VU+ Uno 4K" -else ifeq ($(BOXMODEL), vuuno4kse) +else ifeq ($(BOXMODEL),vuuno4kse) BOXNAME="VU+ Uno 4K SE" -else ifeq ($(BOXMODEL), vuduo) +else ifeq ($(BOXMODEL),vuduo) BOXNAME="VU+ Duo" endif diff --git a/make/environment-build.mk b/make/environment-build.mk index ec883364..d785b48d 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -33,7 +33,7 @@ WHOAMI := $(shell id -un) DL_DIR = $(BASE_DIR)/download BUILD_DIR = $(BASE_DIR)/build_tmp ROOTFS = $(BUILD_DIR)/rootfs -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x)) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd5x)) ROOTFS = $(BUILD_DIR)/rootfs/linuxrootfs1 endif DEPS_DIR = $(BASE_DIR)/deps @@ -52,7 +52,7 @@ STATIC_DIR = $(STATIC_BASE)/$(BOXARCH)-linux-$(KERNEL_VER) CONFIGS = $(BASE_DIR)/configs PATCHES = $(BASE_DIR)/patches SKEL-ROOT = $(BASE_DIR)/skel-root/$(BOXSERIES) -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) SKEL-ROOT = $(BASE_DIR)/skel-root/vuplus endif TARGET_FILES = $(BASE_DIR)/skel-root/general @@ -90,7 +90,7 @@ DEBUG ?= no # ----------------------------------------------------------------------------- -ifeq ($(BOXSERIES), hd1) +ifeq ($(BOXSERIES),hd1) DRIVERS-BIN_DIR = $(BOXTYPE)/$(BOXFAMILY) CORTEX-STRINGS_LDFLAG = TARGET = arm-cx2450x-linux-gnueabi @@ -102,7 +102,7 @@ ifeq ($(BOXSERIES), hd1) TARGET_EXTRA_LDFLAGS = -Wl,--gc-sections CXX11_ABI = -else ifeq ($(BOXSERIES), hd2) +else ifeq ($(BOXSERIES),hd2) DRIVERS-BIN_DIR = $(BOXTYPE)/$(BOXFAMILY) CORTEX-STRINGS_LDFLAG = -lcortex-strings TARGET = arm-cortex-linux-uclibcgnueabi @@ -112,14 +112,14 @@ else ifeq ($(BOXSERIES), hd2) TARGET_ABI = -march=$(TARGET_ARCH) -mtune=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard -mlittle-endian TARGET_EXTRA_CFLAGS = TARGET_EXTRA_LDFLAGS = - ifeq ($(BOXMODEL), kronos_v2) + ifeq ($(BOXMODEL),kronos_v2) TARGET_OPTIMIZATION = -Os TARGET_EXTRA_CFLAGS = -fdata-sections -ffunction-sections TARGET_EXTRA_LDFLAGS = -Wl,--gc-sections endif CXX11_ABI = -D_GLIBCXX_USE_CXX11_ABI=0 -else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) +else ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) DRIVERS-BIN_DIR = $(BOXTYPE)/$(BOXMODEL) CORTEX-STRINGS_LDFLAG = -lcortex-strings TARGET = arm-cortex-linux-gnueabihf @@ -131,7 +131,7 @@ else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuduo TARGET_EXTRA_LDFLAGS = CXX11_ABI = -else ifeq ($(BOXSERIES), $(filter $(BOXSERIES), vuduo)) +else ifeq ($(BOXSERIES),$(filter $(BOXSERIES),vuduo)) DRIVERS-BIN_DIR = $(BOXTYPE)/$(BOXMODEL) CORTEX-STRINGS_LDFLAG = TARGET = mipsel-unknown-linux-gnu diff --git a/make/environment-image.mk b/make/environment-image.mk index d9be2577..d7339a90 100644 --- a/make/environment-image.mk +++ b/make/environment-image.mk @@ -36,15 +36,15 @@ IMAGE_NEW = no # Beta/Release Server NI-SERVER = http://neutrino-images.de/neutrino-images -ifeq ($(IMAGE_TYPE), 0) +ifeq ($(IMAGE_TYPE),0) # Release NI-SUBDIR = release IMAGE_TYPE_STRING = release -else ifeq ($(IMAGE_TYPE), 1) +else ifeq ($(IMAGE_TYPE),1) # Beta NI-SUBDIR = beta IMAGE_TYPE_STRING = beta -else ifeq ($(IMAGE_TYPE), 2) +else ifeq ($(IMAGE_TYPE),2) # Nightly NI-SUBDIR = nightly IMAGE_TYPE_STRING = nightly @@ -54,7 +54,7 @@ else IMAGE_TYPE_STRING = selfmade endif -ifeq ($(BOXTYPE), $(filter $(BOXTYPE), coolstream)) +ifeq ($(BOXTYPE),$(filter $(BOXTYPE),coolstream)) IMAGE_DESC ="$(BOXNAME) [$(IMAGE_SUFFIX)][$(BOXSERIES)] $(shell echo $(IMAGE_TYPE_STRING) | sed 's/.*/\u&/')" else IMAGE_DESC ="$(BOXNAME) [$(IMAGE_SUFFIX)] $(shell echo $(IMAGE_TYPE_STRING) | sed 's/.*/\u&/')" @@ -65,9 +65,9 @@ IMAGE_MD5FILE = $(IMAGE_TYPE_STRING)-$(IMAGE_SUFFIX).txt IMAGE_BUILD_DIR = $(BUILD_DIR)/image-build -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) IMAGE_SUBDIR = $(subst vu,vuplus/,$(BOXMODEL)) -else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), h7)) +else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),h7)) IMAGE_SUBDIR = zgemma/$(BOXMODEL) else IMAGE_SUBDIR = $(BOXMODEL) diff --git a/make/environment-linux.mk b/make/environment-linux.mk index d9df199f..b8be009f 100644 --- a/make/environment-linux.mk +++ b/make/environment-linux.mk @@ -3,7 +3,7 @@ # # ----------------------------------------------------------------------------- -ifeq ($(BOXMODEL), nevis) +ifeq ($(BOXMODEL),nevis) KERNEL_VER = 2.6.34.13 KERNEL_DIR = linux-$(KERNEL_VER) KERNEL_SOURCE = git @@ -12,14 +12,14 @@ ifeq ($(BOXMODEL), nevis) KERNEL_BRANCH = ni/linux-2.6.34.15 KERNEL_DTB = $(EMPTY) -else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner kronos kronos_v2)) +else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner kronos kronos_v2)) KERNEL_VER = 3.10.93 KERNEL_DIR = linux-$(KERNEL_VER) KERNEL_SOURCE = git KERNEL_SITE = $(EMPTY) KERNEL_BRANCH = ni/linux-3.10.108 - ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner)) + ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner)) KERNEL_DTB = $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/kernel-dtb/hd849x.dtb KERNEL_CONFIG = $(CONFIGS)/kernel-apollo.config else @@ -27,7 +27,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner kronos kronos_v2)) KERNEL_CONFIG = $(CONFIGS)/kernel-kronos.config endif -else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7)) +else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7)) KERNEL_VER = 4.10.12 KERNEL_DIR = linux-$(KERNEL_VER) KERNEL_SOURCE = linux-$(KERNEL_VER)-arm.tar.gz @@ -39,7 +39,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7)) BOOT_PARTITION = 1 -else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60)) +else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60)) KERNEL_VER = 4.4.35 KERNEL_DATE = 20200219 KERNEL_DIR = linux-$(KERNEL_VER) @@ -52,7 +52,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60)) BOOT_PARTITION = 4 -else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd61)) +else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd61)) KERNEL_VER = 4.4.35 KERNEL_DATE = 20181228 KERNEL_DIR = linux-$(KERNEL_VER) @@ -65,7 +65,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd61)) BOOT_PARTITION = 4 -else ifeq ($(BOXMODEL), vusolo4k) +else ifeq ($(BOXMODEL),vusolo4k) KERNEL_VER = 3.14.28-1.8 KERNEL_DIR = linux KERNEL_SOURCE = stblinux-3.14-1.8.tar.bz2 @@ -81,7 +81,7 @@ else ifeq ($(BOXMODEL), vusolo4k) BOOT_PARTITION = 1 -else ifeq ($(BOXMODEL), vuduo4k) +else ifeq ($(BOXMODEL),vuduo4k) KERNEL_VER = 4.1.45-1.17 KERNEL_DIR = linux KERNEL_SOURCE = stblinux-4.1-1.17.tar.bz2 @@ -97,7 +97,7 @@ else ifeq ($(BOXMODEL), vuduo4k) BOOT_PARTITION = 6 -else ifeq ($(BOXMODEL), vuduo4kse) +else ifeq ($(BOXMODEL),vuduo4kse) KERNEL_VER = 4.1.45-1.17 KERNEL_DIR = linux KERNEL_SOURCE = stblinux-4.1-1.17.tar.bz2 @@ -113,7 +113,7 @@ else ifeq ($(BOXMODEL), vuduo4kse) BOOT_PARTITION = 6 -else ifeq ($(BOXMODEL), vuultimo4k) +else ifeq ($(BOXMODEL),vuultimo4k) KERNEL_VER = 3.14.28-1.12 KERNEL_DIR = linux KERNEL_SOURCE = stblinux-3.14-1.12.tar.bz2 @@ -129,7 +129,7 @@ else ifeq ($(BOXMODEL), vuultimo4k) BOOT_PARTITION = 1 -else ifeq ($(BOXMODEL), vuzero4k) +else ifeq ($(BOXMODEL),vuzero4k) KERNEL_VER = 4.1.20-1.9 KERNEL_DIR = linux KERNEL_SOURCE = stblinux-4.1-1.9.tar.bz2 @@ -145,7 +145,7 @@ else ifeq ($(BOXMODEL), vuzero4k) BOOT_PARTITION = 4 -else ifeq ($(BOXMODEL), vuuno4k) +else ifeq ($(BOXMODEL),vuuno4k) KERNEL_VER = 3.14.28-1.12 KERNEL_DIR = linux KERNEL_SOURCE = stblinux-3.14-1.12.tar.bz2 @@ -161,7 +161,7 @@ else ifeq ($(BOXMODEL), vuuno4k) BOOT_PARTITION = 1 -else ifeq ($(BOXMODEL), vuuno4kse) +else ifeq ($(BOXMODEL),vuuno4kse) KERNEL_VER = 4.1.20-1.9 KERNEL_DIR = linux KERNEL_SOURCE = stblinux-4.1-1.9.tar.bz2 @@ -177,7 +177,7 @@ else ifeq ($(BOXMODEL), vuuno4kse) BOOT_PARTITION = 1 -else ifeq ($(BOXMODEL), vuduo) +else ifeq ($(BOXMODEL),vuduo) KERNEL_VER = 3.9.6 KERNEL_DIR = linux KERNEL_SOURCE = stblinux-$(KERNEL_VER).tar.bz2 @@ -200,7 +200,7 @@ KERNEL_NAME = NI $(shell echo $(BOXFAMILY) | sed 's/.*/\u&/') Kernel KERNEL_modulesdir = $(BUILD_DIR)/$(KERNEL_MODULES)/lib/modules/$(KERNEL_VER) -ifeq ($(BOXMODEL), nevis) +ifeq ($(BOXMODEL),nevis) KERNEL_UIMAGE = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/Image else KERNEL_UIMAGE = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/uImage @@ -223,9 +223,9 @@ KERNEL_MAKEVARS += \ KVER=$(KERNEL_VER) \ KSRC=$(BUILD_DIR)/$(KERNEL_DIR) -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuduo)) KERNEL_IMAGE = vmlinux -else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60 hd61)) +else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60 hd61)) KERNEL_IMAGE = uImage else KERNEL_IMAGE = zImage @@ -234,6 +234,6 @@ endif KERNEL_MAKEOPTS = $(KERNEL_IMAGE) modules # build also the kernel-dtb for arm-hd5x and arm-hd6x -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7 hd60 hd61)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61)) KERNEL_MAKEOPTS += $(notdir $(KERNEL_DTB)) endif diff --git a/make/environment-target.mk b/make/environment-target.mk index 13b7e7fa..585ebc6f 100644 --- a/make/environment-target.mk +++ b/make/environment-target.mk @@ -120,4 +120,4 @@ $(VAR_PLUGINS) : | $(TARGET_DIR) # ----------------------------------------------------------------------------- -PERSISTENT_VAR_PARTITION = $(if $(filter $(BOXMODEL), apollo shiner kronos kronos_v2),yes,no) +PERSISTENT_VAR_PARTITION = $(if $(filter $(BOXMODEL),apollo shiner kronos kronos_v2),yes,no) diff --git a/make/helpers.mk b/make/helpers.mk index bcd07642..1519f220 100644 --- a/make/helpers.mk +++ b/make/helpers.mk @@ -39,7 +39,7 @@ define apply_patches endef # apply patch sets automatically -APPLY_PATCHES = $(call apply_patches, $(PKG_PATCHES_DIR)) +APPLY_PATCHES = $(call apply_patches,$(PKG_PATCHES_DIR)) # ----------------------------------------------------------------------------- diff --git a/make/host-tools.mk b/make/host-tools.mk index 0a94a466..c4794f2d 100644 --- a/make/host-tools.mk +++ b/make/host-tools.mk @@ -73,7 +73,7 @@ host-pkgconf: $(DL_DIR)/$(HOST_PKGCONF_SOURCE) | $(HOST_DIR) pkg-config-preqs $(REMOVE)/$(HOST_PKGCONF_DIR) $(UNTAR)/$(HOST_PKGCONF_SOURCE) $(CHDIR)/$(HOST_PKGCONF_DIR); \ - $(call apply_patches, $(addprefix $(@F)/,$(HOST_PKGCONF_PATCH))); \ + $(call apply_patches,$(addprefix $(@F)/,$(HOST_PKGCONF_PATCH))); \ ./configure \ --prefix=$(HOST_DIR) \ --with-sysroot=$(TARGET_DIR) \ @@ -189,7 +189,7 @@ host-parted: $(DL_DIR)/$(HOST_PARTED_SOURCE) | $(HOST_DIR) $(REMOVE)/$(HOST_PARTED_DIR) $(UNTAR)/$(HOST_PARTED_SOURCE) $(CHDIR)/$(HOST_PARTED_DIR); \ - $(call apply_patches, $(HOST_PARTED_PATCH)); \ + $(call apply_patches,$(HOST_PARTED_PATCH)); \ ./configure \ --prefix= \ --enable-silent-rules \ @@ -291,7 +291,7 @@ host-ninja: $(DL_DIR)/$(HOST_NINJA_SOURCE) | $(HOST_DIR) $(REMOVE)/$(HOST_NINJA_DIR) $(UNTAR)/$(HOST_NINJA_SOURCE) $(CHDIR)/$(HOST_NINJA_DIR); \ - $(call apply_patches, $(HOST_NINJA_PATCH)); \ + $(call apply_patches,$(HOST_NINJA_PATCH)); \ cmake . \ -DCMAKE_INSTALL_PREFIX="" \ ; \ @@ -319,7 +319,7 @@ host-lua: $(DL_DIR)/$(HOST_LUA_SOURCE) | $(HOST_DIR) $(REMOVE)/$(HOST_LUA_DIR) $(UNTAR)/$(HOST_LUA_SOURCE) $(CHDIR)/$(HOST_LUA_DIR); \ - $(call apply_patches, $(HOST_LUA_PATCH)); \ + $(call apply_patches,$(HOST_LUA_PATCH)); \ $(MAKE) linux; \ $(MAKE) install INSTALL_TOP=$(HOST_DIR) $(REMOVE)/$(HOST_LUA_DIR) @@ -356,7 +356,7 @@ $(HOST_LUAROCKS): $(HOST_LUA) $(DL_DIR)/$(HOST_LUAROCKS_SOURCE) | $(HOST_DIR) $(REMOVE)/$(HOST_LUAROCKS_DIR) $(UNTAR)/$(HOST_LUAROCKS_SOURCE) $(CHDIR)/$(HOST_LUAROCKS_DIR); \ - $(call apply_patches, $(HOST_LUAROCKS_PATCH)); \ + $(call apply_patches,$(HOST_LUAROCKS_PATCH)); \ ./configure $(SILENT_OPT) \ --prefix=$(HOST_DIR) \ --sysconfdir=$(HOST_DIR)/etc \ diff --git a/make/image-updates.mk b/make/image-updates.mk index 7bfea6a2..aff3c8ff 100644 --- a/make/image-updates.mk +++ b/make/image-updates.mk @@ -4,7 +4,7 @@ # ----------------------------------------------------------------------------- BOXSERIES_UPDATE = hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo -ifneq ($(DEBUG), yes) +ifneq ($(DEBUG),yes) BOXSERIES_UPDATE += hd1 endif @@ -41,7 +41,7 @@ u-neutrino: neutrino-clean $(INSTALL_EXEC) -D $(TARGET_bindir)/neutrino $(UPDATE_INST_DIR)/bin/neutrino $(INSTALL_DATA) -D $(TARGET_datadir)/tuxbox/neutrino/locale/deutsch.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/deutsch.locale $(INSTALL_DATA) -D $(TARGET_datadir)/tuxbox/neutrino/locale/english.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/english.locale -ifneq ($(DEBUG), yes) +ifneq ($(DEBUG),yes) find $(UPDATE_INST_DIR)/bin -type f ! -name *.sh -print0 | xargs -0 $(TARGET_STRIP) || true endif $(MAKE) u-update-bin \ @@ -55,10 +55,10 @@ u-neutrino-full: neutrino-clean echo "sync; reboot" >> $(POSTINSTALL_SH) $(MAKE) neutrino NEUTRINO_INST_DIR=$(UPDATE_INST_DIR) $(INSTALL_EXEC) -D $(TARGET_sysconfdir)/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino -ifneq ($(DEBUG), yes) +ifneq ($(DEBUG),yes) find $(UPDATE_INST_DIR)/bin -type f ! -name *.sh -print0 | xargs -0 $(TARGET_STRIP) || true endif -ifeq ($(PERSISTENT_VAR_PARTITION), yes) +ifeq ($(PERSISTENT_VAR_PARTITION),yes) # avoid overrides in user's var-partition mv $(UPDATE_INST_DIR)/var $(UPDATE_INST_DIR)/var_init endif diff --git a/make/images.mk b/make/images.mk index be3c908c..8ee41036 100644 --- a/make/images.mk +++ b/make/images.mk @@ -4,17 +4,17 @@ # ----------------------------------------------------------------------------- MKFSFLAGS = -U -D $(BUILD_DIR)/devtable-$(BOXSERIES).txt -r $(ROOTFS) -ifeq ($(BOXSERIES), hd1) +ifeq ($(BOXSERIES),hd1) MKFSFLAGS += -p endif -ifeq ($(BOXSERIES), hd2) +ifeq ($(BOXSERIES),hd2) MKFSFLAGS += -n -l endif -ifeq ($(BOXSERIES), hd1) +ifeq ($(BOXSERIES),hd1) SUMFLAGS = -p endif -ifeq ($(BOXSERIES), hd2) +ifeq ($(BOXSERIES),hd2) SUMFLAGS = -n -l endif @@ -50,26 +50,26 @@ devtable-remove: # ----------------------------------------------------------------------------- flash-image: -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), nevis kronos kronos_v2)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),nevis kronos kronos_v2)) make flash-image-coolstream ERASE_SIZE=0x20000 endif -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner)) make flash-image-coolstream ERASE_SIZE=0x40000 IMAGE_SUFFIX=$(BOXTYPE_SC)-apollo make flash-image-coolstream ERASE_SIZE=0x20000 IMAGE_SUFFIX=$(BOXTYPE_SC)-shiner endif -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7)) make flash-image-hd5x make flash-image-hd5x-multi endif -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60 hd61)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60 hd61)) make flash-image-hd6x make flash-image-hd6x-single endif -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) make flash-image-vuplus make flash-image-vuplus-multi endif -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuduo)) make flash-image-vuduo endif @@ -80,7 +80,7 @@ flash-image-coolstream: | $(IMAGE_DIR) make devtable mkfs.jffs2 -e $(ERASE_SIZE) $(MKFSFLAGS) -o $(IMAGE_DIR)/$(IMAGE_NAME).img make devtable-remove -ifeq ($(IMAGE_SUMMARIZE), yes) +ifeq ($(IMAGE_SUMMARIZE),yes) sumtool -e $(ERASE_SIZE) $(SUMFLAGS) -i $(IMAGE_DIR)/$(IMAGE_NAME).img -o $(IMAGE_DIR)/$(IMAGE_NAME)-sum.img rm -f $(IMAGE_DIR)/$(IMAGE_NAME).img mv $(IMAGE_DIR)/$(IMAGE_NAME)-sum.img $(IMAGE_DIR)/$(IMAGE_NAME).img @@ -91,11 +91,11 @@ endif # ----------------------------------------------------------------------------- # ROOTFS_SIZE detected with 'df -k' -ifeq ($(BOXMODEL), nevis) +ifeq ($(BOXMODEL),nevis) ROOTFS_SIZE = 28160 -else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner kronos)) +else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner kronos)) ROOTFS_SIZE = 262144 -else ifeq ($(BOXMODEL), kronos_v2) +else ifeq ($(BOXMODEL),kronos_v2) ROOTFS_SIZE = 57344 endif ifdef ROOTFS_SIZE @@ -375,7 +375,7 @@ flash-image-vuplus-multi: | $(IMAGE_DIR) echo Dummy for update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs2.tar.bz2 echo Dummy for update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs3.tar.bz2 echo Dummy for update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs4.tar.bz2 -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuzero4k vuuno4k)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuzero4k vuuno4k)) echo This file forces the update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/force.update else echo This file forces a reboot after the update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/reboot.update diff --git a/make/linux-drivers.mk b/make/linux-drivers.mk index c73b9ab4..1ea271dc 100644 --- a/make/linux-drivers.mk +++ b/make/linux-drivers.mk @@ -87,7 +87,7 @@ hd6x-mali-drivers: kernel-$(BOXTYPE) hd6x-libgles-headers $(DL_DIR)/$(HD6x-MALI- $(REMOVE)/$(HD6x-MALI-DRIVERS_DIR) $(UNTAR)/$(HD6x-MALI-DRIVERS_SOURCE) $(CHDIR)/$(HD6x-MALI-DRIVERS_DIR); \ - $(call apply_patches, $(HD6x-MALI-DRIVERS_PATCH)); \ + $(call apply_patches,$(HD6x-MALI-DRIVERS_PATCH)); \ $(MAKE) -C $(BUILD_DIR)/$(KERNEL_OBJ) $(KERNEL_MAKEVARS) $(HD6x-MALI-DRIVERS_MAKEVARS); \ $(MAKE) -C $(BUILD_DIR)/$(KERNEL_OBJ) $(KERNEL_MAKEVARS) $(HD6x-MALI-DRIVERS_MAKEVARS) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install make depmod diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk index 2c01b39d..602ed492 100644 --- a/make/linux-kernel.mk +++ b/make/linux-kernel.mk @@ -210,7 +210,7 @@ kernel.do_prepare: $(MKDIR)/$(KERNEL_OBJ) $(MKDIR)/$(KERNEL_MODULES) $(INSTALL_DATA) $(KERNEL_CONFIG) $(BUILD_DIR)/$(KERNEL_OBJ)/.config -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7 hd60 hd61)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61)) $(INSTALL_DATA) $(PATCHES)/initramfs-subdirboot.cpio.gz $(BUILD_DIR)/$(KERNEL_OBJ) endif $(TOUCH) @@ -227,14 +227,14 @@ kernel.do_prepare.tar: $(DL_DIR)/$(KERNEL_SOURCE) $(REMOVE)/$(KERNEL_DIR) $(UNTAR)/$(KERNEL_SOURCE) $(CHDIR)/$(KERNEL_DIR); \ - $(call apply_patches, $(addprefix kernel/,$(KERNEL_PATCH))) + $(call apply_patches,$(addprefix kernel/,$(KERNEL_PATCH))) kernel.do_compile: kernel.do_prepare $(CHDIR)/$(KERNEL_DIR); \ $(MAKE) $(KERNEL_MAKEVARS) silentoldconfig; \ $(MAKE) $(KERNEL_MAKEVARS) $(KERNEL_MAKEOPTS); \ $(MAKE) $(KERNEL_MAKEVARS) modules_install -ifneq ($(KERNEL_DTB), $(EMPTY)) +ifneq ($(KERNEL_DTB),$(EMPTY)) cat $(KERNEL_ZIMAGE) $(KERNEL_DTB) > $(KERNEL_ZIMAGE_DTB) endif $(TOUCH) @@ -256,11 +256,11 @@ kernel-coolstream-hd1: kernel.do_compile | $(IMAGE_DIR) kernel-coolstream-hd2: kernel.do_compile | $(IMAGE_DIR) mkimage -A $(BOXARCH) -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n "$(KERNEL_NAME)" -d $(KERNEL_ZIMAGE_DTB) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner)) - ifeq ($(BOXMODEL), apollo) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner)) + ifeq ($(BOXMODEL),apollo) # create also shiner-kernel when building apollo $(INSTALL_DATA) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-shiner-vmlinux.ub.gz - else ifeq ($(BOXMODEL), shiner) + else ifeq ($(BOXMODEL),shiner) # create also apollo-kernel when building shiner $(INSTALL_DATA) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL)-vmlinux.ub.gz $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-apollo-vmlinux.ub.gz endif @@ -268,7 +268,7 @@ endif $(TOUCH) kernel-armbox: kernel.do_compile | $(IMAGE_DIR) -#ifneq ($(KERNEL_DTB), $(EMPTY)) +#ifneq ($(KERNEL_DTB),$(EMPTY)) # $(INSTALL_DATA) $(KERNEL_ZIMAGE_DTB) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL).bin #else # $(INSTALL_DATA) $(KERNEL_ZIMAGE) $(IMAGE_DIR)/kernel-$(BOXTYPE_SC)-$(BOXMODEL).bin @@ -321,12 +321,12 @@ kernel-modules-armbox: kernel-armbox $(INSTALL_DATA) $(KERNEL_modulesdir)/modules.builtin $(TARGET_modulesdir) $(INSTALL_DATA) $(KERNEL_modulesdir)/modules.order $(TARGET_modulesdir) make depmod -ifeq ($(BOXSERIES), hd5x hd6x) +ifeq ($(BOXSERIES),hd5x hd6x) make rtl8192eu make rtl8812au make rtl8822bu endif -ifeq ($(BOXSERIES), hd6x) +ifeq ($(BOXSERIES),hd6x) make hd6x-mali-drivers endif $(TOUCH) @@ -349,7 +349,7 @@ vmlinuz-initrd: $(DL_DIR)/$(VMLINUZ-INITRD_SOURCE) depmod: PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGET_DIR) $(KERNEL_VER) -ifeq ($(BOXSERIES), hd1) +ifeq ($(BOXSERIES),hd1) mv $(TARGET_modulesdir)/modules.dep $(TARGET_modulesdir)/.modules.dep rm $(TARGET_modulesdir)/modules.* mv $(TARGET_modulesdir)/.modules.dep $(TARGET_modulesdir)/modules.dep diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk index 6f3b773e..e20d2da0 100644 --- a/make/neutrino-plugins.mk +++ b/make/neutrino-plugins.mk @@ -8,9 +8,9 @@ plugins: $(MAKE) logo-addon $(MAKE) neutrino-mediathek $(MAKE) doscam-webif-skin -ifneq ($(BOXSERIES), hd1) +ifneq ($(BOXSERIES),hd1) $(MAKE) channellogos - ifneq ($(BOXMODEL), kronos_v2) + ifneq ($(BOXMODEL),kronos_v2) $(MAKE) links endif endif @@ -55,7 +55,7 @@ NEUTRINO-PLUGINS_CONF_OPTS = \ --with-targetprefix=$(prefix) \ --with-boxtype=$(BOXTYPE) -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2)) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) NEUTRINO-PLUGINS_CONF_OPTS += --with-boxmodel=$(BOXSERIES) else NEUTRINO-PLUGINS_CONF_OPTS += --with-boxmodel=$(BOXMODEL) @@ -67,8 +67,8 @@ NEUTRINO-PLUGINS_CONF_OPTS += \ --disable-mountpointmanagement \ --disable-stbup -ifeq ($(BOXTYPE), coolstream) - ifeq ($(BOXSERIES), hd1) +ifeq ($(BOXTYPE),coolstream) + ifeq ($(BOXSERIES),hd1) NEUTRINO-PLUGINS_CONF_OPTS += \ --disable-spiegel_tv_doc \ --disable-tierwelt_tv @@ -82,7 +82,7 @@ endif # ----------------------------------------------------------------------------- -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2)) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) NEUTRINO-PLUGINS_BOXMODEL = $(BOXSERIES) else NEUTRINO-PLUGINS_BOXMODEL = $(BOXMODEL) @@ -227,11 +227,11 @@ LINKS_PATCH = links.patch LINKS_PATCH += links-ac-prog-cxx.patch LINKS_PATCH += links-accept_https_play.patch -ifeq ($(BOXTYPE), $(filter $(BOXTYPE), coolstream)) +ifeq ($(BOXTYPE),$(filter $(BOXTYPE),coolstream)) LINKS_PATCH += links-input-nevis_ir.patch -else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k)) +else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k)) LINKS_PATCH += links-input-event1.patch -else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), h7)) +else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),h7)) LINKS_PATCH += links-input-event2.patch endif @@ -244,7 +244,7 @@ links: $(LINKS_DEPS) $(DL_DIR)/$(LINKS_SOURCE) $(SHARE_PLUGINS) | $(TARGET_DIR) echo "german" >> index.txt; \ ./gen-intl $(CHDIR)/$(LINKS_DIR); \ - $(call apply_patches, $(LINKS_PATCH)); \ + $(call apply_patches,$(LINKS_PATCH)); \ autoreconf -vfi; \ $(CONFIGURE) \ --prefix=$(prefix) \ diff --git a/make/neutrino.mk b/make/neutrino.mk index f89be131..485dd1b9 100644 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -29,14 +29,14 @@ NEUTRINO_DEPS += zlib # ----------------------------------------------------------------------------- NEUTRINO_CFLAGS = -Wall -W -Wshadow -D__STDC_CONSTANT_MACROS -ifeq ($(BOXSERIES), hd1) +ifeq ($(BOXSERIES),hd1) NEUTRINO_CFLAGS += -DCPU_FREQ endif -ifeq ($(BOXSERIES), hd2) +ifeq ($(BOXSERIES),hd2) NEUTRINO_CFLAGS += -DFB_HW_ACCELERATION endif -ifeq ($(DEBUG), yes) +ifeq ($(DEBUG),yes) NEUTRINO_CFLAGS += -ggdb3 -rdynamic -I$(TARGET_includedir) else NEUTRINO_CFLAGS += $(TARGET_CFLAGS) @@ -47,7 +47,7 @@ NEUTRINO_CFLAGS += -Wno-psabi # ----------------------------------------------------------------------------- NEUTRINO_LDFLAGS = -lcrypto -ldl -lz $(CORTEX-STRINGS_LDFLAG) -L$(TARGET_libdir) -ifeq ($(DEBUG), yes) +ifeq ($(DEBUG),yes) NEUTRINO_LDFLAGS += -Wl,-rpath-link,$(TARGET_libdir) else NEUTRINO_LDFLAGS += -Wl,-O1 -Wl,-rpath-link,$(TARGET_libdir) $(TARGET_EXTRA_LDFLAGS) @@ -101,7 +101,7 @@ NEUTRINO_CONF_OPTS = \ --with-targetprefix=$(prefix) \ --with-boxtype=$(BOXTYPE) -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2)) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) NEUTRINO_CONF_OPTS += --with-boxmodel=$(BOXSERIES) else NEUTRINO_CONF_OPTS += --with-boxmodel=$(BOXMODEL) @@ -109,11 +109,11 @@ endif # ----------------------------------------------------------------------------- -ifeq ($(BOXTYPE), coolstream) +ifeq ($(BOXTYPE),coolstream) NEUTRINO_DEPS += coolstream-drivers - ifeq ($(HAS_LIBCS), yes) + ifeq ($(HAS_LIBCS),yes) NEUTRINO_DEPS += libcoolstream - ifeq ($(DEBUG), yes) + ifeq ($(DEBUG),yes) NEUTRINO_CONF_OPTS += \ --enable-libcoolstream-static \ --with-libcoolstream-static-dir=$(TARGET_libdir) @@ -130,10 +130,10 @@ else NEUTRINO_DEPS += graphlcd-base NEUTRINO_CONF_OPTS += --enable-graphlcd - ifeq ($(BOXTYPE), armbox) + ifeq ($(BOXTYPE),armbox) NEUTRINO_CONF_OPTS += --disable-arm-acc endif - ifeq ($(BOXTYPE), mipsbox) + ifeq ($(BOXTYPE),mipsbox) NEUTRINO_CONF_OPTS += --disable-mips-acc endif endif @@ -141,7 +141,7 @@ endif # enable ffmpeg audio decoder in neutrino NEUTRINO_AUDIODEC = ffmpeg -ifeq ($(NEUTRINO_AUDIODEC), ffmpeg) +ifeq ($(NEUTRINO_AUDIODEC),ffmpeg) NEUTRINO_CONF_OPTS += --enable-ffmpegdec else NEUTRINO_DEPS += libid3tag @@ -205,7 +205,7 @@ LIBSTB-HAL_CONF_OPTS = \ --with-targetprefix=$(prefix) \ --with-boxtype=$(BOXTYPE) -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2)) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) LIBSTB-HAL_CONF_OPTS += --with-boxmodel=$(BOXSERIES) else LIBSTB-HAL_CONF_OPTS += --with-boxmodel=$(BOXMODEL) @@ -233,14 +233,14 @@ libstb-hal: $(LIBSTB-HAL_BUILD_DIR)/config.status # ----------------------------------------------------------------------------- neutrino-bin: -ifeq ($(CLEAN), yes) +ifeq ($(CLEAN),yes) $(MAKE) neutrino-clean endif $(MAKE) $(NEUTRINO_BUILD_DIR)/config.status PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ $(MAKE) -C $(NEUTRINO_BUILD_DIR) all DESTDIR=$(TARGET_DIR) $(INSTALL_EXEC) -D $(NEUTRINO_BUILD_DIR)/src/neutrino $(TARGET_bindir)/neutrino -ifneq ($(DEBUG), yes) +ifneq ($(DEBUG),yes) $(TARGET_STRIP) $(TARGET_bindir)/neutrino endif make done diff --git a/make/ni.mk b/make/ni.mk index a20dd3c9..f9825b99 100644 --- a/make/ni.mk +++ b/make/ni.mk @@ -4,7 +4,7 @@ # ----------------------------------------------------------------------------- BOXMODEL_IMAGE = $(EMPTY) -ifneq ($(DEBUG), yes) +ifneq ($(DEBUG),yes) BOXMODEL_IMAGE += nevis endif BOXMODEL_IMAGE += apollo kronos kronos_v2 @@ -59,26 +59,26 @@ ni-image: $(MAKE) mtd-utils $(MAKE) wget #$(MAKE) streamripper -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) $(MAKE) less $(MAKE) parted $(MAKE) openvpn $(MAKE) openssh $(MAKE) ethtool - ifneq ($(BOXMODEL), kronos_v2) + ifneq ($(BOXMODEL),kronos_v2) $(MAKE) bash $(MAKE) iperf $(MAKE) minicom $(MAKE) mc endif - ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) + ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) $(MAKE) gptfdisk $(MAKE) rsync $(MAKE) ofgwrite $(MAKE) aio-grab $(MAKE) dvbsnoop endif - ifeq ($(DEBUG), yes) + ifeq ($(DEBUG),yes) $(MAKE) strace $(MAKE) valgrind $(MAKE) gdb @@ -89,7 +89,7 @@ endif make files-var-etc make scripts make init-scripts -ifeq ($(PERSONALIZE), yes) +ifeq ($(PERSONALIZE),yes) make personalize endif make rootfs diff --git a/make/prerequisites.mk b/make/prerequisites.mk index 0453813e..f6fa7889 100644 --- a/make/prerequisites.mk +++ b/make/prerequisites.mk @@ -76,7 +76,7 @@ $(BUILD-GENERIC-PC): $(SOURCE_DIR)/$(NI-NEUTRINO): $(CD) $(SOURCE_DIR); \ git clone $(NI-PUBLIC)/$(@F).git -ifeq ($(NI_ADMIN), true) +ifeq ($(NI_ADMIN),true) $(CD) $(@); \ git remote add tuxbox $(GITHUB)/tuxbox-neutrino/gui-neutrino.git; \ git remote add seife $(GITHUB)/neutrino-mp/neutrino-mp.git; \ @@ -88,7 +88,7 @@ endif $(SOURCE_DIR)/$(NI-LIBSTB-HAL): $(CD) $(SOURCE_DIR); \ git clone $(NI-PUBLIC)/$(@F).git -ifeq ($(NI_ADMIN), true) +ifeq ($(NI_ADMIN),true) $(CD) $(@); \ git remote add tuxbox $(GITHUB)/tuxbox-neutrino/library-stb-hal.git; \ git remote add seife $(GITHUB)/neutrino-mp/libstb-hal.git; \ @@ -98,7 +98,7 @@ ifeq ($(NI_ADMIN), true) endif $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM): -ifeq ($(HAS_LIBCS), yes) +ifeq ($(HAS_LIBCS),yes) $(CD) $(SOURCE_DIR); \ git clone $(NI-PRIVATE)/$(@F).git $(CD) $(@); \ @@ -109,7 +109,7 @@ endif $(SOURCE_DIR)/$(NI-FFMPEG): $(CD) $(SOURCE_DIR); \ git clone $(NI-PUBLIC)/$(@F).git -ifeq ($(NI_ADMIN), true) +ifeq ($(NI_ADMIN),true) $(CD) $(@); \ git remote add upstream https://git.ffmpeg.org/ffmpeg.git; \ git fetch --all @@ -120,7 +120,7 @@ endif $(SOURCE_DIR)/$(NI-LINUX-KERNEL): $(CD) $(SOURCE_DIR); \ git clone $(NI-PUBLIC)/$(@F).git -ifeq ($(NI_ADMIN), true) +ifeq ($(NI_ADMIN),true) $(CD) $(@); \ git remote add upstream https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git; \ git remote add torvalds https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git; \ @@ -131,7 +131,7 @@ endif $(SOURCE_DIR)/$(NI-OFGWRITE): $(CD) $(SOURCE_DIR); \ git clone $(NI-PUBLIC)/$(@F).git -ifeq ($(NI_ADMIN), true) +ifeq ($(NI_ADMIN),true) $(CD) $(@); \ git remote add upstream $(GITHUB)/oe-alliance/ofgwrite.git; \ git fetch --all @@ -141,7 +141,7 @@ endif $(SOURCE_DIR)/$(NI-RTMPDUMP): $(CD) $(SOURCE_DIR); \ git clone $(NI-PUBLIC)/$(@F).git -ifeq ($(NI_ADMIN), true) +ifeq ($(NI_ADMIN),true) $(CD) $(@); \ git remote add upstream git://git.ffmpeg.org/rtmpdump; \ git fetch --all diff --git a/make/target-blobs.mk b/make/target-blobs.mk index dbcb6c12..5f93224a 100644 --- a/make/target-blobs.mk +++ b/make/target-blobs.mk @@ -8,13 +8,13 @@ blobs: $(BLOBS_DEPS) $(MAKE) firmware $(MAKE) $(BOXMODEL)-drivers -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7 hd60 hd61 vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61 vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) $(MAKE) $(BOXMODEL)-libgles - ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60 hd61)) + ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60 hd61)) $(MAKE) $(BOXMODEL)-libs endif endif -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) $(MAKE) vuplus-platform-util endif @@ -26,7 +26,7 @@ firmware-boxmodel: $(SOURCE_DIR)/$(NI-DRIVERS-BIN) | $(TARGET_DIR) $(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-firmware/.,$(TARGET_base_libdir)/firmware) $(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-firmware-dvb/.,$(TARGET_base_libdir)/firmware) -ifeq ($(BOXMODEL), nevis) +ifeq ($(BOXMODEL),nevis) FIRMWARE-WIRELESS = rt2870.bin FIRMWARE-WIRELESS += rt3070.bin FIRMWARE-WIRELESS += rt3071.bin @@ -67,7 +67,7 @@ VUSOLO4K-DRIVERS_VER = 20190424 VUSOLO4K-DRIVERS_SOURCE = vuplus-dvb-proxy-vusolo4k-3.14.28-$(VUSOLO4K-DRIVERS_VER).r0.tar.gz VUSOLO4K-DRIVERS_SITE = http://archive.vuplus.com/download/build_support/vuplus -ifeq ($(VUPLUS-DRIVERS_LATEST), yes) +ifeq ($(VUPLUS-DRIVERS_LATEST),yes) VUDUO4K-DRIVERS_VER = 20191218 else VUDUO4K-DRIVERS_VER = 20190212 @@ -79,7 +79,7 @@ VUDUO4KSE-DRIVERS_VER = 20200903 VUDUO4KSE-DRIVERS_SOURCE = vuplus-dvb-proxy-vuduo4kse-4.1.45-$(VUDUO4KSE-DRIVERS_VER).r0.tar.gz VUDUO4KSE-DRIVERS_SITE = http://archive.vuplus.com/download/build_support/vuplus -ifeq ($(VUPLUS-DRIVERS_LATEST), yes) +ifeq ($(VUPLUS-DRIVERS_LATEST),yes) VUULTIMO4K-DRIVERS_VER = 20190424 else VUULTIMO4K-DRIVERS_VER = 20190104 @@ -91,7 +91,7 @@ VUZERO4K-DRIVERS_VER = 20190424 VUZERO4K-DRIVERS_SOURCE = vuplus-dvb-proxy-vuzero4k-4.1.20-$(VUZERO4K-DRIVERS_VER).r0.tar.gz VUZERO4K-DRIVERS_SITE = http://archive.vuplus.com/download/build_support/vuplus -ifeq ($(VUPLUS-DRIVERS_LATEST), yes) +ifeq ($(VUPLUS-DRIVERS_LATEST),yes) VUUNO4K-DRIVERS_VER = 20190424 else VUUNO4K-DRIVERS_VER = 20190104 @@ -99,7 +99,7 @@ endif VUUNO4K-DRIVERS_SOURCE = vuplus-dvb-proxy-vuuno4k-3.14.28-$(VUUNO4K-DRIVERS_VER).r0.tar.gz VUUNO4K-DRIVERS_SITE = http://archive.vuplus.com/download/build_support/vuplus -ifeq ($(VUPLUS-DRIVERS_LATEST), yes) +ifeq ($(VUPLUS-DRIVERS_LATEST),yes) VUUNO4KSE-DRIVERS_VER = 20190424 else VUUNO4KSE-DRIVERS_VER = 20190104 @@ -131,12 +131,12 @@ coolstream-drivers: $(SOURCE_DIR)/$(NI-DRIVERS-BIN) | $(TARGET_DIR) mkdir -p $(TARGET_libdir) $(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib/. $(TARGET_libdir) $(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/libcoolstream/$(shell echo -n $(NI-FFMPEG_BRANCH) | sed 's,/,-,g')/. $(TARGET_libdir) -ifeq ($(BOXMODEL), nevis) +ifeq ($(BOXMODEL),nevis) ln -sf libnxp.so $(TARGET_libdir)/libconexant.so endif mkdir -p $(TARGET_modulesdir) $(INSTALL_COPY) $(SOURCE_DIR)/$(NI-DRIVERS-BIN)/$(DRIVERS-BIN_DIR)/lib-modules/$(KERNEL_VER)/. $(TARGET_modulesdir) -ifeq ($(BOXMODEL), nevis) +ifeq ($(BOXMODEL),nevis) ln -sf $(KERNEL_VER) $(TARGET_modulesdir)-$(BOXMODEL) endif make depmod @@ -383,7 +383,7 @@ vuplus-platform-util: $(DL_DIR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) | $(TARGET_DIR) $(UNTAR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) $(INSTALL_EXEC) -D $(BUILD_DIR)/$(BOXMODEL-PLATFORM-UTIL_DIR)/* $(TARGET_bindir) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/vuplus-platform-util.init $(TARGET_sysconfdir)/init.d/vuplus-platform-util -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo4k)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuduo4k)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/bp3flash.sh $(TARGET_bindir)/bp3flash.sh endif $(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_DIR) diff --git a/make/target-development.mk b/make/target-development.mk index c520f369..423a99bd 100644 --- a/make/target-development.mk +++ b/make/target-development.mk @@ -3,7 +3,7 @@ # # ----------------------------------------------------------------------------- -VALGRIND_TARGET = $(if $(filter $(BOXMODEL), nevis), valgrind12305, valgrind3) +VALGRIND_TARGET = $(if $(filter $(BOXMODEL),nevis),valgrind12305, valgrind3) valgrind: $(VALGRIND_TARGET) $(TOUCH) @@ -24,7 +24,7 @@ valgrind3: $(DL_DIR)/$(VALGRIND_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(VALGRIND_DIR) $(UNTAR)/$(VALGRIND_SOURCE) $(CHDIR)/$(VALGRIND_DIR); \ - $(call apply_patches, $(VALGRIND_PATCH)); \ + $(call apply_patches,$(VALGRIND_PATCH)); \ export AR=$(TARGET_AR); \ autoreconf -fi; \ $(CONFIGURE) \ @@ -51,7 +51,7 @@ valgrind12305: | $(TARGET_DIR) svn co -r 12305 svn://svn.valgrind.org/valgrind/trunk $(BUILD_DIR)/valgrind; \ $(CHDIR)/valgrind; \ svn up --force -r {2011-12-13} VEX; \ - $(call apply_patches, $(VALGRIND12305_PATCH)); \ + $(call apply_patches,$(VALGRIND12305_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix=$(prefix) \ diff --git a/make/target-ffmpeg-coolstream.mk b/make/target-ffmpeg-coolstream.mk index 9a33b1ee..c8c7fc46 100644 --- a/make/target-ffmpeg-coolstream.mk +++ b/make/target-ffmpeg-coolstream.mk @@ -7,7 +7,7 @@ FFMPEG_DEPS = openssl rtmpdump libbluray libass # ----------------------------------------------------------------------------- -ifeq ($(NI-FFMPEG_BRANCH), ni/ffmpeg/2.8) +ifeq ($(NI-FFMPEG_BRANCH),ni/ffmpeg/2.8) FFMPEG_DEPS += libroxml FFMPEG_CONFIGURE_BRANCH = else @@ -152,14 +152,14 @@ FFMPEG_CONFIGURE_GENERIC = \ # ----------------------------------------------------------------------------- -ifeq ($(BOXSERIES), hd1) +ifeq ($(BOXSERIES),hd1) FFMPEG_CONFIGURE_PLATFORM = \ --enable-small \ --cpu=armv6 \ --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir)" endif -ifeq ($(BOXSERIES), hd2) +ifeq ($(BOXSERIES),hd2) FFMPEG_CONFIGURE_PLATFORM = \ --enable-decoder=h264 \ --enable-decoder=vc1 \ diff --git a/make/target-ffmpeg.mk b/make/target-ffmpeg.mk index 728cc505..be93d52f 100644 --- a/make/target-ffmpeg.mk +++ b/make/target-ffmpeg.mk @@ -329,12 +329,12 @@ FFMPEG_CONFIGURE_GENERIC = \ # ----------------------------------------------------------------------------- -ifeq ($(BOXARCH), arm) +ifeq ($(BOXARCH),arm) FFMPEG_CONFIGURE_PLATFORM = \ --cpu=cortex-a15 \ --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir) -mfpu=neon-vfpv4 -mfloat-abi=hard" -else ifeq ($(BOXARCH), mips) +else ifeq ($(BOXARCH),mips) FFMPEG_CONFIGURE_PLATFORM = \ --cpu=generic \ --extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir)" @@ -345,7 +345,7 @@ endif ffmpeg: $(FFMPEG_DEPS) $(DL_DIR)/$(FFMPEG_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(FFMPEG_DIR) $(UNTAR)/$(FFMPEG_SOURCE) -ifneq ($(FFMPEG_UNPATCHED), yes) +ifneq ($(FFMPEG_UNPATCHED),yes) $(CHDIR)/$(FFMPEG_DIR); \ $(APPLY_PATCHES) endif diff --git a/make/target-files.mk b/make/target-files.mk index 9375725f..6f85813f 100644 --- a/make/target-files.mk +++ b/make/target-files.mk @@ -26,7 +26,7 @@ $(TARGET_sysconfdir)/default/rcS: $(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/default/rcS $(@) $(TARGET_sysconfdir)/network/interfaces: -ifeq ($(PERSISTENT_VAR_PARTITION), yes) +ifeq ($(PERSISTENT_VAR_PARTITION),yes) $(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/network/interfaces $(TARGET_localstatedir)/etc/network/interfaces else $(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/network/interfaces $(@) @@ -36,7 +36,7 @@ $(TARGET_sysconfdir)/date-dummy: echo "$(shell date +%Y)01010000" > $(@) $(TARGET_sysconfdir)/exports: -ifeq ($(PERSISTENT_VAR_PARTITION), yes) +ifeq ($(PERSISTENT_VAR_PARTITION),yes) $(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/exports-var $(TARGET_localstatedir)/etc/exports else $(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/exports $(@) @@ -70,14 +70,14 @@ $(TARGET_sysconfdir)/profile: $(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/profile $(@) $(TARGET_sysconfdir)/passwd: -ifeq ($(PERSISTENT_VAR_PARTITION), yes) +ifeq ($(PERSISTENT_VAR_PARTITION),yes) $(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/passwd $(TARGET_localstatedir)/etc/passwd else $(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/passwd $(@) endif $(TARGET_sysconfdir)/profile.local: -ifeq ($(PERSISTENT_VAR_PARTITION), yes) +ifeq ($(PERSISTENT_VAR_PARTITION),yes) $(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/profile.local-var $(TARGET_localstatedir)/etc/profile.local else $(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/profile.local $(@) diff --git a/make/target-libs-static.mk b/make/target-libs-static.mk index 8d4bf30f..b61f3e2f 100644 --- a/make/target-libs-static.mk +++ b/make/target-libs-static.mk @@ -4,7 +4,7 @@ # ----------------------------------------------------------------------------- LIBS-STATIC = -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) LIBS-STATIC += cortex-strings endif @@ -23,7 +23,7 @@ CORTEX-STRINGS_SITE = http://git.linaro.org/git-ro/toolchain/cortex-strings.gi $(DL_DIR)/$(CORTEX-STRINGS_SOURCE): $(GET-GIT-ARCHIVE) $(CORTEX-STRINGS_SITE) $(CORTEX-STRINGS_VER) $(@F) $(DL_DIR) -CORTEX-STRINGS_CONF = $(if $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse),--with-neon,--without-neon) +CORTEX-STRINGS_CONF = $(if $(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse),--with-neon,--without-neon) cortex-strings: $(STATIC_libdir)/libcortex-strings.la $(STATIC_libdir)/libcortex-strings.la: $(DL_DIR)/$(CORTEX-STRINGS_SOURCE) | $(STATIC_DIR) diff --git a/make/target-libs-unused.mk b/make/target-libs-unused.mk index 1d034ec1..f34f33a5 100644 --- a/make/target-libs-unused.mk +++ b/make/target-libs-unused.mk @@ -19,7 +19,7 @@ libid3tag: $(LIBID3TAG_DEPS) $(DL_DIR)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBID3TAG_DIR) $(UNTAR)/$(LIBID3TAG_SOURCE) $(CHDIR)/$(LIBID3TAG_DIR); \ - $(call apply_patches, $(LIBID3TAG_PATCH)); \ + $(call apply_patches,$(LIBID3TAG_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix=$(prefix) \ @@ -48,7 +48,7 @@ bzip2: $(DL_DIR)/$(BZIP2_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BZIP2_DIR) $(UNTAR)/$(BZIP2_SOURCE) $(CHDIR)/$(BZIP2_DIR); \ - $(call apply_patches, $(BZIP2_PATCH)); \ + $(call apply_patches,$(BZIP2_PATCH)); \ mv Makefile-libbz2_so Makefile; \ $(MAKE_ENV) \ $(MAKE) all; \ @@ -108,7 +108,7 @@ pixman: $(PIXMAN_DEPS) $(DL_DIR)/$(PIXMAN_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PIXMAN_DIR) $(UNTAR)/$(PIXMAN_SOURCE) $(CHDIR)/$(PIXMAN_DIR); \ - $(call apply_patches, $(PIXMAN_PATCH)); \ + $(call apply_patches,$(PIXMAN_PATCH)); \ $(CONFIGURE) \ --prefix=$(prefix) \ --disable-gtk \ @@ -141,7 +141,7 @@ cairo: $(CAIRO_DEPS) $(DL_DIR)/$(CAIRO_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(CAIRO_DIR) $(UNTAR)/$(CAIRO_SOURCE) $(CHDIR)/$(CAIRO_DIR); \ - $(call apply_patches, $(CAIRO_PATCH)); \ + $(call apply_patches,$(CAIRO_PATCH)); \ $(MAKE_ENV) \ ax_cv_c_float_words_bigendian="no" \ ./configure $(CONFIGURE_OPTS) \ @@ -184,7 +184,7 @@ harfbuzz: $(HARFBUZZ_DEPS) $(DL_DIR)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(HARFBUZZ_DIR) $(UNTAR)/$(HARFBUZZ_SOURCE) $(CHDIR)/$(HARFBUZZ_DIR); \ - $(call apply_patches, $(HARFBUZZ_PATCH)); \ + $(call apply_patches,$(HARFBUZZ_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix=$(prefix) \ diff --git a/make/target-libs.mk b/make/target-libs.mk index ea3df886..9eac7096 100644 --- a/make/target-libs.mk +++ b/make/target-libs.mk @@ -18,7 +18,7 @@ zlib: $(DL_DIR)/$(ZLIB_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(ZLIB_DIR) $(UNTAR)/$(ZLIB_SOURCE) $(CHDIR)/$(ZLIB_DIR); \ - $(call apply_patches, $(ZLIB_PATCH)); \ + $(call apply_patches,$(ZLIB_PATCH)); \ $(MAKE_ENV) \ mandir=$(REMOVE_mandir) \ ./configure \ @@ -106,7 +106,7 @@ libdvbsi: | $(TARGET_DIR) $(GET-GIT-SOURCE) $(LIBDVBSI_SITE)/$(LIBDVBSI_SOURCE) $(DL_DIR)/$(LIBDVBSI_SOURCE) $(CPDIR)/$(LIBDVBSI_SOURCE) $(CHDIR)/$(LIBDVBSI_DIR); \ - $(call apply_patches, $(LIBDVBSI_PATCH)); \ + $(call apply_patches,$(LIBDVBSI_PATCH)); \ $(CONFIGURE) \ --prefix=$(prefix) \ --enable-shared \ @@ -152,7 +152,7 @@ $(DL_DIR)/$(LIBCURL_SOURCE): LIBCURL_DEPS = zlib openssl rtmpdump ca-bundle -LIBCURL_CONF = $(if $(filter $(BOXSERIES), hd1),--disable-ipv6,--enable-ipv6) +LIBCURL_CONF = $(if $(filter $(BOXSERIES),hd1),--disable-ipv6,--enable-ipv6) libcurl: $(LIBCURL_DEPS) $(DL_DIR)/$(LIBCURL_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBCURL_DIR) @@ -208,13 +208,13 @@ LIBPNG_PATCH = libpng-Disable-pngfix-and-png-fix-itxt.patch LIBPNG_DEPS = zlib -LIBPNG_CONF = $(if $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse),--enable-arm-neon,--disable-arm-neon) +LIBPNG_CONF = $(if $(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse),--enable-arm-neon,--disable-arm-neon) libpng: $(LIBPNG_DEPS) $(DL_DIR)/$(LIBPNG_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBPNG_DIR) $(UNTAR)/$(LIBPNG_SOURCE) $(CHDIR)/$(LIBPNG_DIR); \ - $(call apply_patches, $(LIBPNG_PATCH)); \ + $(call apply_patches,$(LIBPNG_PATCH)); \ $(CONFIGURE) \ --prefix=$(prefix) \ --mandir=$(REMOVE_mandir) \ @@ -251,7 +251,7 @@ freetype: $(FREETYPE_DEPS) $(DL_DIR)/$(FREETYPE_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(FREETYPE_DIR) $(UNTAR)/$(FREETYPE_SOURCE) $(CHDIR)/$(FREETYPE_DIR); \ - $(call apply_patches, $(FREETYPE_PATCH)); \ + $(call apply_patches,$(FREETYPE_PATCH)); \ $(SED) '/^FONT_MODULES += \(type1\|cid\|pfr\|type42\|pcf\|bdf\|winfonts\|cff\)/d' modules.cfg $(CHDIR)/$(FREETYPE_DIR)/builds/unix; \ libtoolize --force --copy; \ @@ -296,7 +296,7 @@ libjpeg-turbo: $(DL_DIR)/$(LIBJPEG-TURBO_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBJPEG-TURBO_DIR) $(UNTAR)/$(LIBJPEG-TURBO_SOURCE) $(CHDIR)/$(LIBJPEG-TURBO_DIR); \ - $(call apply_patches, $(LIBJPEG-TURBO_PATCH)); \ + $(call apply_patches,$(LIBJPEG-TURBO_PATCH)); \ $(CMAKE) \ -DWITH_SIMD=False \ -DWITH_JPEG8=80 \ @@ -320,9 +320,9 @@ $(DL_DIR)/$(OPENSSL_SOURCE): OPENSSL_PATCH = 0000-Configure-align-O-flag.patch -ifeq ($(BOXARCH), arm) +ifeq ($(BOXARCH),arm) OPENSSL_ARCH = linux-armv4 -else ifeq ($(BOXARCH), mips) +else ifeq ($(BOXARCH),mips) OPENSSL_ARCH = linux-generic32 endif @@ -330,7 +330,7 @@ openssl: $(DL_DIR)/$(OPENSSL_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(OPENSSL_DIR) $(UNTAR)/$(OPENSSL_SOURCE) $(CHDIR)/$(OPENSSL_DIR); \ - $(call apply_patches, $(addprefix $(@F)/,$(OPENSSL_PATCH))); \ + $(call apply_patches,$(addprefix $(@F)/,$(OPENSSL_PATCH))); \ ./Configure \ $(OPENSSL_ARCH) \ shared \ @@ -362,7 +362,7 @@ openssl: $(DL_DIR)/$(OPENSSL_SOURCE) | $(TARGET_DIR) rm -rf $(TARGET_libdir)/engines rm -f $(TARGET_bindir)/c_rehash rm -f $(TARGET_sysconfdir)/ssl/misc/{CA.pl,tsget} -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2)) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) rm -f $(TARGET_bindir)/openssl rm -f $(TARGET_sysconfdir)/ssl/misc/{CA.*,c_*} endif @@ -390,7 +390,7 @@ ncurses: $(DL_DIR)/$(NCURSES_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(NCURSES_DIR) $(UNTAR)/$(NCURSES_SOURCE) $(CHDIR)/$(NCURSES_DIR); \ - $(call apply_patches, $(NCURSES_PATCH)); \ + $(call apply_patches,$(NCURSES_PATCH)); \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix=$(prefix) \ @@ -479,7 +479,7 @@ libusb-compat: $(LUBUSB-COMPAT_DEPS) $(DL_DIR)/$(LIBUSB-COMPAT_SOURCE) | $(TARGE $(REMOVE)/$(LIBUSB-COMPAT_DIR) $(UNTAR)/$(LIBUSB-COMPAT_SOURCE) $(CHDIR)/$(LIBUSB-COMPAT_DIR); \ - $(call apply_patches, $(addprefix $(@F)/,$(LIBUSB-COMPAT_PATCH))); \ + $(call apply_patches,$(addprefix $(@F)/,$(LIBUSB-COMPAT_PATCH))); \ $(CONFIGURE) \ --prefix=$(prefix) \ ; \ @@ -539,7 +539,7 @@ libdpf: $(LIBDPF_DEPS) | $(TARGET_DIR) $(GET-GIT-SOURCE) $(LIBDPF_SITE)/$(LIBDPF_SOURCE) $(DL_DIR)/$(LIBDPF_SOURCE) $(CPDIR)/$(LIBDPF_SOURCE) $(CHDIR)/$(LIBDPF_DIR)/dpflib; \ - $(call apply_patches, $(LIBDPF_PATCH)); \ + $(call apply_patches,$(LIBDPF_PATCH)); \ make libdpf.a CC=$(TARGET_CC) PREFIX=$(TARGET_prefix); \ mkdir -p $(TARGET_includedir)/libdpf; \ cp dpf.h $(TARGET_includedir)/libdpf/libdpf.h; \ @@ -618,7 +618,7 @@ expat: $(DL_DIR)/$(EXPAT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(EXPAT_DIR) $(UNTAR)/$(EXPAT_SOURCE) $(CHDIR)/$(EXPAT_DIR); \ - $(call apply_patches, $(EXPAT_PATCH)); \ + $(call apply_patches,$(EXPAT_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix=$(prefix) \ @@ -648,7 +648,7 @@ $(DL_DIR)/$(LIBBLURAY_SOURCE): LIBBLURAY_PATCH = libbluray.patch LIBBLURAY_DEPS = freetype -ifeq ($(BOXSERIES), hd2) +ifeq ($(BOXSERIES),hd2) LIBBLURAY_DEPS += libaacs libbdplus endif @@ -656,7 +656,7 @@ libbluray: $(LIBBLURAY_DEPS) $(DL_DIR)/$(LIBBLURAY_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBBLURAY_DIR) $(UNTAR)/$(LIBBLURAY_SOURCE) $(CHDIR)/$(LIBBLURAY_DIR); \ - $(call apply_patches, $(LIBBLURAY_PATCH)); \ + $(call apply_patches,$(LIBBLURAY_PATCH)); \ ./bootstrap; \ $(CONFIGURE) \ --prefix=$(prefix) \ @@ -699,7 +699,7 @@ libass: $(LIBASS_DEPS) $(DL_DIR)/$(LIBASS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBASS_DIR) $(UNTAR)/$(LIBASS_SOURCE) $(CHDIR)/$(LIBASS_DIR); \ - $(call apply_patches, $(LIBASS_PATCH)); \ + $(call apply_patches,$(LIBASS_PATCH)); \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix=$(prefix) \ @@ -915,7 +915,7 @@ pugixml: $(DL_DIR)/$(PUGIXML_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PUGIXML_DIR) $(UNTAR)/$(PUGIXML_SOURCE) $(CHDIR)/$(PUGIXML_DIR); \ - $(call apply_patches, $(PUGIXML_PATCH)); \ + $(call apply_patches,$(PUGIXML_PATCH)); \ $(CMAKE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) @@ -988,7 +988,7 @@ libtirpc: $(DL_DIR)/$(LIBTIRPC_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBTIRPC_DIR) $(UNTAR)/$(LIBTIRPC_SOURCE) $(CHDIR)/$(LIBTIRPC_DIR); \ - $(call apply_patches, $(addprefix $(@F)/,$(LIBTIRP_PATCH))); \ + $(call apply_patches,$(addprefix $(@F)/,$(LIBTIRP_PATCH))); \ autoreconf -fi; \ $(CONFIGURE) \ --target=$(TARGET) \ @@ -1002,7 +1002,7 @@ libtirpc: $(DL_DIR)/$(LIBTIRPC_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) -ifeq ($(BOXSERIES), hd1) +ifeq ($(BOXSERIES),hd1) $(SED) '/^\(udp\|tcp\)6/ d' $(TARGET_sysconfdir)/netconfig endif $(REMOVE)/$(LIBTIRPC_DIR) @@ -1085,7 +1085,7 @@ libmad: $(DL_DIR)/$(LIBMAD_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBMAD_DIR) $(UNTAR)/$(LIBMAD_SOURCE) $(CHDIR)/$(LIBMAD_DIR); \ - $(call apply_patches, $(LIBMAD_PATCH)); \ + $(call apply_patches,$(LIBMAD_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix=$(prefix) \ @@ -1192,7 +1192,7 @@ LIBFFI_SITE = $(call github,libffi,libffi,v$(LIBFFI_VER)) $(DL_DIR)/$(LIBFFI_SOURCE): $(DOWNLOAD) $(LIBFFI_SITE)/$(LIBFFI_SOURCE) -LIBFFI_CONF = $(if $(filter $(BOXSERIES), hd1),--enable-static --disable-shared) +LIBFFI_CONF = $(if $(filter $(BOXSERIES),hd1),--enable-static --disable-shared) libffi: $(DL_DIR)/$(LIBFFI_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBFFI_DIR) @@ -1226,13 +1226,13 @@ GLIB2_PATCH = glib2-disable-tests.patch GLIB2_PATCH += glib2-automake.patch GLIB2_DEPS = zlib libffi -ifeq ($(BOXSERIES), hd2) +ifeq ($(BOXSERIES),hd2) GLIB2_DEPS += gettext endif -GLIB2_CONF = $(if $(filter $(BOXSERIES), hd1),--enable-static --disable-shared) +GLIB2_CONF = $(if $(filter $(BOXSERIES),hd1),--enable-static --disable-shared) -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), vusolo4k vuduo4k vuduo4kse vuultimo4k vuuno4kse)) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),vusolo4k vuduo4k vuduo4kse vuultimo4k vuuno4kse)) GLIB2_DEPS += libiconv GLIB2_CONF += --with-libiconv=gnu endif @@ -1241,7 +1241,7 @@ glib2: $(GLIB2_DEPS) $(DL_DIR)/$(GLIB2_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(GLIB2_DIR) $(UNTAR)/$(GLIB2_SOURCE) $(CHDIR)/$(GLIB2_DIR); \ - $(call apply_patches, $(GLIB2_PATCH)); \ + $(call apply_patches,$(GLIB2_PATCH)); \ echo "ac_cv_type_long_long=yes" > arm-linux.cache; \ echo "glib_cv_stack_grows=no" >> arm-linux.cache; \ echo "glib_cv_uscore=no" >> arm-linux.cache; \ @@ -1377,7 +1377,7 @@ GRAPHLCD_BASE_SITE = git://projects.vdr-developer.org GRAPHLCD_BASE_PATCH = graphlcd.patch GRAPHLCD_BASE_PATCH += 0003-strip-graphlcd-conf.patch GRAPHLCD_BASE_PATCH += 0004-material-colors.patch -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo4k vuduo4kse vusolo4k vuultimo4k vuuno4kse)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuduo4k vuduo4kse vusolo4k vuultimo4k vuuno4kse)) GRAPHLCD_BASE_PATCH += 0005-add-vuplus-driver.patch endif @@ -1388,7 +1388,7 @@ graphlcd-base: $(GRAPHLCD_BASE_DEPS) | $(TARGET_DIR) $(GET-GIT-SOURCE) $(GRAPHLCD_BASE_SITE)/$(GRAPHLCD_BASE_SOURCE) $(DL_DIR)/$(GRAPHLCD_BASE_SOURCE) $(CPDIR)/$(GRAPHLCD_BASE_DIR) $(CHDIR)/$(GRAPHLCD_BASE_DIR); \ - $(call apply_patches, $(addprefix $(@)/,$(GRAPHLCD_BASE_PATCH))); \ + $(call apply_patches,$(addprefix $(@)/,$(GRAPHLCD_BASE_PATCH))); \ $(MAKE_ENV) \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) PREFIX=$(prefix) diff --git a/make/target-lua.mk b/make/target-lua.mk index a061941d..a7388b5f 100644 --- a/make/target-lua.mk +++ b/make/target-lua.mk @@ -24,7 +24,7 @@ lua: $(LUA_DEPS) $(DL_DIR)/$(LUA_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LUA_DIR) $(UNTAR)/$(LUA_SOURCE) $(CHDIR)/$(LUA_DIR); \ - $(call apply_patches, $(LUA_PATCH)); \ + $(call apply_patches,$(LUA_PATCH)); \ $(MAKE) linux \ PKG_VERSION=$(LUA_VER) \ $(MAKE_OPTS) \ @@ -86,7 +86,7 @@ lua-feedparser: $(LUA-DEEDPARSER_DEPS) $(DL_DIR)/$(LUA-FEEDPARSER_SOURCE) | $(TA $(UNTAR)/$(LUA-FEEDPARSER_SOURCE) $(CHDIR)/$(LUA-FEEDPARSER_DIR); \ $(SED) 's|^PREFIX =|PREFIX ?=|' Makefile; \ - $(call apply_patches, $(LUA-FEEDPARSER_PATCH)); \ + $(call apply_patches,$(LUA-FEEDPARSER_PATCH)); \ $(MAKE) install PREFIX=$(TARGET_prefix) $(REMOVE)/$(LUA-FEEDPARSER_DIR) $(TOUCH) @@ -167,7 +167,7 @@ luaposix: $(LUAPOSIX_DEPS) $(DL_DIR)/$(SLINGSHOT_SOURCE) $(DL_DIR)/$(GNULIB_SOUR $(CHDIR)/$(LUAPOSIX_DIR); \ tar -C gnulib --strip=1 -xf $(DL_DIR)/$(GNULIB_SOURCE); \ tar -C slingshot --strip=1 -xf $(DL_DIR)/$(SLINGSHOT_SOURCE); \ - $(call apply_patches, $(LUAPOSIX_PATCH)); \ + $(call apply_patches,$(LUAPOSIX_PATCH)); \ export LUA=$(HOST_LUA); \ ./bootstrap; \ autoreconf -fi; \ diff --git a/make/target-rootfs.mk b/make/target-rootfs.mk index bd816bab..b4c7dc3c 100644 --- a/make/target-rootfs.mk +++ b/make/target-rootfs.mk @@ -4,7 +4,7 @@ # ----------------------------------------------------------------------------- target-finish: .version update.urls symbolic-links -ifeq ($(BOXTYPE), armbox) +ifeq ($(BOXTYPE),armbox) make e2-multiboot endif @@ -22,7 +22,7 @@ $(TARGET_DIR)/.version: | $(TARGET_DIR) echo "box_model=$(BOXMODEL)" >> $(@) echo "creator=$(MAINTAINER)" >> $(@) echo "homepage=www.neutrino-images.de" >> $(@) -ifeq ($(BOXTYPE), $(filter $(BOXTYPE), armbox mipsbox)) +ifeq ($(BOXTYPE),$(filter $(BOXTYPE),armbox mipsbox)) echo "imagedir=$(IMAGE_SUBDIR)" >> $(@) endif @@ -45,7 +45,7 @@ symbolic-links: | $(TARGET_DIR) rm -rf tmp; ln -sf /tmp tmp $(CD) $(TARGET_sysconfdir); \ ln -sf /proc/mounts mtab -ifeq ($(PERSISTENT_VAR_PARTITION), yes) +ifeq ($(PERSISTENT_VAR_PARTITION),yes) $(CD) $(TARGET_sysconfdir); \ ln -sf /var/etc/exports exports; \ ln -sf /var/etc/hostname hostname; \ @@ -132,7 +132,7 @@ ROOTFS-STRIP_LIBS += $(libdir) # strip bins and libs in root filesystem rootfs-strip: $(ROOTFS) -ifneq ($(DEBUG), yes) +ifneq ($(DEBUG),yes) $(call draw_line); @echo "The following warnings from strip are harmless!" $(call draw_line); @@ -148,7 +148,7 @@ ifneq ($(DEBUG), yes) -path $(ROOTFS)/lib/modules \) -prune -o \ -type f -print0 | xargs -0 $(TARGET_STRIP) || true; \ done - ifeq ($(BOXSERIES), hd2) + ifeq ($(BOXSERIES),hd2) find $(ROOTFS)/lib/modules/$(KERNEL_VER)/kernel -type f -name '*.ko' | xargs -n 1 $(TARGET_OBJCOPY) --strip-unneeded endif @echo -e "$(TERM_YELLOW)" @@ -159,7 +159,7 @@ endif # ----------------------------------------------------------------------------- -ifeq ($(BOXTYPE), $(filter $(BOXTYPE), coolstream)) +ifeq ($(BOXTYPE),$(filter $(BOXTYPE),coolstream)) get-update-info: get-update-info-$(BOXSERIES) diff --git a/make/target-scripts.mk b/make/target-scripts.mk index bf780f63..5e4f317f 100644 --- a/make/target-scripts.mk +++ b/make/target-scripts.mk @@ -46,7 +46,7 @@ $(TARGET_sysconfdir)/init.d/rc: $(INSTALL_EXEC) -D $(TARGET_FILES)/files-etc/init.d/rc $(@) $(TARGET_sysconfdir)/init.d/rcS: -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse)) $(INSTALL_EXEC) -D $(TARGET_FILES)/files-etc/init.d/rcS-vuplus $(@) else $(INSTALL_EXEC) -D $(TARGET_FILES)/files-etc/init.d/rcS-$(BOXSERIES) $(@) @@ -72,7 +72,7 @@ $(TARGET_sysconfdir)/init.d/crond: $(UPDATE-RC.D) $(@F) defaults 50 $(TARGET_sysconfdir)/init.d/custom-poweroff: -ifeq ($(BOXTYPE), coolstream) +ifeq ($(BOXTYPE),coolstream) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/custom-poweroff.init $(@) $(UPDATE-RC.D) $(@F) start 99 0 6 . endif @@ -96,23 +96,23 @@ $(TARGET_sysconfdir)/init.d/networking: $(UPDATE-RC.D) $(@F) stop 98 0 6 . $(TARGET_sysconfdir)/init.d/partitions-by-name: -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7 hd60 hd61)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/partitions-by-name.init $(@) endif $(TARGET_sysconfdir)/init.d/proc: -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7 hd60 hd61 vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61 vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/proc.init $(@) $(UPDATE-RC.D) $(@F) start 90 S . endif $(TARGET_sysconfdir)/init.d/resizerootfs: -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7 hd60 hd61)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/resizerootfs.init $(@) endif $(TARGET_sysconfdir)/init.d/swap: -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7 hd60 hd61 vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7 hd60 hd61 vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/swap.init $(@) $(UPDATE-RC.D) $(@F) stop 98 0 6 . endif @@ -125,19 +125,19 @@ $(TARGET_sysconfdir)/init.d/syslogd: $(UPDATE-RC.D) $(@F) stop 98 0 6 . $(TARGET_sysconfdir)/init.d/sendsigs: -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60 hd61)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60 hd61)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/sendsigs.init $(@) $(UPDATE-RC.D) $(@F) start 85 0 . endif $(TARGET_sysconfdir)/init.d/umountfs: -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60 hd61)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60 hd61)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/umountfs.init $(@) $(UPDATE-RC.D) $(@F) start 86 0 . endif $(TARGET_sysconfdir)/init.d/suspend: -ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60 hd61)) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60 hd61)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/suspend.init $(@) $(UPDATE-RC.D) $(@F) start 89 0 . endif @@ -147,17 +147,17 @@ $(TARGET_sysconfdir)/init.d/user-initscripts: $(UPDATE-RC.D) $(@F) defaults 98 01 $(TARGET_sysconfdir)/init.d/stb_update.sh: -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2)) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/stb_update_$(BOXSERIES).sh $(@) endif $(TARGET_sysconfdir)/init.d/var_mount.sh: -ifeq ($(PERSISTENT_VAR_PARTITION), yes) +ifeq ($(PERSISTENT_VAR_PARTITION),yes) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/var_mount.sh $(@) endif $(TARGET_sysconfdir)/init.d/var_update.sh: -ifeq ($(PERSISTENT_VAR_PARTITION), yes) +ifeq ($(PERSISTENT_VAR_PARTITION),yes) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/var_update.sh $(@) endif diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk index 17997c14..c0dd5691 100644 --- a/make/target-tools-unused.mk +++ b/make/target-tools-unused.mk @@ -21,7 +21,7 @@ usbutils: $(USBUTILS_DEPS) $(DL_DIR)/$(USBUTILS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(USBUTILS_DIR) $(UNTAR)/$(USBUTILS_SOURCE) $(CHDIR)/$(USBUTILS_DIR); \ - $(call apply_patches, $(USBUTILS_PATCH)); \ + $(call apply_patches,$(USBUTILS_PATCH)); \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix=$(prefix) \ diff --git a/make/target-tools.mk b/make/target-tools.mk index 9b78567b..d5709cd0 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -50,7 +50,7 @@ define BUSYBOX_INSTALL_CONFIG $(call KCONFIG_SET_OPT,CONFIG_PREFIX,"$(TARGET_DIR)",$(BUSYBOX_BUILD_CONFIG)) endef -ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) +ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd2 hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) define BUSYBOX_SET_BLKDISCARD $(call KCONFIG_ENABLE_OPT,CONFIG_BLKDISCARD,$(BUSYBOX_BUILD_CONFIG)) @@ -61,7 +61,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd5x hd6x vusolo4k vuduo4k vuduo4 $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IPV6,$(BUSYBOX_BUILD_CONFIG)) endef - ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) + ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) define BUSYBOX_SET_SWAP $(call KCONFIG_ENABLE_OPT,CONFIG_SWAPON,$(BUSYBOX_BUILD_CONFIG)) @@ -76,7 +76,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd5x hd6x vusolo4k vuduo4k vuduo4 $(call KCONFIG_ENABLE_OPT,CONFIG_PKILL,$(BUSYBOX_BUILD_CONFIG)) endef - ifeq ($(BOXSERIES), $(filter $(BOXSERIES), vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) + ifeq ($(BOXSERIES),$(filter $(BOXSERIES),vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) define BUSYBOX_SET_START_STOP_DAEMON $(call KCONFIG_ENABLE_OPT,CONFIG_START_STOP_DAEMON,$(BUSYBOX_BUILD_CONFIG)) @@ -118,7 +118,7 @@ busybox: $(BUSYBOX_DEPS) $(DL_DIR)/$(BUSYBOX_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BUSYBOX_DIR) $(UNTAR)/$(BUSYBOX_SOURCE) $(CHDIR)/$(BUSYBOX_DIR); \ - $(call apply_patches, $(BUSYBOX_PATCH)) + $(call apply_patches,$(BUSYBOX_PATCH)) $(BUSYBOX_INSTALL_CONFIG) $(BUSYBOX_MODIFY_CONFIG) $(CHDIR)/$(BUSYBOX_DIR); \ @@ -149,7 +149,7 @@ bash: $(DL_DIR)/$(BASH_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BASH_DIR) $(UNTAR)/$(BASH_SOURCE) $(CHDIR)/$(BASH_DIR); \ - $(call apply_patches, $(BASH_PATCH), 0); \ + $(call apply_patches,$(BASH_PATCH),0); \ $(CONFIGURE) \ --prefix=$(base_prefix) \ --includedir=$(includedir) \ @@ -205,7 +205,7 @@ coreutils: $(DL_DIR)/$(COREUTILS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(COREUTILS_DIR) $(UNTAR)/$(COREUTILS_SOURCE) $(CHDIR)/$(COREUTILS_DIR); \ - $(call apply_patches, $(COREUTILS_PATCH)); \ + $(call apply_patches,$(COREUTILS_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ --target=$(TARGET) \ @@ -250,7 +250,7 @@ procps-ng: $(PROCPS-NG_DEPS) $(DL_DIR)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PROCPS-NG_DIR) $(UNTAR)/$(PROCPS-NG_SOURCE) $(CHDIR)/$(PROCPS-NG_DIR); \ - $(call apply_patches, $(PROCPS-NG_PATCH)); \ + $(call apply_patches,$(PROCPS-NG_PATCH)); \ export ac_cv_func_malloc_0_nonnull=yes; \ export ac_cv_func_realloc_0_nonnull=yes; \ autoreconf -fi; \ @@ -290,7 +290,7 @@ $(DL_DIR)/$(MTD-UTILS_SOURCE): MTD-UTILS_DEPS = zlib lzo e2fsprogs MTD-UTILS_SBIN = flash_erase flash_eraseall -ifeq ($(BOXSERIES), hd2) +ifeq ($(BOXSERIES),hd2) MTD-UTILS_SBIN+= nanddump nandtest nandwrite mkfs.jffs2 endif @@ -335,7 +335,7 @@ dosfstools: $(DL_DIR)/$(DOSFSTOOLS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(DOSFSTOOLS_DIR) $(UNTAR)/$(DOSFSTOOLS_SOURCE) $(CHDIR)/$(DOSFSTOOLS_DIR); \ - $(call apply_patches, $(addprefix $(@F)/,$(DOSFSTOOLS_PATCH))); \ + $(call apply_patches,$(addprefix $(@F)/,$(DOSFSTOOLS_PATCH))); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix=$(base_prefix) \ @@ -442,7 +442,7 @@ exfat-utils: $(EXFAT-UTILS_DEPS) $(DL_DIR)/$(EXFAT-UTILS_SOURCE) | $(TARGET_DIR) # ----------------------------------------------------------------------------- # for coolstream: formatting ext4 failes with newer versions then 1.43.8 -E2FSPROGS_VER = $(if $(filter $(BOXTYPE), coolstream),1.43.8,1.45.6) +E2FSPROGS_VER = $(if $(filter $(BOXTYPE),coolstream),1.43.8,1.45.6) E2FSPROGS_DIR = e2fsprogs-$(E2FSPROGS_VER) E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VER).tar.gz E2FSPROGS_SITE = https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(E2FSPROGS_VER) @@ -621,7 +621,7 @@ TZDATA_ZONELIST = \ TZDATA_LOCALTIME = CET -ETC_LOCALTIME = $(if $(filter $(PERSISTENT_VAR_PARTITION), yes),/var/etc/localtime,/etc/localtime) +ETC_LOCALTIME = $(if $(filter $(PERSISTENT_VAR_PARTITION),yes),/var/etc/localtime,/etc/localtime) tzdata: $(TZDATA_DEPS) $(DL_DIR)/$(TZDATA_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(TZDATA_DIR) @@ -659,7 +659,7 @@ iperf: $(DL_DIR)/$(IPERF_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(IPERF_DIR) $(UNTAR)/$(IPERF_SOURCE) $(CHDIR)/$(IPERF_DIR); \ - $(call apply_patches, $(IPERF_PATCH)); \ + $(call apply_patches,$(IPERF_PATCH)); \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix=$(prefix) \ @@ -690,7 +690,7 @@ parted: $(PARTED_DEPS) $(DL_DIR)/$(PARTED_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PARTED_DIR) $(UNTAR)/$(PARTED_SOURCE) $(CHDIR)/$(PARTED_DIR); \ - $(call apply_patches, $(PARTED_PATCH)); \ + $(call apply_patches,$(PARTED_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ --target=$(TARGET) \ @@ -816,7 +816,7 @@ djmount: $(DJMOUNT_DEPS) $(DL_DIR)/$(DJMOUNT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(DJMOUNT_DIR) $(UNTAR)/$(DJMOUNT_SOURCE) $(CHDIR)/$(DJMOUNT_DIR); \ - $(call apply_patches, $(DJMOUNT_PATCH)); \ + $(call apply_patches,$(DJMOUNT_PATCH)); \ touch libupnp/config.aux/config.rpath; \ autoreconf -fi; \ $(CONFIGURE) -C \ @@ -850,7 +850,7 @@ ushare: $(USHARE_DEPS) $(DL_DIR)/$(USHARE_SOURCE)| $(TARGET_DIR) $(REMOVE)/$(USHARE_DIR) $(UNTAR)/$(USHARE_SOURCE) $(CHDIR)/$(USHARE_DIR); \ - $(call apply_patches, $(USHARE_PATCH)); \ + $(call apply_patches,$(USHARE_PATCH)); \ $(MAKE_ENV) \ ./configure \ --prefix=$(prefix) \ @@ -948,7 +948,7 @@ vsftpd: $(VSFTPD_DEPS) $(DL_DIR)/$(VSFTPD_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(VSFTPD_DIR) $(UNTAR)/$(VSFTPD_SOURCE) $(CHDIR)/$(VSFTPD_DIR); \ - $(call apply_patches, $(VSFTPD_PATCH)); \ + $(call apply_patches,$(VSFTPD_PATCH)); \ $(SED) 's/.*VSF_BUILD_PAM/#undef VSF_BUILD_PAM/' builddefs.h; \ $(SED) 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' builddefs.h; \ $(MAKE) clean; \ @@ -1012,7 +1012,7 @@ minicom: $(MINICOM_DEPS) $(DL_DIR)/$(MINICOM_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(MINICOM_DIR) $(UNTAR)/$(MINICOM_SOURCE) $(CHDIR)/$(MINICOM_DIR); \ - $(call apply_patches, $(MINICOM_PATCH)); \ + $(call apply_patches,$(MINICOM_PATCH)); \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix=$(prefix) \ @@ -1046,7 +1046,7 @@ autofs: $(AUTOFS_DEPS) $(DL_DIR)/$(AUTOFS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(AUTOFS_DIR) $(UNTAR)/$(AUTOFS_SOURCE) $(CHDIR)/$(AUTOFS_DIR); \ - $(call apply_patches, $(addprefix $(@F)/,$(AUTOFS_PATCH))); \ + $(call apply_patches,$(addprefix $(@F)/,$(AUTOFS_PATCH))); \ $(SED) "s|nfs/nfs.h|linux/nfs.h|" include/rpc_subs.h; \ export ac_cv_linux_procfs=yes; \ export ac_cv_path_KRB5_CONFIG=no; \ @@ -1077,7 +1077,7 @@ autofs: $(AUTOFS_DEPS) $(DL_DIR)/$(AUTOFS_SOURCE) | $(TARGET_DIR) # ----------------------------------------------------------------------------- -SAMBA_TARGET = $(if $(filter $(BOXSERIES), hd1), samba33, samba36) +SAMBA_TARGET = $(if $(filter $(BOXSERIES),hd1),samba33, samba36) samba: $(SAMBA_TARGET) $(TOUCH) @@ -1101,7 +1101,7 @@ samba33: $(SAMBA33_DEPS) $(DL_DIR)/$(SAMBA33_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(SAMBA33_DIR) $(UNTAR)/$(SAMBA33_SOURCE) $(CHDIR)/$(SAMBA33_DIR); \ - $(call apply_patches, $(SAMBA33_PATCH)); \ + $(call apply_patches,$(SAMBA33_PATCH)); \ $(CHDIR)/$(SAMBA33_DIR)/source; \ ./autogen.sh; \ export CONFIG_SITE=$(CONFIGS)/samba33-config.site; \ @@ -1183,8 +1183,8 @@ samba36: $(SAMBA36_DEPS) $(DL_DIR)/$(SAMBA36_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(SAMBA36_DIR) $(UNTAR)/$(SAMBA36_SOURCE) $(CHDIR)/$(SAMBA36_DIR); \ - $(call apply_patches, $(SAMBA36_PATCH1), 1); \ - $(call apply_patches, $(SAMBA36_PATCH0), 0); \ + $(call apply_patches,$(SAMBA36_PATCH1),1); \ + $(call apply_patches,$(SAMBA36_PATCH0),0); \ $(CHDIR)/$(SAMBA36_DIR)/source3; \ ./autogen.sh; \ export CONFIG_SITE=$(CONFIGS)/samba36-config.site; \ @@ -1333,7 +1333,7 @@ fbshot: $(FBSHOT_DEPS) $(DL_DIR)/$(FBSHOT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(FBSHOT_DIR) $(UNTAR)/$(FBSHOT_SOURCE) $(CHDIR)/$(FBSHOT_DIR); \ - $(call apply_patches, $(FBSHOT_PATCH)); \ + $(call apply_patches,$(FBSHOT_PATCH)); \ $(SED) 's| gcc | $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) |' Makefile; \ $(SED) '/strip fbshot/d' Makefile; \ $(MAKE) all; \ @@ -1438,7 +1438,7 @@ xupnpd: $(XUPNPD_DEPS) | $(TARGET_DIR) $(CPDIR)/$(XUPNPD_SOURCE) $(CHDIR)/$(XUPNPD_DIR); \ git checkout 25d6d44; \ - $(call apply_patches, $(XUPNPD_PATCH)) + $(call apply_patches,$(XUPNPD_PATCH)) $(CHDIR)/$(XUPNPD_DIR)/src; \ $(MAKE_ENV) \ $(MAKE) embedded TARGET=$(TARGET) CC=$(TARGET_CC) STRIP=$(TARGET_STRIP) LUAFLAGS="$(TARGET_LDFLAGS) -I$(TARGET_includedir)"; \ @@ -1474,13 +1474,13 @@ NFS-UTILS_PATCH += nfs-utils_04-mountd-Add-check-for-struct-file_handle.patch NFS-UTILS_DEPS = rpcbind -NFS-UTILS_CONF = $(if $(filter $(BOXSERIES), hd1),--disable-ipv6,--enable-ipv6) +NFS-UTILS_CONF = $(if $(filter $(BOXSERIES),hd1),--disable-ipv6,--enable-ipv6) nfs-utils: $(NFS-UTILS_DEPS) $(DL_DIR)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(NFS-UTILS_DIR) $(UNTAR)/$(NFS-UTILS_SOURCE) $(CHDIR)/$(NFS-UTILS_DIR); \ - $(call apply_patches, $(NFS-UTILS_PATCH)); \ + $(call apply_patches,$(NFS-UTILS_PATCH)); \ export knfsd_cv_bsd_signals=no; \ autoreconf -fi; \ $(CONFIGURE) \ @@ -1528,7 +1528,7 @@ rpcbind: $(RPCBIND_DEPS) $(DL_DIR)/$(RPCBIND_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(RPCBIND_DIR) $(UNTAR)/$(RPCBIND_SOURCE) $(CHDIR)/$(RPCBIND_DIR); \ - $(call apply_patches, $(RPCBIND_PATCH)); \ + $(call apply_patches,$(RPCBIND_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ --target=$(TARGET) \ @@ -1663,7 +1663,7 @@ wget: $(WGET_DEPS) $(DL_DIR)/$(WGET_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(WGET_DIR) $(UNTAR)/$(WGET_SOURCE) $(CHDIR)/$(WGET_DIR); \ - $(call apply_patches, $(addprefix $(@F)/,$(WGET_PATCH))); \ + $(call apply_patches,$(addprefix $(@F)/,$(WGET_PATCH))); \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix=$(prefix) \ @@ -1788,7 +1788,7 @@ gptfdisk: $(GPTFDISK_DEPS) $(DL_DIR)/$(GPTFDISK_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(GPTFDISK_DIR) $(UNTAR)/$(GPTFDISK_SOURCE) $(CHDIR)/$(GPTFDISK_DIR); \ - $(call apply_patches, $(GPTFDISK_PATCH)); \ + $(call apply_patches,$(GPTFDISK_PATCH)); \ $(SED) 's|^CC=.*|CC=$(TARGET_CC)|' Makefile; \ $(SED) 's|^CXX=.*|CXX=$(TARGET_CXX)|' Makefile; \ $(MAKE_ENV) \ diff --git a/make/update.mk b/make/update.mk index 5dc108c0..4ca8e28f 100644 --- a/make/update.mk +++ b/make/update.mk @@ -6,7 +6,7 @@ update-self: export GIT_MERGE_AUTOEDIT=no; \ git pull -ifeq ($(HAS_INTERNALS), yes) +ifeq ($(HAS_INTERNALS),yes) $(CD) $(BASE_DIR)/$(NI-INTERNALS); git pull endif @@ -17,7 +17,7 @@ update-neutrino: git pull origin $(NI-NEUTRINO_BRANCH) update-remotes: -ifeq ($(NI_ADMIN), true) +ifeq ($(NI_ADMIN),true) export GIT_MERGE_AUTOEDIT=no; \ $(CD) $(SOURCE_DIR)/$(NI-NEUTRINO); \ git checkout $(NI-NEUTRINO_BRANCH); \ @@ -47,7 +47,7 @@ update-ni-sources: ni-sources $(CD) $(BUILD-GENERIC-PC); git pull $(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN); git pull $(CD) $(SOURCE_DIR)/$(NI-FFMPEG); git pull --all; git checkout $(NI-FFMPEG_BRANCH) -ifeq ($(HAS_LIBCS), yes) +ifeq ($(HAS_LIBCS),yes) $(CD) $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM); git pull --all; git checkout $(NI-LIBCOOLSTREAM_BRANCH) endif $(CD) $(SOURCE_DIR)/$(NI-LIBSTB-HAL); git pull @@ -69,13 +69,13 @@ update-all: update-ni update-remotes push: git push -ifeq ($(HAS_INTERNALS), yes) +ifeq ($(HAS_INTERNALS),yes) $(CD) $(BASE_DIR)/$(NI-INTERNALS); git push endif $(CD) $(BUILD-GENERIC-PC); git push $(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN); git push $(CD) $(SOURCE_DIR)/$(NI-FFMPEG); git push --all -ifeq ($(HAS_LIBCS), yes) +ifeq ($(HAS_LIBCS),yes) $(CD) $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM); git push --all endif $(CD) $(SOURCE_DIR)/$(NI-LIBSTB-HAL); git push @@ -90,13 +90,13 @@ endif status: git status -s -b -ifeq ($(HAS_INTERNALS), yes) +ifeq ($(HAS_INTERNALS),yes) $(CD) $(BASE_DIR)/$(NI-INTERNALS); git status -s -b endif $(CD) $(BUILD-GENERIC-PC); git status -s -b $(CD) $(SOURCE_DIR)/$(NI-DRIVERS-BIN); git status -s -b $(CD) $(SOURCE_DIR)/$(NI-FFMPEG); git status -s -b -ifeq ($(HAS_LIBCS), yes) +ifeq ($(HAS_LIBCS),yes) $(CD) $(SOURCE_DIR)/$(NI-LIBCOOLSTREAM); git status -s -b endif $(CD) $(SOURCE_DIR)/$(NI-LIBSTB-HAL); git status -s -b