Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-dev

4 files changed, 25 insertions, 9 deletions

diff --git a/build_tools/bin/km-up.prf b/build_tools/bin/km-up.prf
index 9fa6ce4..73a3cf9 100644
--- a/build_tools/bin/km-up.prf
+++ b/build_tools/bin/km-up.prf
@@ -3,4 +3,4 @@
     ignore = Name .*~
     ignore = Name *.o
     ignore = Name *.tmp
-    ignore = Name *.db.tar.gz.old
+    ignore = Name *.pkg.tar.gz
diff --git a/build_tools/bin/kmsync.sh b/build_tools/bin/kmsync.sh
index c15bef4..6da7f11 100755
--- a/build_tools/bin/kmsync.sh
+++ b/build_tools/bin/kmsync.sh
@@ -14,10 +14,10 @@ fi
 cwd=`dirname $0`
 REMOTE_DIR=/mount/repository/repo
 DOCROOT=/data/pkg_repo/$CARCH
-
 #export UNISON="/root/.unison"
 export UNISON="/data/pkg_repo/.unison"
-
+cp -f /build_tools/bin/km-up.prf  $UNISON/km-up.prf
+cp -f /build_tools/bin/km-down.prf  $UNISON/km-down.prf
 function sync_dirs {
     REMOTE=$1
     LOCAL=$2
@@ -26,6 +26,11 @@ function sync_dirs {
     echo "________________________________________________________"
 
     #first bring down new changes from knoppmyth.net
+    echo "--------"
+    echo
+    echo "Syncing the  packages with knoppmyth.net"
+    echo
+    echo "--------"
     unison km-down  -logfile /tmp/unison-down.log -auto -batch  -numericids ssh://reposync@knoppmyth.net/$REMOTE $LOCAL
 
     if [ ! $? = 0 ]
@@ -40,7 +45,14 @@ function sync_dirs {
     update_db_repo.sh $LOCAL $3
 
     #push the database back
-    unison km-up -logfile /tmp/unison-up.log -auto -batch -numericids   ssh://reposync@knoppmyth.net/$REMOTE $LOCAL
+    echo "--------"
+    echo
+    echo "Pushing the pkg database to knoppmyth.net"
+    echo
+    echo "--------"
+    unison km-up  -logfile /tmp/unison-up.log -auto -batch -numericids -force $LOCAL  $LOCAL ssh://reposync@knoppmyth.net/$REMOTE 
+    #scp $LOCAL/*.db.tar.gz reposync@knoppmyth.net:$REMOTE/  
+
     echo "-------------------------------------------------------"
     echo "-----------         Finished with $3        -----------"
     echo "-------------------------------------------------------"
diff --git a/build_tools/bin/mp b/build_tools/bin/mp
index 102454e..884fece 100755
--- a/build_tools/bin/mp
+++ b/build_tools/bin/mp
@@ -23,20 +23,21 @@ fi
 
 
 function find_repo {
-    echo $mydir|grep -q "extra"
+    dirname=`dirname $mydir`
+    echo $dirname|grep -q "extra"
     if [ $? = 0 ]
     then
         REPO=extra${PFIX}
         else
         REPO=core${PFIX}
     fi
-    echo $mydir|grep -q "chroot-devel"
+    echo $dirname|grep -q "chroot-devel"
     if [ $? = 0 ]
     then
 	   REPO=chroot-devel
     fi
 
-    echo $mydir|grep -q "mv-core"
+    echo $dirname|grep -q "mv-core"
     if [ $? = 0 ]
     then
        REPO=mv-core
@@ -51,6 +52,7 @@ function find_repo {
     then
 	mkdir -p $DOCROOT
    fi
+
 }
 
 
@@ -95,11 +97,11 @@ function update-src-pkg {
 
 find_repo
 
-makepkg --holdver --asroot  $@ || exit 1
+makepkg  --asroot  $@ || exit 1
 echo "---------updating database ----------"
 update-repo #&& pacman -Sy
 echo "----------creating source package---------"
-makepkg -f  --holdver --asroot  --source  &&  update-src-pkg
+makepkg -f --holdver  --asroot  --source  &&  update-src-pkg
 
 
 
diff --git a/build_tools/bin/update_db_repo.sh b/build_tools/bin/update_db_repo.sh
index 27a594b..c4d38cf 100755
--- a/build_tools/bin/update_db_repo.sh
+++ b/build_tools/bin/update_db_repo.sh
@@ -17,5 +17,7 @@ echo " --------------------------"
 echo "updating database for $REPO"
 echo " --------------------------"
 pwd
+	#forcefully remove the old db to start clean
+	rm -f $REPO.db.tar.gz
 	repo-add -q $REPO.db.tar.gz *.pkg.tar.gz
 cd -