X-Git-Url: http://gitweb/?a=blobdiff_plain;f=Makefile;h=53384411e7475d1342e420582223abac88083ef4;hb=4cc802d0cf454279278ade822cf596e9faaa1f2d;hp=cd3df6dee479ee35279eeb4ee53f76a2566391f3;hpb=557be67fe72dc8b70d81817a22effd074c665c52;p=initramfs.git

diff --git a/Makefile b/Makefile
index cd3df6d..5338441 100644
--- a/Makefile
+++ b/Makefile
@@ -6,32 +6,30 @@ 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
 
-
-KERNEL_PATH = $(PWD)/../kernel/$(DEVICE)
-KERNEL_VERSION = $(shell grep '^KERNEL_VERSION = ' $(KERNEL_PATH)/Makefile | sed 's|KERNEL_VERSION = ||')
-
-BUSYBOX_VERSION  = 1.20.2
+BUSYBOX_VERSION  = 1.21.1
 BUSYBOX_SOURCE   = http://busybox.net/downloads/busybox-$(BUSYBOX_VERSION).tar.bz2
 
-DIALOG_VERSION = 1.1-20120215
-DIALOG_SOURCE = ftp://dickey.his.com/dialog/dialog-$(DIALOG_VERSION).tgz
+E2FSPROGS_VERSION = 1.42.5
+E2FSPROGS_SOURCE = http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)/e2fsprogs-$(E2FSPROGS_VERSION).tar.gz
+
+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 initramfs clean distclean
+.PHONY: all check-root busybox e2fsprogs dialog gen_init_cpio initramfs clean distclean
 
-all: busybox dialog initramfs
+all: initramfs
 
-clean: busybox-clean dialog-clean initramfs-clean
+clean: busybox-clean e2fsprogs-clean dialog-clean gen_init_cpio-clean initramfs-clean
 
-dist-clean: busybox-distclean dialog-distclean gen_init_cpio-distclean initramfs-distclean
+distclean: busybox-distclean e2fsprogs-distclean dialog-distclean gen_init_cpio-distclean initramfs-distclean
 
 check-root:
 	@if [ "$$UID" != "0" ]; then \
@@ -41,17 +39,19 @@ 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/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
@@ -64,6 +64,36 @@ busybox-clean:
 busybox-distclean: busybox-clean
 	rm -vf $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2
 
+$(WORK)/e2fsprogs-$(E2FSPROGS_VERSION).tar.gz:
+	wget -P $(WORK) -c $(E2FSPROGS_SOURCE)
+
+$(WORK)/e2fsprogs-$(E2FSPROGS_VERSION): $(WORK)/e2fsprogs-$(E2FSPROGS_VERSION).tar.gz
+	tar -C $(WORK) -xvzf $(WORK)/e2fsprogs-$(E2FSPROGS_VERSION).tar.gz
+	touch $(WORK)/e2fsprogs-$(E2FSPROGS_VERSION)
+
+$(WORK)/e2fsprogs-$(E2FSPROGS_VERSION)/misc/mke2fs: $(WORK)/e2fsprogs-$(E2FSPROGS_VERSION)
+	export PATH=$(CROSSTOOLS)/bin:$$PATH &&  \
+	export LD_LIBRARY_PATH=$(CROSSTOOLS)/lib:$$LD_LIBRARY_PATH && \
+	cd $(WORK)/e2fsprogs-$(E2FSPROGS_VERSION) && \
+		./configure --build=$(BUILD) --host=$(TARGET) --prefix=/usr --with-root-prefix= \
+		--mandir=/usr/man --disable-symlink-install --disable-nls --disable-compression \
+		--disable-htree --disable-elf-shlibs --disable-bsd-shlibs --disable-profile \
+		--disable-checker --disable-jbd-debug --disable-blkid-debug --disable-testio-debug \
+		--enable-libuuid --enable-libblkid --disable-libquota --disable-debugfs --disable-imager \
+		--disable-resizer --disable-defrag --disable-fsck --disable-e2initrd-helper \
+		--disable-tls --disable-rpath && \
+		make V=1 CFLAGS="$(CFLAGS) -static" LDFLAGS="$(LDFLAGS) -static" && \
+		$(TARGET)-strip $(WORK)/e2fsprogs-$(E2FSPROGS_VERSION)/misc/mke2fs && \
+		touch $(WORK)/e2fsprogs-$(E2FSPROGS_VERSION)/misc/mke2fs
+
+e2fsprogs: $(WORK)/e2fsprogs-$(E2FSPROGS_VERSION)/misc/mke2fs
+
+e2fsprogs-clean:
+	rm -vrf $(WORK)/e2fsprogs-$(E2FSPROGS_VERSION)
+
+e2fsprogs-distclean:
+	rm -vf $(WORK)/e2fsprogs-$(E2FSPROGS_VERSION).tar.bz2
+
 $(WORK)/dialog-$(DIALOG_VERSION).tgz:
 	wget -P $(WORK) -c $(DIALOG_SOURCE)
 
@@ -74,14 +104,14 @@ $(WORK)/dialog-$(DIALOG_VERSION): $(WORK)/dialog-$(DIALOG_VERSION).tgz
 $(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
+	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
 
@@ -102,29 +132,43 @@ gen_init_cpio-clean:
 
 gen_init_cpio-distclean: gen_init_cpio-clean
 
-$(WORK)/initramfs.cpio.gz-$(KERNEL_VERSION): check-root busybox dialog $(TOPDIR)/filesystem $(WORK)/gen_init_cpio $(WORK)/initramfs.lst
-	mkdir -p $(WORK)/mnt/{etc,lib,usr/share/terminfo}
+$(WORK)/mnt:
+	mkdir -p $(WORK)/mnt
+
+$(WORK)/initramfs.cpio: check-root busybox e2fsprogs 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)/e2fsprogs-$(E2FSPROGS_VERSION)/misc/mke2fs $(WORK)/mnt/sbin
+	for i in 2 3 4 4dev; do \
+		ln -s mke2fs $(WORK)/mnt/sbin/mkfs.ext$$i; \
+	done
 	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 0755 $(TOPDIR)/filesystem/rc $(WORK)/mnt/etc
-	install -v -m 0755 $(TOPDIR)/filesystem/{setup*,crux} $(WORK)/mnt/usr/bin
+	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 && \
-		sed -e "s/#KERNEL_VERSION#/$(KERNEL_VERSION)/g; s/#BUSYBOX_VERSION#/$(BUSYBOX_VERSION)/g" \
-		$(WORK)/initramfs.lst > $(WORK)/initramfs.lst-sed && \
-		$(WORK)/gen_init_cpio $(WORK)/initramfs.lst-sed | 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
+	cd $(WORK)/mnt && find . | cpio -o -H newc > $(WORK)/initramfs.cpio
+	touch $(WORK)/initramfs.cpio
 
-initramfs: $(WORK)/initramfs.cpio.gz-$(KERNEL_VERSION)
+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