2 Commits

Author	SHA1	Message	Date
Zdenek Behan	63989c25ec	make_conf_util: initialize make.conf with the real number of CPUs ... BUG=none TEST=cros_sdk --bootstrap, check out make.conf.host_setup Change-Id: Icca34d4185869092f281de6b53929377c1410f5e Reviewed-on: https://gerrit.chromium.org/gerrit/17845 Reviewed-by: David James <davidjames@chromium.org> Commit-Ready: Zdenek Behan <zbehan@chromium.org> Tested-by: Zdenek Behan <zbehan@chromium.org>	2012-03-12 14:02:56 -07:00
J. Richard Barnette	e80f6de440	Include the Chrome OS private overlay in the chroot, if present. ... To build recovery images, the initramfs package needs fonts for various languages. The Japanese fonts to use depend on whether it's an internal (Chrome OS) or external (Chromium OS) build. Including the internal Japanese fonts requires additional settings in /etc/make.conf in the chroot. This change updates make_chroot and update_chroot to ensure that the necessary settings are present when appropriate. BUG=chromium-os:26757 TEST=confirm proper packages after chroot creation with private manifest TEST=confirm proper packages after chroot creation with public manifest TEST=confirm proper packages after chroot upgrade with private manifest TEST=confirm proper packages after chroot upgrade with public manifest CQ-DEPEND=I32c4561c47752d96d2769c5429c5e44fe630f8f9 Change-Id: I2b29b32bf4e6b891a2228dc7f93ae0bb3f85e37f Reviewed-on: https://gerrit.chromium.org/gerrit/17372 Tested-by: Richard Barnette <jrbarnette@chromium.org> Reviewed-by: David James <davidjames@chromium.org> Commit-Ready: Richard Barnette <jrbarnette@chromium.org>	2012-03-08 12:17:44 -08:00