Author: jogo Date: 2015-08-14 12:20:53 +0200 (Fri, 14 Aug 2015) New Revision: 46592
Modified: trunk/include/image.mk trunk/target/linux/ar71xx/image/Makefile trunk/target/linux/lantiq/image/Makefile trunk/target/linux/mvebu/image/Makefile trunk/target/linux/oxnas/image/Makefile Log: image.mk: move KDIR_TMP definition to a central location Instead of each target defining it the same, move the KDIR_TMP definition to include/image.mk. In addition Image/Build/SysupgradeNAND already requires KDIR_TMP to be set, so it makes sense to have it globally defined. Signed-off-by: Jonas Gorski <[email protected]> Modified: trunk/include/image.mk =================================================================== --- trunk/include/image.mk 2015-08-13 19:35:29 UTC (rev 46591) +++ trunk/include/image.mk 2015-08-14 10:20:53 UTC (rev 46592) @@ -15,6 +15,7 @@ override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE) KDIR=$(KERNEL_BUILD_DIR) +KDIR_TMP=$(KDIR)/tmp DTS_DIR:=$(LINUX_DIR)/arch/$(ARCH)/boot/dts/ IMG_PREFIX:=openwrt-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) Modified: trunk/target/linux/ar71xx/image/Makefile =================================================================== --- trunk/target/linux/ar71xx/image/Makefile 2015-08-13 19:35:29 UTC (rev 46591) +++ trunk/target/linux/ar71xx/image/Makefile 2015-08-14 10:20:53 UTC (rev 46592) @@ -961,7 +961,6 @@ LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR) -KDIR_TMP:=$(KDIR)/tmp VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage Modified: trunk/target/linux/lantiq/image/Makefile =================================================================== --- trunk/target/linux/lantiq/image/Makefile 2015-08-13 19:35:29 UTC (rev 46591) +++ trunk/target/linux/lantiq/image/Makefile 2015-08-14 10:20:53 UTC (rev 46592) @@ -13,8 +13,6 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -KDIR_TMP:=$(KDIR)/tmp - LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR) define Image/BuildLoader/Template Modified: trunk/target/linux/mvebu/image/Makefile =================================================================== --- trunk/target/linux/mvebu/image/Makefile 2015-08-13 19:35:29 UTC (rev 46591) +++ trunk/target/linux/mvebu/image/Makefile 2015-08-14 10:20:53 UTC (rev 46592) @@ -12,10 +12,6 @@ LOADADDR:=0x00008000 - -KDIR_TMP:=$(KDIR)/tmp - - define Image/Build/DTB cp $(KDIR)/zImage$(2) $(KDIR)/zImage$(2)-$(1); cat $(DTS_DIR)/$(1).dtb >> $(KDIR)/zImage$(2)-$(1); Modified: trunk/target/linux/oxnas/image/Makefile =================================================================== --- trunk/target/linux/oxnas/image/Makefile 2015-08-13 19:35:29 UTC (rev 46591) +++ trunk/target/linux/oxnas/image/Makefile 2015-08-14 10:20:53 UTC (rev 46592) @@ -19,7 +19,6 @@ POGOPLUG_V3_UBI_OPTS = -m 2048 -p 128KiB -s 512 POGOPLUG_V3_UBIFS_OPTS = -m 2048 -e 126KiB -c 4096 -KDIR_TMP:=$(KDIR)/tmp VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
