diff options
author | Thomas Schwinge <thomas@schwinge.name> | 2010-12-13 17:11:51 +0100 |
---|---|---|
committer | Thomas Schwinge <thomas@schwinge.name> | 2010-12-13 17:11:51 +0100 |
commit | 2d75167da62e3486836e5f1773e5f1ab06e43fe8 (patch) | |
tree | e44fc83e0b1419836d1b21652ad1d38b8d0af2c4 /source_repositories/glibc.mdwn | |
parent | 217998d56f5b6424a685f8c87f2c0e924d1c89da (diff) | |
parent | 5c5c16e265d8ef56b71f319885f32bf144bdea23 (diff) |
Merge branch 'master' into external_pager_mechanism
Conflicts:
microkernel/mach/external_pager_mechanism.mdwn
Diffstat (limited to 'source_repositories/glibc.mdwn')
-rw-r--r-- | source_repositories/glibc.mdwn | 93 |
1 files changed, 93 insertions, 0 deletions
diff --git a/source_repositories/glibc.mdwn b/source_repositories/glibc.mdwn new file mode 100644 index 00000000..fabd7cab --- /dev/null +++ b/source_repositories/glibc.mdwn @@ -0,0 +1,93 @@ +[[!meta copyright="Copyright © 2010 Free Software Foundation, Inc."]] + +[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable +id="license" text="Permission is granted to copy, distribute and/or modify this +document under the terms of the GNU Free Documentation License, Version 1.2 or +any later version published by the Free Software Foundation; with no Invariant +Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license +is included in the section entitled [[GNU Free Documentation +License|/fdl]]."]]"""]] + +There is a repository for maintenance of [[/glibc]] for the Hurd's needs: +<http://git.savannah.gnu.org/cgit/hurd/glibc.git/>. + +This repository uses [[TopGit]]. + +*A plan for the Hurd-specific glibc repository*, thread +[begins](http://lists.gnu.org/archive/html/bug-hurd/2010-01/msg00062.html), +[continues](http://lists.gnu.org/archive/html/bug-hurd/2010-02/msg00021.html). + + +# Usage + +## Clone + + $ git init + $ git remote add savannah git://git.sv.gnu.org/hurd/glibc.git + $ git remote update + $ tg remote --populate savannah + tg: Remote savannah can now follow TopGit topic branches. + tg: Populating local topic branches from remote 'savannah'... + From git://git.sv.gnu.org/hurd/glibc + * [new branch] refs/top-bases/t/_dl_random -> savannah/top-bases/t/_dl_random + * [new branch] refs/top-bases/t/accept4 -> savannah/top-bases/t/accept4 + [...] + * [new branch] refs/top-bases/tschwinge/Roger_Whittaker -> savannah/top-bases/tschwinge/Roger_Whittaker + tg: Adding branch t/_dl_random... + tg: Adding branch t/accept4... + [...] + tg: Adding branch tschwinge/Roger_Whittaker... + tg: The remote 'savannah' is now the default source of topic branches. + +## Use tschwinge's Working Branch + + $ git checkout tschwinge/Roger_Whittaker + +## Integrate a New Branch + +A new (TopGit) branch has been published upstream: + + $ tg remote --populate savannah + tg: Remote savannah can now follow TopGit topic branches. + tg: Populating local topic branches from remote 'savannah'... + remote: Counting objects: 28, done. + remote: Compressing objects: 100% (19/19), done. + remote: Total 20 (delta 13), reused 1 (delta 0) + Unpacking objects: 100% (20/20), done. + From git://git.sv.gnu.org/hurd/glibc + * [new branch] t/unwind-resume.c -> savannah/t/unwind-resume.c + * [new branch] refs/top-bases/t/unwind-resume.c -> savannah/top-bases/t/unwind-resume.c + tg: Skipping branch t/____longjmp_chk: Already exists + [...] + tg: Skipping branch t/tlsdesc.sym: Already exists + tg: Adding branch t/unwind-resume.c... + tg: Skipping branch t/verify.h: Already exists + tg: Skipping branch tschwinge/Roger_Whittaker: Already exists + tg: The remote 'savannah' is now the default source of topic branches. + +Make `tschwinge/Roger_Whittaker` (the current branch) depend on it: + + $ tg depend add t/unwind-resume.c + [tschwinge/Roger_Whittaker 63f11ff] New TopGit dependency: t/unwind-resume.c + 1 files changed, 1 insertions(+), 0 deletions(-) + tg: Updating base with t/unwind-resume.c changes... + Auto-merging .topdeps + Auto-merging .topmsg + Merge made by recursive. + nptl/sysdeps/pthread/Makefile | 12 ++---------- + sysdeps/gnu/Makefile | 18 ++++++++++++++++-- + .../pthread => sysdeps/gnu}/rt-unwind-resume.c | 0 + .../pthread => sysdeps/gnu}/unwind-resume.c | 4 ++-- + 4 files changed, 20 insertions(+), 14 deletions(-) + rename {nptl/sysdeps/pthread => sysdeps/gnu}/rt-unwind-resume.c (100%) + rename {nptl/sysdeps/pthread => sysdeps/gnu}/unwind-resume.c (93%) + tg: The tschwinge/Roger_Whittaker head is up-to-date wrt. its remote branch. + tg: Updating tschwinge/Roger_Whittaker against new base... + Merge made by recursive. + nptl/sysdeps/pthread/Makefile | 12 ++---------- + sysdeps/gnu/Makefile | 18 ++++++++++++++++-- + .../pthread => sysdeps/gnu}/rt-unwind-resume.c | 0 + .../pthread => sysdeps/gnu}/unwind-resume.c | 4 ++-- + 4 files changed, 20 insertions(+), 14 deletions(-) + rename {nptl/sysdeps/pthread => sysdeps/gnu}/rt-unwind-resume.c (100%) + rename {nptl/sysdeps/pthread => sysdeps/gnu}/unwind-resume.c (93%) |