Issue 193057: Split the binary and source mirror defaults (Closed)
|
Created:
15 years, 6 months ago by tgardner Modified:
15 years, 6 months ago Reviewers:
cjwatson, wfrichar Visibility:
Public. |
DescriptionSplit the binary and source mirror defaults
Many local mirrors (such as mine) only contain mirrors
of the binary packages, sufficient to create a debootstrap
chroot. Source packages, the sum of which, can be quite large and
are not typically mirrored locally. This patch allows one
to create a chroot with overrides to the desired mirrors, e.g.,
./make_chroot.sh --replace --mirror http://mirror.rtg.net/ubuntu
In this example all of the binaries come from my local mirror, all source
packages come from $DEFAULT_DEV_MIRROR.
./make_chroot.sh --replace --mirror_src http://archive.ubuntu.com/ubuntu
Here the source packages are pulled from the Ubuntu archive whereas the
binaries come from $DEFAULT_DEV_MIRROR.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Patch Set 1 #
MessagesTotal messages: 5
The change LGTM.
Tim - could you be sure to upload your reviews to
codereview.chromium.organd not
codereview.appspot.com?
I typically run this after checking out the tree for the first time:
cd chromeos
git cl configfile://`pwd`/codereview.settings
which puts this into .git/config:
[rietveld]
server = codereview.chromium.org
cc = chromium-os-reviews@googlegroups.com
viewvc-url = http://chrome-svn/viewvc/chromeos?view=rev&revision=
extracc =
(the viewvc-url parameter is only used for subversion commits, which we
don't have)
Thanks.
Bill
On Fri, Jan 22, 2010 at 7:42 AM, <tgardner@chromium.org> wrote:
> Reviewers: cjwatson_chromium.org, wfrichar_chromium.org,
>
> Description:
> Split the binary and source mirror defaults
>
> Many local mirrors (such as mine) only contain mirrors
> of the binary packages, sufficient to create a debootstrap
> chroot. Source packages, the sum of which, can be quite large and
> are not typically mirrored locally. This patch allows one
> to create a chroot with overrides to the desired mirrors, e.g.,
>
> ./make_chroot.sh --replace --mirror http://mirror.rtg.net/ubuntu
>
> In this example all of the binaries come from my local mirror, all
> source
> packages come from $DEFAULT_DEV_MIRROR.
>
> ./make_chroot.sh --replace --mirror_src http://archive.ubuntu.com/ubuntu
>
> Here the source packages are pulled from the Ubuntu archive whereas the
> binaries come from $DEFAULT_DEV_MIRROR.
>
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
>
> Please review this at http://codereview.appspot.com/193057/show
>
> Affected files:
> M src/scripts/make_chroot.sh
>
>
> Index: src/scripts/make_chroot.sh
> diff --git a/src/scripts/make_chroot.sh b/src/scripts/make_chroot.sh
> index
>
5bef9a1d5845a69442090c85a9e79461e4b46ceb..b2e8e85daddfa6474629c812b9c914bdcb0bc463
> 100755
> --- a/src/scripts/make_chroot.sh
> +++ b/src/scripts/make_chroot.sh
> @@ -29,6 +29,8 @@ DEFINE_string suite "$DEFAULT_DEV_SUITE" \
> "Ubuntu suite to use to create the development chroot."
> DEFINE_string mirror "$DEFAULT_DEV_MIRROR" \
> "Ubuntu mirror to use to create the development chroot."
> +DEFINE_string mirror_src "$DEFAULT_DEV_MIRROR" \
> + "Ubuntu mirror to use to apt-get package sources."
> DEFINE_string chroot "$DEFAULT_CHROOT_DIR" \
> "Destination dir for the chroot environment."
> DEFINE_string pkglist "$DEFAULT_PKGLIST" \
> @@ -141,7 +143,7 @@ bash_chroot "echo deb $FLAGS_mirror $FLAGS_suite \
>
> # Enable sources for upstream packages. Currently, kernel source is
> checked in
> # and all other sources are pulled via DEPS files.
> -bash_chroot "echo deb-src $FLAGS_mirror $FLAGS_suite \
> +bash_chroot "echo deb-src $FLAGS_mirror_src $FLAGS_suite \
> main restricted multiverse universe >> /etc/apt/sources.list"
>
> # Set /etc/debian_chroot so '(chroot)' shows up in shell prompts
>
>
>
Sign in to reply to this message.
On Fri, Jan 22, 2010 at 08:04:19AM -0800, Bill Richardson wrote: > The change LGTM. Ditto. > Tim - could you be sure to upload your reviews to > codereview.chromium.organd not > codereview.appspot.com? I just ran Tim through this on IRC. I think the problem was one of having run 'git cl config' in src/third_party/kernel/ but not in the root ... -- Colin Watson [cjwatson@chromium.org]
Sign in to reply to this message.
Colin has pointed out the error of my ways. I've encountered a couple of places where it said to just 'git cl config', but the correct way is detailed at http://dev.chromium.org/chromium-os/building-chromium-os/making-changes I believe one of the comments on that page is in error, or is at least disingenuous: "First, configure the code review server (only necessary once and must be done from ~/chromiumos)" I think you have to the 'git cl config' thing for every git repo in the tree, right? rtg Bill Richardson wrote: > The change LGTM. > > Tim - could you be sure to upload your reviews to > codereview.chromium.organd not > codereview.appspot.com? > > I typically run this after checking out the tree for the first time: > > cd chromeos > git cl configfile://`pwd`/codereview.settings > > which puts this into .git/config: > > [rietveld] > server = codereview.chromium.org > cc = chromium-os-reviews@googlegroups.com > viewvc-url = http://chrome-svn/viewvc/chromeos?view=rev&revision= > extracc = > > > (the viewvc-url parameter is only used for subversion commits, which we > don't have) > > Thanks. > > Bill > > On Fri, Jan 22, 2010 at 7:42 AM, <tgardner@chromium.org> wrote: > >> Reviewers: cjwatson_chromium.org, wfrichar_chromium.org, >> >> Description: >> Split the binary and source mirror defaults >> >> Many local mirrors (such as mine) only contain mirrors >> of the binary packages, sufficient to create a debootstrap >> chroot. Source packages, the sum of which, can be quite large and >> are not typically mirrored locally. This patch allows one >> to create a chroot with overrides to the desired mirrors, e.g., >> >> ./make_chroot.sh --replace --mirror http://mirror.rtg.net/ubuntu >> >> In this example all of the binaries come from my local mirror, all >> source >> packages come from $DEFAULT_DEV_MIRROR. >> >> ./make_chroot.sh --replace --mirror_src http://archive.ubuntu.com/ubuntu >> >> Here the source packages are pulled from the Ubuntu archive whereas the >> binaries come from $DEFAULT_DEV_MIRROR. >> >> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> >> >> Please review this at http://codereview.appspot.com/193057/show >> >> Affected files: >> M src/scripts/make_chroot.sh >> >> >> Index: src/scripts/make_chroot.sh >> diff --git a/src/scripts/make_chroot.sh b/src/scripts/make_chroot.sh >> index >> 5bef9a1d5845a69442090c85a9e79461e4b46ceb..b2e8e85daddfa6474629c812b9c914bdcb0bc463 >> 100755 >> --- a/src/scripts/make_chroot.sh >> +++ b/src/scripts/make_chroot.sh >> @@ -29,6 +29,8 @@ DEFINE_string suite "$DEFAULT_DEV_SUITE" \ >> "Ubuntu suite to use to create the development chroot." >> DEFINE_string mirror "$DEFAULT_DEV_MIRROR" \ >> "Ubuntu mirror to use to create the development chroot." >> +DEFINE_string mirror_src "$DEFAULT_DEV_MIRROR" \ >> + "Ubuntu mirror to use to apt-get package sources." >> DEFINE_string chroot "$DEFAULT_CHROOT_DIR" \ >> "Destination dir for the chroot environment." >> DEFINE_string pkglist "$DEFAULT_PKGLIST" \ >> @@ -141,7 +143,7 @@ bash_chroot "echo deb $FLAGS_mirror $FLAGS_suite \ >> >> # Enable sources for upstream packages. Currently, kernel source is >> checked in >> # and all other sources are pulled via DEPS files. >> -bash_chroot "echo deb-src $FLAGS_mirror $FLAGS_suite \ >> +bash_chroot "echo deb-src $FLAGS_mirror_src $FLAGS_suite \ >> main restricted multiverse universe >> /etc/apt/sources.list" >> >> # Set /etc/debian_chroot so '(chroot)' shows up in shell prompts >> >> >> > -- Tim Gardner tim.gardner@canonical.com
Sign in to reply to this message.
Yes, it needs to be done once at the top of every git repo in which you want to make changes. I've updated that document to say so. Thanks. On Fri, Jan 22, 2010 at 8:18 AM, Tim Gardner <tim.gardner@canonical.com>wrote: > Colin has pointed out the error of my ways. I've encountered a couple of > places where it said to just 'git cl config', but the correct way is > detailed at > http://dev.chromium.org/chromium-os/building-chromium-os/making-changes > > I believe one of the comments on that page is in error, or is at least > disingenuous: > > "First, configure the code review server (only necessary once and must > be done from ~/chromiumos)" > > I think you have to the 'git cl config' thing for every git repo in the > tree, right? > > rtg > > Bill Richardson wrote: > > The change LGTM. > > > > Tim - could you be sure to upload your reviews to > > codereview.chromium.organd not > > codereview.appspot.com? > > > > I typically run this after checking out the tree for the first time: > > > > cd chromeos > > git cl configfile://`pwd`/codereview.settings > > > > which puts this into .git/config: > > > > [rietveld] > > server = codereview.chromium.org > > cc = chromium-os-reviews@googlegroups.com > > viewvc-url = > http://chrome-svn/viewvc/chromeos?view=rev&revision= > > extracc = > > > > > > (the viewvc-url parameter is only used for subversion commits, which we > > don't have) > > > > Thanks. > > > > Bill > > > > On Fri, Jan 22, 2010 at 7:42 AM, <tgardner@chromium.org> wrote: > > > >> Reviewers: cjwatson_chromium.org, wfrichar_chromium.org, > >> > >> Description: > >> Split the binary and source mirror defaults > >> > >> Many local mirrors (such as mine) only contain mirrors > >> of the binary packages, sufficient to create a debootstrap > >> chroot. Source packages, the sum of which, can be quite large and > >> are not typically mirrored locally. This patch allows one > >> to create a chroot with overrides to the desired mirrors, e.g., > >> > >> ./make_chroot.sh --replace --mirror http://mirror.rtg.net/ubuntu > >> > >> In this example all of the binaries come from my local mirror, all > >> source > >> packages come from $DEFAULT_DEV_MIRROR. > >> > >> ./make_chroot.sh --replace --mirror_src > http://archive.ubuntu.com/ubuntu > >> > >> Here the source packages are pulled from the Ubuntu archive whereas the > >> binaries come from $DEFAULT_DEV_MIRROR. > >> > >> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > >> > >> Please review this at http://codereview.appspot.com/193057/show > >> > >> Affected files: > >> M src/scripts/make_chroot.sh > >> > >> > >> Index: src/scripts/make_chroot.sh > >> diff --git a/src/scripts/make_chroot.sh b/src/scripts/make_chroot.sh > >> index > >> > 5bef9a1d5845a69442090c85a9e79461e4b46ceb..b2e8e85daddfa6474629c812b9c914bdcb0bc463 > >> 100755 > >> --- a/src/scripts/make_chroot.sh > >> +++ b/src/scripts/make_chroot.sh > >> @@ -29,6 +29,8 @@ DEFINE_string suite "$DEFAULT_DEV_SUITE" \ > >> "Ubuntu suite to use to create the development chroot." > >> DEFINE_string mirror "$DEFAULT_DEV_MIRROR" \ > >> "Ubuntu mirror to use to create the development chroot." > >> +DEFINE_string mirror_src "$DEFAULT_DEV_MIRROR" \ > >> + "Ubuntu mirror to use to apt-get package sources." > >> DEFINE_string chroot "$DEFAULT_CHROOT_DIR" \ > >> "Destination dir for the chroot environment." > >> DEFINE_string pkglist "$DEFAULT_PKGLIST" \ > >> @@ -141,7 +143,7 @@ bash_chroot "echo deb $FLAGS_mirror $FLAGS_suite \ > >> > >> # Enable sources for upstream packages. Currently, kernel source is > >> checked in > >> # and all other sources are pulled via DEPS files. > >> -bash_chroot "echo deb-src $FLAGS_mirror $FLAGS_suite \ > >> +bash_chroot "echo deb-src $FLAGS_mirror_src $FLAGS_suite \ > >> main restricted multiverse universe >> /etc/apt/sources.list" > >> > >> # Set /etc/debian_chroot so '(chroot)' shows up in shell prompts > >> > >> > >> > > > > > -- > Tim Gardner tim.gardner@canonical.com >
Sign in to reply to this message.
|
||||||||||||||||||||||||||||||||||
