Packaging - Revision history

Reynhout: /* All Packages */

2016-01-18T03:09:02Z

‎All Packages

Reynhout: /* All Packages */

2016-01-18T03:07:23Z

‎All Packages

Reynhout: /* More Examples */

2016-01-15T20:13:47Z

‎More Examples

Reynhout at 20:08, 15 January 2016

2016-01-15T20:08:44Z

Reynhout: /* Package Building */

2016-01-15T20:08:04Z

‎Package Building

Reynhout at 02:16, 14 January 2016

2016-01-14T02:16:30Z

Reynhout: update versioning bits

2016-01-11T03:17:02Z

update versioning bits

Show changes

Reynhout: /* Packaging Workflow (proposed) */

2016-01-05T01:16:34Z

‎Packaging Workflow (proposed)

Reynhout: /* Packaging Workflow (proposed) */

2015-12-31T03:33:36Z

‎Packaging Workflow (proposed)

Reynhout: /* Package Building */

2015-12-29T20:01:19Z

‎Package Building

@@ Line 78: / Line 78: @@
 Additionally, we should always:
-*   Update the distribution name to <code>vivid-galliumos</code>
+*   Update the distribution name in <code>debian/changelog</code> to <code>vivid-galliumos</code>
 === Packaging (nightly builds) ===

@@ Line 75: / Line 75: @@
 *   Add a new entry to <code>debian/changelog</code> with an updated version string
 **  If changes are not final and release-ready, update version <code>3.2.1-4galliumos1</code> to, e.g.: <code>3.2.1-4galliumos1+dev1</code>
 === Packaging (nightly builds) ===

@@ Line 158: / Line 158: @@
 | 3.2.1
 | Debian v4, <strike>Ubuntu</strike>, GalliumOS v6
 |-
 | 3.2.1-4ubuntu5-galliumos6
@@ Line 178: / Line 182: @@
 The hyphenation rules are due to Debian's complicated sort logic. See below for a demonstration.
-    # These version strings are Debian-ordered from oldest to newest
+  # These version strings are Debian-ordered from oldest to newest
-−
+  #
 .2.1
 .2.1-0galliumos1
 .2.1-1
 .2.1-1galliumos1
 .2.1-1ubuntu1
 .2.1-1ubuntu2
 .2.1-2galliumos1
 .2.1-10
 .2.1-10galliumos1
 .2.1-1ubuntu1-galliumos1
 .2.1-1ubuntu2-galliumos1
-.2.1-1ubuntu2-galliumos2
+.2.1-1ubuntu2-galliumos1+dev1
-.2.1-1ubuntu2-galliumos10
+.2.1-1ubuntu2-galliumos1+dev1.1
-.2.1-1ubuntu10-galliumos1
+.2.1-1ubuntu2-galliumos1+dev1.2
-.2.1.1
+.2.1-1ubuntu2-galliumos1+dev1.10
+.2.1-1ubuntu2-galliumos1.1
-    # These do not sort as expected, and are visually ambiguous: do not use!
+.2.1-1ubuntu2-galliumos1.2
-.2.1-0-galliumos1             ## DO NOT USE; ambiguous
+.2.1-1ubuntu2-galliumos1.10
-.2.1-0-ubuntu1                ## DO NOT USE; ambiguous
+.2.1-1ubuntu2-galliumos2
-.2.1-0-ubuntu0-galliumos1     ## DO NOT USE; ambiguous
+.2.1-1ubuntu2-galliumos10
-.2.1-0-ubuntu1-galliumos1     ## DO NOT USE; ambiguous
+.2.1-1ubuntu10-galliumos1
-.2.1-1-galliumos1             ## DO NOT USE; ambiguous
+.2.1.1
-.2.1-10-galliumos1            ## DO NOT USE; ambiguous

← Older revision		Revision as of 20:08, 15 January 2016
Line 37:		Line 37:


−	== Workflow (proposed) ==	+	== Development and Packaging Workflow (proposed) ==

	Debian/Ubuntu has a fairly complex system for creating `deb` packages for use in `apt` repositories and distributions. There are many approaches and sets of tools to choose from.		Debian/Ubuntu has a fairly complex system for creating `deb` packages for use in `apt` repositories and distributions. There are many approaches and sets of tools to choose from.

@@ Line 37: / Line 37: @@
-== Package Building ==
+== Workflow (proposed) ==
 Debian/Ubuntu has a fairly complex system for creating `deb` packages for use in `apt` repositories and distributions. There are many approaches and sets of tools to choose from.
