From: Jose V Beneyto <sepen@crux.nu>
Date: Fri, 1 Jun 2012 09:51:10 +0000 (+0000)
Subject: Added installation for setup-chroot and fixed some minor issues on Makefile
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=766ef30cb87b6e13ba873001cd0a0fa2883bbcf1;p=initrd.git

Added installation for setup-chroot and fixed some minor issues on Makefile
---

diff --git a/Makefile b/Makefile
index c33cd56..3769608 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2:
 $(WORK)/busybox-$(BUSYBOX_VERSION): $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2 $(TOPDIR)/busybox-$(BUSYBOX_VERSION).config
 	tar -C $(WORK) -xvjf $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2
 	cp -v $(TOPDIR)/busybox-$(BUSYBOX_VERSION).config $(WORK)/busybox-$(BUSYBOX_VERSION)/.config
-	touch $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2
+	touch $(WORK)/busybox-$(BUSYBOX_VERSION)
 
 $(WORK)/busybox-$(BUSYBOX_VERSION)/_install/bin/busybox: $(WORK)/busybox-$(BUSYBOX_VERSION)
 	export PATH=$(CROSSTOOLS)/bin:$$PATH &&  \
@@ -101,7 +101,7 @@ $(WORK)/initrd.gz: check-root busybox dialog $(WORK)/mnt $(TOPDIR)/filesystem $(
 	cp -dRv $(CLFS)/usr/share/terminfo/v $(WORK)/mnt/usr/share/terminfo
 	install -v -m 0644 $(TOPDIR)/filesystem/{fstab,inittab,profile,protocols,*.conf} $(WORK)/mnt/etc
 	install -v -m 0755 $(TOPDIR)/filesystem/rc $(WORK)/mnt/etc && \
-	install -v -m 0755 $(TOPDIR)/filesystem/{setup,crux} $(WORK)/mnt/usr/bin && \
+	install -v -m 0755 $(TOPDIR)/filesystem/{setup*,crux} $(WORK)/mnt/usr/bin && \
 	/sbin/ldconfig -r $(WORK)/mnt
 	umount -v $(WORK)/mnt
 	cd $(WORK) && gzip -v initrd