Revert "Networking-BGPVPN Fixing stable/liberty branch"
This reverts commit fa803b03e7
.
Change-Id: I8446b521912d264740e88861cc8ecae1e862a311
This commit is contained in:
parent
fa803b03e7
commit
fb8a9ad29f
|
@ -23,14 +23,6 @@ function cleanup {
|
|||
rm -rf "${TMP_DIR}"
|
||||
}
|
||||
|
||||
function patch_bgpvpn {
|
||||
# test if patch is needed
|
||||
git fetch ssh://enikher@review.openstack.org:29418/openstack/networking-bgpvpn refs/changes/52/274552/2 && git format-patch -1 --stdout FETCH_HEAD > ./odl-client-patch
|
||||
patch -p1 -N --dry-run < ./odl-client-patch && patch -p1 -N < ./odl-client-patch || true
|
||||
|
||||
sed -i -- 's/sphinxcontrib-blockdiag//' ./requirements.txt
|
||||
sed -i -- 's/sphinxcontrib-seqdiag//' ./requirements.txt
|
||||
}
|
||||
function build_pkg {
|
||||
case $1 in
|
||||
ubuntu)
|
||||
|
@ -67,7 +59,8 @@ pushd $TMP_DIR
|
|||
git clone $NETWORKING_BGPVPN_REPO networking-bgpvpn
|
||||
pushd networking-bgpvpn
|
||||
git checkout $NETWORKING_BGPVPN_BRANCH
|
||||
patch_bgpvpn
|
||||
sed -i -- 's/sphinxcontrib-blockdiag//' ./requirements.txt
|
||||
sed -i -- 's/sphinxcontrib-seqdiag//' ./requirements.txt
|
||||
popd
|
||||
git clone $NETWORKING_ODL_REPO networking_odl
|
||||
pushd networking_odl
|
||||
|
|
Loading…
Reference in New Issue