From c8f0f771e612bbb05dffae26f84a1e1508e23355 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 30 Sep 2014 11:48:54 +0000 Subject: [PATCH] Initrd updated: - busybox updated to 1.22.0 - Updated filesystem/{crux,rc,setup,setup-helper} to 3.1 --- Makefile | 2 +- ...box-1.21.1.config => busybox-1.22.0.config | 66 ++++++++++--------- filesystem/crux | 2 +- filesystem/rc | 2 +- filesystem/setup | 2 +- filesystem/setup-helper | 4 +- 6 files changed, 41 insertions(+), 37 deletions(-) rename busybox-1.21.1.config => busybox-1.22.0.config (99%) diff --git a/Makefile b/Makefile index 905f003..ab69208 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ WORK = $(TOPDIR)/work CLFS = $(TOPDIR)/../toolchain/clfs CROSSTOOLS = $(TOPDIR)/../toolchain/crosstools -BUSYBOX_VERSION = 1.21.1 +BUSYBOX_VERSION = 1.22.0 BUSYBOX_SOURCE = http://busybox.net/downloads/busybox-$(BUSYBOX_VERSION).tar.bz2 E2FSPROGS_VERSION = 1.42.5 diff --git a/busybox-1.21.1.config b/busybox-1.22.0.config similarity index 99% rename from busybox-1.21.1.config rename to busybox-1.22.0.config index c18cea0..a30b48f 100644 --- a/busybox-1.21.1.config +++ b/busybox-1.22.0.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.21.1 -# Fri Nov 1 23:35:07 2013 +# Busybox version: 1.22.0 +# Tue Sep 30 09:14:27 2014 # CONFIG_HAVE_DOT_CONFIG=y @@ -135,7 +135,14 @@ CONFIG_FEATURE_SEAMLESS_GZ=y # CONFIG_AR is not set # CONFIG_FEATURE_AR_LONG_FILENAMES is not set # CONFIG_FEATURE_AR_CREATE is not set +# CONFIG_UNCOMPRESS is not set +CONFIG_GUNZIP=y CONFIG_BUNZIP2=y +CONFIG_UNLZMA=y +CONFIG_FEATURE_LZMA_FAST=y +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZ=y CONFIG_BZIP2=y CONFIG_CPIO=y CONFIG_FEATURE_CPIO_O=y @@ -143,14 +150,13 @@ CONFIG_FEATURE_CPIO_P=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y CONFIG_GZIP=y CONFIG_FEATURE_GZIP_LONG_OPTIONS=y CONFIG_GZIP_FAST=0 CONFIG_LZOP=y # CONFIG_LZOP_COMPR_HIGH is not set -CONFIG_RPM2CPIO=y CONFIG_RPM=y +CONFIG_RPM2CPIO=y CONFIG_TAR=y CONFIG_FEATURE_TAR_CREATE=y CONFIG_FEATURE_TAR_AUTODETECT=y @@ -163,12 +169,6 @@ CONFIG_FEATURE_TAR_TO_COMMAND=y CONFIG_FEATURE_TAR_UNAME_GNAME=y CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y # CONFIG_FEATURE_TAR_SELINUX is not set -# CONFIG_UNCOMPRESS is not set -CONFIG_UNLZMA=y -CONFIG_FEATURE_LZMA_FAST=y -CONFIG_LZMA=y -CONFIG_UNXZ=y -CONFIG_XZ=y CONFIG_UNZIP=y # @@ -186,6 +186,7 @@ CONFIG_ID=y CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y CONFIG_TOUCH=y +CONFIG_FEATURE_TOUCH_NODEREF=y CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y @@ -363,7 +364,16 @@ CONFIG_WHICH=y # # Editors # +CONFIG_AWK=y +CONFIG_FEATURE_AWK_LIBM=y +CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y +CONFIG_CMP=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_LONG_OPTIONS=y +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y CONFIG_PATCH=y +CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 # CONFIG_FEATURE_VI_8BIT is not set @@ -378,14 +388,6 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_AWK=y -CONFIG_FEATURE_AWK_LIBM=y -CONFIG_CMP=y -CONFIG_DIFF=y -CONFIG_FEATURE_DIFF_LONG_OPTIONS=y -CONFIG_FEATURE_DIFF_DIR=y -CONFIG_ED=y -CONFIG_SED=y CONFIG_FEATURE_ALLOW_EXEC=y # @@ -528,6 +530,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # Linux System Utilities # CONFIG_BLOCKDEV=y +CONFIG_FSTRIM=y CONFIG_MDEV=y CONFIG_FEATURE_MDEV_CONF=y CONFIG_FEATURE_MDEV_RENAME=y @@ -614,26 +617,27 @@ CONFIG_VOLUMEID=y # # Filesystem/Volume identification # -CONFIG_FEATURE_VOLUMEID_EXT=y CONFIG_FEATURE_VOLUMEID_BTRFS=y -CONFIG_FEATURE_VOLUMEID_REISERFS=y -CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_CRAMFS=y CONFIG_FEATURE_VOLUMEID_EXFAT=y +CONFIG_FEATURE_VOLUMEID_EXT=y +CONFIG_FEATURE_VOLUMEID_F2FS=y +CONFIG_FEATURE_VOLUMEID_FAT=y CONFIG_FEATURE_VOLUMEID_HFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y CONFIG_FEATURE_VOLUMEID_JFS=y -CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +CONFIG_FEATURE_VOLUMEID_LUKS=y CONFIG_FEATURE_VOLUMEID_NILFS=y CONFIG_FEATURE_VOLUMEID_NTFS=y -CONFIG_FEATURE_VOLUMEID_ISO9660=y -CONFIG_FEATURE_VOLUMEID_UDF=y -CONFIG_FEATURE_VOLUMEID_LUKS=y -CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y -CONFIG_FEATURE_VOLUMEID_CRAMFS=y +CONFIG_FEATURE_VOLUMEID_OCFS2=y +CONFIG_FEATURE_VOLUMEID_REISERFS=y CONFIG_FEATURE_VOLUMEID_ROMFS=y CONFIG_FEATURE_VOLUMEID_SQUASHFS=y CONFIG_FEATURE_VOLUMEID_SYSV=y -CONFIG_FEATURE_VOLUMEID_OCFS2=y -CONFIG_FEATURE_VOLUMEID_LINUXRAID=y +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_XFS=y # # Miscellaneous Utilities @@ -651,6 +655,7 @@ CONFIG_FEATURE_LESS_DASHCMD=y CONFIG_FEATURE_LESS_LINENUMS=y CONFIG_NANDWRITE=y CONFIG_NANDDUMP=y +CONFIG_RFKILL=y CONFIG_SETSERIAL=y CONFIG_UBIATTACH=y CONFIG_UBIDETACH=y @@ -658,6 +663,7 @@ CONFIG_UBIMKVOL=y CONFIG_UBIRMVOL=y CONFIG_UBIRSVOL=y CONFIG_UBIUPDATEVOL=y +# CONFIG_WALL is not set CONFIG_ADJTIMEX=y CONFIG_BBCONFIG=y CONFIG_FEATURE_COMPRESS_BBCONFIG=y @@ -714,7 +720,6 @@ CONFIG_MOUNTPOINT=y CONFIG_MT=y CONFIG_RAIDAUTORUN=y CONFIG_READAHEAD=y -CONFIG_RFKILL=y # CONFIG_RUNLEVEL is not set CONFIG_RX=y CONFIG_SETSID=y @@ -725,7 +730,6 @@ CONFIG_TIME=y CONFIG_TIMEOUT=y CONFIG_TTYSIZE=y CONFIG_VOLNAME=y -# CONFIG_WALL is not set CONFIG_WATCHDOG=y # diff --git a/filesystem/crux b/filesystem/crux index 2c2d764..c7ca611 100755 --- a/filesystem/crux +++ b/filesystem/crux @@ -1,5 +1,5 @@ #! /bin/sh -echo "CRUX-ARM 3.0" +echo "CRUX-ARM 3.1" # End of file diff --git a/filesystem/rc b/filesystem/rc index 5b19485..cc1bc7e 100755 --- a/filesystem/rc +++ b/filesystem/rc @@ -98,7 +98,7 @@ find_and_mount_media() { # echo "" -echo -e "${BOLD}CRUX-ARM 3.0 - ${BLUE}http://crux-arm.nu/${NORM}" +echo -e "${BOLD}CRUX-ARM 3.1 - ${BLUE}http://crux-arm.nu/${NORM}" echo "" exec >/dev/console &1 diff --git a/filesystem/setup b/filesystem/setup index 717a98b..71476a7 100755 --- a/filesystem/setup +++ b/filesystem/setup @@ -22,7 +22,7 @@ # USA. # -VERSION="3.0" +VERSION="3.1" do_dialog() { dialog --backtitle "CRUX $VERSION Setup" --no-shadow "$@" diff --git a/filesystem/setup-helper b/filesystem/setup-helper index a88adc8..9af9d22 100755 --- a/filesystem/setup-helper +++ b/filesystem/setup-helper @@ -102,8 +102,8 @@ for i in /media/crux/*; do. fi done -##### # 2.8 -> 3.0 ##### -echo "* CRUX-ARM 2.8 -> 3.0 setup-helper" +##### # 3.0 -> 3.1 ##### +echo "* CRUX-ARM 3.0 -> 3.1 setup-helper" if grep -q opt $EXTRA_COLLECTIONS; then if [ `is_installed pango` ]; then -- 2.26.2