Modified again pkg*-cross scripts for being compatible with upstream branch sources

diff --git a/pkginfo-cross b/pkginfo-cross
index 4b2d359aaac957957e209a83834d80191c93950f..201c58088aa08d098ab523d90fadf6aa47828d56 100755 (executable)
--- a/pkginfo-cross
+++ b/pkginfo-cross
@@ -2,7 +2,7 @@
 
 TOPDIR="$(cd $(dirname $(which $0)); pwd)"
 
-PKGINFO=$TOPDIR/pkgadd
+PKGINFO=$TOPDIR/pkginfo
 
 PKGMK_CONF=$TOPDIR/pkgmk-cross.conf
 . $PKGMK_CONF
@@ -13,6 +13,11 @@ if [ -z "$CLFS" ]; then
   exit 1
 fi
 
-$PKGINFO -r $CLFS $@
+if [ -x $PKGINFO ]; then
+  $PKGINFO -r $CLFS $@
+else
+  ln -s pkgadd pkginfo
+  $PKGINFO -r $CLFS $@
+fi
 
 # End of file

diff --git a/pkgmk-cross b/pkgmk-cross
index a3c64ba7038f105f65b170215c4f0adae931d053..6d02f4b670789a57d2dabce441e54599819533ce 100755 (executable)
--- a/pkgmk-cross
+++ b/pkgmk-cross
@@ -29,7 +29,12 @@ if [ ! -z "$PKGMK_OPTIMIZE" ]; then
   fi
 fi
 
-$PKGMK -cf $PKGMK_CONF $PKGMK_ARGS
+if [ -x $PKGMK ]; then
+  $PKGMK -cf $PKGMK_CONF $PKGMK_ARGS
+else
+  chmod +x $PKGMK
+  $PKGMK -cf $PKGMK_CONF $PKGMK_ARGS
+fi
 
 rm -f $TMP_CONF
 

diff --git a/pkgrm-cross b/pkgrm-cross
index 835190e4bcd5437d933c284e46441a9cb7087e90..88b98768d849cd6a89a05716bfaf937a6f04ae98 100755 (executable)
--- a/pkgrm-cross
+++ b/pkgrm-cross
@@ -2,7 +2,7 @@
 
 TOPDIR="$(cd $(dirname $(which $0)); pwd)"
 
-PKGRM=$TOPDIR/pkgadd
+PKGRM=$TOPDIR/pkgrm
 
 PKGMK_CONF=$TOPDIR/pkgmk-cross.conf
 . $PKGMK_CONF
@@ -13,6 +13,13 @@ if [ -z "$CLFS" ]; then
   exit 1
 fi
 
+if [ -x $PKGRM ]; then
+  $PKGRM -r $CLFS $@
+else
+  ln -s pkgadd pkgrm
+  $PKGRM -r $CLFS $@
+fi
+
 $PKGRM -r $CLFS $@
 
 # End of file