diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-19 21:27:55 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-19 21:27:55 +0100 |
| commit | c7fb9b16557ece5516833e975f8612d777324399 (patch) | |
| tree | 2e3840573db1d459ca9fc0a270f44ed37b6c6bd6 | |
| parent | 614ba3455117d5514096723f414ad32706c67371 (diff) | |
use cpio instead of gnu tar, otherwise the /etc/mtab symlinks fails to be included
| -rw-r--r-- | mk/vars.mk | 1 | ||||
| -rw-r--r-- | package/bkeymaps/Makefile | 1 | ||||
| -rw-r--r-- | scripts/ipkg | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index cd8c25d62..e5959f203 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -150,6 +150,7 @@ PKG_INSTALL:= IPKG_TMP=$(BUILD_DIR)/tmp \ IPKG_INSTROOT=$(TARGET_DIR) \ IPKG_CONF_DIR=$(STAGING_TARGET_DIR)/etc \ IPKG_OFFLINE_ROOT=$(TARGET_DIR) \ + TOOLS_DIR=$(TOOLS_DIR) \ ${BASH} ${SCRIPT_DIR}/ipkg \ -force-defaults -force-depends install PKG_STATE_DIR:= $(TARGET_DIR)/usr/lib/ipkg diff --git a/package/bkeymaps/Makefile b/package/bkeymaps/Makefile index 0a6bf90d8..8d6acb498 100644 --- a/package/bkeymaps/Makefile +++ b/package/bkeymaps/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= a68058ab4a81cf9a8dcbaaa7a5df5b11 PKG_DESCR:= binary keymaps for busybox loadkmap PKG_SECTION:= utils +PKG_BUILDDEP:= base-files PKG_SITES:= http://openadk.org/distfiles/ PKG_DFLT_BKEYMAPS:= y if ADK_TARGET_WITH_INPUT diff --git a/scripts/ipkg b/scripts/ipkg index 101d20dc1..428761a3a 100644 --- a/scripts/ipkg +++ b/scripts/ipkg @@ -808,7 +808,7 @@ Status: install ok pending" | ipkg_status_update_sd $sd $pkg set -o noglob rm -r $IPKG_TMP/$pkg/control - if ! $pkg_extract_stdout $filename ./data.tar.gz|gzip -dc|tar -xf - -C $IPKG_TMP/$pkg/data ; then + if ! $pkg_extract_stdout $filename ./data.tar.gz|gzip -dc|(cd $IPKG_TMP/$pkg/data && $TOOLS_DIR/cpio -iud -H ustar) ; then echo "ipkg_install_file: ERROR unpacking data.tar.gz from $filename" return 1 fi @@ -876,7 +876,7 @@ diff -u $dest/$conffile $IPKG_TMP/$pkg/data/$conffile" fi local owd="`pwd`" - (cd $IPKG_TMP/$pkg/data/; tar cf - . | (cd $owd; cd $dest; tar xf -)) + (cd $IPKG_TMP/$pkg/data/; find . | $TOOLS_DIR/cpio -o -H ustar | (cd $owd; cd $dest; $TOOLS_DIR/cpio -iud -H ustar)) rm -rf $IPKG_TMP/$pkg/data rmdir $IPKG_TMP/$pkg rm -f $info_dir/$pkg.list |