<div dir="ltr">Hey Andreas,<br><div class="gmail_extra"><br>I did all of the mentioned steps. The attached file shows the process and results on my system. <br><br></div><div class="gmail_extra">About remote/origin, I cloned your (and my manila_Mali) repo. Remote/origin is set to <a href="http://git.debian.org" target="_blank">git.debian.org</a> when you check remotes on cloned repo, although the config file on server still shows a local location as remote/origin <br></div><div class="gmail_extra"><br>root@mali-Lenovo-IdeaPad-Z410:/git/debian/Debian-ops# gbp-clone ssh://<a href="http://git.debian.org/git/openstack/manila_Mali.git">git.debian.org/git/openstack/manila_Mali.git</a><br><br>root@mali-Lenovo-IdeaPad-Z410:/git/debian/Debian-ops/manila_Mali# git remote -v<br>origin ssh://<a href="http://git.debian.org/git/openstack/manila_Mali.git">git.debian.org/git/openstack/manila_Mali.git</a> (fetch)<br>origin ssh://<a href="http://git.debian.org/git/openstack/manila_Mali.git">git.debian.org/git/openstack/manila_Mali.git</a> (push)<br><br>mali-guest@moszumanska:~$ cat /git/openstack/manila_Mali.git/config <br>[core]<br> repositoryformatversion = 0<br> filemode = true<br> bare = true<br> sharedRepository = group<br>[remote "origin"]<br> url = /git/manila_Mali<br></div><div class="gmail_extra"><br>Also, I tested to add some files to my repo and push them to git. It works correctly.<br><br>root@mali-Lenovo-IdeaPad-Z410:/git/debian/Debian-ops/manila_Mali# git commit debian/control debian/watch -m "Change Maintainer and Convert whatching url to github"<br>[debian/kilo 11a7258] Change Maintainer and Convert whatching url to github<br> 2 files changed, 3 insertions(+), 4 deletions(-)<br>root@mali-Lenovo-IdeaPad-Z410:/git/debian/Debian-ops/TestingDir/manila_Mali# git push<br>Enter passphrase for key '/root/.ssh/id_rsa_debian_2': <br>Counting objects: 9, done.<br>Delta compression using up to 8 threads.<br>Compressing objects: 100% (5/5), done.<br>Writing objects: 100% (5/5), 619 bytes | 0 bytes/s, done.<br>Total 5 (delta 3), reused 0 (delta 0)<br>To ssh://<a href="http://git.debian.org/git/openstack/manila_Mali.git">git.debian.org/git/openstack/manila_Mali.git</a><br> 5cf93c8..11a7258 debian/kilo -> debian/kilo<br><br><br></div><div class="gmail_extra"><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Sat, Apr 25, 2015 at 12:11 AM, Andreas Tille <span dir="ltr"><<a href="mailto:andreas@an3as.eu" target="_blank">andreas@an3as.eu</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hi Malihe,<br>
<br>
are you able to reproduce the following<br>
<span><br></span></blockquote><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><span>
On Thu, Apr 23, 2015 at 12:24:12PM +0430, Malihe Asemani wrote:<br>
</span>> > > git clone git://<a href="http://github.com/openstack/manila.git" target="_blank">github.com/openstack/manila.git</a><br>
<br>
$ git clone git://<a href="http://github.com/openstack/manila.git" target="_blank">github.com/openstack/manila.git</a><br>
Klone nach 'manila'...<br>
remote: Counting objects: 13960, done.<br>
remote: Compressing objects: 100% (41/41), done.<br>
remote: Total 13960 (delta 15), reused 0 (delta 0), pack-reused 13919<br>
Empfange Objekte: 100% (13960/13960), 4.76 MiB | 235.00 KiB/s, Fertig.<br>
Löse Unterschiede auf: 100% (10141/10141), Fertig.<br>
Prüfe Konnektivität... Fertig.<br>
<br>
(sorry for German locale - if you repoduce you should see something<br>
similar ... and learn German :-) )<br>
<br>
> > > cd manila<br>
$ cd manila<br>
(master) $ git tag<br>
2014.2<br>
2014.2.b3<br>
2014.2.rc1<br>
2014.2.rc2<br>
2015.1.0b1<br>
2015.1.0b2<br>
2015.1.0b3<br>
2015.1.0rc1<br>
2015.1.0rc2<br>
<br>
> > > git tag 2015.1_b3 2015.1.0b3<br>
<br>
$ git tag 2015.1.0_rc2 2015.1.0rc2<br>
<br>
(I think the proper version number for the package would be<br>
2015.1.0~rc2 -> see my other mail for an explanation)<br>
<br>
> > > git reset --hard 2015.1_b3<br>
<br>
(master) $ git reset --hard 2015.1.0_rc2<br>
HEAD ist jetzt bei ec56e0b Merge "NetApp cDOT driver clones NFS export policy" into stable/kilo<br>
<br>
> > > git checkout -b debian/kilo<br>
<br>
(master) $ git checkout -b debian/kilo<br>
Zu neuem Branch 'debian/kilo' gewechselt<br>
<br>
(debian/kilo) $ git branch<br>
* debian/kilo<br>
master<br>
<br>
> > > git branch -d master<br>
<br>
(debian/kilo) $ LANG=C git branch -d master<br>
warning: not deleting branch 'master' that is not yet merged to<br>
'refs/remotes/origin/master', even though it is merged to HEAD.<br>
error: The branch 'master' is not fully merged.<br>
If you are sure you want to delete it, run 'git branch -D master'.<br>
<br>
... OK, lets try this ...<br>
<br>
(debian/kilo) $ LANG=C git branch -D master<br>
Deleted branch master (was ec56e0b).<br>
<span><br>
> > > # <add here your debian folder for the packaging><br>
<br>
</span>(debian/kilo) $ cp -a <my_path_to_debcheckout_ubuntu>/manila-2015.1~b2/debian .<br>
<br>
> > > git add debian<br>
<br>
(debian/kilo) $ git add debian<br>
<span><br>
> > > git commit -a -m "Initial debian folder"<br>
<br>
</span>(debian/kilo) $ git commit -a -m "Initial debian folder"<br>
[debian/kilo f4b6844] Initial debian folder<br>
22 files changed, 502 insertions(+)<br>
create mode 100644 debian/changelog<br>
create mode 100644 debian/compat<br>
create mode 100644 debian/control<br>
create mode 100644 debian/copyright<br>
create mode 100644 debian/docs<br>
create mode 100644 debian/install<br>
create mode 100644 debian/logging.conf<br>
create mode 100644 debian/<a href="http://manila-api.init.in" target="_blank">manila-api.init.in</a><br>
create mode 100644 debian/manila-api.install<br>
create mode 100644 debian/manila-common.dirs<br>
create mode 100644 debian/manila-common.install<br>
create mode 100644 debian/manila-common.logrotate<br>
create mode 100644 debian/manila-common.postinst<br>
create mode 100644 debian/<a href="http://manila-scheduler.init.in" target="_blank">manila-scheduler.init.in</a><br>
create mode 100644 debian/manila-scheduler.install<br>
create mode 100644 debian/manila_sudoers<br>
create mode 100644 debian/manila_tgt.conf<br>
create mode 100644 debian/patches/pep-0476.patch<br>
create mode 100644 debian/patches/series<br>
create mode 100755 debian/rules<br>
create mode 100644 debian/source/format<br>
create mode 100644 debian/watch<br>
<br>
(Just noticed that this contains my changed debian/watch file which<br>
should have been a separate commit - I'll leave it as is for simplicity)<br>
<span><br>
> > > Make sure that, when you add your Debian folder, you get something<br>
> > > like this in debian/gbp.conf:<br>
> > ><br>
> > > [DEFAULT]<br>
> > > debian-branch = debian/kilo<br>
> > > upstream-tag = %(version)s<br>
> > > compression = xz<br>
> > ><br>
> > > [git-buildpackage]<br>
> > > export-dir = ../build-area/<br>
<br>
</span>(debian/kilo) $ cat > debian/gbp.conf <<EOT<br>
<span>> [DEFAULT]<br>
> debian-branch = debian/kilo<br>
> upstream-tag = %(version)s<br>
> compression = xz<br>
><br>
> [git-buildpackage]<br>
> export-dir = ../build-area/<br>
</span>> EOT<br>
(debian/kilo) $ git add debian/gbp.conf<br>
(debian/kilo) $ git commit -a -m "Add gbp.conf"<br>
[debian/kilo 73cc358] Add gbp.conf<br>
1 file changed, 7 insertions(+)<br>
create mode 100644 debian/gbp.conf<br>
<span><br>
<br>
> > > Then doing "pkgos-bop" should rebuild the package correctly.<br>
<br>
</span>(debian/kilo) $ sudo apt-get -t experimental install openstack-pkg-tools<br>
<br>
(Attention: You need to install openstack-pkg-tools from experimental!)<br>
<br>
(debian/kilo) $ /usr/bin/pkgos-bop<br>
===> Cleaning-up old builds<br>
debian/rules:12: warning: overriding recipe for target 'get-orig-source'<br>
/usr/share/openstack-pkg-tools/pkgos.make:69: warning: ignoring old recipe for target 'get-orig-source'<br>
git tag -v 2015.1_b2 || true<br>
error: Tag '2015.1_b2' nicht gefunden.<br>
if [ ! -f ../manila_2015.1~b2.orig.tar.xz ] ; then \<br>
git archive --prefix=manila-2015.1~b2/ 2015.1_b2 | xz >../manila_2015.1~b2.orig.tar.xz ; \<br>
fi<br>
fatal: Not a valid object name<br>
[ ! -e ../build-area ] && mkdir ../build-area || true<br>
[ ! -e ../build-area/manila_2015.1~b2.orig.tar.xz ] && cp ../manila_2015.1~b2.orig.tar.xz ../build-area<br>
===> Building using git-buildpackage<br>
dch warning: new version (2015.1~b2-0ubuntu1~bpo80+1) is less than<br>
the current version number (2015.1~b2-0ubuntu1).<br>
[debian/kilo eeb65ca] Rebuilt by bop.<br>
1 file changed, 6 insertions(+)<br>
gbp:info: Orig tarball 'manila_2015.1~b2.orig.tar.xz' not found at '../tarballs/'<br>
gbp:info: Exporting 'WC' to '/home/andreas/debian-maintain/alioth/openstack/build-area/manila-tmp'<br>
gbp:info: Moving '/home/andreas/debian-maintain/alioth/openstack/build-area/manila-tmp' to '/home/andreas/debian-maintain/alioth/openstack/build-area/manila-2015.1~b2'<br>
I: using cowbuilder as pbuilder<br>
dpkg-checkbuilddeps: Unmet build dependencies: dh-systemd<br>
W: Unmet build-dependency in source<br>
dpkg-buildpackage: source package manila<br>
dpkg-buildpackage: source version 2015.1~b2-0ubuntu1~bpo80+1<br>
dpkg-buildpackage: source distribution UNRELEASED<br>
dpkg-buildpackage: source changed by Andreas Tille <<a href="mailto:tille@debian.org" target="_blank">tille@debian.org</a>><br>
dpkg-source -i.git -I.git --before-build manila-2015.1~b2<br>
dpkg-checkbuilddeps: Unmet build dependencies: dh-systemd<br>
dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting<br>
dpkg-buildpackage: warning: (Use -d flag to override.)<br>
dpkg-buildpackage: warning: this is currently a non-fatal warning with -S, but will probably become fatal in the future<br>
fakeroot debian/rules clean<br>
debian/rules:12: warning: overriding recipe for target 'get-orig-source'<br>
/usr/share/openstack-pkg-tools/pkgos.make:69: warning: ignoring old recipe for target 'get-orig-source'<br>
dh clean --with python2,systemd<br>
dh: unable to load addon systemd: Can't locate Debian/Debhelper/Sequence/<a href="http://systemd.pm" target="_blank">systemd.pm</a> in @INC (you may need to install the Debian::Debhelper::Sequence::systemd module) (@INC contains: /etc/perl /usr/local/lib/x86_64-linux-gnu/perl/5.20.2 /usr/local/share/perl/5.20.2 /usr/lib/x86_64-linux-gnu/perl5/5.20 /usr/share/perl5 /usr/lib/x86_64-linux-gnu/perl/5.20 /usr/share/perl/5.20 /usr/local/lib/site_perl .) at (eval 12) line 2.<br>
BEGIN failed--compilation aborted at (eval 12) line 2.<br>
<br>
debian/rules:9: recipe for target 'clean' failed<br>
make: *** [clean] Error 2<br>
dpkg-buildpackage: error: fakeroot debian/rules clean gave error exit status 2<br>
gbp:error: '~/bin/git-pbuilder' failed: it exited with 2<br>
HEAD ist jetzt bei 73cc358 Add gbp.conf<br>
There was an error when bop called git-buildpackage: exiting.<br>
<br>
<br>
Well, that's something we can work out later once you confirm that you<br>
reached this point.<br>
<br>
<br>
(debian/kilo) $ pkgos-alioth-new-git openstack<br>
===> Cloning manila as bare: manila.git<br>
Klone in Bare-Repository 'manila.git'...<br>
Fertig.<br>
===> Building tarball: manila.git.tar.gz<br>
===> Uploading manila.git.tar.gz to <a href="http://git.debian.org" target="_blank">git.debian.org</a><br>
manila.git.tar.gz 100% 5117KB 67.3KB/s 01:16<br>
===> Uncompressing manila.git.tar.gz in /git/openstack<br>
(tar is mumbling something about timestamp in future ... I'll strip this)<br>
tar: ===> Activating update-server-info hook<br>
===> Deleting tarball on alioth<br>
manila.git/objects: Zeitstempel 2015-04-24 19:26:28 liegt 49.416265975 Sekunden in der Zukunft.<br>
===> Fxing g+w unix permissions<br>
===> Cleaning local bare copy and tarball<br>
<br>
<br>
Finally this created a bare git repository on <a href="http://git.debian.org" target="_blank">git.debian.org</a>.<br>
<br>
I admit I need help now as well since I now have no idea what<br>
is our remote Git repository. If I do on alioth<br>
<br>
tille@moszumanska:~$ cat /srv/<a href="http://git.debian.org/git/openstack/manila.git/config" target="_blank">git.debian.org/git/openstack/manila.git/config</a><br>
[core]<br>
repositoryformatversion = 0<br>
filemode = true<br>
bare = true<br>
sharedRepository = group<br>
[remote "origin"]<br>
url = /home/andreas/debian-maintain/alioth/openstack/manila<br>
<br>
A local dir is a pretty stupid remote origin. I guess we might need<br>
help now myself since I have no idea how to push our next changes. I<br>
would have assumed that in my local git repository the remote origin<br>
would have been set to <a href="http://git.debian.org" target="_blank">git.debian.org</a>.<br>
<br>
Thomas (or somebody else from openstack team), could you explain what to<br>
do next?<br>
<br>
Malihe, this is the kind of report I'd recommend you to do. Could you<br>
please confirm that you can reproduce all this (except the last step<br>
of pkgos-alioth-new-git since this will definitely fail due to the now<br>
existing manila.git) In case you might fail on one step I guess you<br>
could do<br>
<br>
gbp-clone ssh://<a href="http://git.debian.org/git/openstack/manila.git" target="_blank">git.debian.org/git/openstack/manila.git</a><br>
<br>
This should bring you my work - however, most probably with different<br>
remote origin.<br>
<br>
Please send a mail where you confirm these steps.<br>
<br>
Hope this helps<br>
<div><div><br>
Andreas.<br>
<br>
--<br>
<a href="http://fam-tille.de" target="_blank">http://fam-tille.de</a><br>
<br>
_______________________________________________<br>
Openstack-devel mailing list<br>
<a href="mailto:Openstack-devel@lists.alioth.debian.org" target="_blank">Openstack-devel@lists.alioth.debian.org</a><br>
<a href="http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/openstack-devel" target="_blank">http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/openstack-devel</a><br>
</div></div></blockquote></div><br><br clear="all"><br>-- <br><div><div dir="ltr"><div><div dir="ltr">------------<br><div><span style="color:rgb(51,51,51);font-family:Verdana,sans-serif;font-size:12.7273px;line-height:18px">you can't start the next chapter if you keep re-reading the last one</span><br></div><div><span style="color:rgb(51,51,51);font-family:Verdana,sans-serif;font-size:12.7273px;line-height:18px"><br></span></div><div>mali</div></div></div></div></div>
</div></div>