diff options
Diffstat (limited to 'target/x86')
| -rw-r--r-- | target/x86/grub/grub.mk | 11 | ||||
| -rw-r--r-- | target/x86/syslinux/syslinux.mk | 6 |
2 files changed, 10 insertions, 7 deletions
diff --git a/target/x86/grub/grub.mk b/target/x86/grub/grub.mk index 971b779e5..9181929af 100644 --- a/target/x86/grub/grub.mk +++ b/target/x86/grub/grub.mk @@ -27,7 +27,7 @@ GRUB_PATCH_SITE:=http://ftp.debian.org/debian/pool/main/g/grub GRUB_CAT:=$(ZCAT) GRUB_DIR:=$(BUILD_DIR)/grub-0.97 GRUB_BINARY:=grub/grub -GRUB_TARGET_BINARY:=bin/grub +GRUB_TARGET_BINARY:=sbin/grub GRUB_SPLASHIMAGE=$(TOPDIR)/target/x86/grub/splash.xpm.gz @@ -93,21 +93,22 @@ $(GRUB_DIR)/.configured: $(GRUB_DIR)/.unpacked --disable-auto-linux-mem-opt \ $(GRUB_CONFIG-y) \ ); - touch $@ + touch $@ $(GRUB_DIR)/$(GRUB_BINARY): $(GRUB_DIR)/.configured $(MAKE) CC=$(TARGET_CC) -C $(GRUB_DIR) -grub-target_binary: $(GRUB_DIR)/$(GRUB_BINARY) - cp $(GRUB_DIR)/$(GRUB_BINARY) $(TARGET_DIR)/sbin/ +$(GRUB_DIR)/.installed: $(GRUB_DIR)/$(GRUB_BINARY) + cp $(GRUB_DIR)/$(GRUB_BINARY) $(TARGET_DIR)/$(GRUB_TARGET_BINARY) test -d $(TARGET_DIR)/boot/grub || mkdir -p $(TARGET_DIR)/boot/grub cp $(GRUB_DIR)/stage1/stage1 $(GRUB_DIR)/stage2/*1_5 $(GRUB_DIR)/stage2/stage2 $(TARGET_DIR)/boot/grub/ ifeq ($(BR2_TARGET_GRUB_SPLASH),y) test -f $(TARGET_DIR)/boot/grub/$(GRUB_SPLASHIMAGE) || \ cp $(GRUB_SPLASHIMAGE) $(TARGET_DIR)/boot/grub/ endif + touch $@ -grub: grub-target_binary +grub: uclibc $(GRUB_DIR)/.installed grub-clean: $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GRUB_DIR) uninstall diff --git a/target/x86/syslinux/syslinux.mk b/target/x86/syslinux/syslinux.mk index 8d6d1e168..a1f5d7f8e 100644 --- a/target/x86/syslinux/syslinux.mk +++ b/target/x86/syslinux/syslinux.mk @@ -34,14 +34,16 @@ SYSLINUX_BIN=$(SYSLINUX_DIR2)/mtools/syslinux $(DL_DIR)/$(SYSLINUX_SOURCE): $(WGET) -P $(DL_DIR) $(SYSLINUX_SITE)/$(SYSLINUX_SOURCE) +syslinux-source: $(DL_DIR)/$(SYSLINUX_SOURCE) + $(SYSLINUX_DIR)/Makefile: $(DL_DIR)/$(SYSLINUX_SOURCE) $(SYSLINUX_PATCH) $(SYSLINUX_CAT) $(DL_DIR)/$(SYSLINUX_SOURCE) | tar -C $(BUILD_DIR) -xvf - toolchain/patch-kernel.sh $(SYSLINUX_DIR) target/x86/syslinux/ \*.patch - touch -c $(SYSLINUX_DIR)/Makefile + touch -c $@ $(SYSLINUX_DIR)/isolinux.bin: $(SYSLINUX_DIR)/Makefile $(MAKE) -C $(SYSLINUX_DIR) - touch -c $(SYSLINUX_DIR)/isolinux.bin + touch -c $@ syslinux: $(SYSLINUX_DIR)/isolinux.bin |