pkgmk-cross.conf: adapted to 64b

[pkgutils-cross.git] / pkgadd-cross

diff --git a/pkgadd-cross b/pkgadd-cross
index 8ecac21927a0dbb003b7c823001650f6b551e8de..168617144c86562320b666f7b170e38323cef231 100755 (executable)
--- a/pkgadd-cross
+++ b/pkgadd-cross
@@ -2,8 +2,9 @@
 
 TOPDIR="$(cd $(dirname $(which $0)); pwd)"
 
-PKGADD=$TOPDIR/src/pkgadd
-PKGMK_CONF=$TOPDIR/src/pkgmk.conf
+PKGADD=$TOPDIR/pkgadd
+PKGADD_CONF=$TOPDIR/pkgadd.conf
+PKGMK_CONF=$TOPDIR/pkgmk-cross.conf
 . $PKGMK_CONF
 
 if [ -z "$CLFS" ]; then
@@ -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