X-Git-Url: http://gitweb/?a=blobdiff_plain;f=Makefile;h=82462b8a6bc22014488514a95bfa9c998749a3f1;hb=bb58a5ac38c5b80f90a67a96bcad85d13355e7df;hp=546403c46b53a0c8f8d6757120d2ba7ad83a42b8;hpb=be3fa5e6b89ffed059c250c3c03fbebfca0c6f11;p=initramfs.git

diff --git a/Makefile b/Makefile
index 546403c..82462b8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,28 +2,31 @@
 # initramfs/Makefile
 #
 
-TARGET = arm-crux-linux-gnueabi
-DEVICE = versatile
+TOPDIR = $(shell pwd)
 
-PWD  = $(shell pwd)
-WORK = $(PWD)/work
-CLFS = $(PWD)/../toolchain/clfs
-CROSSTOOLS = $(PWD)/../toolchain/crosstools
+include $(TOPDIR)/../toolchain/vars.mk
 
+TARGET = arm-crux-linux-gnueabihf
 
-KERNEL_PATH = $(PWD)/../kernel/$(DEVICE)
-KERNEL_VERSION = $(shell grep '^KERNEL_VERSION = ' $(KERNEL_PATH)/Makefile | sed 's|KERNEL_VERSION = ||')
+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
-BUSYBOX_VERSION  = 1.18.4
 
-.PHONY: all check-root busybox initramfs clean distclean
+DIALOG_VERSION = 1.2-20130523
+DIALOG_SOURCE = ftp://invisible-island.net/dialog/dialog-$(DIALOG_VERSION).tgz
 
-all: busybox initramfs
+NCURSES_HEADER = $(CLFS)/usr/include/ncurses.h
 
-clean: busybox-clean initramfs-clean
+.PHONY: all check-root busybox dialog gen_init_cpio initramfs clean distclean
 
-dist-clean: busybox-distclean gen_init_cpio-distclean initramfs-distclean
+all: initramfs
+
+clean: busybox-clean dialog-clean gen_init_cpio-clean initramfs-clean
+
+distclean: busybox-distclean dialog-distclean gen_init_cpio-distclean initramfs-distclean
 
 check-root:
 	@if [ "$$UID" != "0" ]; then \
@@ -33,20 +36,24 @@ check-root:
 	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 $(PWD)/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
-	cp -v $(PWD)/busybox-$(BUSYBOX_VERSION).config $(WORK)/busybox-$(BUSYBOX_VERSION)/.config
-	touch $(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)
 
-$(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 -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)
@@ -54,6 +61,33 @@ busybox-clean:
 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)/gen_init_cpio: $(WORK)/gen_init_cpio.c
 	cd $(WORK) && \
 		$(CC) $(CFLAGS) -Wall -o gen_init_cpio gen_init_cpio.c
@@ -65,21 +99,39 @@ gen_init_cpio-clean:
 
 gen_init_cpio-distclean: gen_init_cpio-clean
 
-$(WORK)/initramfs.cpio.gz-$(KERNEL_VERSION): check-root $(WORK)/busybox-$(BUSYBOX_VERSION)/_install $(KERNEL_PATH) $(WORK)/gen_init_cpio $(WORK)/initramfs.lst
+$(WORK)/mnt:
 	mkdir -p $(WORK)/mnt
-	cp -drv $(PWD)/filesystem/* $(WORK)/busybox-$(BUSYBOX_VERSION)/_install/* $(WORK)/mnt
-	ln -s /bin/busybox $(WORK)/mnt/init
-	cd $(WORK)/mnt && \
-		$(WORK)/gen_init_cpio $(WORK)/initramfs.lst | cpio -id && \
-		find * | cpio -H newc -o > $(WORK)/initramfs.cpio && \
-		gzip -v9 $(WORK)/initramfs.cpio
-	mv $(WORK)/initramfs.cpio.gz{,-$(KERNEL_VERSION)}
-	rm -rf $(WORK)/mnt
 
-initramfs: $(WORK)/initramfs.cpio.gz-$(KERNEL_VERSION)
+$(WORK)/initramfs.cpio: check-root busybox dialog $(WORK)/mnt gen_init_cpio $(TOPDIR)/filesystem
+	install -d -m 0755 $(WORK)/mnt/{mnt,media,etc,dev,sys,proc,lib,usr,var/{log,lock,run},tmp}
+	mknod $(WORK)/mnt/dev/console c 5 1 && chmod 666 $(WORK)/mnt/dev/console
+	mknod $(WORK)/mnt/dev/null c 1 3 && chmod 666 $(WORK)/mnt/dev/null
+	mknod $(WORK)/mnt/dev/tty c 5 0 && chmod 666 $(WORK)/mnt/dev/tty
+	mkdir $(WORK)/mnt/dev/rd && mknod $(WORK)/mnt/dev/rd/0 b 1 0
+	mknod $(WORK)/mnt/dev/ram0 b 1 0 && chmod 600 $(WORK)/mnt/dev/ram0
+	for i in 0 1 2 3 4 5 6 7; do \
+		mknod $(WORK)/mnt/dev/tty$$i c 4 $$i && chmod 666 $(WORK)/mnt/dev/tty$$i; \
+	done
+	cp -dRv $(WORK)/busybox-$(BUSYBOX_VERSION)/_install/* $(WORK)/mnt
+	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/{setup,setup-chroot,crux} $(WORK)/mnt/usr/bin && \
+	ln -s bin/busybox $(WORK)/mnt/init
+	/sbin/ldconfig -r $(WORK)/mnt
+	cd $(WORK)/mnt && find . | cpio -o -H newc > $(WORK)/initramfs.cpio
+	touch $(WORK)/initramfs.cpio
+
+initramfs: $(WORK)/initramfs.cpio
 
 initramfs-clean:
-	rm -rf $(WORK)/initramfs-$(KERNEL_VERSION) $(WORK)/mnt $(WORK)/initramfs.cpio.gz-$(KERNEL_VERSION)
+	rm -rf $(WORK)/initramfs* $(WORK)/mnt
 
 initramfs-distclean: initramfs-clean