X-Git-Url: http://gitweb/?p=initrd.git;a=blobdiff_plain;f=Makefile;h=842fcb4ad935a7f444de1b67a1eaedb302c69265;hp=14d439c174b2428f8d7d359cc72977c8f2888c66;hb=07bbf582863b81ea9032177bb39662c58d646427;hpb=a03a415ee6975fdb68e0f7aea750bf359f927293 diff --git a/Makefile b/Makefile index 14d439c..842fcb4 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# initrd.git/Makefile +# initrd/Makefile # TOPDIR = $(shell pwd) @@ -38,7 +38,7 @@ check-root: $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2: wget -P $(WORK) -c $(BUSYBOX_SOURCE) -$(WORK)/busybox-$(BUSYBOX_VERSION): $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2 $(TOPDIR)/busybox-$(BUSYBOX_VERSION).config +$(WORK)/busybox-$(BUSYBOX_VERSION): $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2 $(TOPDIR)/busybox-$(BUSYBOX_VERSION).config $(WORK)/fix-resource_header.patch tar -C $(WORK) -xvjf $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2 cd $(WORK)/busybox-$(BUSYBOX_VERSION) && \ patch -p1 -i $(WORK)/fix-resource_header.patch @@ -48,7 +48,7 @@ $(WORK)/busybox-$(BUSYBOX_VERSION): $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2 $ $(WORK)/busybox-$(BUSYBOX_VERSION)/_install/bin/busybox: $(WORK)/busybox-$(BUSYBOX_VERSION) export PATH=$(CROSSTOOLS)/bin:$$PATH && \ export LD_LIBRARY_PATH=$(CROSSTOOLS)/lib:$$LD_LIBRARY_PATH && \ - make -C $(WORK)/busybox-$(BUSYBOX_VERSION) ARCH=arm CROSS_COMPILE=$(TARGET)- install && \ + make -j1 -C $(WORK)/busybox-$(BUSYBOX_VERSION) ARCH=arm CROSS_COMPILE=$(TARGET)- install && \ install -D -m 0755 $(WORK)/busybox-$(BUSYBOX_VERSION)/examples/udhcp/simple.script $(WORK)/busybox-$(BUSYBOX_VERSION)/_install/usr/share/udhcpc/default.script && \ $(TARGET)-strip $(WORK)/busybox-$(BUSYBOX_VERSION)/_install/bin/busybox && \ touch $(WORK)/busybox-$(BUSYBOX_VERSION)/_install/bin/busybox @@ -106,6 +106,7 @@ $(WORK)/initrd.gz: check-root busybox dialog $(WORK)/mnt $(TOPDIR)/filesystem $( install -v -m 0400 $(TOPDIR)/filesystem/shadow $(WORK)/mnt/etc install -v -m 0755 $(TOPDIR)/filesystem/rc $(WORK)/mnt/etc && \ install -v -m 0755 $(TOPDIR)/filesystem/{setup,setup-chroot,crux} $(WORK)/mnt/usr/bin && \ + ln -s bin/busybox $(WORK)/mnt/init /sbin/ldconfig -r $(WORK)/mnt umount -v $(WORK)/mnt cd $(WORK) && gzip -v initrd @@ -114,7 +115,7 @@ $(WORK)/initrd.gz: check-root busybox dialog $(WORK)/mnt $(TOPDIR)/filesystem $( initrd: $(WORK)/initrd.gz initrd-clean: check-root - rm -vf $(WORK)/initrd.gz + rm -rvf $(WORK)/initrd.gz $(WORK)/mnt initrd-distclean: initrd-clean