diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
commit | d07d53d7af1e9694d9558783841bc2df3124a90f (patch) | |
tree | 40d68de204b29d3360efd654d3c458c9cdad3cd6 /core/mkinitcpio-busybox | |
parent | a873bdc69d24650d832933463af71dfaa96f1a8a (diff) | |
parent | 64e290184042563a240e2d6d15c02e06703d00ee (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/obconf/PKGBUILD
community/obconf/obconf.install
community/qstardict/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
extra/cups/PKGBUILD
extra/eject/PKGBUILD
extra/emacs/PKGBUILD
extra/evilwm/PKGBUILD
extra/fbset/PKGBUILD
extra/gmpc/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gtkpod/PKGBUILD
extra/kdepim/PKGBUILD
extra/kile/PKGBUILD
extra/libvpx/PKGBUILD
extra/php-apc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/potrace/PKGBUILD
extra/racket/PKGBUILD
extra/soundtouch/PKGBUILD
extra/wireshark/PKGBUILD
extra/xpdf/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/lib32-acl/PKGBUILD
multilib/lib32-attr/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'core/mkinitcpio-busybox')
-rw-r--r-- | core/mkinitcpio-busybox/PKGBUILD | 8 | ||||
-rw-r--r-- | core/mkinitcpio-busybox/config | 20 |
2 files changed, 16 insertions, 12 deletions
diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index 7458facf3..e2e797741 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 123921 2011-05-14 11:29:02Z thomas $ +# $Id: PKGBUILD 135588 2011-08-16 07:52:57Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio-busybox -pkgver=1.18.4 +pkgver=1.18.5 pkgrel=1 pkgdesc="base initramfs tools" arch=('i686' 'x86_64' 'mips64el') @@ -10,8 +10,8 @@ license=('GPL') depends=('glibc') source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2 config) -sha256sums=('4d24d37bd6f1bd153e8cf9a984ec2f32f18464f73ca535e2cc2e8be9694097fa' - 'dd6dca08fbc335f1394e0f1b619df6895349c759d0c6e43456aed411e16d4194') +sha256sums=('10954fcd5c48d8a262a3497b16227bf983a05658bf2bf661af2fdeca773f2fc0' + '0961b4db5eb5eaa1b8d353a3fc792884f4f2733ec0f5715ba88a0e667f0f48ec') build() { cd "${srcdir}/busybox-${pkgver}" diff --git a/core/mkinitcpio-busybox/config b/core/mkinitcpio-busybox/config index 1aa333faf..31a9d4330 100644 --- a/core/mkinitcpio-busybox/config +++ b/core/mkinitcpio-busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.18.2 -# Wed Jan 26 23:08:18 2011 +# Busybox version: 1.18.5 +# Sun Aug 14 01:22:25 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -90,7 +90,7 @@ CONFIG_PREFIX="./_install" # Busybox Library Tuning # CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=3 +CONFIG_MD5_SIZE_VS_SPEED=0 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set # CONFIG_FEATURE_USE_TERMIOS is not set @@ -227,7 +227,7 @@ CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y # CONFIG_FEATURE_LS_COLOR is not set # CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -# CONFIG_MD5SUM is not set +CONFIG_MD5SUM=y CONFIG_MKDIR=y CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y CONFIG_MKFIFO=y @@ -247,9 +247,9 @@ CONFIG_RM=y CONFIG_RMDIR=y CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y CONFIG_SEQ=y -# CONFIG_SHA1SUM is not set -# CONFIG_SHA256SUM is not set -# CONFIG_SHA512SUM is not set +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y @@ -297,7 +297,11 @@ CONFIG_FEATURE_AUTOWIDTH=y # Common options for df, du, ls # CONFIG_FEATURE_HUMAN_READABLE=y -# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # # Console Utilities |