Fixed block devices used to find_and_mount_media in rc script, also added debug section.

[initrd.git] / Makefile

diff --git a/Makefile b/Makefile
index 376960870411cc6e4a53aa28fc2c8ac2268c33b1..54c8259cb29632c927ea934e6c132f4be47829b7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,10 +13,10 @@ WORK = $(TOPDIR)/work
 CLFS = $(TOPDIR)/../toolchain/clfs
 CROSSTOOLS = $(TOPDIR)/../toolchain/crosstools
 
-BUSYBOX_VERSION  = 1.19.4
+BUSYBOX_VERSION  = 1.20.2
 BUSYBOX_SOURCE   = http://busybox.net/downloads/busybox-$(BUSYBOX_VERSION).tar.bz2
 
-DIALOG_VERSION = 1.1-20120215
+DIALOG_VERSION = 1.1-20120706
 DIALOG_SOURCE = ftp://dickey.his.com/dialog/dialog-$(DIALOG_VERSION).tgz
 
 NCURSES_HEADER = $(CLFS)/usr/include/ncurses.h
@@ -41,6 +41,8 @@ $(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)
 
@@ -74,7 +76,7 @@ $(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
@@ -100,8 +102,11 @@ $(WORK)/initrd.gz: check-root busybox dialog $(WORK)/mnt $(TOPDIR)/filesystem $(
        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*,crux} $(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