Yes it would be during get-sources or another target like add-upstream. >From what I read in the doc, to update every components from upstream, I use make prepare-merge GIT_REMOTE=upstream. So this is why I added a upstream remote for each components.
So maybe I missed something? PS: Sorry I forgot to CC to the list Le 05/11/2017 à 17:51, Marek Marczykowski-Górecki a écrit : > On Sun, Nov 05, 2017 at 05:41:17PM +0100, Frédéric Epitre wrote: > > Following the list of options I setup in my infrastructure, I made a > > script to add automatically the upstream branch following the same rules > > for branches: default is QubesOS github repo and we can specify another > > upstream for a specific repo e.g. UPSTREAM_linux_kernel = > > https://github.com/fepitre. > > > How do you proceed? Do you think it would be useful to integrate it in > > the qubes-builder? > > How exactly would that be handled? During get-sources? If you just want > to sync with upstream, it is already possible with something like: > > make prepare-merge GIT_PREFIX=QubesOS/qubes- > > It will give you upstream version in FETCH_HEAD (and verify its > signature!), and also display shortlog for each repository. > Creating separate "upstream" branch might introduce some additional > complexity, as you need to keep it in sync (when? how to handle > conflicts? how to change upstream branch/repo?). > > PS CCing qubes-devel > -- You received this message because you are subscribed to the Google Groups "qubes-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to qubes-devel+unsubscr...@googlegroups.com. To post to this group, send email to qubes-devel@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/qubes-devel/3389e34f-1931-e4c2-2369-8f7acbc1d57e%40orange.fr. For more options, visit https://groups.google.com/d/optout.
