KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make image names shorten

Browse source 
SVN-Revision: 9089
This commit is contained in:
Gabor Juhos 2007-10-02 09:09:55 +00:00
parent b3ab6c458d
commit 58fcfa7ea0
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
target/linux/adm5120/image/Makefile
View file

@ -12,7 +12,7 @@ IMGNAME := $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)
JFFS2EOF := $(KDIR)/jffs2.eof JFFS2EOF := $(KDIR)/jffs2.eof
define imgname define imgname
$(IMGNAME)-$(patsubst jffs2-%,jffs2,$(1))-$(2) $(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(1))
endef endef
define Build/Clean define Build/Clean
@ -35,7 +35,7 @@ endef
define Image/Build/LZMAKernel define Image/Build/LZMAKernel
$(LOADER_MAKE) TARGET_DIR=$(BIN_DIR) \ $(LOADER_MAKE) TARGET_DIR=$(BIN_DIR) \
LOADER=openwrt-$(BOARD)-$(KERNEL)-ramfs-lzma-$(1).$(2) \ LOADER=openwrt-$(BOARD)-$(KERNEL)-$(1)-ramfs.$(2) \
LOADER_DATA=$(KDIR)/vmlinux.lzma \ LOADER_DATA=$(KDIR)/vmlinux.lzma \
LZMA_TEXT_START=$(3) LZMA_STARTUP_ORG=$(4) \ LZMA_TEXT_START=$(3) LZMA_STARTUP_ORG=$(4) \
CONFIG_PASS_KARGS=$(5) CONFIG_BOARD=$(6) \ CONFIG_PASS_KARGS=$(5) CONFIG_BOARD=$(6) \

11
target/linux/adm5120/image/router_le.mk
View file

@ -226,7 +226,7 @@ endef
# Mikrotik RB-1xx # Mikrotik RB-1xx
# #
define Image/Build/Board/RB1xx/Initramfs define Image/Build/Board/RB1xx/Initramfs
$(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-ramfs-rb1xx.elf $(CP) $(KDIR)/vmlinux.elf $(call imgname,netboot,rb1xx)
endef endef
# #
@ -266,6 +266,7 @@ define Image/Build/Group/All
$(call Image/Build/Group/Edimax,$(1)) $(call Image/Build/Group/Edimax,$(1))
$(call Image/Build/Group/Cellvision,$(1)) $(call Image/Build/Group/Cellvision,$(1))
$(call Image/Build/Group/Infineon,$(1)) $(call Image/Build/Group/Infineon,$(1))
$(call Image/Build/Board/RB1xx/$(1))
endef endef
# #
@ -311,14 +312,14 @@ define Image/Build/Profile/RouterBoard
$(call Image/Build/Board/RB1xx/$(1)) $(call Image/Build/Board/RB1xx/$(1))
endef endef
ifeq ($(PROFILE),Routerboard) ifeq ($(PROFILE),RouterBoard)
define Image/cmdline/yaffs2 define Image/cmdline/yaffs2
root=/dev/mtdblock1 rootfstype=yaffs2 init=/etc/preinit root=/dev/mtdblock3 rootfstype=yaffs2 init=/etc/preinit
endef endef
define Image/BuildKernel/RouterBoard define Image/BuildKernel/RouterBoard
$(CP) $(KDIR)/vmlinux.elf $(IMGNAME)-rb1xx-vmlinux $(CP) $(KDIR)/vmlinux.elf $(call imgname,kernel,rb1xx)
$(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux.elf \ $(STAGING_DIR_HOST)/bin/patch-cmdline $(call imgname,kernel,rb1xx) \
'$(strip $(call Image/cmdline/yaffs2))' '$(strip $(call Image/cmdline/yaffs2))'
endef endef