diff options
author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2019-12-19 20:42:19 +0100 |
---|---|---|
committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2019-12-20 00:29:05 +0100 |
commit | 0757f7fedca77d169682d41e7b861d86e7308a11 (patch) | |
tree | 4023147ff5c8c7645afdc0cd39149aba7c1e005a /target/linux/ath79/image/generic-ubnt.mk | |
parent | e417ff88f19b90fc7badbb67b2e8c1760dd024dc (diff) | |
download | upstream-0757f7fedca77d169682d41e7b861d86e7308a11.tar.gz upstream-0757f7fedca77d169682d41e7b861d86e7308a11.tar.bz2 upstream-0757f7fedca77d169682d41e7b861d86e7308a11.zip |
ath79: harmonize line breaks in image Makefiles
This harmonizes the line wrapping in image Makefile device
definitions, as those are frequently copy-pasted and are a common
subject of review comments. Having the treatment unifying should
reduce the cases where adjustment is necessary afterwards.
Harmonization is achieved by consistently (read "strictly")
applying certain rules:
- Never put more than 80 characters into one line
- Fill lines up (do not break after 40 chars because of ...)
- Use one tab for indent after wrapping by "\"
- Only break after pipe "|" for IMAGE variables
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/ath79/image/generic-ubnt.mk')
-rw-r--r-- | target/linux/ath79/image/generic-ubnt.mk | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 59c22b8af4..6deff781f7 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -8,11 +8,9 @@ UBNT_REVISION := $(VERSION_DIST)-$(REVISION) # mkubntimage is using the kernel image direct # routerboard creates partitions out of the ubnt header define Build/mkubntimage - -$(STAGING_DIR_HOST)/bin/mkfwimage \ - -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-$(VERSION_DIST)-$(REVISION) \ - -k $(IMAGE_KERNEL) \ - -r $@ \ - -o $@ + -$(STAGING_DIR_HOST)/bin/mkfwimage -B $(UBNT_BOARD) \ + -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-$(VERSION_DIST)-$(REVISION) \ + -k $(IMAGE_KERNEL) -r $@ -o $@ endef # all UBNT XM/WA devices expect the kernel image to have 1024k while flash, when @@ -21,11 +19,9 @@ define Build/mkubntimage-split -[ -f $@ ] && ( \ dd if=$@ of=$@.old1 bs=1024k count=1; \ dd if=$@ of=$@.old2 bs=1024k skip=1; \ - $(STAGING_DIR_HOST)/bin/mkfwimage \ - -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v$(UBNT_VERSION)-$(UBNT_REVISION) \ - -k $@.old1 \ - -r $@.old2 \ - -o $@; \ + $(STAGING_DIR_HOST)/bin/mkfwimage -B $(UBNT_BOARD) \ + -v $(UBNT_TYPE).$(UBNT_CHIP).v$(UBNT_VERSION)-$(UBNT_REVISION) \ + -k $@.old1 -r $@.old2 -o $@; \ rm $@.old1 $@.old2 ) endef @@ -184,12 +180,14 @@ endef TARGET_DEVICES += ubnt_rocket-m define Device/ubnt_routerstation_common - DEVICE_PACKAGES := -kmod-ath9k -wpad-mini -uboot-envtools kmod-usb-ohci kmod-usb2 fconfig + DEVICE_PACKAGES := -kmod-ath9k -wpad-mini -uboot-envtools kmod-usb-ohci \ + kmod-usb2 fconfig DEVICE_VENDOR := Ubiquiti ATH_SOC := ar7161 IMAGE_SIZE := 16128k IMAGES := factory.bin - IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := append-rootfs | pad-rootfs | mkubntimage | \ + check-size $$$$(IMAGE_SIZE) KERNEL := kernel-bin | append-dtb | lzma | pad-to $$(BLOCKSIZE) KERNEL_INITRAMFS := kernel-bin | append-dtb endef |