projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strip double quotes from grub boot options (fixes #1406)
[openwrt.git]
/
target
/
linux
/
x86-2.6
/
image
/
Makefile
diff --git
a/target/linux/x86-2.6/image/Makefile
b/target/linux/x86-2.6/image/Makefile
index
dc1d333
..
955a42b
100644
(file)
--- a/
target/linux/x86-2.6/image/Makefile
+++ b/
target/linux/x86-2.6/image/Makefile
@@
-8,8
+8,9
@@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
export PATH=$(TARGET_PATH):/sbin
include $(INCLUDE_DIR)/image.mk
export PATH=$(TARGET_PATH):/sbin
+BOOTOPTS=$(strip $(subst ",, $(CONFIG_X86_GRUB_BOOTOPTS)))
ROOTPART=$(strip $(subst ",, $(CONFIG_X86_GRUB_ROOTPART)))
ROOTPART=$(strip $(subst ",, $(CONFIG_X86_GRUB_ROOTPART)))
-#")) # fix vim's broken syntax highlighting
+#"))
"))
# fix vim's broken syntax highlighting
ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
@@
-41,10
+42,10
@@
ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
$(KDIR)/root.grub/boot/grub/
$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
sed \
$(KDIR)/root.grub/boot/grub/
$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
sed \
- -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(
CONFIG_X86_GRUB_
BOOTOPTS)#g' \
+ -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
-e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \
./grub/menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
- 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)
+ PA
DDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PA
TH="$(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)
endef
endif
endef
endif
This page took
0.038826 seconds
and
4
git commands to generate.