From a10264f46fe14387c79b5491a859989692f56e1b Mon Sep 17 00:00:00 2001 From: Hunor Csomortáni Date: May 27 2021 10:53:25 +0000 Subject: [PATCH 1/2] Meeting minutes on 2021-05-26 Signed-off-by: Hunor Csomortáni --- diff --git a/meeting-minutes/2021-05-26.md b/meeting-minutes/2021-05-26.md new file mode 100644 index 0000000..7ad98f2 --- /dev/null +++ b/meeting-minutes/2021-05-26.md @@ -0,0 +1,58 @@ +# Source-git SIG meeting #4 (May 26th) + +## Where to host source-git repositories? + +- pagure.io or src.fedoraproject.org +- Start with POC on pagure.io OR +- Do it on src.stg.fedoraproject.org, b/c it could be a good place for experimentation. +- What would fedora-infra team recommend? +- Push directly to dist-git vs. creating PRs. +- CI: we'd love to run CI checks on dist-git, get the results and mirror them to the source-git PR + +## Lookaside cache and src.fp.o PRs +- PRs and lookaside: one can upload to lookaside for a PR though you need to have perms to do the uploading + - we'd be cluttering lookaside if we uploaded every testing tarball in the lookaside +- Neal: for src.fp.o PRs, tarballs are being downloaded from Source URLs +- Docs: forge meta RPM macros and release notes for ?? +- Source URLs: source-git URL vs. the authoritative upstream Source +- We could also utilize VCS RPM macro +- dist_url RPM macro +- we can add new tags to RPM, repurposing is more difficult. +- In dist-git: Source **HAS TO** be the original upstream tarball: for testing, we can change it to something temporary. + +- Patch list RPM macro +- We should support synchronizing of squashing patches into one vs. commit = patch + +- Ours vs theirs commits: it should be clear for everyone to know what changes come from upstream and which are downstream only +- tooling needs to support config to verify the upstream release (signed commit or tarbal) +- More explanation from Neal: + ``` + 17:01 btw, RPM has DistURL and VCS tags + 17:01 absent another tag being defined, we should use DistURL + 17:02 for things that use source-git stuff + 17:02 (or dist-git stuff, even) + 17:02 basically document the "canonical" Fedora packaging sources + 17:03 https://github.com/rpm-software-management/rpm/commit/6ba887683b4bf9712be00a3d5dcaa890bfce47c1 + 17:03 oops + 17:03 https://github.com/rpm-software-management/rpm/blob/master/macros.in#L292-L296 + 17:03 there you go + ``` + +Seems like we'll need a plugin system to generate patches: e.g. kernel and python do it completely differently. + +## Handling Spec-file stored in source-git + +- Spec-file template vs. real spec-file? +- Empty patch line pointing to an empty patch +- One patch file vs. commit = patch file + +## Rebase vs merging + +- Probably need to support both + +## Sync into dist-git + +via SRPM +- overriding dist-git changes is a concern +- it's a great way to sanitize the changes before getting them to dist-git +- SRPM is the universal format From 7875961839aa67b9d983d97054773d1411713424 Mon Sep 17 00:00:00 2001 From: Hunor Csomortáni Date: May 27 2021 10:54:07 +0000 Subject: [PATCH 2/2] It's 2021, duh! Signed-off-by: Hunor Csomortáni --- diff --git a/meeting-minutes/2020-05-05.md b/meeting-minutes/2020-05-05.md deleted file mode 100644 index 508bba2..0000000 --- a/meeting-minutes/2020-05-05.md +++ /dev/null @@ -1,84 +0,0 @@ -# Source-git SIG meeting 2021-05-05 - -## Intro discussion \[motivation\] - -Neal: not having a dist-git tree makes it difficult for packagers to -work with packages. Downstream to consume Fedora packages. - -Florian: source-git to dist-git conversion might be problematic. - -Florian: synthesize srpms. - -Neal: no way to tell the order, or to retrieve a version. - -Florian: how about using composes? - -Neal: difficult on rely to them. Fedora has no history of -composes. Compose can get complicated. - -Neal picks up Fedora packages and rebuilds them for Suse and Ubuntu; -and contributes changes to dist-git for things that make sense // the -intention is for people to contribute back to upstream * Example of such -package: https://pagure.io/libvirt-deb - -Neal: Source code vs packaging: in source it's more difficult to get -consistency. - -Neal suggests to have consistency in how source-git repos work, are -interacted with so it's convenient for maintainers and contributors and -they have consistent experience across all. - -Hunor will share a proposal for the workflow. - -Florian opened up a PR with rules how Red Hat Kernel team is -doing commit messages in their source-git (dist-git) repos: -https://pagure.io/fedora-source-git/docs/pull-request/1 - -## How do we reach consistency? - -Next step: propose a workflow and reach a conclussion on it. - -## Where will be the source-git repos hosted? - -https://pagure.io/fedora-source-git/sig/issue/1 - -Neal: should be hosted on src.fedoraproject.org (Pagure) - FPCA. B/c of -git-hooks, which GitLab, for example, is missing. - -Neal: we need to block content which does not comply with our source-git -workflow/rules. - -Hunor: our current proposal is to convert src repos to dist-git and do -official builds from dist-git. - -Neal: opensuse is adopting pagure as a git forge -(https://code.opensuse.org) and is interested in a src-based workflow -and Neal is interested in bringing what we develop here to that community - -Florian has a set of src <-> dist-git scripts of his own and would like -to get rid of those for some universal workflow - -Justin Forbes (via IRC): We need to ask Fedora infra for input. We may -not like their answer, but with a project this size, we need to get them -involved earlier rather than later. - - -## Synchronization dist-git and src trees - -Bi-directional sync is really tricky, especially for in-flight changes: -would reqire rebase. - - -Figure out the workflows and then try to simplify the problem domain. - -Neil: spec-files might not be the same in source-git as they are in -dist-git. - -## Meeting time: how can we all meet? - -https://pagure.io/fedora-source-git/sig/issue/5 - -Meet on the 2nd and 4th weeks of the month. Maybe do it 30-60 minutes -later. - -All agreed to move to 2nd and 4th. diff --git a/meeting-minutes/2021-05-05.md b/meeting-minutes/2021-05-05.md new file mode 100644 index 0000000..508bba2 --- /dev/null +++ b/meeting-minutes/2021-05-05.md @@ -0,0 +1,84 @@ +# Source-git SIG meeting 2021-05-05 + +## Intro discussion \[motivation\] + +Neal: not having a dist-git tree makes it difficult for packagers to +work with packages. Downstream to consume Fedora packages. + +Florian: source-git to dist-git conversion might be problematic. + +Florian: synthesize srpms. + +Neal: no way to tell the order, or to retrieve a version. + +Florian: how about using composes? + +Neal: difficult on rely to them. Fedora has no history of +composes. Compose can get complicated. + +Neal picks up Fedora packages and rebuilds them for Suse and Ubuntu; +and contributes changes to dist-git for things that make sense // the +intention is for people to contribute back to upstream * Example of such +package: https://pagure.io/libvirt-deb + +Neal: Source code vs packaging: in source it's more difficult to get +consistency. + +Neal suggests to have consistency in how source-git repos work, are +interacted with so it's convenient for maintainers and contributors and +they have consistent experience across all. + +Hunor will share a proposal for the workflow. + +Florian opened up a PR with rules how Red Hat Kernel team is +doing commit messages in their source-git (dist-git) repos: +https://pagure.io/fedora-source-git/docs/pull-request/1 + +## How do we reach consistency? + +Next step: propose a workflow and reach a conclussion on it. + +## Where will be the source-git repos hosted? + +https://pagure.io/fedora-source-git/sig/issue/1 + +Neal: should be hosted on src.fedoraproject.org (Pagure) - FPCA. B/c of +git-hooks, which GitLab, for example, is missing. + +Neal: we need to block content which does not comply with our source-git +workflow/rules. + +Hunor: our current proposal is to convert src repos to dist-git and do +official builds from dist-git. + +Neal: opensuse is adopting pagure as a git forge +(https://code.opensuse.org) and is interested in a src-based workflow +and Neal is interested in bringing what we develop here to that community + +Florian has a set of src <-> dist-git scripts of his own and would like +to get rid of those for some universal workflow + +Justin Forbes (via IRC): We need to ask Fedora infra for input. We may +not like their answer, but with a project this size, we need to get them +involved earlier rather than later. + + +## Synchronization dist-git and src trees + +Bi-directional sync is really tricky, especially for in-flight changes: +would reqire rebase. + + +Figure out the workflows and then try to simplify the problem domain. + +Neil: spec-files might not be the same in source-git as they are in +dist-git. + +## Meeting time: how can we all meet? + +https://pagure.io/fedora-source-git/sig/issue/5 + +Meet on the 2nd and 4th weeks of the month. Maybe do it 30-60 minutes +later. + +All agreed to move to 2nd and 4th.