Re: [one-users] Official Debian packages
Jaime Melis jme...@opennebula.org writes: Hmm, writing the question seems to gives my answer, it looks like the cherry-picking of master commits on the one-version branches are the reasons of the merge conflicts. Yes... that's the way we usually do it: by cherry picking the commits. Ok, I'll broke everything to rebase on master then. Unfortunately we don't think there's an easier way. Personally, I prefer to use DaggyFix[1][2] over cherry-picking. This requires to base the commits on the oldest supported release and then merge them everywhere needed, which can be seen as a lot of work, but not that much different from doing cherry-picking ;-) I think DaggyFix is more GIT friendly and respect the context as explain in an article I just found[3]. For example, here is the GIT graph to apply a foo-bar patch (issue #42): o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-M₃ - master \ \ \ \ / \ \ \ o-o-o-o-M₂ /- prod/4/master (integration branch for version 4) \ \ \ / / \ \ \ o-o---+ - prod/3/42-foo-bar (short living branch) \ \ \ / \ \ \ o-o-o-o-M₁ - prod/3/master (integration branch for version 3) \ \ \ o-o-o-o-o-o-o-M₀ - prod/2/master (integration branch for version 2) \ \ / \ o-o-o-o - prod/2/41-fix-something \ o-o-o-o-o-o - prod/1/master (integration branch for version 1) in this example: - version 1 is not supported anymore - version 2 is supported but not concerned by #42: foo-bar A temporary branch is created based on version 3 named prod/3/42-foo-bar and the commits are done here. I use do to prefix my branch names by the name of the release branch it first apply to, it help to sort them when doing “git branch” ;-) Then, this 42/foo-bar branch is merge back into version 3 integration branch (commit M₁), to prepare a new release 3.X. This 42/foo-bar branch is merge into version 4 integration branch (commit M₂) if it apply to it like in my example. Finally, this 42/foo-bar branch is merge into the main development branch (commit M₃) if it apply to it like in my example. This is based on the “successful Git branching model[4]” I extended with the packaging branches. I hope it will help you, it took me time to find some kind of best practice I agree with, like “Is it better to rebase or merge?[5]”. Regards. Footnotes: [1] by mercurial http://mercurial.selenic.com/wiki/DaggyFixes [2] by monotone http://wiki.monotone.ca/DaggyFixes/ [3] https://queue.acm.org/detail.cfm?id=1595636 [4] http://nvie.com/posts/a-successful-git-branching-model/ [5] http://www.randyfay.com/node/91 -- Daniel Dehennin Récupérer ma clef GPG: gpg --recv-keys 0xCC1E9E5B7A6FE2DF Fingerprint: 3E69 014E 5C23 50E8 9ED6 2AAD CC1E 9E5B 7A6F E2DF signature.asc Description: PGP signature ___ Users mailing list Users@lists.opennebula.org http://lists.opennebula.org/listinfo.cgi/users-opennebula.org
Re: [one-users] Official Debian packages
Hi, Should I rebase[2] all my branches on master directly and then follow the OpenNebula releases or is there a path to merge master and one-4.10? Hmm, writing the question seems to gives my answer, it looks like the cherry-picking of master commits on the one-version branches are the reasons of the merge conflicts. Yes... that's the way we usually do it: by cherry picking the commits. Unfortunately we don't think there's an easier way. -- Jaime Melis Project Engineer OpenNebula - Flexible Enterprise Cloud Made Simple www.OpenNebula.org | jme...@opennebula.org ___ Users mailing list Users@lists.opennebula.org http://lists.opennebula.org/listinfo.cgi/users-opennebula.org
Re: [one-users] Official Debian packages
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Jamie and Daniel, I perfectly understand the problems with Debian official packaging guidelines. I asked this, because at the moment I'm collaborating with Devuan, an upcoming Debian fork which is aimed to not have systemd mandatory. Could be interesting for you, in the near future, to have official packages for this distro? Cheers, Alberto Il 17/02/2015 8:53 am, Jaime Melis ha scritto: Hi Alberto, I can confirm what Daniel said. We have no current plans of updating the offical Debian package of OpenNebula. Debian packaing guidelines are very strict and as Daniel mentioned it's a very big job. Daniel, I apologize, but somehow I was not aware of #3129. I will update the ticket now. regards, Jaime -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0.22 (Darwin) iQIcBAEBAgAGBQJU4wZfAAoJEAzproFXfBTIVTMP/ikHyyCGKeyZtEIWRLZXaGi8 tlve4syO0xqhRCJz6vHjodaPjFoBPGFf33uoJfJUj9RurMIaxuL6ry6bAc3cSil0 2MEDcOlbM2q6J778BHzLUN5viFJ0lx+bTElD75WmEO0MYjV0dhxnW/h7gw5R4Laa DXs6qSuIrcjlxLAz3+C7PiRuo8E7cxNA59x9/20WbLMEwcTeF8jpGbK70LZbxehv ZKU7RteWx+vo1MQ+9VZTQpLAvYqqO6Cv03SFTnQlIdEZZqNJTtRdo97lR4XSHXQO 9E+KW9ZZ4Jw8oR/dsPzLmDClz9STeqGAFhZsZXcDoPrrxAJv7kWNvcRD/QiXWm6E MHNeaIoF1ILy4Hzcat3jjYDHOvCeqBIwE1VsG7DdueuYzRgVFREM0rhKvjgWxD7C uFnC3gesNyILGMHEcfBjozIjCkjDxmRSKC3dq+SmsGdmIO6A7W9DHSPUL91hSfq3 P0Enn0odAGfw9G59OwSjsVnb/lFS85lL5JK2pxKnWKnr8kBazUZ/YGr7+yz69D/w cNvrquOTGi6cdJxjc3tgCUwxwKAY2KFEDLSd/1pW1KYak7Yj3jqfyqvWgy2EXIWO bTURrWb4ihfp8rqdRnCRrNbwZMzqjTUfOSQekenRu8gIg4kQosORQf7DxrpLtLwV +C9nghRVk7QD8ROaIi3N =5AYH -END PGP SIGNATURE- ___ Users mailing list Users@lists.opennebula.org http://lists.opennebula.org/listinfo.cgi/users-opennebula.org
Re: [one-users] Official Debian packages
Jaime Melis jmelis@opennebula.systems writes: Hi Alberto, I can confirm what Daniel said. We have no current plans of updating the offical Debian package of OpenNebula. Debian packaing guidelines are very strict and as Daniel mentioned it's a very big job. Daniel, I apologize, but somehow I was not aware of #3129. I will update the ticket now. Thanks, I have one issue with OpenNebula branches. I based my work on the 4.10 package[1] to compare the original package content with mine. Now, I would like to follow master and derive the packaging based on OpenNebula version, but I have a lot of conflicts when I merge master into my packaging branch. The base idea is to have one packaging branch following OpenNebula master branch. On a new release, a “release dedicated” packaging branch is derived from the master packaging branch to follow the OpenNebula release. Should I rebase[2] all my branches on master directly and then follow the OpenNebula releases or is there a path to merge master and one-4.10? Hmm, writing the question seems to gives my answer, it looks like the cherry-picking of master commits on the one-version branches are the reasons of the merge conflicts. Any hints? Footnotes: [1] http://downloads.opennebula.org/packages/opennebula-4.10.1/ [2] so changing history -- Daniel Dehennin Récupérer ma clef GPG: gpg --recv-keys 0xCC1E9E5B7A6FE2DF Fingerprint: 3E69 014E 5C23 50E8 9ED6 2AAD CC1E 9E5B 7A6F E2DF signature.asc Description: PGP signature ___ Users mailing list Users@lists.opennebula.org http://lists.opennebula.org/listinfo.cgi/users-opennebula.org
Re: [one-users] Official Debian packages
Hello Alberto, yes, of course. But due to resources we can only try and help out people from the community like yourself or Daniel who want to collaborate in creating these packages. We can assist and try to change this around in the codebase to make things easier for package maintainers. On Tue, Feb 17, 2015 at 10:14 AM, Alberto Zuin - Liste li...@albertozuin.eu wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Jamie and Daniel, I perfectly understand the problems with Debian official packaging guidelines. I asked this, because at the moment I'm collaborating with Devuan, an upcoming Debian fork which is aimed to not have systemd mandatory. Could be interesting for you, in the near future, to have official packages for this distro? Cheers, Alberto Il 17/02/2015 8:53 am, Jaime Melis ha scritto: Hi Alberto, I can confirm what Daniel said. We have no current plans of updating the offical Debian package of OpenNebula. Debian packaing guidelines are very strict and as Daniel mentioned it's a very big job. Daniel, I apologize, but somehow I was not aware of #3129. I will update the ticket now. regards, Jaime -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0.22 (Darwin) iQIcBAEBAgAGBQJU4wZfAAoJEAzproFXfBTIVTMP/ikHyyCGKeyZtEIWRLZXaGi8 tlve4syO0xqhRCJz6vHjodaPjFoBPGFf33uoJfJUj9RurMIaxuL6ry6bAc3cSil0 2MEDcOlbM2q6J778BHzLUN5viFJ0lx+bTElD75WmEO0MYjV0dhxnW/h7gw5R4Laa DXs6qSuIrcjlxLAz3+C7PiRuo8E7cxNA59x9/20WbLMEwcTeF8jpGbK70LZbxehv ZKU7RteWx+vo1MQ+9VZTQpLAvYqqO6Cv03SFTnQlIdEZZqNJTtRdo97lR4XSHXQO 9E+KW9ZZ4Jw8oR/dsPzLmDClz9STeqGAFhZsZXcDoPrrxAJv7kWNvcRD/QiXWm6E MHNeaIoF1ILy4Hzcat3jjYDHOvCeqBIwE1VsG7DdueuYzRgVFREM0rhKvjgWxD7C uFnC3gesNyILGMHEcfBjozIjCkjDxmRSKC3dq+SmsGdmIO6A7W9DHSPUL91hSfq3 P0Enn0odAGfw9G59OwSjsVnb/lFS85lL5JK2pxKnWKnr8kBazUZ/YGr7+yz69D/w cNvrquOTGi6cdJxjc3tgCUwxwKAY2KFEDLSd/1pW1KYak7Yj3jqfyqvWgy2EXIWO bTURrWb4ihfp8rqdRnCRrNbwZMzqjTUfOSQekenRu8gIg4kQosORQf7DxrpLtLwV +C9nghRVk7QD8ROaIi3N =5AYH -END PGP SIGNATURE- ___ Users mailing list Users@lists.opennebula.org http://lists.opennebula.org/listinfo.cgi/users-opennebula.org -- Jaime Melis Project Engineer OpenNebula - Flexible Enterprise Cloud Made Simple www.OpenNebula.org | jme...@opennebula.org ___ Users mailing list Users@lists.opennebula.org http://lists.opennebula.org/listinfo.cgi/users-opennebula.org
Re: [one-users] Official Debian packages
Alberto Zuin - Liste li...@albertozuin.eu writes: Hello all, Hello, just for information, I know there is a pre-compiled version of OpenNebula in your repository, but in the official Debian repository there is only an old version of OpenNebula for Wheezy (3.4) and only the contextualization package for the upcoming Jessie. There is any plan to have the package in the official Jessie repository? First, I'm neither from the OpenNebula team nor a Debian developper. I see no activity on the Debian repository[1]. I started[2] to rework the Debian packaging. It's a big work, for now lintian is far from being happy[3] and I don't know if the OpenNebula team is OK with it[4]. I do not even take the DFSG into account or the duplication of some components[5] with other Debian packages. So, I can't answer for others but it does not looks like it planed to make the fast moving OpenNebula fit the distribution releases. Regards. Footnotes: [1] http://anonscm.debian.org/cgit/pkg-opennebula/opennebula.git [2] https://github.com/baby-gnu/one/tree/pkg/debian/master [3] c.f. attachement [4] http://dev.opennebula.org/issues/3129#note-5 [5] https://bugs.debian.org/774114 -- Daniel Dehennin Récupérer ma clef GPG: gpg --recv-keys 0xCC1E9E5B7A6FE2DF Fingerprint: 3E69 014E 5C23 50E8 9ED6 2AAD CC1E 9E5B 7A6F E2DF signature.asc Description: PGP signature ___ Users mailing list Users@lists.opennebula.org http://lists.opennebula.org/listinfo.cgi/users-opennebula.org
Re: [one-users] Official Debian packages
Daniel Dehennin daniel.dehen...@baby-gnu.org writes: [...] It's a big work, for now lintian is far from being happy[3] [...] [3] c.f. attachement Missing attachement, sorry. -- Daniel Dehennin Récupérer ma clef GPG: gpg --recv-keys 0xCC1E9E5B7A6FE2DF Fingerprint: 3E69 014E 5C23 50E8 9ED6 2AAD CC1E 9E5B 7A6F E2DF P: opennebula source: source-contains-prebuilt-java-object src/oca/java/lib/xmlrpc-common-3.1.2.jar N: N:The source tarball contains a prebuilt Java class file. These are often N:included by mistake when developers generate a tarball without cleaning N:the source directory first. If there is no sign this was intended, N:consider reporting it as an upstream bug. N: N:Severity: pedantic, Certainty: possible N: N:Check: cruft, Type: source N: P: opennebula source: source-contains-prebuilt-java-object src/oca/java/lib/xmlrpc-client-3.1.2.jar P: opennebula source: source-contains-prebuilt-java-object src/oca/java/lib/ws-commons-util-1.0.2.jar P: opennebula source: source-contains-prebuilt-javascript-object src/sunstone/public/vendor/crypto-js/sha1-min.js N: N:The source tarball contains a prebuilt (minified) JavaScript object. N:They are usually left by mistake when generating the tarball by not N:cleaning the source directory first. You may want to report this as an N:upstream bug, in case there is no sign that this was intended. N: N:Severity: pedantic, Certainty: possible N: N:Check: cruft, Type: source N: E: opennebula source: source-is-missing src/sunstone/public/vendor/crypto-js/sha1-min.js N: N:The source of the following file is missing. Lintian checked a few N:possible paths to find the source, and do not find it. N: N:Please repack your package to include the source or add it to N:debian/missing-sources directory. N: N:If this is a false-positive, please report a bug against Lintian. N: N:Severity: serious, Certainty: possible N: N:Check: cruft, Type: source N: P: opennebula source: source-contains-prebuilt-javascript-object src/sunstone/public/vendor/crypto-js/enc-base64-min.js E: opennebula source: source-is-missing src/sunstone/public/vendor/crypto-js/enc-base64-min.js P: opennebula source: source-contains-prebuilt-javascript-object src/sunstone/public/vendor/crypto-js/core-min.js E: opennebula source: source-is-missing src/sunstone/public/vendor/crypto-js/core-min.js P: opennebula source: source-contains-prebuilt-javascript-object src/sunstone/public/bower_components/jquery-migrate/jquery-migrate.min.js P: opennebula source: source-contains-prebuilt-javascript-object src/sunstone/public/bower_components/jgrowl/jquery.jgrowl.min.js P: opennebula source: source-contains-prebuilt-javascript-object src/sunstone/public/bower_components/flot/excanvas.min.js P: opennebula source: source-contains-prebuilt-javascript-object src/sunstone/public/vendor/4.0/nouislider/jquery.nouislider.min.js E: opennebula source: source-is-missing src/sunstone/public/vendor/4.0/nouislider/jquery.nouislider.min.js P: opennebula source: source-contains-prebuilt-javascript-object src/sunstone/public/bower_components/sizzle/dist/sizzle.min.js P: opennebula source: source-contains-prebuilt-javascript-object src/sunstone/public/bower_components/no-vnc/include/logo.js mean line length is about 16184 characters E: opennebula source: source-is-missing src/sunstone/public/bower_components/no-vnc/include/logo.js P: opennebula source: source-contains-prebuilt-javascript-object src/sunstone/public/bower_components/no-vnc/include/keysymdef.js mean line length is about 3983 characters E: opennebula source: source-is-missing src/sunstone/public/bower_components/no-vnc/include/keysymdef.js P: opennebula source: source-contains-prebuilt-javascript-object src/sunstone/public/bower_components/jquery/dist/jquery.min.js P: opennebula source: source-contains-prebuilt-javascript-object src/sunstone/public/bower_components/foundation/js/foundation.min.js P: opennebula source: source-contains-prebuilt-javascript-object src/sunstone/public/bower_components/flot.tooltip/js/jquery.flot.tooltip.min.js P: opennebula source: source-contains-prebuilt-javascript-object src/sunstone/public/bower_components/flot.tooltip/js/excanvas.min.js E: opennebula source: source-is-missing src/sunstone/public/bower_components/flot.tooltip/js/excanvas.min.js P: opennebula source: source-contains-prebuilt-javascript-object src/sunstone/public/bower_components/no-vnc/include/web-socket-js/swfobject.js mean line length is about 10071 characters E: opennebula source: source-is-missing src/sunstone/public/bower_components/no-vnc/include/web-socket-js/swfobject.js P: opennebula source: source-contains-prebuilt-flash-object src/sunstone/public/bower_components/no-vnc/include/web-socket-js/WebSocketMain.swf N: N:The source tarball contains a prebuilt file in the Shockwave Flash (SWF) N:or Flash Video (FLV)
[one-users] Official Debian packages
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hello all, just for information, I know there is a pre-compiled version of OpenNebula in your repository, but in the official Debian repository there is only an old version of OpenNebula for Wheezy (3.4) and only the contextualization package for the upcoming Jessie. There is any plan to have the package in the official Jessie repository? Thank you, Alberto -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0.22 (Darwin) iQIcBAEBAgAGBQJU27s7AAoJEAzproFXfBTIFYUP/1mw1jw5K4EXk+ZRQS4PWEua CWQMj1AiMYEzct4v8DhblfW5iOrIHpf3DmQmn+ETv0sVip3hEYfL/KbhJSkgk/9L ZxrQ6qIo4Eqz3YLe+DGdy/YWdCm0yQ33PZvx0MLU2Jgcm15GtNeteVaqMhtyQcb4 RHI9e4n2qK+LvDMy0IIpLneDPN94NG9gQYz6ZHYNR0sZDhhPolB8unZdUXUjqqeS phOcQi3YyaH4WI8XGEJoOtOvNXFN5XHUZhlj1Y7VWEo7bo2+n+bvEhcrYkIVJt1c 7e9cr66pfPoq3HYMf4a/KIota18af/XunDqrOk1wio2ihI1276oY8lZ6/sC48a5p SELnkXNRxebqxX65KLVMaIWzi9u3DwO0IuwfcpNdjcEMXGq/sf0SWGJv3etIbgFD cIbymbxdEmr5KR6H6ys0hB/kzkdv92nzozalUgXzHYLGGuMgeOLGy3NlsY8qiLNO 9lFKE1KKPu6bh5NWprwdw808B8QgJapHQJanOIMLf6TC3Z+t9M0EuUGkhJXNPWze wQ6rKdTMDHe7AamUHDaFhTaoRbVGWMSqW0RMGEYDUuPyierkwz7s9Iq1c/HpsQeY FqIjyjYsqV6ZnNVgUveFGFjBh5bLAudqagKOneISwSF42Cq2VkfofIKmA4X6krAs C8Iq3FjKc4+DW+V0j4PP =Eq+K -END PGP SIGNATURE- ___ Users mailing list Users@lists.opennebula.org http://lists.opennebula.org/listinfo.cgi/users-opennebula.org
