On Japsand, which Jenkins builds on, I updated the mock files (/etc/mock/*.cfg) for Fedora Rawhide to their mock 1.2.7-1 versions: https://apps.fedoraproject.org/packages/mock/changelog/
One of the differences is that the rawhide RPMs now have "fc23" instead of "fc22" in their names.
I started rebuilding the Rawhide packages through the Jenkins WebGUI. I intend to finish doing so tonight.
-Mike#2
On 31.03.2015 02:53 PM, Michael DePaulo wrote:
On Japsand, which Jenkins builds on, I updated the mock files (/etc/mock/*.cfg) for Fedora Rawhide to their mock 1.2.7-1 versions: https://apps.fedoraproject.org/packages/mock/changelog/
Note that /etc/mock/*.cfg isn't used anymore for the current builds, neither for manual builds nor Jenkins... so changing stuff there does absolutely nothing.
Also, as far as I've seen, the new config didn't add anything interesting but DNF support, which I assumed to be automatic. Maybe that wasn't the case.
I'll update this manually.
Mihai
On 31.03.2015 08:02 PM, Mihai Moldovan wrote:
On 31.03.2015 02:53 PM, Michael DePaulo wrote:
On Japsand, which Jenkins builds on, I updated the mock files (/etc/mock/*.cfg) for Fedora Rawhide to their mock 1.2.7-1 versions: https://apps.fedoraproject.org/packages/mock/changelog/ Note that /etc/mock/*.cfg isn't used anymore for the current builds, neither for manual builds nor Jenkins... so changing stuff there does absolutely nothing.
Also, as far as I've seen, the new config didn't add anything interesting but DNF support, which I assumed to be automatic. Maybe that wasn't the case.
Besides, mock on Jenkins is at 1.1.33 (< 1.2.7) and I feared that some changes in the config file may be incompatible with this rather version. I *did* diff the fedora-rawhide config file against the newest one from mock's git repository, but as there was a chance for breaking it completely and it not introducing any real benefit, I left it out.
For instance, it changes the buildsys-build groupinstall command to just install with an additional @ sign, or mirrorlink yum config lines to metalink ones. That's not really changing anything, especially the first change is merely another way to express the same thing.
However, setting /run/lock as extra directory did sound weird. Why would that need to be defined in the mock config file? Shouldn't that directory be created automatically? The pre-23 mock config files as shipped by Debian Stale Backports (the mentioned 1.1.33 version) didn't have that for any Fedora release, while in 1.2.x that was added to pretty much all of them, even old ones.
I decided to better not change the files as there was potential for breakage and no clearly cut out reason for this option.
Anyway, I guess I'll just be merging that and see how it goes.
Also, next time you do any changes, PLEASE copy the original files either by making a copy of the original /etc/mock directory or the individual files there with a .bak or similar extension.
Reverting changes to config files on Debian is a pain, because Debian has no sane way to just get the original config file as shipped by the package, other than either deleting the files completely and forcing unpacking the original config files or unpacking the .deb file manually. Neither of these options are really sane.
Mihai
On Tue, Mar 31, 2015 at 2:33 PM, Mihai Moldovan <ionic@ionic.de> wrote:
On 31.03.2015 08:02 PM, Mihai Moldovan wrote:
On 31.03.2015 02:53 PM, Michael DePaulo wrote:
On Japsand, which Jenkins builds on, I updated the mock files (/etc/mock/*.cfg) for Fedora Rawhide to their mock 1.2.7-1 versions: https://apps.fedoraproject.org/packages/mock/changelog/ Note that /etc/mock/*.cfg isn't used anymore for the current builds, neither for manual builds nor Jenkins... so changing stuff there does absolutely nothing.
I believe you are mistaken. The newly X2Go rawhide RPMs are for fc23 rather than fc22: http://packages.x2go.org/fedora/rawhide/heuler/x86_64/rpms/nx-libs/
This indicates that the mock config files are being used.
Also, as far as I've seen, the new config didn't add anything interesting but DNF support, which I assumed to be automatic. Maybe that wasn't the case.
See above.
Besides, mock on Jenkins is at 1.1.33 (< 1.2.7) and I feared that some changes in the config file may be incompatible with this rather version. I *did* diff the fedora-rawhide config file against the newest one from mock's git repository, but as there was a chance for breaking it completely and it not introducing any real benefit, I left it out.
For instance, it changes the buildsys-build groupinstall command to just install with an additional @ sign, or mirrorlink yum config lines to metalink ones. That's not really changing anything, especially the first change is merely another way to express the same thing.
However, setting /run/lock as extra directory did sound weird. Why would that need to be defined in the mock config file? Shouldn't that directory be created automatically? The pre-23 mock config files as shipped by Debian Stale Backports (the mentioned 1.1.33 version) didn't have that for any Fedora release, while in 1.2.x that was added to pretty much all of them, even old ones.
I decided to better not change the files as there was potential for breakage and no clearly cut out reason for this option.
Anyway, I guess I'll just be merging that and see how it goes.
Also, next time you do any changes, PLEASE copy the original files either by making a copy of the original /etc/mock directory or the individual files there with a .bak or similar extension.
Reverting changes to config files on Debian is a pain, because Debian has no sane way to just get the original config file as shipped by the package, other than either deleting the files completely and forcing unpacking the original config files or unpacking the .deb file manually. Neither of these options are really sane.
Mihai
Yeah, sorry, I was in a hurry.
I think these were the old versions: https://git.fedorahosted.org/cgit/mock.git/tree/etc/mock?id=mock-1.2.2 (Mock 1.2.2 was released on 2014-11-18).
BTW, an easy solution to this problem is etckeeper + git: https://packages.debian.org/wheezy/etckeeper
-Mike#2
On 31.03.2015 11:21 PM, Michael DePaulo wrote:
I believe you are mistaken. The newly X2Go rawhide RPMs are for fc23 rather than fc22: http://packages.x2go.org/fedora/rawhide/heuler/x86_64/rpms/nx-libs/ This indicates that the mock config files are being used.
Please trust me when I say they are not. This is merely incidental, because the config files in use don't specify the fedora release version, so the default one as specified in the "rawhide" image is used.
I think these were the old versions: https://git.fedorahosted.org/cgit/mock.git/tree/etc/mock?id=mock-1.2.2 (Mock 1.2.2 was released on 2014-11-18).
I've restored the old config files from the original mock .deb package and renamed your set to <name>.new.
In order to really use the stuff in /etc/mock, I'll have to rewrite the RPM build script to create temporary config files to be used when invoking mock, I just haven't come around that yet, sorry!
BTW, an easy solution to this problem is etckeeper + git: https://packages.debian.org/wheezy/etckeeper
Ah, that's actually a very nice idea for tracking config files!
Please give me some time to actually get the automatic mock config file generation set up. The current manual approach I did last week is brain-dead.
Mihai
On Tue, Mar 31, 2015 at 6:10 PM, Mihai Moldovan <ionic@ionic.de> wrote:
On 31.03.2015 11:21 PM, Michael DePaulo wrote:
I believe you are mistaken. The newly X2Go rawhide RPMs are for fc23 rather than fc22: http://packages.x2go.org/fedora/rawhide/heuler/x86_64/rpms/nx-libs/ This indicates that the mock config files are being used.
Please trust me when I say they are not. This is merely incidental, because the config files in use don't specify the fedora release version, so the default one as specified in the "rawhide" image is used.
Ack.
I think these were the old versions: https://git.fedorahosted.org/cgit/mock.git/tree/etc/mock?id=mock-1.2.2 (Mock 1.2.2 was released on 2014-11-18).
I've restored the old config files from the original mock .deb package and renamed your set to <name>.new.
In order to really use the stuff in /etc/mock, I'll have to rewrite the RPM build script to create temporary config files to be used when invoking mock, I just haven't come around that yet, sorry!
Ack
BTW, an easy solution to this problem is etckeeper + git: https://packages.debian.org/wheezy/etckeeper
Ah, that's actually a very nice idea for tracking config files!
I will set it up, OK?
Please give me some time to actually get the automatic mock config file generation set up. The current manual approach I did last week is brain-dead.
Mihai
Will do.
-Mike
On 01.04.2015 12:20 AM, Michael DePaulo wrote:
On Tue, Mar 31, 2015 at 6:10 PM, Mihai Moldovan <ionic@ionic.de> wrote:
On 31.03.2015 11:21 PM, Michael DePaulo wrote:
BTW, an easy solution to this problem is etckeeper + git: https://packages.debian.org/wheezy/etckeeper Ah, that's actually a very nice idea for tracking config files! I will set it up, OK?
Generally more than OK from my side (as mentioned, I find the "plain" Debian way of (not) managing config files horrible), but please check back with Heinz, as it's his machine after all and he probably wants to be kept "in the loop" and approve of such drastic changes.
Mihai
-
Michael DePaulo -
Mihai Moldovan