From: R. Steve McKown Date: Thu, 6 May 2010 16:00:04 +0000 (-0600) Subject: Updates reflecting new TinyOS 2.1.0-4.2 release. X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;h=1f769871f555c78a58255eaeea8f58bd7215960d;p=oss-web.git Updates reflecting new TinyOS 2.1.0-4.2 release. --- diff --git a/in/aptrepo.md b/in/aptrepo.md index cbf1567..42c8ec0 100644 --- a/in/aptrepo.md +++ b/in/aptrepo.md @@ -28,17 +28,18 @@ Contents of the APT repostory, as of 2009-05-06 msp430-gcc 3.2.3-1tmi msp430-libc 0.0~cvs20080819-1tmi nesc 1.3.0-1tmi - tinyos 2.1.0-4.1-1tmi - tinyos-avr 2.1.0-4.1-1tmi - tinyos-msp430 2.1.0-4.1-1tmi - tinyos-source 2.1.0-4.1-1tmi + tinyos 2.1.0-4.2-1tmi + tinyos-avr 2.1.0-4.2-1tmi + tinyos-msp430 2.1.0-4.2-1tmi + tinyos-source 2.1.0-4.2-1tmi tinyos-source-2.0.1 2.0.1-2tmi tinyos-source-2.0.2.2 2.0.2.2-2tmi tinyos-source-2.1.0 2.1.0-2tmi tinyos-source-2.1.0-3 2.1.0-3-2tmi tinyos-source-2.1.0-4 2.1.0-4-2tmi tinyos-source-2.1.0-4.1 2.1.0-4.1-1tmi - tinyos-tools 2.1.0-4.1-1tmi + tinyos-source-2.1.0-4.2 2.1.0-4.2-1tmi + tinyos-tools 2.1.0-4.2-1tmi tmi-keyring 1.0-1tmi topgit 0.8-2 diff --git a/in/tinyos.md b/in/tinyos.md index 08767d6..95794c9 100644 --- a/in/tinyos.md +++ b/in/tinyos.md @@ -36,13 +36,13 @@ internal and customer development efforts. TMI enhancements include: # About the TMI repository The TMI TinyOS repository contains code imported from CVS upstream, our internal -working branches, and tags marking a series of commits that are a clean patch -series of the TMI enhancements against an official upstream release. +working branches, and tags marking a series of commits that are a each a clean +patch series of the TMI enhancements against an official upstream release. -* Current patchset tag: `patchset/2.1.0-3` +* Current patchset tag: `patchset/2.1.0-4.2` * Derived from official release tag: `tinyos/2.1.0` * The commits between the two above tags represent the series of patches in the - [latest patchset](/gitweb/?p=tinyos-2.x.git;a=shortlog;h=refs/tags/patchset/2.1.0-3). + [latest patchset](/gitweb/?p=tinyos-2.x.git;a=shortlog;h=refs/tags/patchset/2.1.0-4.2). The TMI TinyOS code requires a newer [[msp430]] toolchain. diff --git a/in/tinyospkgs.md b/in/tinyospkgs.md index 77e6d77..1755db9 100644 --- a/in/tinyospkgs.md +++ b/in/tinyospkgs.md @@ -16,38 +16,38 @@ package version number is of the form `tosver-tmiver`, where `tosver` is the official TinyOS release version on which the code is based, and `tmiver` is the version of the modifications applied by TMI. Released APT package versions are associated with tags in the source code repository. Consider the latest -package version, 2.1.0-3, for which these tags exist in the repository: +package version, 2.1.0-4.2, for which these tags exist in the repository: -* `debian/2.1.0-3-2tmi` is the tag of the 'debianized' code from which the APT - packages version 2.1.0-3-2tmi were built. +* `debian/2.1.0-4.2-1tmi` is the tag of the 'debianized' code from which the APT + packages version 2.1.0-4.2-1tmi were built. -* `release/2.1.0-3` is the tag of the TinyOS code of which - `debian/2.1.0-3-2tmi` is a superset, the latter containing the debian +* `release/2.1.0-4.2` is the tag of the TinyOS code of which + `debian/2.1.0-4.2-1tmi` is a superset, the latter containing the debian packaging files. -* `tinyos/2.1.0` is the official upstream release on which `release/2.1.0-3` is - based, the difference being the TMI enhancements. +* `tinyos/2.1.0` is the official upstream release on which `release/2.1.0-4.2` + is based, the difference being the TMI enhancements. -* `patchset/2.1.0-3` is the head of a string of commits from the +* `patchset/2.1.0-4.2` is the head of a string of commits from the `tinyos/2.1.0` tag that represent a clean patch series that applies the TMI enhancements to the official upstream release. # Multiple source trees -Often it is impractical to maintain an older application by porting it forward +Often it is impractical to maintain older applications by porting them forward to the latest TinyOS version. The TMI approach allows multiple TinyOS trees to be installed simultaneously, thereby allowing different applications to be compiled against different TinyOS versions. The official TinyOS installs the source tree at `/opt/tinyos-2.x`. The TMI version installs source trees at `/opt/tinyos/VER`. For example, the latest -TMI tree is installed at `/opt/tinyos/2.1.0-3`. TMI also maintains in its +TMI tree is installed at `/opt/tinyos/2.1.0-4.2`. TMI also maintains in its repository the last few official source trees. At least one must be installed, and the developer may install others as needed. When installing or upgrading TMI TinyOS packages via APT, the latest TMI tree package is automatically installed. Source the script `/opt/tinyos/tinyos.sh` to set the three you wish -to use. Source this script from your login profile with no argument to ensure -that your tree selection is persistent across logins. +to use. This script also updates your shell rc file (if running bash, ksh or +csh) so that your tree selection is persistent across logins. This is the currently available trees as of this writing. You can use the command shown below to at any time view the available source trees. @@ -58,6 +58,9 @@ command shown below to at any time view the available source trees. tinyos-source-2.0.2.2 - TinyOS source code tree tinyos-source-2.1.0 - TinyOS source code tree tinyos-source-2.1.0-3 - TinyOS source code tree + tinyos-source-2.1.0-4 - TinyOS source code tree + tinyos-source-2.1.0-4.1 - TinyOS source code tree + tinyos-source-2.1.0-4.2 - TinyOS source code tree # Installing TinyOS @@ -67,6 +70,11 @@ To install TinyOS, perform the steps shown for the [[aptrepo]], then type: By default, the latest TinyOS source tree, with TMI enhancements, and the TMI [[msp430]] toolchain are installed. At this point, additional tinyos source -trees may be installed as required. For example: +trees may be installed as required. For example, to install the official +upstream source version 2.1.0 without TMI enhancements: sudo apt-get install tinyos-source-2.1.0 + +You may also install the AVR compiler for TinyOS by typing: + + sudo apt-get install tinyos-avr