OpenEmbedded Merge Policy - Revision history

Glenn: catchg

2009-07-19T11:25:17Z

catchg

Kempelen: Category changes: -Policy, +System developers.

2008-08-31T23:43:31Z

Category changes: -Policy, +System developers.

Marko Knöbl: reomoving first heading

2008-08-29T11:09:37Z

reomoving first heading

Marko Knöbl: Openembedded Merge Policy moved to OpenEmbedded Merge Policy

2008-08-29T11:08:51Z

Openembedded Merge Policy moved to OpenEmbedded Merge Policy

Coolcat at 05:54, 29 August 2008

2008-08-29T05:54:14Z

Zecke: New page: = OpenEmbedded Merge Policy = What to check when merging upstream [http://www.openembedded.org OpenEmbedded] into the [http://git.openmoko.org/?p=openmoko.git;a=shortlog;h=org.openmoko.dev...

2008-08-29T00:12:48Z

New page: = OpenEmbedded Merge Policy = What to check when merging upstream [http://www.openembedded.org OpenEmbedded] into the [http://git.openmoko.org/?p=openmoko.git;a=shortlog;h=org.openmoko.dev...

New page

= OpenEmbedded Merge Policy =
What to check when merging upstream [http://www.openembedded.org OpenEmbedded] into the [http://git.openmoko.org/?p=openmoko.git;a=shortlog;h=org.openmoko.dev org.openmoko.dev] branch.

== Compile check ==
Make sure that a build from scratch is still working. This is specially interesting when a toolchain upgrade has happened or other major components were changed.

=== Do not remove packages from task-openmoko-feed ===
If packages from the task-openmoko-feed are not buildable anymore do not remove them but make them build. If it was removed from [http://www.openembedded.org OpenEmbedded] look at the reason and make a decision.

== Check version numbers ==
The upgrade path is important to us. Make sure that version numbers do not jump backwards but increase. This is one of the reasons we add .XY to the PR instead of increasing it by one.

== Version policy ==
[http://www.openembedded.org OpenEmbedded] has a versioning policy but is not following it. We have to fix that for them, sometimes we need to bump the PE to make the upgrade working.
* Make sure that PR is not inside the PV (a hack for git base files)
* Make everything but cvs SRCREV based (instead of SRCDATE)
* Make sure that there are sane-srcrev's for the packages or add them
* Move the SRCREVs from the bb file into sane-srcrev's
* Use SRCPV for the Openmoko tree instead of SRCREV in the PV variable
* make sure +gitr${SRCPV}, +svnr${SRCPV} (note the 'r') is present.

== Merge early and often ==
With merging early and often (regularly like every week) the adjustments we have to make and test should be managable.

← Older revision		Revision as of 11:25, 19 July 2009
Line 22:		Line 22:
	With merging early and often (regularly like every week) the adjustments we have to make and test should be managable.		With merging early and often (regularly like every week) the adjustments we have to make and test should be managable.

−	[[~~category~~:~~System Developers~~]]	+	[[Category:Developer resources]]

← Older revision		Revision as of 11:09, 29 August 2008
Line 1:		Line 1:
−	~~= OpenEmbedded Merge Policy =~~
	What to check when merging upstream [http://www.openembedded.org OpenEmbedded] into the [http://git.openmoko.org/?p=openmoko.git;a=shortlog;h=org.openmoko.dev org.openmoko.dev] branch.		What to check when merging upstream [http://www.openembedded.org OpenEmbedded] into the [http://git.openmoko.org/?p=openmoko.git;a=shortlog;h=org.openmoko.dev org.openmoko.dev] branch.

← Older revision		Revision as of 05:54, 29 August 2008
Line 22:		Line 22:
	== Merge early and often ==		== Merge early and often ==
	With merging early and often (regularly like every week) the adjustments we have to make and test should be managable.		With merging early and often (regularly like every week) the adjustments we have to make and test should be managable.
		+	[[category:Policy]]

@@ Line 21: / Line 21: @@
 == Merge early and often ==
 With merging early and often (regularly like every week) the adjustments we have to make and test should be managable.
-[[category:Policy]]