CRUX-ARM : Home

Home :: Documentation :: Download :: Development :: Community :: Ports :: Packages :: Bugs :: Links :: About :: Donors
Added installation for setup-chroot and fixed some minor issues on Makefile
authorJose V Beneyto <sepen@crux.nu>
Fri, 1 Jun 2012 09:51:10 +0000 (09:51 +0000)
committerJose V Beneyto <sepen@crux.nu>
Fri, 1 Jun 2012 09:51:10 +0000 (09:51 +0000)
Makefile

index c33cd5645be37806528f43dee0195a3659b6d4fa..376960870411cc6e4a53aa28fc2c8ac2268c33b1 100644 (file)
--- 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