ofed_makedist.sh: Adopt for compat-rdma

Created tarballs per backport directory will include initial git commit
in order to ease creating new backport patches.

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>

diff --git a/ofed_scripts/ofed_makedist.sh b/ofed_scripts/ofed_makedist.sh
index 8f343878d8616f8b2b87b5005cf74c1c67161582..d85fd3b72ea302ed466d163d6fff164f9aab648d 100755 (executable)
--- a/ofed_scripts/ofed_makedist.sh
+++ b/ofed_scripts/ofed_makedist.sh
@@ -29,33 +29,26 @@ ex()
 }
 
 CWD=`pwd`
-project=${project:-"ofed_kernel"}
+project=${project:-"compat-rdma"}
 tmpdir=`mktemp -d /tmp/build-$project-XXXXXX`
 giturl=${giturl:-${CWD}}
 head=${head:-`git show-ref -s -h -- HEAD`}
-backports=${backports:-`(cd kernel_patches/backport/; ls)`}
+backports=${backports:-`(cd backports/; ls)`}
 destdir=${destdir:-${CWD}}
 
-# Add reference to local git directory on git.openfabrics.org
-git_reference_dir=${git_reference_dir:-"/home/vlad/scm/ofed_kernel.git"}
-
-git_extra_flags=
-if [ -d ${git_reference_dir} ]; then
-       git_extra_flags="--reference ${git_reference_dir}"
-fi
-
 for backport in $backports
 do
-       if [ ! -d kernel_patches/backport/$backport ] && [ ! -d kernel_addons/backport/$backport ]
+       if [ ! -d backports/$backport ]
        then
                continue
        fi
-       ex "" git clone -q -s -n $git_extra_flags $giturl $tmpdir/$project-$backport
+       ex "" git clone -q $git_extra_flags $giturl $tmpdir/$project-$backport
        ex "" pushd $tmpdir/$project-$backport
+       version=`./scripts/setlocalversion`
        ex $tmpdir/$project-$backport.log \
-        $CWD/ofed_scripts/ofed_checkout.sh $head
+        ./scripts/admin_rdma.sh
        ex $tmpdir/$project-$backport.log \
-        $CWD/ofed_scripts/ofed_patch.sh --with-backport=$backport
+        ./ofed_scripts/ofed_patch.sh --with-backport=$backport
        #Some QUILT versions create files with 0 permissions
        #work around this
        if [ -d .pc ]
@@ -63,19 +56,15 @@ do
                ex "" chmod -R u+rw .pc
                ex "" chmod -R o+r .pc
        fi
+       ex "" rm -fr .git
+       ex "" git init-db
+       ex "" git add .
+       ex "" git commit -s -m\"${project}-${backport}: Initial commit based on $project git: $version\"
        ex "" cd $tmpdir
        ex "" tar czf $tmpdir/$project-$backport.tgz $project-$backport
        ex "" popd
 done
 
-# create a tree with only the 'fixes' patches applied
-ex "" git clone -q -s -n $git_extra_flags $giturl $tmpdir/$project-fixes
-ex "" pushd $tmpdir/$project-fixes
-ex $tmpdir/$project-fixes.log \
-       $CWD/ofed_scripts/ofed_checkout.sh $head
-ex $tmpdir/$project-fixes.log BACKPORT_DIR='NONE' \
-       $CWD/ofed_scripts/ofed_patch.sh --with-kernel-fixes \
-               --without-backport-patches
 #Some QUILT versions create files with 0 permissions
 #work around this
 if [ -d .pc ]
@@ -83,17 +72,6 @@ then
        ex "" chmod -R u+rw .pc
        ex "" chmod -R o+r .pc
 fi
-ex "" cd $tmpdir
-ex "" tar czf $tmpdir/$project-fixes.tgz $project-fixes
-ex "" popd
-
-# create a tree with no patches applied
-ex "" git clone -q -s -n $git_extra_flags $giturl $tmpdir/$project
-ex "" pushd $tmpdir/$project
-ex $tmpdir/$project.log $CWD/ofed_scripts/ofed_checkout.sh $head
-ex "" cd ..
-ex "" tar czf $tmpdir/$project.tgz $project
-ex "" popd
 
 results=`(cd $tmpdir; ls *tgz)`
 ex "" mv $tmpdir/*tgz $destdir