On Sun, Apr 21, 2013 at 08:17:46AM +0200, Jan Engelhardt wrote:
On Friday 2013-04-19 20:48, Lars Müller wrote:
we have several bug fixes in the Samba queue and thefore I used the following 'osc mbranch' commands:
osc mbranch samba home:lmuelle:bnc815994etal osc co home:lmuelle:bnc815994etal
Surprisingly for each samba.openSUSE_12.* the build service caused independent builds of openSUSE 12.1, 12.2, and 12.3.
To create multiple packages is the point of mbranch.
Yes. And that was my intention. But I expected to get in samba.openSUSE_12.1_Update only openSUSE_12.1 targets enabled to build and not 12.2 and 12.3 too. https://build.opensuse.org/package/repositories?package=samba.openSUSE_12.1_Update&project=home%3Almuelle%3Abranches%3AOBS_Maintained%3Asamba For 12.2 only 12.2 builds and no 12.1 and 12.3 too. https://build.opensuse.org/package/repositories?package=samba.openSUSE_12.2_Update&project=home%3Almuelle%3Abranches%3AOBS_Maintained%3Asamba For 12.3 only 12.3 builds and no 12.1 and 12.2 too. https://build.opensuse.org/package/repositories?package=samba.openSUSE_12.3_Update&project=home%3Almuelle%3Abranches%3AOBS_Maintained%3Asamba For the usual OBS_Maintained workflow users might not need to publish the results. I guess that's why publishing is disabled by default. Here we intended to get some feedback before we start the maintenance workflow and therefore enabled building and publishing on the project level: osc meta prj home:lmuelle:branches:OBS_Maintained:samba First had by default when created: <build> <disable/> </build> <publish> <disable/> </publish> To gather feedback got modified to: <build> <enable/> </build> <publish> <enable/> </publish> Soon after I noticed that more than the intended builds started. That's why I had to define on the meta pkg level for: home:lmuelle:branches:OBS_Maintained:samba samba.openSUSE_12.1_Update <build> <enable repository="openSUSE_12.1_Update"/> <disable repository="openSUSE_12.2_Update"/> <disable repository="openSUSE_12.3_Update_ports"/> <disable repository="openSUSE_12.3_Update_standard"/> </build> home:lmuelle:branches:OBS_Maintained:samba samba.openSUSE_12.2_Update <build> <enable repository="openSUSE_12.2_Update"/> <disable repository="openSUSE_12.1_Update"/> <disable repository="openSUSE_12.3_Update_ports"/> <disable repository="openSUSE_12.3_Update_standard"/> </build> home:lmuelle:branches:OBS_Maintained:samba samba.openSUSE_12.3_Update <build> <enable repository="openSUSE_12.3_Update_ports"/> <enable repository="openSUSE_12.3_Update_standard"/> <disable repository="openSUSE_12.1_Update"/> <disable repository="openSUSE_12.2_Update"/> </build> This looks unintended to me. But we here might use the osc mbranch feature the wrong way.
All of openSUSE:12.{1,2,3}:Update/samba may have different code and may thus require different patches, creating three packages is the only sensible action for mbranch.
If you want to publish the same version to multiple releases, mbranch is just a hell of an indirection. The short route:
cd network/samba/STABLE/samba/ <commit update> sosc sr --no-cleanup openSUSE:12.3:Update sosc sr --no-cleanup openSUSE:12.2:Update sosc sr --no-cleanup openSUSE:12.1:Update
Yes, that would have been the preferred approach. And it would break sssd builds again. That's why we patch all version to the same code level. BTW network:samba:STABLE/samba is on the same patch level as well. Cheers, Lars -- Lars Müller [ˈlaː(r)z ˈmʏlɐ] Samba Team + SUSE Labs SUSE Linux, Maxfeldstraße 5, 90409 Nürnberg, Germany