[CentOS-devel] Dist-git's git structure in CBS

Fri Jan 28 17:01:48 UTC 2022
Fabian Arrotin <arrfab at centos.org>

On 28/01/2022 17:56, Brian Stinson wrote:
> On Fri, Jan 28, 2022, at 10:51, Pierre-Yves Chibon wrote:
>> Good Morning Everyone,
>> Nowadays we have different structures in the git repositories of the dist-git
>> instance for CBS and for CentOS-Stream.
>> CBS' dist-git (used by the SIG and for CentOS Linux 7, CentOS-Stream 8), uses
>> something like:
>> ├── .gitignore
>> ├── .kernel.metadata
>> ├── SOURCES
>> │   ├─ ....
>> │   ├── patch-5.14.0-redhat.patch
>> │   ├─ ...
>> │   └── x509.genkey.rhel
>> └── SPECS
>>      └── kernel.spec
>> Ie: patches and other sources in a SOURCES folder, spec in a SPECS folder and
>> the link between the git repo and the lookaside cache is done via the
>> `.<packagename>.metadata` file.
>> source: https://git.centos.org/rpms/kernel/tree/c8s
>> On CentOS-Stream 9, the structure is similar to Fedora's structure where
>> everything is in the top directory.
>> source: https://gitlab.com/redhat/centos-stream/rpms/kernel
>> I was wondering if there has been some thoughts given on harmonizing these
>> structures? I am particularly interested on changing them for SIG building on
>> the top of CS9. It would make pulling changes from gitlab onto the SIG's repo a
>> lot easier I believe.
>> I suspect there may be some work to do for this and if I'm pointed to the right
>> direction, I wouldn't mind having a look at it but first I'd like to know if
>> it's a good idea :)
>> So... what do you think?
> We are not going to force folks using the exploded-SRPM layout to change *yet*. But SIGs should evaluate moving toward the standard dist-git layout. I think I still have a couple of changes to make so that CBS supports both, but especially for new work: plan to use the dist-git layout.

Especially because that's still how sources for Stream 8 are pushed to 
git.centos.org (and 7/8 too), so that would mean asking Red Hat to adapt 
their internal workflow.
And then impacting also somehow all the people consuming current layout, 
etc ... (hello other $rebuilds)

WRT cbs, if centpkg-minimal can then be changed to automatically detect 
which layout the git repository is using (or even just branch in case it 
differs from main one), that would work , as long as a src.rpm can be 
rebuilt by koji.

Fabian Arrotin
The CentOS Project | https://www.centos.org
gpg key: 17F3B7A1 | twitter: @arrfab
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <http://lists.centos.org/pipermail/centos-devel/attachments/20220128/fd17f17d/attachment.sig>