domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ramips: fix build error in ubnt-erx initramfs factory image

Browse Source 
Build initramfs kernel image, but skip factory image if initramfs size
is too big.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau
2016-07-06 10:11:29 +02:00
parent ad430c1080
commit 201dbb9fe8
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ramips/image/Makefile
View File

@@ -22,7 +22,7 @@ define Image/Build/Initramfs
$(call Image/Build/Profile/$(PROFILE),initramfs) $(call Image/Build/Profile/$(PROFILE),initramfs)
endef endef
DEVICE_VARS += DTS IMAGE_SIZE DEVICE_VARS += DTS IMAGE_SIZE KERNEL_SIZE
loadaddr-y := 0x80000000 loadaddr-y := 0x80000000
loadaddr-$(CONFIG_TARGET_ramips_rt288x) := 0x88000000 loadaddr-$(CONFIG_TARGET_ramips_rt288x) := 0x88000000

7
target/linux/ramips/image/mt7621.mk
View File

@@ -12,7 +12,7 @@ define Build/seama-seal
endef endef
define Build/ubnt-erx-factory-image define Build/ubnt-erx-factory-image
if [ -e $(KDIR)/tmp/$(KERNEL_INITRAMFS_IMAGE) ]; then \ if [ -e $(KDIR)/tmp/$(KERNEL_INITRAMFS_IMAGE) -a "$$(stat -c%s $@)" -lt "$(KERNEL_SIZE)" ]; then \
echo '21001:6' > $(1).compat; \ echo '21001:6' > $(1).compat; \
$(TAR) -cf $(1) --transform='s/^.*/compat/' $(1).compat; \ $(TAR) -cf $(1) --transform='s/^.*/compat/' $(1).compat; \
\ \
@@ -30,6 +30,8 @@ define Build/ubnt-erx-factory-image
$(TAR) -rf $(1) --transform='s/^.*/version.tmp/' $(1).version; \ $(TAR) -rf $(1) --transform='s/^.*/version.tmp/' $(1).version; \
\ \
$(CP) $(1) $(BIN_DIR)/; \ $(CP) $(1) $(BIN_DIR)/; \
else \
echo "WARNING: initramfs kernel image too big, cannot generate factory image" >&2; \
fi fi
endef endef
@@ -155,8 +157,7 @@ define Device/ubnt-erx
KERNEL_SIZE := 3145728 KERNEL_SIZE := 3145728
KERNEL := $(KERNEL_DTB) | uImage lzma KERNEL := $(KERNEL_DTB) | uImage lzma
IMAGES := sysupgrade.tar IMAGES := sysupgrade.tar
KERNEL_INITRAMFS := $$(KERNEL) | check-size $$(KERNEL_SIZE) | \ KERNEL_INITRAMFS := $$(KERNEL) | ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar
ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar
IMAGE/sysupgrade.tar := sysupgrade-nand IMAGE/sysupgrade.tar := sysupgrade-nand
DEVICE_TITLE := Ubiquiti EdgeRouter X DEVICE_TITLE := Ubiquiti EdgeRouter X
DEVICE_PACKAGES := -kmod-mt76 -kmod-rt2800-pci -kmod-cfg80211 -wpad-mini -iwinfo DEVICE_PACKAGES := -kmod-mt76 -kmod-rt2800-pci -kmod-cfg80211 -wpad-mini -iwinfo