-=== Packaging Workflow (proposed) ===
+=== Development ===
-# All packages distributed by GalliumOS are maintained in git, on GitHub
+All packages distributed by GalliumOS are maintained at https://github.org/GalliumOS.
-#* Code for our origin packages (e.g. <code>galliumos-base</code>) is committed to the git repo as a regular project tree, with the addition of the <code>debian</code> directory and associated config files for packaging
-#* Code for upstream origin packages is committed an expanded copy of the upstream tar file
+==== GalliumOS Origin Packages ====
-#** If upstream is Ubuntu or Debian or Debian-via-Ubuntu, the tree will include a <code>debian</code> directory
-#** If upstream is another source, we will create a <code>debian</code> directory
+Code for GalliumOS origin packages (e.g. <code>galliumos-base</code>) is committed to the git repo as a regular project tree
-#** All of our patches will live in <code>debian/patches</code>
-#** When we move to a new upstream version
+* We include a <code>debian</code> directory and associated config files for packaging
-#*** the upstream changes are applied onto the existing tree
-#*** our patches are updated if necessary to apply against the updated tree
+==== Upstream Origin Packages ====
-#*** <code>debian/galliumos/upstream</code> is updated with the new upstream <code>dsc</code> URL
-# All development is done on branches, and when branches are merged back to master, <code>debian/changelog</code> must be updated
+Code for upstream origin packages is committed as an expanded copy of the upstream archive
-#* NOTE: We use separate branches for development and buildsrc to make sure that we never publish packages with the same version number (from <code>debian/changelog</code>) but different code. Obviously not foolproof, but the separation removes the concern from ordinary development activities and moves it to deployment/publishing where we can add controls as needed.
-# Packages are built nightly (or on demand) by an automated process, which pulls from the GitHub master branch
+*   If upstream is Ubuntu or Debian or Debian-via-Ubuntu
-#* Package builder generates both binary and source packages
+**  The tree will already include a <code>debian</code> directory tree
-#** Some source packages are presently skipped
+**  A <code>debian/galliumos/upstream</code> file is added containing the full URL of the upstream <code>dsc</code> file
-#*** Some because they require a copy of the upstream source package tar file, the URL of which is not always possible to determine programmatically! this is easy to fix manually but requires maintenance, so is worth more thought
+*   If upstream is another source
-#*** Some others because the manually-presented upstream is inconsistent with our current tree, which will require manual adjustment to our repo to fix
+**  We will create a <code>debian</code> directory tree
-# Packages are signed with the <code>contact@galliumos.org</code> signing key
+*   GalliumOS patches to the upstream tree go into <code>debian/patches</code>
-#* TODO: Further investigate key caching for automated builds. manual builds can use <code>gpg-agent</code> to prompt once and cache for a specific length of time..
+*   When we move to a new upstream version
-# Nightly packages are pushed to repo <code>apt.galliumos.org</code>, distribution <code>vivid-galliumos-testing</code>
+**  Upstream changes are applied directly onto the existing tree
-#* TBD: Packages are then imported: manually/as part of builder script, automatically/via cron, automatically/as part of repodist config(+cron?)
+**  Our patches are updated if necessary to apply against the updated tree
-# When preparing packages for a formal (non-nightly) GalliumOS release, the master branch of each active GitHub repository is tagged with the release label (e.g. <code>1.0beta2</code>, <code>1.0</code>, etc)
+**  <code>debian/galliumos/upstream</code> is updated with the new URL of the upstream <code>dsc</code> file
 == Package Versioning ==

@@ Line 4: / Line 4: @@
 We have one apt repository at https://apt.galliumos.org/ which serves three "distributions" (confusing name, but there it is).
 The current distributions are:
@@ Line 51: / Line 49: @@
 #** If upstream is another source, we will create a <code>debian</code> directory
 #** All of our patches will live in <code>debian/patches</code>
-#** When we move to a new upstream version, the changes will be applied onto the existing tree, and our patches will be updated if necessary to apply against the updated tree
+#** When we move to a new upstream version
 # All development is done on branches, and when branches are merged back to master, <code>debian/changelog</code> must be updated
 #* NOTE: We use separate branches for development and buildsrc to make sure that we never publish packages with the same version number (from <code>debian/changelog</code>) but different code. Obviously not foolproof, but the separation removes the concern from ordinary development activities and moves it to deployment/publishing where we can add controls as needed.
@@ Line 141: / Line 142: @@
 | 0git20151003.be882ef2-galliumos6
 | (unversioned, git date.hash)
-| Galliumos v6
+| GalliumOS v6
 |-
 | 0.1~beta2-1git20150920.d7f95b5-galliumos6