From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31603 invoked by alias); 23 Nov 2007 17:50:28 -0000 Received: (qmail 31571 invoked by uid 9639); 23 Nov 2007 17:50:27 -0000 Date: Fri, 23 Nov 2007 17:50:00 -0000 Message-ID: <20071123175027.31551.qmail@sourceware.org> From: moore@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Added documentation on importing a third party package X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 4d94f9bf96e6adf1d8e96afe84523e6359f9dc55 X-Git-Newrev: 8c320cb2580d3ba842778c46afa7ce04017ab92a Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2007-q4/txt/msg00448.txt.bz2 The branch, master has been updated via 8c320cb2580d3ba842778c46afa7ce04017ab92a (commit) from 4d94f9bf96e6adf1d8e96afe84523e6359f9dc55 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 8c320cb2580d3ba842778c46afa7ce04017ab92a Author: Tim Moore Date: Fri Nov 23 18:50:16 2007 +0100 Added documentation on importing a third party package ----------------------------------------------------------------------- Summary of changes: htdocs/build/index.html | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) First 500 lines of diff: diff --git a/htdocs/build/index.html b/htdocs/build/index.html index f7d7778..29cad3a 100644 --- a/htdocs/build/index.html +++ b/htdocs/build/index.html @@ -428,6 +428,40 @@ $ cvs -d :ext:MYNAME@sourceware.org:/cvs/frysk \ +
How do I import a third party package into frysk-imports?
+
Checkout a branch for the imported package only. Future updates to + the package will be made on this branch. You do this by checking out + the first revision of Frysk, which was empty, + then add and commit the frysk-imports directory and the +package. After that you checkout the Frysk master branch +and merge in the branch with the packge. + +

Example: +

+$ git-checkout -b vendor/LIBFOO genesis(1)
+$ mkdir frysk-imports
+$ tar xf libfoo.tar -C frysk-imports
+$ git-add frysk-imports(2)
+$ git-commit -m"Initial import of libfoo"
+$ git-checkout master(3)
+$ git-merge vendor/LIBFOO(4)
+$ git-push origin master vendor/LIBFOO:vendor/LIBFOO(5)
+

+
    +

  1. Checkout the first revision of Frysk, which we've tagged with + the tag genesis. with the -b flag we create a new + branch for the checkout. All our 3rd party import branches have a + prefix of vendor/ and then the name of the package in + uppercase.

    +

  2. Adding a directory recursively adds its contents.

    +

  3. Switch back to the master branch

    +

  4. The merge creates libfoo and its contents on the + master branch.

    +

  5. Push the imported changes to the master branch in the remote + repository,and also create a new remote branch for the import in the + remote repo.

    +
+
How do I update a third party package in frysk-imports?
This assumes that there is already a vendor branch in git for the package under frysk-imports. hooks/post-receive -- frysk system monitor/debugger