chore(*): use coreos_ everywhere

This commit is contained in:
Brandon Philips 2013-07-21 23:20:50 -07:00
parent 80b72e9318
commit 95b2a4b8cd
11 changed files with 20 additions and 20 deletions

View File

@ -35,8 +35,8 @@ from dev import autoupdate_lib
# This is the default filename within the image directory to load updates from # This is the default filename within the image directory to load updates from
DEFAULT_IMAGE_NAME = 'chromiumos_image.bin' DEFAULT_IMAGE_NAME = 'coreos_image.bin'
DEFAULT_IMAGE_NAME_TEST = 'chromiumos_test_image.bin' DEFAULT_IMAGE_NAME_TEST = 'coreos_test_image.bin'
# The filenames we provide to clients to pull updates # The filenames we provide to clients to pull updates
UPDATE_FILENAME = 'update.gz' UPDATE_FILENAME = 'update.gz'

View File

@ -79,8 +79,8 @@ DEFINE_string image_type "base" \
"Type of image we're building for (base/factory_install)." "Type of image we're building for (base/factory_install)."
DEFINE_string output_dir "/tmp" \ DEFINE_string output_dir "/tmp" \
"Directory to place output in." "Directory to place output in."
DEFINE_string image "chromiumos_base.img" \ DEFINE_string image "coreos_base.img" \
"Full path to the chromiumos image to make bootable." "Full path to the coreos image to make bootable."
DEFINE_string arch "x86" \ DEFINE_string arch "x86" \
"Architecture to make bootable for: arm, x86, or amd64" "Architecture to make bootable for: arm, x86, or amd64"
DEFINE_boolean cleanup_dirs ${FLAGS_TRUE} \ DEFINE_boolean cleanup_dirs ${FLAGS_TRUE} \

View File

@ -36,7 +36,7 @@ assert_inside_chroot
locate_gpt locate_gpt
DEFINE_string from "chromiumos_image.bin" \ DEFINE_string from "coreos_image.bin" \
"Input file name of Chrome OS image to re-sign." "Input file name of Chrome OS image to re-sign."
DEFINE_string datakey "" \ DEFINE_string datakey "" \
"Private Kernel Data Key (.vbprivk) to use for re-signing." "Private Kernel Data Key (.vbprivk) to use for re-signing."

View File

@ -5,7 +5,7 @@
# found in the LICENSE file. # found in the LICENSE file.
# Script to build a bootable keyfob-based chromeos system image from within # Script to build a bootable keyfob-based chromeos system image from within
# a chromiumos setup. This assumes that all needed packages have been built into # a coreos setup. This assumes that all needed packages have been built into
# the given target's root with binary packages turned on. This script will # the given target's root with binary packages turned on. This script will
# build the Chrome OS image using only pre-built binary packages. # build the Chrome OS image using only pre-built binary packages.

View File

@ -153,7 +153,7 @@ emit_gpt_scripts() {
TARGET=\${1:-} TARGET=\${1:-}
if [[ -z \${TARGET} ]]; then if [[ -z \${TARGET} ]]; then
echo "Usage: \$0 <image>" 1>&2 echo "Usage: \$0 <image>" 1>&2
echo "Example: \$0 chromiumos_image.bin" 1>&2 echo "Example: \$0 coreos_image.bin" 1>&2
exit 1 exit 1
fi fi
set -x set -x

View File

@ -399,11 +399,11 @@ DEFAULT_FAST=${FLAGS_TRUE}
BUILD_DIR= BUILD_DIR=
# Standard filenames # Standard filenames
CHROMEOS_BASE_IMAGE_NAME="chromiumos_base_image.bin" CHROMEOS_BASE_IMAGE_NAME="coreos_base_image.bin"
CHROMEOS_IMAGE_NAME="chromiumos_image.bin" CHROMEOS_IMAGE_NAME="coreos_image.bin"
CHROMEOS_DEVELOPER_IMAGE_NAME="chromiumos_image.bin" CHROMEOS_DEVELOPER_IMAGE_NAME="coreos_image.bin"
CHROMEOS_RECOVERY_IMAGE_NAME="recovery_image.bin" CHROMEOS_RECOVERY_IMAGE_NAME="recovery_image.bin"
CHROMEOS_TEST_IMAGE_NAME="chromiumos_test_image.bin" CHROMEOS_TEST_IMAGE_NAME="coreos_test_image.bin"
COREOS_BASE_IMAGE_NAME=${CHROMEOS_BASE_IMAGE_NAME} COREOS_BASE_IMAGE_NAME=${CHROMEOS_BASE_IMAGE_NAME}
COREOS_IMAGE_NAME=${CHROMEOS_IMAGE_NAME} COREOS_IMAGE_NAME=${CHROMEOS_IMAGE_NAME}

View File

@ -32,7 +32,7 @@ Setting everything up for use\n
1) Run 'gsutil config' and use project id coreos.com:core-update-storage\n 1) Run 'gsutil config' and use project id coreos.com:core-update-storage\n
2) Ensure core-admin is installed, it is a recent addition\n 2) Ensure core-admin is installed, it is a recent addition\n
NOTE: Use the chromiumos_image.bin not a qemu/xen/etc image for generating the NOTE: Use the coreos_image.bin not a qemu/xen/etc image for generating the
update. update.
" "

View File

