diff options
| author |   Thomas Sachau <tommy@gentoo.org> | 2009-10-12 20:39:52 +0200 |
|---|---|---|
| committer | Thomas Sachau <tommy@gentoo.org> | 2009-10-12 20:39:52 +0200 |
| commit | 9208c5316dadbdb8b81a95235de8bd71bb73ced2 (patch) | |
| tree | 5722632ea9ca4ebb3ef5cbf024ee2baa1ae90a6d /doc | |
| parent | Sync portage (diff) | |
| download | multilib-portage-9208c5316dadbdb8b81a95235de8bd71bb73ced2.tar.gz multilib-portage-9208c5316dadbdb8b81a95235de8bd71bb73ced2.tar.bz2 multilib-portage-9208c5316dadbdb8b81a95235de8bd71bb73ced2.zip | |
Simplify checkout command, wrap lines as suggested by vapier
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/portage-multilib-instructions | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/doc/portage-multilib-instructions b/doc/portage-multilib-instructions index 4a96d662a..0e2dd95ce 100644 --- a/doc/portage-multilib-instructions +++ b/doc/portage-multilib-instructions @@ -1,17 +1,12 @@ First, if you want to install and use it via layman: layman -a multilib -cd $PORTDIR_OVERLAY/layman/multilib ($PORTDIR_OVERLAY is for most probably /usr/local/portage) -git checkout origin/portage-multilib -git checkout -b portage-multilib +cd $PORTDIR_OVERLAY/layman/multilib ($PORTDIR_OVERLAY is for most +probably /usr/local/portage) +git checkout -b portage-multilib origin/portage-multilib -then open .git/config with your favorite editor and add the following lines: - -[branch "portage-multilib"] - remote = origin - merge = refs/heads/portage-multilib - -After that, every layman sync should update the branch as normal, switching is done with +After that, every layman sync should update the branch as normal, +switching is done with git checkout <branch> @@ -25,11 +20,16 @@ First, install the modified portage version: emerge -av1 portage 2. --check the target of /etc/make.profile, rm /etc/make.profile, mkdir /etc/make.profile, --echo /path/to/current/profile >> /etc/make.profile/parent, echo /path/to/multilib-overlay/profiles/base >> /etc/make.profile/parent +check the target of /etc/make.profile +rm /etc/make.profile +mkdir /etc/make.profile +echo /path/to/current/profile >> /etc/make.profile/parent +echo /path/to/multilib-overlay/profiles/base >> /etc/make.profile/parent 3. -let the multilib overlay eclasses override the main tree ones: add the following to /etc/portage/repos.conf or create it with the following content: +let the multilib overlay eclasses override the main tree ones: add the +following to /etc/portage/repos.conf or create it with the following +content: [DEFAULT] eclass-overrides = gentoo multilib @@ -42,6 +42,7 @@ then recompile world: emerge -e world -(you can also use /bin/add_lib32 to add the useflag to the database, but this branch does also remove all .la files, so you might have to run revdep-rebuild or lafilefixer every time you built a -package with multilib-portage) - +(you can also use /bin/add_lib32 to add the useflag to the database, +but this branch does also remove all .la files, so you might have to +run revdep-rebuild or lafilefixer every time you built a package with +multilib-portage) |