--
Chromium OS Developers mailing list: chromiu...@chromium.org
View archives, change email options, or unsubscribe:
http://groups.google.com/a/chromium.org/group/chromium-os-dev?hl=en
cheers,
/v
On Fri, May 6, 2011 at 10:43 AM, Olof Johansson <ol...@google.com> wrote:
You probably mentioned this before (not sure) - looks like we're still
going to have arm and x86 targets using different kernel repos. Any
chance of converging them on the same tree?
I just pushed the manifest change as well as an ebuild fix needed to switch the main kernel.git repo over to track chromeos-2.6.38 instead of the older 2.6.32 base.
Anyone with minilayout and cros_workon kernel will need to change the tracking branch manually.There are a handful of things that we will address in the upcoming week(s), among other things:* Configuration trim -- current main configs on .38 are not cleaned up and will include cruft that we'll want to remove* Boot time optimization (to some extent hurt by the larger config as well).* Suspend/resume optimization (same).I will be keeping an eye on the lists and the bug tracker in case of problem reports. Some of us have been using the newer kernel for a while without issue though, so hopefully most issues will be minor.This also means that it makes no sense to submit changes to 2.6.32, since it's now a stale branch. Please move your work to 2.6.38.Finally, since both kernel-next and kernel.git is at the same branch (the kernel.git branch is a clone of the kernel-next one as of yesterday), we are going to move the ARM boards over to use kernel.git. Until all boards are building from kernel.git, there will be a bit of confusion as some things might go into one tree and not the other. I will take care of the mirroring of changes between the trees myself for the next few days, and let people know once I expect them to do it themselves. Most work should move over to kernel.git anyway with periodic syncs to kernel-next.-Olof
--
Olof,On Sat, May 7, 2011 at 1:43 AM, Olof Johansson <ol...@google.com> wrote:I just pushed the manifest change as well as an ebuild fix needed to switch the main kernel.git repo over to track chromeos-2.6.38 instead of the older 2.6.32 base.# git branch -av...remotes/cros/chromeos-2.6.32 6d970c3 BACKPORT: iio: tsl258x i2c device id changeremotes/cros/chromeos-2.6.38 c67d408 CHROMIUM: i915: Backlight to PWM conversions round more accuratelyremotes/cros/master 6d970c3 BACKPORT: iio: tsl258x i2c device id changeremotes/m/master -> cros/chromeos-2.6.38I see that m/master now points to 2.6.38, but cros/master still points to 2.6.32.Traditionally I've always used cros/master as the "master" branch. Is my workflow wrong?
(Tried to file a bug about this but the issue tracker is throwing 500s
this morning.)
Started sys-kernel/chromeos-kernel-0.0.1-r227 (logged in
/tmp/chromeos-kernel-0.0.1-r227-rlJybh)
=== Start output for job chromeos-kernel-0.0.1-r227 (0m2.0s) ===
chromeos-kernel-0.0.1-r227: >>> Emerging (1 of 1)
sys-kernel/chromeos-kernel-0.0.1-r227 from chromiumos for
/build/x86-mario/
chromeos-kernel-0.0.1-r227: * Package: sys-kernel/chromeos-kernel-0.0.1-r227
chromeos-kernel-0.0.1-r227: * Repository: chromiumos
chromeos-kernel-0.0.1-r227: * USE: elibc_glibc kconfig_atom
kernel_linux userland_GNU x86
chromeos-kernel-0.0.1-r227: * FEATURES: sandbox splitdebug userpriv
chromeos-kernel-0.0.1-r227: >>> Unpacking source...
chromeos-kernel-0.0.1-r227: * GIT update -->
chromeos-kernel-0.0.1-r227: * repository:
http://git.chromium.org/chromiumos/third_party/kernel.git
chromeos-kernel-0.0.1-r227: From
http://git.chromium.org/chromiumos/third_party/kernel
chromeos-kernel-0.0.1-r227: * branch HEAD -> FETCH_HEAD
chromeos-kernel-0.0.1-r227: * at the commit:
f9d2bfdfe7b57383fdb2aff8ea2e4a1eea1d960a
chromeos-kernel-0.0.1-r227: * commit:
3df765d34afa74c18e58b45bf456c2f7b2b38f91
chromeos-kernel-0.0.1-r227: * branch: master
chromeos-kernel-0.0.1-r227: * storage directory:
"/var/lib/portage/distfiles-target/git-src/chromiumos/third_party/kernel"
chromeos-kernel-0.0.1-r227: Cloning into
/build/x86-mario/tmp/portage/sys-kernel/chromeos-kernel-0.0.1-r227/work/chromeos-kernel-0.0.1...
chromeos-kernel-0.0.1-r227: done.
chromeos-kernel-0.0.1-r227: fatal: reference is not a tree:
3df765d34afa74c18e58b45bf456c2f7b2b38f91
chromeos-kernel-0.0.1-r227: * ERROR:
sys-kernel/chromeos-kernel-0.0.1-r227 failed (unpack phase):
chromeos-kernel-0.0.1-r227: * git.eclass: Could not run git
checkout -b tree-3df765d34afa74c18e58b45bf456c2f7b2b38f91
3df765d34afa74c18e58b45bf456c2f7b2b38f91
chromeos-kernel-0.0.1-r227: *
chromeos-kernel-0.0.1-r227: * Call stack:
chromeos-kernel-0.0.1-r227: * ebuild.sh, line 56: Called src_unpack
chromeos-kernel-0.0.1-r227: * environment, line 3102: Called
cros-workon_src_unpack
chromeos-kernel-0.0.1-r227: * environment, line 779: Called git_src_unpack
chromeos-kernel-0.0.1-r227: * environment, line 2203: Called git_fetch
chromeos-kernel-0.0.1-r227: * environment, line 2189: Called git_branch
chromeos-kernel-0.0.1-r227: * environment, line 2047: Called die
chromeos-kernel-0.0.1-r227: * The specific snippet of code:
chromeos-kernel-0.0.1-r227: * git checkout -b ${branchname}
${src} || die "${EGIT}: Could not run git checkout -b ${branchname}
${src}";
chromeos-kernel-0.0.1-r227: *
chromeos-kernel-0.0.1-r227: * If you need support, post the output of
'emerge --info =sys-kernel/chromeos-kernel-0.0.1-r227',
chromeos-kernel-0.0.1-r227: * the complete build log and the output
of 'emerge -pqv =sys-kernel/chromeos-kernel-0.0.1-r227'.
chromeos-kernel-0.0.1-r227: * This ebuild used the following eclasses
from overlays:
chromeos-kernel-0.0.1-r227: *
/home/derat/trunk/src/third_party/chromiumos-overlay/eclass/binutils-funcs.eclass
chromeos-kernel-0.0.1-r227: *
/home/derat/trunk/src/third_party/chromiumos-overlay/eclass/cros-workon.eclass
chromeos-kernel-0.0.1-r227: *
/home/derat/trunk/src/third_party/chromiumos-overlay/eclass/git.eclass
chromeos-kernel-0.0.1-r227: * This ebuild is from an overlay named
'chromiumos': '/home/derat/trunk/src/third_party/chromiumos-overlay/'
chromeos-kernel-0.0.1-r227: * The complete build log is located at
'/build/x86-mario/tmp/portage/sys-kernel/chromeos-kernel-0.0.1-r227/temp/build.log'.
chromeos-kernel-0.0.1-r227: * The ebuild environment file is located
at '/build/x86-mario/tmp/portage/sys-kernel/chromeos-kernel-0.0.1-r227/temp/environment'.
chromeos-kernel-0.0.1-r227: * S:
'/build/x86-mario/tmp/portage/sys-kernel/chromeos-kernel-0.0.1-r227/work/chromeos-kernel-0.0.1'
chromeos-kernel-0.0.1-r227: >>> Failed to emerge
sys-kernel/chromeos-kernel-0.0.1-r227 for /build/x86-mario/, Log file:
chromeos-kernel-0.0.1-r227: >>>
'/build/x86-mario/tmp/portage/sys-kernel/chromeos-kernel-0.0.1-r227/temp/build.log'
chromeos-kernel-0.0.1-r227:
chromeos-kernel-0.0.1-r227: * Messages for package
sys-kernel/chromeos-kernel-0.0.1-r227 merged to /build/x86-mario/:
chromeos-kernel-0.0.1-r227:
chromeos-kernel-0.0.1-r227: * GIT update -->
chromeos-kernel-0.0.1-r227: * repository:
http://git.chromium.org/chromiumos/third_party/kernel.git
chromeos-kernel-0.0.1-r227: * at the commit:
f9d2bfdfe7b57383fdb2aff8ea2e4a1eea1d960a
chromeos-kernel-0.0.1-r227: * commit:
3df765d34afa74c18e58b45bf456c2f7b2b38f91
chromeos-kernel-0.0.1-r227: * branch: master
chromeos-kernel-0.0.1-r227: * storage directory:
"/var/lib/portage/distfiles-target/git-src/chromiumos/third_party/kernel"
chromeos-kernel-0.0.1-r227: * ERROR:
sys-kernel/chromeos-kernel-0.0.1-r227 failed (unpack phase):
chromeos-kernel-0.0.1-r227: * git.eclass: Could not run git
checkout -b tree-3df765d34afa74c18e58b45bf456c2f7b2b38f91
3df765d34afa74c18e58b45bf456c2f7b2b38f91
chromeos-kernel-0.0.1-r227: *
chromeos-kernel-0.0.1-r227: * Call stack:
chromeos-kernel-0.0.1-r227: * ebuild.sh, line 56: Called src_unpack
chromeos-kernel-0.0.1-r227: * environment, line 3102: Called
cros-workon_src_unpack
chromeos-kernel-0.0.1-r227: * environment, line 779: Called git_src_unpack
chromeos-kernel-0.0.1-r227: * environment, line 2203: Called git_fetch
chromeos-kernel-0.0.1-r227: * environment, line 2189: Called git_branch
chromeos-kernel-0.0.1-r227: * environment, line 2047: Called die
chromeos-kernel-0.0.1-r227: * The specific snippet of code:
chromeos-kernel-0.0.1-r227: * git checkout -b ${branchname}
${src} || die "${EGIT}: Could not run git checkout -b ${branchname}
${src}";
chromeos-kernel-0.0.1-r227: *
chromeos-kernel-0.0.1-r227: * If you need support, post the output of
'emerge --info =sys-kernel/chromeos-kernel-0.0.1-r227',
chromeos-kernel-0.0.1-r227: * the complete build log and the output
of 'emerge -pqv =sys-kernel/chromeos-kernel-0.0.1-r227'.
chromeos-kernel-0.0.1-r227: * This ebuild used the following eclasses
from overlays:
chromeos-kernel-0.0.1-r227: *
/home/derat/trunk/src/third_party/chromiumos-overlay/eclass/binutils-funcs.eclass
chromeos-kernel-0.0.1-r227: *
/home/derat/trunk/src/third_party/chromiumos-overlay/eclass/cros-workon.eclass
chromeos-kernel-0.0.1-r227: *
/home/derat/trunk/src/third_party/chromiumos-overlay/eclass/git.eclass
chromeos-kernel-0.0.1-r227: * This ebuild is from an overlay named
'chromiumos': '/home/derat/trunk/src/third_party/chromiumos-overlay/'
chromeos-kernel-0.0.1-r227: * The complete build log is located at
'/build/x86-mario/tmp/portage/sys-kernel/chromeos-kernel-0.0.1-r227/temp/build.log'.
chromeos-kernel-0.0.1-r227: * The ebuild environment file is located
at '/build/x86-mario/tmp/portage/sys-kernel/chromeos-kernel-0.0.1-r227/temp/environment'.
chromeos-kernel-0.0.1-r227: * S:
'/build/x86-mario/tmp/portage/sys-kernel/chromeos-kernel-0.0.1-r227/work/chromeos-kernel-0.0.1'