Skip to content

Commit

Permalink
Update README.md to reflect the state after contrib and base merge
Browse files Browse the repository at this point in the history
  • Loading branch information
zpytela committed Nov 26, 2020
1 parent 6c91ffd commit d4ba4f9
Showing 1 changed file with 19 additions and 18 deletions.
37 changes: 19 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
## Merging selinux-policy-contrib repository with selinux-policy

Currently, SELinux policy packages in Fedora use 2 repositories:
On November 25th, 2020, the selinux-policy-contrib repository was merged with selinux-policy.

Previously, SELinux policy packages in Fedora used 2 repositories:
base [1] and contrib [2].
This division into two repos is merely a historical artifact.
It currently is just a source of confusion and makes dealing
This division into two repos was merely a historical artifact, being
now just a source of confusion and made dealing
with SELinux policy repos more difficult.

We work on a change to merge these repos into one, containing sources from both.
All the changes would affect both repos, `rawhide` branches and future branches
From now on, these repos are merged into one, containing sources from both.
All the changes affect both repos, `rawhide` branches and future branches
`f34` and newer.
After the merge, when working in the rawhide branch, only the base repo would
be used; the corresponding contrib branch would be archived and not used
any longer. The contrib repo's commit history would be a part of the base repo.
Stable branches (`f33`, `f32`, all older ones) would remain unchanged.
The plan is to make it happen in the week starting with Monday, November 23rd.
When working in the rawhide branch, only the base repo is
now used; the corresponding contrib branch was archived and will not be used
any longer. The contrib repo's commit history are a part of the base repo.
Stable branches (`f33`, `f32`, all older ones) remain unchanged.

It mainly is an internal change of where the git repository is stored and
how it is referenced. After the merge, there will be just one notable change
how it is referenced. There should now be just one notable change
inside the repo: all files previously accessible from the root directory in the
selinux-policy-contrib repo will be in the selinux-policy base repo, directory
selinux-policy-contrib repo are in the selinux-policy base repo, directory
`policy/modules/contrib/`. No change for working in the selinux-policy base repo.

### How users will be affected?
### How users are affected?
There is no change for users.

How custom selinux-policy developers will be affected?
### How custom selinux-policy developers are affected?
No change for policy writing other than where to look for modules, previously found in the contrib repo.

Scripts, data, specfile, etc. in the dist git will be updated to use the new location for builds targeting rawhide or f34+.
Scripts, data, specfile, etc. in the dist git were updated to use the new location for builds targeting rawhide or f34+.

### How selinux-policy contributors will be affected?
No change other then where to look for the previous contrib modules and where to submit pull requests.
### How selinux-policy contributors are affected?
No change other than where to look for the previous contrib modules and where to submit pull requests.

Pull requests which have not been merged yet would require the submitter to rebase it and open against the base repo.
Pull requests which have not been merged yet require the submitter to rebase it and open against the base repo.

### Where to submit pull requests?
Use the base selinux-policy repository [3].
Expand Down

0 comments on commit d4ba4f9

Please sign in to comment.