diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-16 10:34:49 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-16 10:34:49 +0100 |
commit | f24ad15758f8eebcc46cb0c210f888491869d3f0 (patch) | |
tree | 85c74dd33e056502de7a306161d28f5b15b274c2 /core/mkinitcpio-busybox | |
parent | 5f4568c7f7ba204bc047d2c74a5721f23024b339 (diff) | |
parent | 636ce8849a9c82c1787c2919ffcfe6685cb799d3 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chmsee/PKGBUILD
community/darkstat/PKGBUILD
community/dbmail/PKGBUILD
community/dvdisaster/PKGBUILD
community/epic4/PKGBUILD
community/fb-client/PKGBUILD
community/fcrackzip/PKGBUILD
community/fdupes/PKGBUILD
community/flobopuyo/PKGBUILD
community/intel-tbb/PKGBUILD
community/openbsd-netcat/PKGBUILD
community/sunpinyin/PKGBUILD
community/tinc/PKGBUILD
community/uudeview/PKGBUILD
community/zathura/PKGBUILD
core/libedit/PKGBUILD
core/mkinitcpio-busybox/PKGBUILD
core/openssl/PKGBUILD
core/util-linux/PKGBUILD
extra/lua/PKGBUILD
gnome-unstable/pidgin/PKGBUILD
testing/openssl/PKGBUILD
testing/sudo/PKGBUILD
testing/udev/PKGBUILD
testing/util-linux/PKGBUILD
Diffstat (limited to 'core/mkinitcpio-busybox')
-rw-r--r-- | core/mkinitcpio-busybox/PKGBUILD | 12 | ||||
-rw-r--r-- | core/mkinitcpio-busybox/config | 38 |
2 files changed, 25 insertions, 25 deletions
diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index 22980acea..ddc7eac08 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 141112 2011-10-24 09:59:21Z dreisner $ +# $Id: PKGBUILD 153485 2012-03-14 23:26:22Z tomegun $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio-busybox -pkgver=1.19.2 -pkgrel=1.1 +pkgver=1.19.4 +pkgrel=2 pkgdesc="base initramfs tools" arch=('i686' 'x86_64' 'mips64el') url="http://www.busybox.net/" @@ -13,8 +13,8 @@ depends=('glibc') options=('!buildflags') source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" 'config') -sha256sums=('ea7ec9b6df70b8c528f4a2b6300e9913431c7223308fb08dfafa7508d75a0cb9' - '21ae2cd21e33ba1ef9500a9b14273579fc554bf995cfd7907fb3fe94fc162cf8') +sha256sums=('9b853406da61ffb59eb488495fe99cbb7fb3dd29a31307fcfa9cf070543710ee' + '28dc775e12c40718b48e1dd6a63544ca9d8aa128f786577b27e4df73e1e8766a') build() { cd "$srcdir/busybox-$pkgver" @@ -33,7 +33,7 @@ build() { } package() { - install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/lib/initcpio/busybox" + install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/usr/lib/initcpio/busybox" } # vim:set ts=2 sw=2 et: diff --git a/core/mkinitcpio-busybox/config b/core/mkinitcpio-busybox/config index 86160a203..3cd776e03 100644 --- a/core/mkinitcpio-busybox/config +++ b/core/mkinitcpio-busybox/config @@ -486,14 +486,14 @@ CONFIG_LAST_SYSTEM_ID=0 # # Linux Module Utilities # -CONFIG_MODINFO=y +# CONFIG_MODINFO is not set # CONFIG_MODPROBE_SMALL is not set # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -CONFIG_INSMOD=y -CONFIG_RMMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +# CONFIG_INSMOD is not set +# CONFIG_RMMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set # CONFIG_MODPROBE is not set # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set # CONFIG_DEPMOD is not set @@ -508,11 +508,11 @@ CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set # CONFIG_FEATURE_MODUTILS_ALIAS is not set # CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -CONFIG_DEFAULT_MODULES_DIR="" -CONFIG_DEFAULT_DEPMOD_FILE="" +# CONFIG_DEFAULT_MODULES_DIR is not set +# CONFIG_DEFAULT_DEPMOD_FILE is not set # # Linux System Utilities @@ -570,15 +570,15 @@ CONFIG_LOSETUP=y # CONFIG_MKSWAP is not set # CONFIG_FEATURE_MKSWAP_UUID is not set # CONFIG_MORE is not set -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -CONFIG_FEATURE_MOUNT_VERBOSE=y -CONFIG_FEATURE_MOUNT_HELPERS=y -CONFIG_FEATURE_MOUNT_LABEL=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y +# CONFIG_MOUNT is not set +# CONFIG_FEATURE_MOUNT_FAKE is not set +# CONFIG_FEATURE_MOUNT_VERBOSE is not set +# CONFIG_FEATURE_MOUNT_HELPERS is not set +# CONFIG_FEATURE_MOUNT_LABEL is not set +# CONFIG_FEATURE_MOUNT_NFS is not set +# CONFIG_FEATURE_MOUNT_CIFS is not set +# CONFIG_FEATURE_MOUNT_FLAGS is not set +# CONFIG_FEATURE_MOUNT_FSTAB is not set # CONFIG_PIVOT_ROOT is not set # CONFIG_RDATE is not set # CONFIG_RDEV is not set @@ -589,7 +589,7 @@ CONFIG_FEATURE_MOUNT_FSTAB=y # CONFIG_SETARCH is not set # CONFIG_SWAPONOFF is not set # CONFIG_FEATURE_SWAPON_PRI is not set -CONFIG_SWITCH_ROOT=y +# CONFIG_SWITCH_ROOT is not set CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -599,7 +599,7 @@ CONFIG_FEATURE_UMOUNT_ALL=y CONFIG_FEATURE_MOUNT_LOOP=y CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_MTAB_SUPPORT is not set -CONFIG_VOLUMEID=y +# CONFIG_VOLUMEID is not set # # Filesystem/Volume identification |