diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-08-07 00:04:25 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-08-07 00:04:25 +0000 |
| commit | c6bc77ea365704f3f5c79d64aed069792a4e95b1 (patch) | |
| tree | 28c9265495e6ad751fcae0d27a040b222ff2a215 /target/linux/x86-2.6/image/Makefile | |
| parent | 9882253827b16579bbd317f6e8c0deb75b0ca0f3 (diff) | |
| download | mtk-20170518-c6bc77ea365704f3f5c79d64aed069792a4e95b1.zip mtk-20170518-c6bc77ea365704f3f5c79d64aed069792a4e95b1.tar.gz mtk-20170518-c6bc77ea365704f3f5c79d64aed069792a4e95b1.tar.bz2 | |
build system cleanup/restructuring as described in http://lists.openwrt.org/pipermail/openwrt-devel/2007-August/001159.html
SVN-Revision: 8362
Diffstat (limited to 'target/linux/x86-2.6/image/Makefile')
| -rw-r--r-- | target/linux/x86-2.6/image/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/target/linux/x86-2.6/image/Makefile b/target/linux/x86-2.6/image/Makefile index 7c98ea8..f19e6b3 100644 --- a/target/linux/x86-2.6/image/Makefile +++ b/target/linux/x86-2.6/image/Makefile @@ -49,7 +49,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' \ ./grub/menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst - PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/bin:$(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)-$(KERNEL)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1) $(call Image/Build/grub/$(1)) endef endif @@ -58,11 +58,10 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y) define Image/Prepare/grub # for the image builder $(CP) \ - $(STAGING_DIR)/usr/lib/grub/i386-pc/stage1 \ - $(STAGING_DIR)/usr/lib/grub/i386-pc/stage2 \ - $(STAGING_DIR)/usr/lib/grub/i386-pc/e2fs_stage1_5 \ + $(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/stage1 \ + $(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/stage2 \ + $(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/e2fs_stage1_5 \ $(KDIR)/ - $(CP) $(STAGING_DIR)/usr/sbin/grub $(STAGING_DIR)/bin endef endif |