[maemo-commits] [maemo-commits] r16841 - projects/haf/doc/mvo

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-12-02 19:25:25 +0200 (Tue, 02 Dec 2008)
New Revision: 16841

Modified:
   projects/haf/doc/mvo/system-model-2.txt
Log:
Updated.


Modified: projects/haf/doc/mvo/system-model-2.txt
===================================================================
--- projects/haf/doc/mvo/system-model-2.txt	2008-12-02 16:32:29 UTC (rev 16840)
+++ projects/haf/doc/mvo/system-model-2.txt	2008-12-02 17:25:25 UTC (rev 16841)
@@ -1,7 +1,7 @@
 TODO:
 
- - Extended archive: extra categories, generalizing the "pending"
-   stuff.
+ - Documentation in the archive
+ - Extended archive: extra categories
  - Building binaries for the archive from secret sources
 
 
@@ -66,12 +66,6 @@
     of the Maemo system model.  I assume that Debian binary packages
     have already been introduced as part of the compilation process.
 
-  A useful model is to think of the Maemo archive as a source code
-  revision repository: it might have a commit history, tags, branches,
-  merges, and so on.  It would be interesting to explore this analogy
-  fully: storing the package lists that define a distribution in a VCS
-  and use VCS operations to maintain them.
-
   Most of this is modeled after Debian, of course.  The significant
   differences are:
 
@@ -87,7 +81,7 @@
   There are differences to our current way of working as well, of
   course:
 
-  - Everything is public by default.  There some support for keeping
+  - Everything is public by default.  There is support for keeping
     things secret, but this should always be regarded as an exception
     rather than the rule.
 
@@ -108,8 +102,12 @@
 packages, both source packages and the binary packages that have been
 compiled from them, are contained in the "Maemo archive".
 
-Packages that are not in the Maemo archive are not part of Maemo and
-are shot on sight.
+The package management tools on the device are normally configured to
+access the Maemo archive only.  It is possible to extend this
+configuration so that a device has access to more packages than just
+the ones in the Maemo archive.  These packages are not considered to
+be part of Maemo, and whoever provides them is responsible to adapt
+them to changes in the Maemo archive.
 
 All packages in the Maemo archive should work well with each other and
 in all possible configurations and targets, not just the officially
@@ -198,8 +196,8 @@
 The distributions are used to keep different lines of development
 separate from each other.  There is a 'stable' line of development
 that has been released for general consumption.  There is also a
-'testing' line that contains beta releases for developers and daring
-testers.
+'testing' line that contains packages of lesser known quality for
+developers and daring testers.
 
 The distributions for Harmattan are "harmattan-stable",
 "harmattan-testing", and "harmattan-proposed-updates".
@@ -249,12 +247,12 @@
 before the first release of Harmattan.
 
 Compatibility is important because groups of packages are released
-independently.  Consider a typical 3rd party application in the extras
-category: they are meant to be installed 'immediately' on devices that
-run the harmattan-stable distribution.  They are not targeted at users
-running harmattan-testing, and they don't want to wait until their
-dependencies have been released.  Still, they are compiled in a
-harmattan-testing environment.
+independently.  Consider typical 3rd party applications in the
+maemor.org-free category: they are meant to be installed 'immediately'
+on devices that run the harmattan-stable distribution.  They are not
+targeted at users running harmattan-testing, and they don't want to
+wait until their dependencies have been released.  Still, they are
+compiled in a harmattan-testing environment.
 
 Problems with this will only arise when a binary package automatically
 picks up a incorrect run-time dependency that is not satisfiable in
@@ -285,7 +283,7 @@
 
 *** Integration snapshots
 
-A "integration snapshot" is short-lived distribution that has been
+A "integration snapshot" is a short-lived distribution that has been
 created by combining packages from a number of distributions.  This is
 typically done to test the result of integrating a new set of packages
 into some distribution without actually doing it.
@@ -345,50 +343,6 @@
 Harmattan distributions.  Development then starts in isnogud-testing,
 without much regard to compatibility to isnogud-stable if so desired.
 
-** Delayed publication
-
-The Maemo archive is public.  The Maemo system is developed and
-maintained in the open: this facilitates ad-hoc collaboration and
-other advantages of Open Source software development.
-
-However, packages can sometimes not be published immediately, although
-they eventually will be.  Reasons for holding back packages can be
-incomplete legal checks or the desire to keep them a trade secret
-until some launch event.
-
-Note also that delayed publishing is not strictly related to releasing
-a package.  Usually, packages should be published long before they are
-released.
-
-How packages are delayed is up to the party that desires it.  Inside
-Nokia, the Maemo archive is extended into the "Nokia archive" by
-adding three more categories: nokia-free-pending,
-nokia-non-free-pending, nokia-restricted-pending.  Packages in these
-categories are said to be "pending".
-
-The Nokia archive naturally contains the distributions of the Maemo
-archive.  However, those distributions must not have any packages in
-the three "*-pending" categories.  Thus, there is no way to upload a
-package into the "nokia-free-pending" category of the
-"harmattan-testing" distribution.
-
-Instead, the Nokia archive has one additional distribution:
-
- - harmattan-pending
-
- This distribution is used to handle packages in the *-pending
- categories.  It consists of the packages in harmattan-testing plus
- the pending packages.  Source packages uploaded to harmattan-pending
- go to one of the *-pending categories and are compiled in
- harmattan-pending.
-
-The infrastructure for the Maemo archive and the Nokia archive is
-separate: for example, the buildbots for the Maemo archive can only
-access publicly available sources.  When a pending package should
-finally be published, this has to be done by publishing the source and
-uploading it again to the Maemo archive (with an increased version
-number, of course).
-
 ** Repositories
 
 The Maemo archive is published in one or more "Repositories".  A
@@ -478,7 +432,7 @@
 
 A simple way to specify a configuration is to list its packages
 explicitly.  Another way might be to specify it relative to one or
-more existing configurations, ony listing the packages that should be
+more existing configurations, only listing the packages that should be
 added and removed from the 'parent' configurations.  Another useful
 thing is to transform the names of packages, by substituting "rx44"
 for "@VARIANT@", say.
@@ -508,9 +462,9 @@
   It should be possible to compute the base configurations for a
   configuration from the dependency graph: if a listed package of
   configuration B is reachable from a listed package of configuration
-  A, then B is a base for A.  This will usually find too many bases
-  that might conflict with each other and prevent "apt-get install"
-  from doing its job.
+  A, then B is a base for A.  But this will usually find too many
+  bases that might conflict with each other and prevent "apt-get
+  install" from doing its job.
 ]
 
 Thus, the set of listed packages in a configuration does not need to
@@ -598,10 +552,10 @@
 to the main package.  Updates to dependency packages are not visible
 (and would likely be confusing if they were).  The application package
 would need to be updated artificially to pull in the updated
-dependency package.  It is cleaner to do use a meta package instead.
+dependency package.  It is cleaner to use a meta package instead.
 
 Meta packages enter the archive like other packages.  They are
-normally uplaoded to harmattan-testing, except for urgent updates,
+normally uploaded to harmattan-testing, except for urgent updates,
 when they go to harmattan-proposed-updates.
 
 Other configuration can include these meta packages in their set of