From 1bca0cc51704b5ef57c5e3a9d7a1b80633486d16 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 10 Nov 2007 23:08:11 +0000 Subject: [PATCH] make the image filenames a bit shorter SVN-Revision: 9533 --- target/linux/adm5120/image/Makefile | 4 ++-- target/linux/amazon/image/Makefile | 6 +++--- target/linux/amcc/image/Makefile | 6 +++--- target/linux/ar7/image/Makefile | 20 ++++++++++---------- target/linux/at91/image/Makefile | 4 ++-- target/linux/atheros/image/Makefile | 8 ++++---- target/linux/au1000/image/Makefile | 14 +++++++------- target/linux/avr32/image/Makefile | 6 +++--- target/linux/brcm-2.4/image/Makefile | 12 ++++++------ target/linux/brcm63xx/image/Makefile | 2 +- target/linux/etrax/image/Makefile | 4 ++-- target/linux/iop32x/image/Makefile | 8 ++++---- target/linux/ixp4xx/image/Makefile | 20 ++++++++++---------- target/linux/magicbox/image/Makefile | 6 +++--- target/linux/olpc/image/Makefile | 8 ++++---- target/linux/ps3/image/Makefile | 2 +- target/linux/rb532/image/Makefile | 6 +++--- target/linux/rdc/image/Makefile | 16 ++++++++-------- target/linux/sibyte/image/Makefile | 8 ++++---- target/linux/uml/image/Makefile | 4 ++-- target/linux/x86/image/Makefile | 8 ++++---- 21 files changed, 86 insertions(+), 86 deletions(-) diff --git a/target/linux/adm5120/image/Makefile b/target/linux/adm5120/image/Makefile index ee8cf42ea8..9e3d1557f0 100644 --- a/target/linux/adm5120/image/Makefile +++ b/target/linux/adm5120/image/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR) -IMGNAME := $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL) +IMGNAME := $(BIN_DIR)/openwrt-$(BOARD) JFFS2BLOCK := $(KDIR)/jffs2.block JFFS2MARK := $(KDIR)/jffs2.mark @@ -39,7 +39,7 @@ endef define Image/Build/LZMAKernel $(LOADER_MAKE) TARGET_DIR=$(BIN_DIR) \ - LOADER=openwrt-$(BOARD)-$(KERNEL)-$(1)-ramfs.$(2) \ + LOADER=openwrt-$(BOARD)-$(1)-ramfs.$(2) \ LOADER_DATA=$(KDIR)/vmlinux.lzma \ LZMA_TEXT_START=$(3) LZMA_STARTUP_ORG=$(4) \ CONFIG_PASS_KARGS=$(5) CONFIG_BOARD=$(6) \ diff --git a/target/linux/amazon/image/Makefile b/target/linux/amazon/image/Makefile index 29935f9241..6946f89adc 100644 --- a/target/linux/amazon/image/Makefile +++ b/target/linux/amazon/image/Makefile @@ -14,15 +14,15 @@ define Image/BuildKernel -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \ -d $(KDIR)/vmlinux.lzma $(KDIR)/uImage - cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-uImage + cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage endef define Image/Build/squashfs - $(call prepare_generic_squashfs,$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).image) + $(call prepare_generic_squashfs,$(BIN_DIR)/openwrt-$(BOARD)-$(1).image) endef define Image/Build - cat $(KDIR)/uImage $(KDIR)/root.$(1) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).image + cat $(KDIR)/uImage $(KDIR)/root.$(1) > $(BIN_DIR)/openwrt-$(BOARD)-$(1).image $(call Image/Build/$(1),$(1)) endef diff --git a/target/linux/amcc/image/Makefile b/target/linux/amcc/image/Makefile index 09ff061dba..bd284eb975 100644 --- a/target/linux/amcc/image/Makefile +++ b/target/linux/amcc/image/Makefile @@ -14,7 +14,7 @@ define Image/Prepare endef define Image/BuildKernel - cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-uImage + cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage endef define Image/Build @@ -25,7 +25,7 @@ define Image/Build/jffs2-256k ( \ dd if=$(LINUX_DIR)/arch/ppc/boot/images/uImage bs=4096k conv=sync; \ dd if=$(KDIR)/root.$(1) bs=256k conv=sync; \ - ) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-jffs2.img + ) > $(BIN_DIR)/openwrt-$(BOARD)-jffs2.img endef define Image/Build/squashfs @@ -33,7 +33,7 @@ define Image/Build/squashfs ( \ dd if=$(LINUX_DIR)/arch/ppc/boot/images/uImage bs=4096k conv=sync; \ dd if=$(KDIR)/root.$(1) bs=256k conv=sync; \ - ) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img + ) > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img endef $(eval $(call BuildImage)) diff --git a/target/linux/ar7/image/Makefile b/target/linux/ar7/image/Makefile index 8947f2fd99..8952b09cec 100644 --- a/target/linux/ar7/image/Makefile +++ b/target/linux/ar7/image/Makefile @@ -53,27 +53,27 @@ bs=131072 conv=sync endef define Image/Build/CyberTAN - (dd if=/dev/zero bs=16 count=1; cat $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin) | \ - $(STAGING_DIR_HOST)/bin/addpattern -p $(3) -o $(BIN_DIR)/openwrt-$(2)-$(KERNEL)-$(4).bin + (dd if=/dev/zero bs=16 count=1; cat $(BIN_DIR)/openwrt-$(BOARD)-$(1).bin) | \ + $(STAGING_DIR_HOST)/bin/addpattern -p $(3) -o $(BIN_DIR)/openwrt-$(2)-$(4).bin endef #define Image/Build/sErCoMm -# cat sercomm/adam2.bin "$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin" > "$(KDIR)/dgfw.tmp" +# cat sercomm/adam2.bin "$(BIN_DIR)/openwrt-$(BOARD)-$(1).bin" > "$(KDIR)/dgfw.tmp" # dd if=sercomm/$(2) of="$(KDIR)/dgfw.tmp" bs=$$$$((0x3e0000 - 80)) seek=1 conv=notrunc -# $(STAGING_DIR_HOST)/bin/dgfirmware -f -w "$(BIN_DIR)/openwrt-$(2)-$(KERNEL)-$(3).img" "$(KDIR)/dgfw.tmp" +# $(STAGING_DIR_HOST)/bin/dgfirmware -f -w "$(BIN_DIR)/openwrt-$(2)-$(3).img" "$(KDIR)/dgfw.tmp" # rm -f "$(KDIR)/dgfw.tmp" #endef define Image/Build/EVA - $(STAGING_DIR_HOST)/bin/lzma2eva $(KERNEL_ENTRY) $(KERNEL_ENTRY) $(KDIR)/vmlinux.lzma $(BIN_DIR)/openwrt-$(2)-$(KERNEL)-$(1).bin - cat $(KDIR)/root.$(1) >> $(BIN_DIR)/openwrt-$(2)-$(KERNEL)-$(1).bin - $(call prepare_generic_squashfs,$(BIN_DIR)/openwrt-$(2)-$(KERNEL)-$(1).bin) + $(STAGING_DIR_HOST)/bin/lzma2eva $(KERNEL_ENTRY) $(KERNEL_ENTRY) $(KDIR)/vmlinux.lzma $(BIN_DIR)/openwrt-$(2)-$(1).bin + cat $(KDIR)/root.$(1) >> $(BIN_DIR)/openwrt-$(2)-$(1).bin + $(call prepare_generic_squashfs,$(BIN_DIR)/openwrt-$(2)-$(1).bin) endef define Image/Build - dd if=$(KDIR)/loader.bin $(call align/$(1)) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin - cat $(KDIR)/root.$(1) >> $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin - $(call prepare_generic_squashfs,$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin) + dd if=$(KDIR)/loader.bin $(call align/$(1)) > $(BIN_DIR)/openwrt-$(BOARD)-$(1).bin + cat $(KDIR)/root.$(1) >> $(BIN_DIR)/openwrt-$(BOARD)-$(1).bin + $(call prepare_generic_squashfs,$(BIN_DIR)/openwrt-$(BOARD)-$(1).bin) $(call Image/Build/CyberTAN,$(1),AG1B,AG1B,$(1)) $(call Image/Build/CyberTAN,$(1),WA21,WA21,$(1)) $(call Image/Build/CyberTAN,$(1),WA22,WA22,$(1)) diff --git a/target/linux/at91/image/Makefile b/target/linux/at91/image/Makefile index 7e855f06ef..c0239ea050 100644 --- a/target/linux/at91/image/Makefile +++ b/target/linux/at91/image/Makefile @@ -30,14 +30,14 @@ define Image/Prepare endef define Image/BuildKernel - cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-uImage + cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage endef define Image/Build dd if=$(KDIR)/uImage of=$(KDIR)/uImage.block bs=8448 conv=sync dd if=$(KDIR)/root.squashfs of=$(KDIR)/root.block bs=8448 conv=sync cat $(KDIR)/uImage.block $(KDIR)/root.block > $(KDIR)/knlroot.bin - $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).trx -f $(KDIR)/dfboot.bin -f$(KDIR)/u-boot.full -f$(KDIR)/knlroot.bin + $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD).trx -f $(KDIR)/dfboot.bin -f$(KDIR)/u-boot.full -f$(KDIR)/knlroot.bin cp $(KDIR)/dfbptest.bin $(BIN_DIR) $(call Image/Build/$(1),$(1)) endef diff --git a/target/linux/atheros/image/Makefile b/target/linux/atheros/image/Makefile index 5cfa774041..eb335e0667 100644 --- a/target/linux/atheros/image/Makefile +++ b/target/linux/atheros/image/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk define Image/BuildKernel - cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux.elf + cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.elf gzip -9 -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux $(KDIR)/vmlinux.bin.l7 - dd if=$(KDIR)/vmlinux.bin.l7 of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux.lzma bs=65536 conv=sync - dd if=$(KDIR)/vmlinux.bin.gz of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux.gz bs=65536 conv=sync + dd if=$(KDIR)/vmlinux.bin.l7 of=$(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma bs=65536 conv=sync + dd if=$(KDIR)/vmlinux.bin.gz of=$(BIN_DIR)/openwrt-$(BOARD)-vmlinux.gz bs=65536 conv=sync endef define Image/Build/squashfs @@ -21,7 +21,7 @@ endef define Image/Build $(call Image/Build/$(1)) - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-root.$(1) bs=128k conv=sync + dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-root.$(1) bs=128k conv=sync endef diff --git a/target/linux/au1000/image/Makefile b/target/linux/au1000/image/Makefile index 7408e277d6..3013d62660 100644 --- a/target/linux/au1000/image/Makefile +++ b/target/linux/au1000/image/Makefile @@ -49,17 +49,17 @@ define Image/Prepare endef define Image/Build/Initramfs - $(OBJCOPY_SREC) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux.srec + $(OBJCOPY_SREC) $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.srec endef define Image/Build $(TARGET_CROSS)objcopy -O srec -I binary --adjust-vma $(FLASH_FS) $(KDIR)/root.$(1) $(KDIR)/root.$(1).srec - grep -v S7 $(KDIR)/root.$(1).srec > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img - grep -v S0 $(KDIR)/kernel.flash.srec >> $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img - $(CP) $(KDIR)/kernel.flash.bin $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux.bin - $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).fs - $(CP) $(KDIR)/kernel.flash.srec $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux-flash.srec - $(CP) $(KDIR)/kernel.ram.srec $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux-ram.srec + grep -v S7 $(KDIR)/root.$(1).srec > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img + grep -v S0 $(KDIR)/kernel.flash.srec >> $(BIN_DIR)/openwrt-$(BOARD)-$(1).img + $(CP) $(KDIR)/kernel.flash.bin $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.bin + $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).fs + $(CP) $(KDIR)/kernel.flash.srec $(BIN_DIR)/openwrt-$(BOARD)-vmlinux-flash.srec + $(CP) $(KDIR)/kernel.ram.srec $(BIN_DIR)/openwrt-$(BOARD)-vmlinux-ram.srec ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) $(call Image/Build/Initramfs) endif diff --git a/target/linux/avr32/image/Makefile b/target/linux/avr32/image/Makefile index a001097c58..3568984189 100644 --- a/target/linux/avr32/image/Makefile +++ b/target/linux/avr32/image/Makefile @@ -12,7 +12,7 @@ define Image/Prepare endef define Image/BuildKernel - cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-uImage + cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage endef define Image/Build @@ -24,14 +24,14 @@ define Image/Build/squashfs ( \ dd if=$(KDIR)/uImage bs=1024k conv=sync; \ dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \ - ) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img + ) > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img endef define Image/Build/jffs2-64k ( \ dd if=$(KDIR)/uImage bs=1024k conv=sync; \ dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \ - ) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img + ) > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img endef $(eval $(call BuildImage)) diff --git a/target/linux/brcm-2.4/image/Makefile b/target/linux/brcm-2.4/image/Makefile index 5f7f95bbd0..51975fe702 100644 --- a/target/linux/brcm-2.4/image/Makefile +++ b/target/linux/brcm-2.4/image/Makefile @@ -26,21 +26,21 @@ endef ifneq ($(KERNEL),2.4) define Image/Build/wgt634u - dd if=$(KDIR)/loader.elf of=$(BIN_DIR)/openwrt-wgt634u-$(KERNEL)-$(2).bin bs=131072 conv=sync - cat $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).trx >> $(BIN_DIR)/openwrt-wgt634u-$(KERNEL)-$(2).bin + dd if=$(KDIR)/loader.elf of=$(BIN_DIR)/openwrt-wgt634u-$(2).bin bs=131072 conv=sync + cat $(BIN_DIR)/openwrt-$(BOARD)-$(1).trx >> $(BIN_DIR)/openwrt-wgt634u-$(2).bin endef endif define Image/Build/CyberTAN - $(STAGING_DIR_HOST)/bin/addpattern -4 -p $(3) -v v$(4) -i $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).trx -o $(BIN_DIR)/openwrt-$(2)-$(KERNEL)-$(5).bin + $(STAGING_DIR_HOST)/bin/addpattern -4 -p $(3) -v v$(4) -i $(BIN_DIR)/openwrt-$(BOARD)-$(1).trx -o $(BIN_DIR)/openwrt-$(2)-$(5).bin endef define Image/Build/Motorola - $(STAGING_DIR_HOST)/bin/motorola-bin -$(3) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).trx $(BIN_DIR)/openwrt-$(2)-$(4).bin + $(STAGING_DIR_HOST)/bin/motorola-bin -$(3) $(BIN_DIR)/openwrt-$(BOARD)-$(1).trx $(BIN_DIR)/openwrt-$(2)-$(4).bin endef define Image/Build/USR - $(STAGING_DIR_HOST)/bin/trx2usr $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).trx $(BIN_DIR)/openwrt-$(2)-$(3).bin + $(STAGING_DIR_HOST)/bin/trx2usr $(BIN_DIR)/openwrt-$(BOARD)-$(1).trx $(BIN_DIR)/openwrt-$(2)-$(3).bin endef define trxalign/jffs2-128k @@ -79,7 +79,7 @@ define Image/Build/squashfs endef define Image/Build - $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).trx -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma $(call trxalign/$(1),$(1)) + $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD)-$(1).trx -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma $(call trxalign/$(1),$(1)) $(call Image/Build/$(1),$(1)) $(call Image/Build/Motorola,$(1),wr850g,1,$(1)) $(call Image/Build/USR,$(1),usr5461,$(1)) diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile index fa1ccf7659..04231b4e85 100644 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/brcm63xx/image/Makefile @@ -42,7 +42,7 @@ define Image/Prepare endef define Image/Build - $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).trx -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma $(call trxalign/$(1)) -f $(KDIR)/root.$(1) + $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD)-$(1).trx -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma $(call trxalign/$(1)) -f $(KDIR)/root.$(1) endef $(eval $(call BuildImage)) diff --git a/target/linux/etrax/image/Makefile b/target/linux/etrax/image/Makefile index ab1513086a..592cea5136 100644 --- a/target/linux/etrax/image/Makefile +++ b/target/linux/etrax/image/Makefile @@ -14,7 +14,7 @@ FOXBOARD_8MB:=custom 816 832 define Image/BuildKernel for f in $(FOXBOARD); do \ - cp $(KDIR)/vmlinuz_$$$$f $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-zImage_$$$$f; \ + cp $(KDIR)/vmlinuz_$$$$f $(BIN_DIR)/openwrt-$(BOARD)-zImage_$$$$f; \ done endef @@ -32,7 +32,7 @@ define Image/Build/generic mkfimage $(KDIR)/vmlinuz_$$$$f $(KDIR)/vmlinuz_$$$$f.tmp ; \ cat $(KDIR)/vmlinuz_$$$$f.tmp $(KDIR)/root.$(1) > $(KDIR)/fimage.$(1)_$$$$f.tmp; \ dd if=$(KDIR)/fimage.$(1)_$$$$f.tmp of=$(KDIR)/fimage.$(1)_$$$$f bs=$(3) conv=sync; \ - cp $(KDIR)/fimage.$(1)_$$$$f $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-fimage_$$$$f; \ + cp $(KDIR)/fimage.$(1)_$$$$f $(BIN_DIR)/openwrt-$(BOARD)-$(1)-fimage_$$$$f; \ done endef diff --git a/target/linux/iop32x/image/Makefile b/target/linux/iop32x/image/Makefile index d1fbd3f3ea..b061c6d0ef 100644 --- a/target/linux/iop32x/image/Makefile +++ b/target/linux/iop32x/image/Makefile @@ -12,7 +12,7 @@ define Image/Prepare endef define Image/BuildKernel - cp $(KDIR)/zImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-zImage + cp $(KDIR)/zImage $(BIN_DIR)/openwrt-$(BOARD)-zImage # # XXX - FIXME # @@ -24,17 +24,17 @@ define Image/Build endef define Image/Build/jffs2-64k - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=65536 conv=sync + dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=65536 conv=sync endef define Image/Build/jffs2-128k - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=131072 conv=sync + dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=131072 conv=sync $(call Image/Build/slug,$(1)) endef define Image/Build/squashfs $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=131072 conv=sync + dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=131072 conv=sync $(call Image/Build/slug,$(1)) endef diff --git a/target/linux/ixp4xx/image/Makefile b/target/linux/ixp4xx/image/Makefile index 70ff0ebf56..167bd1d5fa 100644 --- a/target/linux/ixp4xx/image/Makefile +++ b/target/linux/ixp4xx/image/Makefile @@ -22,14 +22,14 @@ ifneq ($(CONFIG_IXP4XX_INCLUDE_UCODE),) define Image/Build/slug BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \ -L $(KDIR)/apex-nslu2-armeb.bin -m $(KDIR)/NPE-B \ - -k $(BIN_DIR)/openwrt-nslu2-$(KERNEL)-zImage \ - -r rootfs:$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img \ - -p -o $(BIN_DIR)/openwrt-nslu2-$(KERNEL)-$(1).bin + -k $(BIN_DIR)/openwrt-nslu2-zImage \ + -r rootfs:$(BIN_DIR)/openwrt-$(BOARD)-$(1).img \ + -p -o $(BIN_DIR)/openwrt-nslu2-$(1).bin BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \ -F -L $(KDIR)/apex-nslu2-armeb.bin -m $(KDIR)/NPE-B \ - -k $(BIN_DIR)/openwrt-nslu2-$(KERNEL)-zImage \ - -r rootfs:$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img \ - -p -o $(BIN_DIR)/openwrt-nslu2-$(KERNEL)-$(1)-16mb.bin + -k $(BIN_DIR)/openwrt-nslu2-zImage \ + -r rootfs:$(BIN_DIR)/openwrt-$(BOARD)-$(1).img \ + -p -o $(BIN_DIR)/openwrt-nslu2-$(1)-16mb.bin endef endif @@ -51,7 +51,7 @@ define Image/Prepare endef define Image/BuildKernel - cp $(KDIR)/zImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-zImage + cp $(KDIR)/zImage $(BIN_DIR)/openwrt-$(BOARD)-zImage # $(shell BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/arm-magic.sh) BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/arm-magic.sh endef @@ -61,17 +61,17 @@ define Image/Build endef define Image/Build/jffs2-64k - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=65536 conv=sync + dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=65536 conv=sync endef define Image/Build/jffs2-128k - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=131072 conv=sync + dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=131072 conv=sync $(call Image/Build/slug,$(1)) endef define Image/Build/squashfs $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=131072 conv=sync + dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=131072 conv=sync $(call Image/Build/slug,$(1)) endef diff --git a/target/linux/magicbox/image/Makefile b/target/linux/magicbox/image/Makefile index f99590f1ea..edae68a266 100644 --- a/target/linux/magicbox/image/Makefile +++ b/target/linux/magicbox/image/Makefile @@ -12,7 +12,7 @@ define Image/Prepare endef define Image/BuildKernel - cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-uImage + cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage endef define Image/Build @@ -23,7 +23,7 @@ define Image/Build/jffs2-64k ( \ dd if=$(KDIR)/uImage bs=1024k conv=sync; \ dd if=$(KDIR)/root.$(1) bs=65536 conv=sync; \ - ) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img + ) > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img endef define Image/Build/squashfs @@ -31,7 +31,7 @@ define Image/Build/squashfs ( \ dd if=$(LINUX_DIR)/arch/ppc/boot/images/uImage bs=1024k conv=sync; \ dd if=$(KDIR)/root.$(1) bs=65536 conv=sync; \ - ) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img + ) > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img endef $(eval $(call BuildImage)) diff --git a/target/linux/olpc/image/Makefile b/target/linux/olpc/image/Makefile index 14050bb7f6..b6d95042aa 100644 --- a/target/linux/olpc/image/Makefile +++ b/target/linux/olpc/image/Makefile @@ -42,7 +42,7 @@ ifeq ($(CONFIG_OLPC_GRUB_IMAGES),y) -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \ -e 's#@BAUDRATE@#$(CONFIG_OLPC_GRUB_BAUDRATE)#g' \ ./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst - PADDING="$(CONFIG_OLPC_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).image $(CONFIG_OLPC_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1) + PADDING="$(CONFIG_OLPC_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(1).image $(CONFIG_OLPC_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1) $(call Image/Build/grub/$(1)) endef endif @@ -68,14 +68,14 @@ define Image/Build/squashfs endef define Image/BuildKernel - $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz + $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-vmlinuz endef define Image/Build $(call Image/Build/$(1)) $(call Image/Build/grub,$(1)) - $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).fs - $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz + $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).fs + $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-vmlinuz endef $(eval $(call BuildImage)) diff --git a/target/linux/ps3/image/Makefile b/target/linux/ps3/image/Makefile index e5de26558e..b88f48aa62 100644 --- a/target/linux/ps3/image/Makefile +++ b/target/linux/ps3/image/Makefile @@ -12,7 +12,7 @@ define Image/Prepare endef define Image/BuildKernel - cp $(KDIR)/image $(BIN_DIR)/otheros-$(BOARD)-$(KERNEL).bld + cp $(KDIR)/image $(BIN_DIR)/otheros-$(BOARD).bld endef $(eval $(call BuildImage)) diff --git a/target/linux/rb532/image/Makefile b/target/linux/rb532/image/Makefile index 92984d1b74..ab11706c46 100644 --- a/target/linux/rb532/image/Makefile +++ b/target/linux/rb532/image/Makefile @@ -30,7 +30,7 @@ define Image/Prepare endef define Image/BuildKernel - $(CP) $(KDIR)/loader.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux + $(CP) $(KDIR)/loader.elf $(BIN_DIR)/openwrt-$(BOARD)-vmlinux endef define Image/cmdline/jffs2-64k @@ -55,7 +55,7 @@ endef define Image/Build $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux.elf '$(strip $(call Image/cmdline/$(1))) ' - ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin 4 $(KDIR)/vmlinux.elf $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1) + ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(1).bin 4 $(KDIR)/vmlinux.elf $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1) endef ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) @@ -65,7 +65,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean compile endef define Image/BuildKernel - $(CP) $(KDIR)/loader.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux + $(CP) $(KDIR)/loader.elf $(BIN_DIR)/openwrt-$(BOARD)-vmlinux endef endif diff --git a/target/linux/rdc/image/Makefile b/target/linux/rdc/image/Makefile index 3382a1d287..4d8c5fda33 100644 --- a/target/linux/rdc/image/Makefile +++ b/target/linux/rdc/image/Makefile @@ -22,11 +22,11 @@ bs=1024 endef define Image/Build/ar525w - touch $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-$(2).img + touch $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img mv $(KDIR)/root.$(1) $(KDIR)/root.tmp dd of=$(KDIR)/root.$(1) if=$(KDIR)/root.tmp $(call trxalign/$(1)) conv=sync $(RM) $(KDIR)/root.tmp - $(STAGING_DIR_HOST)/bin/airlink -b 1 -j $(shell bash -c 'echo $$[$(3)]') $(KDIR)/bzImage $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-$(2).img + $(STAGING_DIR_HOST)/bin/airlink -b 1 -j $(shell bash -c 'echo $$[$(3)]') $(KDIR)/bzImage $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img endef define Image/Build/wl153 @@ -34,15 +34,15 @@ define Image/Build/wl153 gzip -9c $(KDIR)/root.$(1) > $(KDIR)/root.$(1).gz ls -l $(KDIR)/root.$(1).gz | sed -r 's/^[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+[^[:blank:]]+[[:blank:]]+([^[:blank:]]+).+$$$$/\1/' | xargs printf '%.8x' > $(KDIR)/rdSize echo -ne "\x$$$$(cut -c 7,8 < $(KDIR)/bzSize)\x$$$$(cut -c 5,6 < $(KDIR)/bzSize)\x$$$$(cut -c 3,4 < $(KDIR)/bzSize)\x$$$$(cut -c 1,2 < $(KDIR)/bzSize)" > $(KDIR)/bzSize.tmp - echo -n 'CSYS' > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-$(2).img - cat $(KDIR)/bzSize.tmp >> $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-$(2).img - echo -ne "\x$$$$(cut -c 7,8 < $(KDIR)/rdSize)\x$$$$(cut -c 5,6 < $(KDIR)/rdSize)\x$$$$(cut -c 3,4 < $(KDIR)/rdSize)\x$$$$(cut -c 1,2 < $(KDIR)/rdSize)WRRM" >> $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-$(2).img - cat $(KDIR)/bzSize.tmp $(KDIR)/bzImage $(KDIR)/root.$(1).gz >> $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-$(2).img + echo -n 'CSYS' > $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img + cat $(KDIR)/bzSize.tmp >> $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img + echo -ne "\x$$$$(cut -c 7,8 < $(KDIR)/rdSize)\x$$$$(cut -c 5,6 < $(KDIR)/rdSize)\x$$$$(cut -c 3,4 < $(KDIR)/rdSize)\x$$$$(cut -c 1,2 < $(KDIR)/rdSize)WRRM" >> $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img + cat $(KDIR)/bzSize.tmp $(KDIR)/bzImage $(KDIR)/root.$(1).gz >> $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img $(RM) $(KDIR)/bzSize.tmp $(KDIR)/bzSize $(KDIR)/rdSize endef define Image/Build/dir450 - touch $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1)-$(2).img + touch $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img mv $(KDIR)/root.$(1) $(KDIR)/root.tmp dd of=$(KDIR)/root.$(1) if=$(KDIR)/root.tmp $(call trxalign/$(1)) conv=sync $(RM) $(KDIR)/root.tmp @@ -50,7 +50,7 @@ define Image/Build/dir450 endef define Image/Build - $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).bzImage + $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD).bzImage $(call Image/Build/$(PROFILE),$(1),$(PROFILE),$(patsubst jffs2-%k,%,$(1))) endef diff --git a/target/linux/sibyte/image/Makefile b/target/linux/sibyte/image/Makefile index fbff86deda..43ac67629a 100644 --- a/target/linux/sibyte/image/Makefile +++ b/target/linux/sibyte/image/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/image.mk #endef define Image/BuildKernel - cp $(KDIR)/vmlinux $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux + cp $(KDIR)/vmlinux $(BIN_DIR)/openwrt-$(BOARD)-vmlinux endef define Image/Build @@ -20,17 +20,17 @@ define Image/Build endef define Image/Build/jffs2-64k - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=65536 conv=sync + dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=65536 conv=sync endef define Image/Build/jffs2-128k - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=131072 conv=sync + dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=131072 conv=sync $(call Image/Build/slug,$(1)) endef define Image/Build/squashfs $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) - dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=131072 conv=sync + dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=131072 conv=sync $(call Image/Build/slug,$(1)) endef diff --git a/target/linux/uml/image/Makefile b/target/linux/uml/image/Makefile index b7bd9e9e65..baf945f507 100755 --- a/target/linux/uml/image/Makefile +++ b/target/linux/uml/image/Makefile @@ -12,8 +12,8 @@ define Image/Prepare endef define Image/Build - cp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img - cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux + cp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).img + cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-vmlinux endef $(eval $(call BuildImage)) diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index db83e324cc..59285f4f25 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -41,7 +41,7 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y) -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \ -e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \ ./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst - PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1) + PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1) $(call Image/Build/grub/$(1)) endef endif @@ -81,14 +81,14 @@ define Image/Build/iso endef define Image/BuildKernel - $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz + $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-vmlinuz endef define Image/Build $(call Image/Build/grub,$(1)) $(call Image/Build/$(1)) - $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).fs - $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz + $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).fs + $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-vmlinuz endef $(eval $(call BuildImage))