diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-05-26 06:35:45 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-05-26 06:35:45 +0000 |
| commit | 2a97e81b88003d4ba0fbe4b2cf108f08f3f8e853 (patch) | |
| tree | 503a0586c4cdf509ededb31eede4d58d8cb1afc2 /core/busybox | |
| parent | dea8bc4a557c35de89e9cbff2ec8f3d616f17049 (diff) | |
| download | aports-2a97e81b88003d4ba0fbe4b2cf108f08f3f8e853.tar.bz2 aports-2a97e81b88003d4ba0fbe4b2cf108f08f3f8e853.tar.xz | |
core/busybox: save history. fix install prefix
The install prefix might differ, depending on version of abuild so
we set it with sed from the APKBUILD.
Diffstat (limited to 'core/busybox')
| -rw-r--r-- | core/busybox/APKBUILD | 8 | ||||
| -rw-r--r-- | core/busybox/busyboxconfig | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/core/busybox/APKBUILD b/core/busybox/APKBUILD index d0119f6a..a6ad2e19 100644 --- a/core/busybox/APKBUILD +++ b/core/busybox/APKBUILD @@ -28,7 +28,11 @@ build() { fi done - cp ../busyboxconfig .config + # we set the install prefix with sed since it might differ depending + # on abuild version + sed -e "s:^CONFIG_PREFIX=.*:CONFIG_PREFIX=\"$pkgdir\":" \ + ../busyboxconfig > .config + make silentoldconfig || return 1 make || return 1 make install DESTDIR="$pkgdir" @@ -46,4 +50,4 @@ a743ec04f378b8456a725c7270b0be8b busybox-1.13.2-modprobe-errormsg.patch 0b5b2d7db201f90cd08f4a3164ee29a1 bb-tar-numeric-owner.patch 56b78c358797cd15fb64719a48939267 busybox.post-install 56b78c358797cd15fb64719a48939267 busybox.post-upgrade -f28a6eedb13cbaa85e1b4d23cb9042ff busyboxconfig" +2ecfd91c98b347be6834a9c0f3a42f52 busyboxconfig" diff --git a/core/busybox/busyboxconfig b/core/busybox/busyboxconfig index f4c11593..696ff9a2 100644 --- a/core/busybox/busyboxconfig +++ b/core/busybox/busyboxconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.13.4 -# Mon Apr 20 11:44:45 2009 +# Tue May 26 06:17:14 2009 # CONFIG_HAVE_DOT_CONFIG=y @@ -70,7 +70,7 @@ CONFIG_INSTALL_APPLET_DONT=y # CONFIG_INSTALL_SH_APPLET_SYMLINK is not set # CONFIG_INSTALL_SH_APPLET_HARDLINK is not set # CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="../../pkg" +CONFIG_PREFIX="../../pkg/busybox" # # Busybox Library Tuning @@ -83,7 +83,7 @@ CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 CONFIG_FEATURE_EDITING_VI=y CONFIG_FEATURE_EDITING_HISTORY=255 -# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +CONFIG_FEATURE_EDITING_SAVEHISTORY=y CONFIG_FEATURE_TAB_COMPLETION=y CONFIG_FEATURE_USERNAME_COMPLETION=y CONFIG_FEATURE_EDITING_FANCY_PROMPT=y |