diff --git a/make/environment-linux.mk b/make/environment-linux.mk index 7c700965..08798726 100644 --- a/make/environment-linux.mk +++ b/make/environment-linux.mk @@ -52,10 +52,10 @@ else ifeq ($(BOXMODEL), vusolo4k) KERNEL_BRANCH = $(EMPTY) KERNEL_DTB = $(EMPTY) - VMLINUZ_INITRD_VER = 20190911 - VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz - VMLINUZ_INITRD_URL = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads - VMLINUZ_INITRD = vmlinuz-initrd-7366c0 + VMLINUZ-INITRD_VER = 20190911 + VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz + VMLINUZ-INITRD_URL = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads + VMLINUZ-INITRD = vmlinuz-initrd-7366c0 BOOT_PARTITION = 1 @@ -71,10 +71,10 @@ else ifeq ($(BOXMODEL), vuduo4k) KERNEL_BRANCH = $(EMPTY) KERNEL_DTB = $(EMPTY) - VMLINUZ_INITRD_VER = 20190911 - VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz - VMLINUZ_INITRD_URL = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads - VMLINUZ_INITRD = vmlinuz-initrd-7278b1 + VMLINUZ-INITRD_VER = 20190911 + VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz + VMLINUZ-INITRD_URL = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads + VMLINUZ-INITRD = vmlinuz-initrd-7278b1 BOOT_PARTITION = 6 @@ -90,10 +90,10 @@ else ifeq ($(BOXMODEL), vuultimo4k) KERNEL_BRANCH = $(EMPTY) KERNEL_DTB = $(EMPTY) - VMLINUZ_INITRD_VER = 20190911 - VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz - VMLINUZ_INITRD_URL = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads - VMLINUZ_INITRD = vmlinuz-initrd-7445d0 + VMLINUZ-INITRD_VER = 20190911 + VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz + VMLINUZ-INITRD_URL = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads + VMLINUZ-INITRD = vmlinuz-initrd-7445d0 BOOT_PARTITION = 1 @@ -109,10 +109,10 @@ else ifeq ($(BOXMODEL), vuzero4k) KERNEL_BRANCH = $(EMPTY) KERNEL_DTB = $(EMPTY) - VMLINUZ_INITRD_VER = 20190911 - VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz - VMLINUZ_INITRD_URL = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads - VMLINUZ_INITRD = vmlinuz-initrd-7260a0 + VMLINUZ-INITRD_VER = 20190911 + VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz + VMLINUZ-INITRD_URL = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads + VMLINUZ-INITRD = vmlinuz-initrd-7260a0 BOOT_PARTITION = 4 @@ -128,10 +128,10 @@ else ifeq ($(BOXMODEL), vuuno4k) KERNEL_BRANCH = $(EMPTY) KERNEL_DTB = $(EMPTY) - VMLINUZ_INITRD_VER = 20191010 - VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz - VMLINUZ_INITRD_URL = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads - VMLINUZ_INITRD = vmlinuz-initrd-7439b0 + VMLINUZ-INITRD_VER = 20191010 + VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz + VMLINUZ-INITRD_URL = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads + VMLINUZ-INITRD = vmlinuz-initrd-7439b0 BOOT_PARTITION = 1 @@ -147,10 +147,10 @@ else ifeq ($(BOXMODEL), vuuno4kse) KERNEL_BRANCH = $(EMPTY) KERNEL_DTB = $(EMPTY) - VMLINUZ_INITRD_VER = 20191010 - VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz - VMLINUZ_INITRD_URL = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads - VMLINUZ_INITRD = vmlinuz-initrd-7439b0 + VMLINUZ-INITRD_VER = 20191010 + VMLINUZ-INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ-INITRD_VER).tar.gz + VMLINUZ-INITRD_URL = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads + VMLINUZ-INITRD = vmlinuz-initrd-7439b0 BOOT_PARTITION = 1 diff --git a/make/images.mk b/make/images.mk index df5d0550..e0fec225 100644 --- a/make/images.mk +++ b/make/images.mk @@ -243,7 +243,7 @@ flash-image-vuplus-multi: | $(IMAGE_DIR) rm -rf $(IMAGE_BUILD_TMP) mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR) cp $(IMAGEFILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/splash_auto.bin - cp $(BUILD_TMP)/$(VMLINUZ_INITRD) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/initrd_auto.bin + cp $(BUILD_TMP)/$(VMLINUZ-INITRD) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/initrd_auto.bin cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel1_auto.bin echo Dummy for update. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel_auto.bin echo Dummy for update. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel2_auto.bin diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk index 2a86f6ec..d660c1fc 100644 --- a/make/linux-kernel.mk +++ b/make/linux-kernel.mk @@ -145,8 +145,8 @@ VUDUO_PATCH = \ $(ARCHIVE)/$(KERNEL_SOURCE): $(DOWNLOAD) $(KERNEL_URL)/$(KERNEL_SOURCE) -$(ARCHIVE)/$(VMLINUZ_INITRD_SOURCE): - $(DOWNLOAD) $(VMLINUZ_INITRD_URL)/$(VMLINUZ_INITRD_SOURCE) +$(ARCHIVE)/$(VMLINUZ-INITRD_SOURCE): + $(DOWNLOAD) $(VMLINUZ-INITRD_URL)/$(VMLINUZ-INITRD_SOURCE) # ----------------------------------------------------------------------------- @@ -285,8 +285,8 @@ kernel-modules-mipsbox: kernel-mipsbox # ----------------------------------------------------------------------------- -vmlinuz-initrd: $(ARCHIVE)/$(VMLINUZ_INITRD_SOURCE) - $(UNTAR)/$(VMLINUZ_INITRD_SOURCE) +vmlinuz-initrd: $(ARCHIVE)/$(VMLINUZ-INITRD_SOURCE) + $(UNTAR)/$(VMLINUZ-INITRD_SOURCE) $(TOUCH) # -----------------------------------------------------------------------------