diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2008-04-18 13:12:28 +0000 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2008-04-18 13:12:28 +0000 |
| commit | 4e9f526ee5052549b978f6d7668f1a7242be2806 (patch) | |
| tree | 5120fe37bf04fbb19a961dd10af1b3036df49f21 /rules/grub.make | |
| parent | 53fd286bc390f14e8d9b93eab158e2b18224ee52 (diff) | |
| download | ptxdist-4e9f526ee5052549b978f6d7668f1a7242be2806.tar.gz ptxdist-4e9f526ee5052549b978f6d7668f1a7242be2806.tar.xz | |
* grub: fix build for NE network drivers
* grup: replace @TFTP_PATH@ and @NFSROOT_PATH@ in menu.lst
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8079 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/grub.make')
| -rw-r--r-- | rules/grub.make | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rules/grub.make b/rules/grub.make index 3a572a0b8..aef9439b3 100644 --- a/rules/grub.make +++ b/rules/grub.make @@ -365,10 +365,8 @@ else GRUB_AUTOCONF += --disable-smc9000-scan endif -ifneq ("$(PTXCONF_GRUB_NE_SCAN)","") +ifneq ($(strip $(call remove_quotes $(PTXCONF_GRUB_NE_SCAN))),) GRUB_AUTOCONF += --enable-ne-scan=$(PTXCONF_GRUB_NE_SCAN) -else -GRUB_AUTOCONF += --disable-ne-scan endif ifneq ("$(PTXCONF_GRUB_WD_DEFAULT_MEM)","") @@ -487,6 +485,8 @@ $(STATEDIR)/grub.targetinstall: $(grub_targetinstall_deps_default) sed -i -e "s/@NETMASK@/$${PTXCONF_BOARDSETUP_NETMASK}/g" $$tmpfile; \ sed -i -e "s/@GATEWAY@/$${PTXCONF_BOARDSETUP_GATEWAY}/g" $$tmpfile; \ sed -i -e "s/@ROOTFS@/$${PTXCONF_BOARDSETUP_ROOTFS}/g" $$tmpfile; \ + sed -i -e "s,@TFTP_PATH@,$${PTXCONF_BOARDSETUP_TFTP_PATH},g" $$tmpfile; \ + sed -i -e "s,@NFSROOT_PATH@,$${PTXCONF_BOARDSETUP_NFSROOT_PATH},g" $$tmpfile; \ $(call install_copy, grub, 0, 0, 0644, $$tmpfile, /boot/grub/menu.lst, n); \ rm $$tmpfile; \ fi |