summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorLinux User <ncopa@buildozer.(none)>2008-11-09 13:16:40 +0000
committerLinux User <ncopa@buildozer.(none)>2008-11-09 13:16:40 +0000
commiteaec254fe63744b700a5fe7d823c3950a11a5b40 (patch)
tree7d540bb0236e9c244d16b93f3681eccab43cc5d9 /core
parentd321a993c960e8d5e913b85807e8a48da504162e (diff)
downloadaports-eaec254fe63744b700a5fe7d823c3950a11a5b40.tar.bz2
aports-eaec254fe63744b700a5fe7d823c3950a11a5b40.tar.xz
added patches from fixes-1.12.1
added 'od' applet
Diffstat (limited to 'core')
-rw-r--r--core/busybox/APKBUILD25
-rw-r--r--core/busybox/busybox-1.12.1-vi-path.patch (renamed from core/busybox/busybox-1.12.1-vi.patch)0
-rw-r--r--core/busybox/busyboxconfig5
3 files changed, 22 insertions, 8 deletions
diff --git a/core/busybox/APKBUILD b/core/busybox/APKBUILD
index b13dd917c..d097e0f32 100644
--- a/core/busybox/APKBUILD
+++ b/core/busybox/APKBUILD
@@ -1,15 +1,20 @@
pkgname=busybox
pkgver=1.12.1
-pkgrel=1
+pkgrel=5
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url=http://busybox.net
license=GPL-2
depends=uclibc
source="http://busybox.net/downloads/busybox-1.12.1.tar.bz2
+ http://busybox.net/downloads/fixes-1.12.1/busybox-1.12.1-basename.patch
http://busybox.net/downloads/fixes-1.12.1/busybox-1.12.1-grep.patch
+ http://busybox.net/downloads/fixes-1.12.1/busybox-1.12.1-lineedit.patch
+ http://busybox.net/downloads/fixes-1.12.1/busybox-1.12.1-login.patch
+ http://busybox.net/downloads/fixes-1.12.1/busybox-1.12.1-standalone.patch
+ http://busybox.net/downloads/fixes-1.12.1/busybox-1.12.1-vi.patch
bb-modprobe-v9.diff
- $pkgname-1.12.1-vi.patch
+ $pkgname-1.12.1-vi-path.patch
$pkgname-1.11.1-bb.patch
$pkgname-1.12.0-mdev-exec.patch
$pkgname-1.12.1-iproute-metric.patch
@@ -19,10 +24,15 @@ build() {
cd $srcdir/$pkgname-$pkgver
#patches
+ patch -p1 -i ../$pkgname-1.12.1-basename.patch || return 1
+ patch -p1 -i ../$pkgname-1.12.1-grep.patch || return 1
+ patch -p1 -i ../$pkgname-1.12.1-lineedit.patch || return 1
+ patch -p1 -i ../$pkgname-1.12.1-login.patch || return 1
+ patch -p1 -i ../$pkgname-1.12.1-standalone.patch || return 1
patch -p1 -i ../$pkgname-1.12.1-vi.patch || return 1
+ patch -p1 -i ../$pkgname-1.12.1-vi-path.patch || return 1
patch -p1 -i ../$pkgname-1.11.1-bb.patch || return 1
patch -p0 -i ../$pkgname-1.12.0-mdev-exec.patch || return 1
- patch -p1 -i ../$pkgname-1.12.1-grep.patch || return 1
patch -p0 -i ../$pkgname-1.12.1-iproute-metric.patch || return 1
patch -p0 -i ../bb-modprobe-v9.diff || return 1
@@ -33,10 +43,15 @@ build() {
}
md5sums="dc2e5e00d6fee8229ae92884c68733a7 busybox-1.12.1.tar.bz2
+70fedd0f03d92bceae053904bca11c1d busybox-1.12.1-basename.patch
76273f1580295a12270dcca0cdeb9a27 busybox-1.12.1-grep.patch
+62efeac9a6da03154cfb677935e84c34 busybox-1.12.1-lineedit.patch
+9c5d79a7426cfc2b4d7d1f0474d59b75 busybox-1.12.1-login.patch
+291c8564e3a25447bbcbfcc6865391cb busybox-1.12.1-standalone.patch
+724e2613f9c9308f24a9c2de504de9a0 busybox-1.12.1-vi.patch
a8aff3962d4481e8b402e739703fbe38 bb-modprobe-v9.diff
-f5a8ae3145aa249868c1a1abc319c228 busybox-1.12.1-vi.patch
+f5a8ae3145aa249868c1a1abc319c228 busybox-1.12.1-vi-path.patch
4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch
b4ce6235028c2c20fa367375534c3a18 busybox-1.12.0-mdev-exec.patch
54de0abe27e0ad362973be7fa81c487e busybox-1.12.1-iproute-metric.patch
-997d1759dec4cbbf90594824a2ac34b5 busyboxconfig"
+7ab1fcb3d56cd2babf38429ef079b481 busyboxconfig"
diff --git a/core/busybox/busybox-1.12.1-vi.patch b/core/busybox/busybox-1.12.1-vi-path.patch
index 428135c9f..428135c9f 100644
--- a/core/busybox/busybox-1.12.1-vi.patch
+++ b/core/busybox/busybox-1.12.1-vi-path.patch
diff --git a/core/busybox/busyboxconfig b/core/busybox/busyboxconfig
index 7650ab76f..733c0a06a 100644
--- a/core/busybox/busyboxconfig
+++ b/core/busybox/busyboxconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.12.1
-# Tue Oct 7 08:10:29 2008
+# Sun Nov 9 13:12:55 2008
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -196,7 +196,7 @@ CONFIG_MV=y
# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
CONFIG_NICE=y
CONFIG_NOHUP=y
-# CONFIG_OD is not set
+CONFIG_OD=y
CONFIG_PRINTENV=y
CONFIG_PRINTF=y
CONFIG_PWD=y
@@ -561,7 +561,6 @@ CONFIG_DC=y
# CONFIG_DEVFSD_FG_NP is not set
# CONFIG_DEVFSD_VERBOSE is not set
# CONFIG_FEATURE_DEVFS is not set
-CONFIG_DEVMEM=y
CONFIG_EJECT=y
CONFIG_FEATURE_EJECT_SCSI=y
CONFIG_FBSPLASH=y