X-Git-Url: http://gitweb/?a=blobdiff_plain;ds=sidebyside;f=pkgadd-cross;h=c3dd96e47ae3906c31752a0cb5fd3a09ad5c1f7e;hb=a7e532ccba42bfed3c88b86f7ef184d894becf72;hp=8ecac21927a0dbb003b7c823001650f6b551e8de;hpb=3972cbb4917b478e60f8568a9d9a5ace84b5374d;p=pkgutils-cross.git

diff --git a/pkgadd-cross b/pkgadd-cross
index 8ecac21..c3dd96e 100755
--- a/pkgadd-cross
+++ b/pkgadd-cross
@@ -3,6 +3,7 @@
 TOPDIR="$(cd $(dirname $(which $0)); pwd)"
 
 PKGADD=$TOPDIR/src/pkgadd
+PKGADD_CONF=$TOPDIR/src/pkgadd.conf
 PKGMK_CONF=$TOPDIR/src/pkgmk.conf
 . $PKGMK_CONF
 
@@ -12,10 +13,30 @@ if [ -z "$CLFS" ]; then
   exit 1
 fi
 
-$PKGADD -r $CLFS $@
+if [ ! -f $CLFS/var/lib/pkg/db ]; then
+  install -d -m 0755 $CLFS/var/lib/pkg
+  touch $CLFS/var/lib/pkg/db
+fi
+
+# be sure that the path to package file exists
+# and if not prepend the package dir variable
+ARGS=""
+while [ "$1" ]; do
+  case $1 in
+    *.pkg.tar.*)
+      PATH_TO_PACKAGE="$1"
+      if [ ! -f "$PATH_TO_PACKAGE" ]; then
+        PATH_TO_PACKAGE="$PKGMK_PACKAGE_DIR/$PATH_TO_PACKAGE"
+      fi
+      ARGS="$ARGS $PATH_TO_PACKAGE"
+      ;;
+    *)
+      ARGS="$ARGS $1"
+      ;;
+  esac
+  shift
+done
 
-# we shoudl avoid .la files when crosscompiling, these files
-# contains the libdir variable hardcoded which is used by libtool
-[ $? -eq 0 ] && find $CLFS -type f -name '*.la' -delete
+$PKGADD -c $PKGADD_CONF -r $CLFS $ARGS
 
 # End of file