@ -7,9 +7,9 @@
# Default values for creating VM's. # Default values for creating VM's.
DEFAULT_MEM="1024" DEFAULT_MEM="1024"
DEFAULT_VMDK="ide.vmdk" DEFAULT_VMDK="ide.vmdk"
DEFAULT_VMX="chromiumos.vmx" DEFAULT_VMX="coreos.vmx"
DEFAULT_VBOX_DISK="os.vdi" DEFAULT_VBOX_DISK="os.vdi"
DEFAULT_QEMU_IMAGE="chromiumos_qemu_image.bin" DEFAULT_QEMU_IMAGE="coreos_qemu_image.bin"
# Minimum sizes for full size vm images -- needed for update. # Minimum sizes for full size vm images -- needed for update.
MIN_VDISK_SIZE_FULL=9216 MIN_VDISK_SIZE_FULL=9216

View File

@ -32,7 +32,7 @@ DEFINE_boolean unmount $FLAGS_FALSE \
"Unmount previously mounted dir." u "Unmount previously mounted dir." u
DEFINE_string from "/dev/sdc" \ DEFINE_string from "/dev/sdc" \
"Directory, image, or device with image on it" f "Directory, image, or device with image on it" f
DEFINE_string image "chromiumos_image.bin"\ DEFINE_string image "coreos_image.bin"\
"Name of the bin file if a directory is specified in the from flag" i "Name of the bin file if a directory is specified in the from flag" i
DEFINE_string "rootfs_mountpt" "/tmp/m" "Mount point for rootfs" "r" DEFINE_string "rootfs_mountpt" "/tmp/m" "Mount point for rootfs" "r"
DEFINE_string "stateful_mountpt" "/tmp/s" \ DEFINE_string "stateful_mountpt" "/tmp/s" \
@ -56,7 +56,7 @@ fi
# Check for conflicting args. # Check for conflicting args.
# If --from is a block device, --image can't also be specified. # If --from is a block device, --image can't also be specified.
if [ -b "${FLAGS_from}" ]; then if [ -b "${FLAGS_from}" ]; then
if [ "${FLAGS_image}" != "chromiumos_image.bin" ]; then if [ "${FLAGS_image}" != "coreos_image.bin" ]; then
die_notrace "-i ${FLAGS_image} can't be used with block device ${FLAGS_from}" die_notrace "-i ${FLAGS_image} can't be used with block device ${FLAGS_from}"
fi fi
fi fi
@ -64,7 +64,7 @@ fi
# Allow --from /foo/file.bin # Allow --from /foo/file.bin
if [ -f "${FLAGS_from}" ]; then if [ -f "${FLAGS_from}" ]; then
# If --from is specified as a file, --image cannot be also specified. # If --from is specified as a file, --image cannot be also specified.
if [ "${FLAGS_image}" != "chromiumos_image.bin" ]; then if [ "${FLAGS_image}" != "coreos_image.bin" ]; then
die_notrace "-i ${FLAGS_image} can't be used with --from file ${FLAGS_from}" die_notrace "-i ${FLAGS_image} can't be used with --from file ${FLAGS_from}"
fi fi
pathname=$(dirname "${FLAGS_from}") pathname=$(dirname "${FLAGS_from}")

View File

@ -237,7 +237,7 @@ init_setup () {
# Add chromite/bin and depot_tools into the path globally; note that the # Add chromite/bin and depot_tools into the path globally; note that the
# chromite wrapper itself might also be found in depot_tools. # chromite wrapper itself might also be found in depot_tools.
# We rely on 'env-update' getting called below. # We rely on 'env-update' getting called below.
target="${FLAGS_chroot}/etc/env.d/99chromiumos" target="${FLAGS_chroot}/etc/env.d/99coreos"
cat <<EOF > "${target}" cat <<EOF > "${target}"
PATH=${CHROOT_TRUNK_DIR}/chromite/bin:${DEPOT_TOOLS_DIR} PATH=${CHROOT_TRUNK_DIR}/chromite/bin:${DEPOT_TOOLS_DIR}
CROS_WORKON_SRCROOT="${CHROOT_TRUNK_DIR}" CROS_WORKON_SRCROOT="${CHROOT_TRUNK_DIR}"
@ -265,7 +265,7 @@ EOF
target="${FLAGS_chroot}/etc/profile.d" target="${FLAGS_chroot}/etc/profile.d"
mkdir -p "${target}" mkdir -p "${target}"
cat << EOF > "${target}/chromiumos-niceties.sh" cat << EOF > "${target}/coreos-niceties.sh"
# Niceties for interactive logins. (cr) denotes this is a chroot, the # Niceties for interactive logins. (cr) denotes this is a chroot, the
# __git_branch_ps1 prints current git branch in ./ . The $r behavior is to # __git_branch_ps1 prints current git branch in ./ . The $r behavior is to
# make sure we don't reset the previous $? value which later formats in # make sure we don't reset the previous $? value which later formats in

View File

@ -70,7 +70,7 @@ if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then
fi fi
# Only update toolchain when binpkgs are available. Toolchain rollout # Only update toolchain when binpkgs are available. Toolchain rollout
# process only takes place when the chromiumos sdk builder finishes # process only takes place when the coreos sdk builder finishes
# a successful build. # a successful build.
EMERGE_FLAGS+=" --useoldpkg-atoms=sys-devel/binutils" EMERGE_FLAGS+=" --useoldpkg-atoms=sys-devel/binutils"
EMERGE_FLAGS+=" --useoldpkg-atoms=sys-devel/gcc" EMERGE_FLAGS+=" --useoldpkg-atoms=sys-devel/gcc"