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

clean up the x86 image build a bit, fixing unconditional copy of grub files

Browse source 
SVN-Revision: 6237
This commit is contained in:
Tim Yardley 2007-02-01 01:07:26 +00:00
parent dc4f082aea
commit 48a4bcc0b7
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
target/linux/x86-2.6/image/Makefile
View file

@ -34,7 +34,8 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
endef endef
define Image/Build/grub define Image/Build/grub
mkdir -p $(KDIR)/root.grub/boot/grub # left here because the image builder doesnt need these
$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub
$(CP) \ $(CP) \
$(KDIR)/*stage* \ $(KDIR)/*stage* \
$(KDIR)/root.grub/boot/grub/ $(KDIR)/root.grub/boot/grub/
@ -47,8 +48,8 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
endef endef
endif endif
define Image/Prepare ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
cp $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/bzImage define Image/Prepare/grub
# for the image builder # for the image builder
$(CP) \ $(CP) \
$(STAGING_DIR)/usr/lib/grub/i386-pc/stage1 \ $(STAGING_DIR)/usr/lib/grub/i386-pc/stage1 \
@ -56,12 +57,18 @@ define Image/Prepare
$(STAGING_DIR)/usr/lib/grub/i386-pc/e2fs_stage1_5 \ $(STAGING_DIR)/usr/lib/grub/i386-pc/e2fs_stage1_5 \
$(KDIR)/ $(KDIR)/
$(CP) $(STAGING_DIR)/usr/sbin/grub $(STAGING_DIR)/bin $(CP) $(STAGING_DIR)/usr/sbin/grub $(STAGING_DIR)/bin
endef
endif
define Image/Prepare
$(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/bzImage
$(call Image/Prepare/grub)
endef endef
define Image/Build define Image/Build
$(call Image/Build/grub,$(1)) $(call Image/Build/grub,$(1))
cp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).fs $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).fs
cp $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz
endef endef
$(eval $(call BuildImage)) $(eval $(call BuildImage))