projects
/
lede.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d18161d
)
fix x86 image builder
author
Felix Fietkau
<nbd@openwrt.org>
Sun, 14 Jan 2007 22:59:51 +0000
(22:59 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Sun, 14 Jan 2007 22:59:51 +0000
(22:59 +0000)
SVN-Revision: 6100
target/linux/x86-2.6/image/Makefile
patch
|
blob
|
history
diff --git
a/target/linux/x86-2.6/image/Makefile
b/target/linux/x86-2.6/image/Makefile
index 44c2ff7e3b2b4bbca9e5129a96160b5122b7c902..24ac9e1fbab3c193ff0c3e123a9cb123a0d92cf1 100644
(file)
--- a/
target/linux/x86-2.6/image/Makefile
+++ b/
target/linux/x86-2.6/image/Makefile
@@
-36,11
+36,9
@@
ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
define Image/Build/grub
mkdir -p $(KDIR)/root.grub/boot/grub
$(CP) \
define Image/Build/grub
mkdir -p $(KDIR)/root.grub/boot/grub
$(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 \
+ $(KDIR)/*stage* \
$(KDIR)/root.grub/boot/grub/
$(KDIR)/root.grub/boot/grub/
- $(CP) $(
LINUX_DIR)/arch/i386/boot
/bzImage $(KDIR)/root.grub/boot/vmlinuz
+ $(CP) $(
KDIR)
/bzImage $(KDIR)/root.grub/boot/vmlinuz
sed \
-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(CONFIG_X86_GRUB_BOOTOPTS)#g' \
-e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \
sed \
-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(CONFIG_X86_GRUB_BOOTOPTS)#g' \
-e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \
@@
-51,6
+49,13
@@
endif
define Image/Prepare
cp $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/bzImage
define Image/Prepare
cp $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/bzImage
+ # 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 \
+ $(KDIR)/
+ $(CP) $(STAGING_DIR)/usr/sbin/grub $(STAGING_DIR)/bin
endef
define Image/Build
endef
define Image/Build