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