Fixed order for injected packages in setup-helper script.

[initrd.git] / Makefile

diff --git a/Makefile b/Makefile
index 0442920eb99281757855a1c88d24e0048317cfbc..54c8259cb29632c927ea934e6c132f4be47829b7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,22 +13,21 @@ WORK = $(TOPDIR)/work
 CLFS = $(TOPDIR)/../toolchain/clfs
 CROSSTOOLS = $(TOPDIR)/../toolchain/crosstools
 
-KERNEL_PATH = $(TOPDIR)/../kernel/$(DEVICE)
-KERNEL_VERSION = $(shell grep '^KERNEL_VERSION = ' $(KERNEL_PATH)/Makefile | sed 's|KERNEL_VERSION = ||')
-
-BUSYBOX_VERSION  = 1.18.4
+BUSYBOX_VERSION  = 1.20.2
 BUSYBOX_SOURCE   = http://busybox.net/downloads/busybox-$(BUSYBOX_VERSION).tar.bz2
 
-DIALOG_VERSION = 1.1-20100119
+DIALOG_VERSION = 1.1-20120706
 DIALOG_SOURCE = ftp://dickey.his.com/dialog/dialog-$(DIALOG_VERSION).tgz
 
+NCURSES_HEADER = $(CLFS)/usr/include/ncurses.h
+
 .PHONY: all check-root busybox dialog initrd clean distclean
 
 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 \
@@ -42,8 +41,10 @@ $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2:
 
 $(WORK)/busybox-$(BUSYBOX_VERSION): $(WORK)/busybox-$(BUSYBOX_VERSION).tar.bz2 $(TOPDIR)/busybox-$(BUSYBOX_VERSION).config
        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 &&  \
@@ -58,7 +59,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:
@@ -75,44 +76,46 @@ $(WORK)/dialog-$(DIALOG_VERSION)/_install/usr/bin/dialog: $(WORK)/dialog-$(DIALO
                ./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 CC="$(TARGET)-gcc -static -mno-unaligned-access" && \
                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: $(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-$(KERNEL_VERSION).gz: check-root busybox dialog $(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
        install -v -m 0755 $(WORK)/dialog-$(DIALOG_VERSION)/_install/usr/bin/dialog $(WORK)/mnt/usr/bin
-       #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 -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,setup*} $(WORK)/mnt/usr/bin && \
+       install -v -m 0755 $(TOPDIR)/filesystem/{setup,setup-chroot,crux} $(WORK)/mnt/usr/bin && \
        /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 -vf $(WORK)/initrd.gz
 
 initrd-distclean: initrd-clean