From: Jose V Beneyto Date: Sat, 2 Nov 2013 00:31:49 +0000 (+0000) Subject: Synced changes with initramfs.git X-Git-Url: http://gitweb/?a=commitdiff_plain;h=908a5d6e0089b76fdb40a20bf7781035a2c92839;p=initrd.git Synced changes with initramfs.git --- diff --git a/Makefile b/Makefile index 842fcb4..905f003 100644 --- a/Makefile +++ b/Makefile @@ -15,18 +15,21 @@ CROSSTOOLS = $(TOPDIR)/../toolchain/crosstools BUSYBOX_VERSION = 1.21.1 BUSYBOX_SOURCE = http://busybox.net/downloads/busybox-$(BUSYBOX_VERSION).tar.bz2 +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 initrd clean distclean +.PHONY: all check-root busybox e2fsprogs dialog initrd clean distclean all: initrd -clean: busybox-clean dialog-clean initrd-clean +clean: busybox-clean e2fsprogs-clean dialog-clean initrd-clean -distclean: busybox-distclean dialog-distclean initrd-distclean +distclean: busybox-distclean e2fsprogs-clean dialog-distclean initrd-distclean check-root: @if [ "$$UID" != "0" ]; then \ @@ -61,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) @@ -91,11 +124,15 @@ dialog-distclean: dialog-clean $(WORK)/mnt: mkdir -p $(WORK)/mnt -$(WORK)/initrd.gz: check-root busybox dialog $(WORK)/mnt $(TOPDIR)/filesystem $(TOPDIR)/mkinitrd.sh +$(WORK)/initrd.gz: check-root busybox e2fsprogs 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)/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 diff --git a/busybox-1.21.1.config b/busybox-1.21.1.config index 9e5fdf1..c18cea0 100644 --- a/busybox-1.21.1.config +++ b/busybox-1.21.1.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.21.1 -# Wed Aug 14 10:26:37 2013 +# Fri Nov 1 23:35:07 2013 # CONFIG_HAVE_DOT_CONFIG=y @@ -116,7 +116,7 @@ CONFIG_FEATURE_NON_POSIX_CP=y # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set CONFIG_FEATURE_COPYBUF_KB=4 CONFIG_FEATURE_SKIP_ROOTFS=y -# CONFIG_MONOTONIC_SYSCALL is not set +CONFIG_MONOTONIC_SYSCALL=y CONFIG_IOCTL_HEX2STR_ERROR=y CONFIG_FEATURE_HWIB=y @@ -370,7 +370,7 @@ CONFIG_FEATURE_VI_MAX_LEN=4096 CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y -# CONFIG_FEATURE_VI_REGEX_SEARCH is not set +CONFIG_FEATURE_VI_REGEX_SEARCH=y CONFIG_FEATURE_VI_USE_SIGNALS=y CONFIG_FEATURE_VI_DOT_CMD=y CONFIG_FEATURE_VI_READONLY=y @@ -427,9 +427,9 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y # # Init Utilities # -CONFIG_BOOTCHARTD=y -CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER=y -CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y +# CONFIG_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set CONFIG_HALT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" @@ -440,10 +440,10 @@ CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_INIT_SYSLOG=y CONFIG_FEATURE_EXTRA_QUIET=y -CONFIG_FEATURE_INIT_COREDUMPS=y +# CONFIG_FEATURE_INIT_COREDUMPS is not set CONFIG_FEATURE_INITRD=y CONFIG_INIT_TERMINAL_TYPE="linux" -CONFIG_MESG=y +# CONFIG_MESG is not set # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set # @@ -559,7 +559,7 @@ CONFIG_FINDFS=y CONFIG_FLOCK=y CONFIG_FREERAMDISK=y CONFIG_FSCK_MINIX=y -CONFIG_MKFS_EXT2=y +# CONFIG_MKFS_EXT2 is not set CONFIG_MKFS_MINIX=y CONFIG_FEATURE_MINIX2=y CONFIG_MKFS_REISER=y @@ -659,8 +659,8 @@ CONFIG_UBIRMVOL=y CONFIG_UBIRSVOL=y CONFIG_UBIUPDATEVOL=y CONFIG_ADJTIMEX=y -# CONFIG_BBCONFIG is not set -# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set +CONFIG_BBCONFIG=y +CONFIG_FEATURE_COMPRESS_BBCONFIG=y CONFIG_BEEP=y CONFIG_FEATURE_BEEP_FREQ=4000 CONFIG_FEATURE_BEEP_LENGTH_MS=30 @@ -745,7 +745,7 @@ CONFIG_WHOIS=y CONFIG_FEATURE_IPV6=y # CONFIG_FEATURE_UNIX_LOCAL is not set CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +CONFIG_VERBOSE_RESOLUTION_ERRORS=y CONFIG_ARP=y CONFIG_ARPING=y CONFIG_BRCTL=y @@ -876,20 +876,20 @@ CONFIG_ZCIP=y # # Print Utilities # -CONFIG_LPD=y -CONFIG_LPR=y -CONFIG_LPQ=y +# CONFIG_LPD is not set +# CONFIG_LPR is not set +# CONFIG_LPQ is not set # # Mail Utilities # -CONFIG_MAKEMIME=y -CONFIG_FEATURE_MIME_CHARSET="us-ascii" -CONFIG_POPMAILDIR=y -CONFIG_FEATURE_POPMAILDIR_DELIVERY=y -CONFIG_REFORMIME=y -CONFIG_FEATURE_REFORMIME_COMPAT=y -CONFIG_SENDMAIL=y +# CONFIG_MAKEMIME is not set +CONFIG_FEATURE_MIME_CHARSET="" +# CONFIG_POPMAILDIR is not set +# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set +# CONFIG_REFORMIME is not set +# CONFIG_FEATURE_REFORMIME_COMPAT is not set +# CONFIG_SENDMAIL is not set # # Process Utilities @@ -936,12 +936,12 @@ CONFIG_WATCH=y # # Runit Utilities # -CONFIG_RUNSV=y -CONFIG_RUNSVDIR=y +# CONFIG_RUNSV is not set +# CONFIG_RUNSVDIR is not set # CONFIG_FEATURE_RUNSVDIR_LOG is not set -CONFIG_SV=y -CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" -CONFIG_SVLOGD=y +# CONFIG_SV is not set +CONFIG_SV_DEFAULT_SERVICE_DIR="" +# CONFIG_SVLOGD is not set CONFIG_CHPST=y CONFIG_SETUIDGID=y CONFIG_ENVUIDGID=y