On 2/11/22 22:12, Guido Günther wrote:
I miss one point in your enumeration: syncing with changes from Debian's salsa which should be part of the picture as well - because in that situation you want the gbp.conf that Debian ships and merge the result into the derivative's branch.
We don't really use Salsa. For most of our Debian's forks, we just have minor changes to maintain, so we don't need to know about Debian's git history. So we just use import-dsc to import new versions from Debian.
The only exception I know of it the debian-installer. For this package we do fetch changes from Salsa, as it's sometimes convenient to package a git snapshot. In that case, we just do plain git commands, eg. "git fetch salsa && git merge salsa/master".
Does that answer your question? I'm not sure I understood exactly what you asked.
So given that I wonder if having the concept of a "downstream" or "derivative" within gbp wouldn't be worthwhile to look at? I know there are more people using gbp for derivative work (including me) so making this easier (without regressing in the "pure" Debian case would make sense to me. This could also include more explicit tracking or a remote for the derivative and salsa.
The concept of "downstream" would make sense indeed. I can do a bit of work on my side to see how it would look like, in order to be usable by Kali. Then I'll come back here to report what I found. No ETA though, this is something that I'll do in the background when times allow ;)
Cheers, -- Arnaud Rebillout / Offensive Security / Kali Linux Developer
