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

diff --git a/Makefile b/Makefile
index 09c0b3b..842fcb4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,83 +1,121 @@
 # 
-# initrd.git/Makefile
+# initrd/Makefile
 #
 
-TARGET = arm-crux-linux-gnueabi
-DEVICE = versatile
-
 TOPDIR = $(shell pwd)
+
+include $(TOPDIR)/../toolchain/vars.mk
+
+TARGET = arm-crux-linux-gnueabihf
+
 WORK = $(TOPDIR)/work
 CLFS = $(TOPDIR)/../toolchain/clfs
 CROSSTOOLS = $(TOPDIR)/../toolchain/crosstools
 
+BUSYBOX_VERSION  = 1.21.1
+BUSYBOX_SOURCE   = http://busybox.net/downloads/busybox-$(BUSYBOX_VERSION).tar.bz2
 
-KERNEL_PATH = $(TOPDIR)/../kernel/$(DEVICE)
-KERNEL_VERSION = $(shell grep '^KERNEL_VERSION = ' $(KERNEL_PATH)/Makefile | sed 's|KERNEL_VERSION = ||')
+DIALOG_VERSION = 1.2-20130523
+DIALOG_SOURCE = ftp://invisible-island.net/dialog/dialog-$(DIALOG_VERSION).tgz
 
-BUSYBOX_SOURCE   = http://busybox.net/downloads/busybox-$(BUSYBOX_VERSION).tar.bz2
-BUSYBOX_VERSION  = 1.14.3
+NCURSES_HEADER = $(CLFS)/usr/include/ncurses.h
 
-.PHONY: all check-root busybox initrd clean distclean
+.PHONY: all check-root busybox dialog initrd clean distclean
 
-all: busybox initrd
+all: initrd
 
-clean: busybox-clean initrd-clean
+clean: busybox-clean dialog-clean initrd-clean
 
-dist-clean: busybox-distclean initrd-distclean
+distclean: busybox-distclean dialog-distclean initrd-distclean
 
 check-root:
 	@if [ "$$UID" != "0" ]; then \
 		echo "You need to be root to do this."; \
-    echo "Now you should run 'make initrd' as root to finish compilation or 'sudo make initrd'."; \
+		echo "Now you should run 'make initrd' as root to finish compilation or 'sudo make initrd'."; \
 		exit 1; \
 	fi
 
 $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2:
-	wget -P $(WORK) -c http://busybox.net/downloads/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)-make382.patch
+$(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)/busybox-$(BUSYBOX_VERSION)-make382.patch
+		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: $(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
-	touch $(WORK)/busybox-$(BUSYBOX_VERSION)/_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
 
-busybox: $(WORK)/busybox-$(BUSYBOX_VERSION)/_install
+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:
+	wget -P $(WORK) -c $(DIALOG_SOURCE)
+
+$(WORK)/dialog-$(DIALOG_VERSION): $(WORK)/dialog-$(DIALOG_VERSION).tgz
+	tar -C $(WORK) -xvzf $(WORK)/dialog-$(DIALOG_VERSION).tgz
+	touch $(WORK)/dialog-$(DIALOG_VERSION)
+
+$(WORK)/dialog-$(DIALOG_VERSION)/_install/usr/bin/dialog: $(WORK)/dialog-$(DIALOG_VERSION)
+	export PATH=$(CROSSTOOLS)/bin:$$PATH && \
+	export LD_LIBRARY_PATH=$(CROSSTOOLS)/lib:$$LD_LIBRARY_PATH && \
+	cd $(WORK)/dialog-$(DIALOG_VERSION) && \
+		./configure --build=$(BUILD) --host=$(TARGET) --prefix=/usr --with-ncursesw && \
+		find -type f -name 'makefile' \
+		-exec sed -e "s|-I/usr|-I$(CLFS)/usr|g" -e "s|-L/usr|-L$(CLFS)/usr|g" -i {} \; && \
+		make CC="$(TARGET)-gcc -static" && \
+		make DESTDIR=$(WORK)/dialog-$(DIALOG_VERSION)/_install install && \
+		$(TARGET)-strip $(WORK)/dialog-$(DIALOG_VERSION)/_install/usr/bin/dialog && \
+		touch $(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: dialog-clean
+	rm -vf $(WORK)/dialog-$(DIALOG_VERSION).tgz
+
 $(WORK)/mnt:
 	mkdir -p $(WORK)/mnt
 
-$(WORK)/initrd-$(KERNEL_VERSION).gz: check-root busybox $(KERNEL_PATH) $(WORK)/mnt $(TOPDIR)/filesystem $(TOPDIR)/mkinitrd.sh
-	sh mkinitrd.sh --name=$(WORK)/initrd-$(KERNEL_VERSION).gz --size=4096
-	cd $(WORK) && gunzip -v initrd-$(KERNEL_VERSION).gz
-	mount -v -t ext2 -o loop,rw $(WORK)/initrd-$(KERNEL_VERSION) $(WORK)/mnt
+$(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
 	cp -dRv $(WORK)/busybox-$(BUSYBOX_VERSION)/_install/* $(WORK)/mnt
-	#make -C $(KERNEL_PATH)/work/linux-$(KERNEL_VERSION) ARCH=arm INSTALL_MOD_PATH=$(WORK)/mnt modules_install
-	cp -dRv $(CLFS)/lib/libnss_{files*,dns*} $(CLFS)/lib/libresolv* $(WORK)/mnt/lib 
+	install -v -m 0755 $(WORK)/dialog-$(DIALOG_VERSION)/_install/usr/bin/dialog $(WORK)/mnt/usr/bin
+	cp -dRv $(CLFS)/lib/libnss_{files*,dns*} $(CLFS)/lib/libresolv* $(WORK)/mnt/lib
+	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-$(KERNEL_VERSION)
-	touch $(WORK)/initrd-$(KERNEL_VERSION).gz
+	cd $(WORK) && gzip -v initrd
+	touch $(WORK)/initrd.gz
 
-initrd: $(WORK)/initrd-$(KERNEL_VERSION).gz
+initrd: $(WORK)/initrd.gz
 
 initrd-clean: check-root
-	rm -rf initrd-$(KERNEL_VERSION).gz
+	rm -rvf $(WORK)/initrd.gz $(WORK)/mnt
 
 initrd-distclean: initrd-clean