diff --git a/SECURITY.md b/SECURITY.md index 83edb72f22..149706f4fe 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,38 +1,17 @@ # Security Policy -## Staging branch - -The `staging` branch is always first point where changes will be introduced, like package updates, features a.s.o. -Package updates from that branch are synced into all [supported branches](#supported-branches) ~2 weeks, to minimize the -size of the changeset, as package updates can occur very frequently. -**Don't** create branches from `staging` as it could be rebased or rewritten at any time. - -## Supported branches +## Actively supported branches Following branches are actively maintained. -| Branch | Integration with poky | Integration with meta-oe | Integration with meta-clang | Support ends | Release tag | -| --------- | --------------------- | ------------------------ | --------------------------- | ------------ | -------------------- | -| master | daily | daily | daily | never | v[VERSION] | -| kirkstone | n.a. | n.a. | n.a. | n.a. | vkirkstone[VERSION] | -| honister | daily | daily | daily | Q2 2022 | vhonister_[VERSION] | -| hardknott | daily | daily | daily | Q2 2022 | vhardknott_[VERSION] | -| dunfell | daily | daily | daily | Q2 2022 | vdunfell_[VERSION] | - -## Other branches +| Branch | Support ends | Maintained by | Release tag | +| ------ | ------------ | --------------- | ----------- | +| master | never | @priv-kweihmann | v[VERSION] | -Following branches get package updates from time to time, but no feature updates nor releases according to the current release plan +all other branches are community maintained - see [maintainer's guide](docs/maintainer_guide.md) for details. -| Branch | Integration with poky | Integration with meta-oe | Integration with meta-clang | Support ends | Release tag | -| ---------- | --------------------- | ------------------------ | --------------------------- | ------------- | --------------------- | -| gatesgarth | on push | n.a. | n.a. | already ended | vgatesgarth_[VERSION] | -| zeus | on push | n.a. | n.a. | already ended | vzeus_[VERSION] | -| warrior | on push | n.a. | n.a. | already ended | vwarrior_[VERSION] | -| thud | on push | n.a. | n.a. | already ended | vthud_[VERSION] | -| sumo | on push | n.a. | n.a. | already ended | vsumo_[VERSION] | -| rocko | on push | n.a. | n.a. | already ended | vrocko_[VERSION] | -| pyro | on push | n.a. | n.a. | already ended | vpyro_[VERSION] | -| krogoth | on push | n.a. | n.a. | already ended | vkrogoth_[VERSION] | +Integration against upstream is done for known good revisions. +Please check [kas manifests](conf/kas/scatest-qemux86-64.yaml) for the exact used revisions. ## Reporting a Vulnerability