X-Git-Url: http://gitweb/?p=initrd.git;a=blobdiff_plain;f=Makefile;h=842fcb4ad935a7f444de1b67a1eaedb302c69265;hp=d76078de972e4e2fda9507235d56eb1781da82bb;hb=07bbf582863b81ea9032177bb39662c58d646427;hpb=6ad01a84b3f0a94d312ee6335a1645c8f89d02b4

diff --git a/Makefile b/Makefile
index d76078d..842fcb4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,24 @@
 # 
-# initrd.git/Makefile
+# initrd/Makefile
 #
 
 TOPDIR = $(shell pwd)
 
 include $(TOPDIR)/../toolchain/vars.mk
 
-TARGET = arm-crux-linux-gnueabi
-DEVICE = versatile
+TARGET = arm-crux-linux-gnueabihf
 
 WORK = $(TOPDIR)/work
 CLFS = $(TOPDIR)/../toolchain/clfs
 CROSSTOOLS = $(TOPDIR)/../toolchain/crosstools
 
-BUSYBOX_VERSION  = 1.18.4
+BUSYBOX_VERSION  = 1.21.1
 BUSYBOX_SOURCE   = http://busybox.net/downloads/busybox-$(BUSYBOX_VERSION).tar.bz2
 
-DIALOG_VERSION = 1.1-20100119
-DIALOG_SOURCE = ftp://dickey.his.com/dialog/dialog-$(DIALOG_VERSION).tgz
+DIALOG_VERSION = 1.2-20130523
+DIALOG_SOURCE = ftp://invisible-island.net/dialog/dialog-$(DIALOG_VERSION).tgz
+
+NCURSES_HEADER = $(CLFS)/usr/include/ncurses.h
 
 .PHONY: all check-root busybox dialog initrd clean distclean
 
@@ -25,7 +26,7 @@ all: initrd
 
 clean: busybox-clean dialog-clean initrd-clean
 
-dist-clean: busybox-distclean dialog-distclean initrd-distclean
+distclean: busybox-distclean dialog-distclean initrd-distclean
 
 check-root:
 	@if [ "$$UID" != "0" ]; then \
@@ -37,15 +38,17 @@ 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
 	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 &&  \
 	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
@@ -55,7 +58,7 @@ busybox: $(WORK)/busybox-$(BUSYBOX_VERSION)/_install/bin/busybox
 busybox-clean:
 	rm -vrf $(WORK)/busybox-$(BUSYBOX_VERSION)
 
-busybox-distclean:
+busybox-distclean: busybox-clean
 	rm -vf $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2
 
 $(WORK)/dialog-$(DIALOG_VERSION).tgz:
@@ -77,18 +80,18 @@ $(WORK)/dialog-$(DIALOG_VERSION)/_install/usr/bin/dialog: $(WORK)/dialog-$(DIALO
 		$(TARGET)-strip $(WORK)/dialog-$(DIALOG_VERSION)/_install/usr/bin/dialog && \
 		touch $(WORK)/dialog-$(DIALOG_VERSION)/_install/usr/bin/dialog
 
-dialog: $(WORK)/dialog-$(DIALOG_VERSION)/_install/usr/bin/dialog
+dialog: $(NCURSES_HEADER) $(WORK)/dialog-$(DIALOG_VERSION)/_install/usr/bin/dialog
 
 dialog-clean:
 	rm -vrf $(WORK)/dialog-$(DIALOG_VERSION)
 
-dialog-distclean:
-	rm -rf $(WORK)/dialog-$(DIALOG_VERSION).tgz
+dialog-distclean: dialog-clean
+	rm -vf $(WORK)/dialog-$(DIALOG_VERSION).tgz
 
 $(WORK)/mnt:
 	mkdir -p $(WORK)/mnt
 
-$(WORK)/initrd.gz: check-root busybox dialog $(KERNEL_PATH) $(WORK)/mnt $(TOPDIR)/filesystem $(TOPDIR)/mkinitrd.sh
+$(WORK)/initrd.gz: check-root busybox dialog $(WORK)/mnt $(TOPDIR)/filesystem $(TOPDIR)/mkinitrd.sh
 	sh mkinitrd.sh --name=$(WORK)/initrd.gz --size=4096
 	cd $(WORK) && gunzip -v initrd.gz
 	mount -v -t ext2 -o loop,rw $(WORK)/initrd $(WORK)/mnt
@@ -98,8 +101,12 @@ $(WORK)/initrd.gz: check-root busybox dialog $(KERNEL_PATH) $(WORK)/mnt $(TOPDIR
 	install -d  $(WORK)/mnt/usr/share/terminfo
 	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 0664 $(TOPDIR)/filesystem/group $(WORK)/mnt/etc
+	install -v -m 0600 $(TOPDIR)/filesystem/passwd $(WORK)/mnt/etc
+	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/crux $(WORK)/mnt/usr/bin && \
+	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
@@ -108,7 +115,7 @@ $(WORK)/initrd.gz: check-root busybox dialog $(KERNEL_PATH) $(WORK)/mnt $(TOPDIR
 initrd: $(WORK)/initrd.gz
 
 initrd-clean: check-root
-	rm -rf initrd.gz
+	rm -rvf $(WORK)/initrd.gz $(WORK)/mnt
 
 initrd-distclean: initrd-clean