Merge pull request #49 from philips/cleanup-chromiumos-constants

Cleanup chromiumos constants

bin/cros_download_latest_image

@@ -1,95 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Downloads the latest buildbot image and prints the path to it.
-# This script only works if you have access to buildbot images.
-
-# --- BEGIN COMMON.SH BOILERPLATE ---
-# Load common CrOS utilities.  Inside the chroot this file is installed in
-# /usr/lib/crosutils.  Outside the chroot we find it relative to the script's
-# location.
-find_common_sh() {
-  local common_paths=("$(dirname "$(readlink -f "$0")")/.." /usr/lib/crosutils)
-  local path
-
-  SCRIPT_ROOT="${common_paths[0]}"
-  for path in "${common_paths[@]}"; do
-    if [ -r "${path}/common.sh" ]; then
-      SCRIPT_ROOT="${path}"
-      break
-    fi
-  done
-}
-
-find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || exit 1
-# --- END COMMON.SH BOILERPLATE ---
-
-DEFINE_string board "$DEFAULT_BOARD" \
-  "The name of the board to check for images."
-DEFINE_boolean incremental "$FLAGS_FALSE" "Download incremental build"
-DEFINE_boolean enable_rootfs_verification "${FLAGS_TRUE}" \
-  "Enable rootfs verification for the downloaded image."
-
-# Parse command line flags.
-FLAGS "$@" || exit 1
-eval set -- "$FLAGS_ARGV"
-
-# Check on the board that they are trying to set up.
-if [ -z "$FLAGS_board" ] ; then
-  die_notrace "Error: --board required."
-fi
-
-BUCKET="chromeos-image-archive"
-if [ $FLAGS_board = x86-generic ]; then
-  if [ "$FLAGS_incremental" -eq "$FLAGS_TRUE" ]; then
-    PATH_PREFIX="x86-generic-pre-flight-queue"
-  else
-    PATH_PREFIX="x86-generic-full"
-  fi
-else
-  PATH_PREFIX="${FLAGS_board}-release"
-fi
-
-URL_PREFIX="gs://$BUCKET/$PATH_PREFIX"
-LATEST_BUILD=$(gsutil cat $URL_PREFIX/LATEST)
-IMAGES_DIR="$DEFAULT_BUILD_ROOT/images/$FLAGS_board"
-LATEST_IMAGE_DIR="$IMAGES_DIR/$LATEST_BUILD"
-if [ ! -e $LATEST_IMAGE_DIR/chromiumos_base_image.bin ]; then
-  mkdir -p $LATEST_IMAGE_DIR
-  gsutil cp "$URL_PREFIX/$LATEST_BUILD/image.zip" \
-      "$LATEST_IMAGE_DIR/image.zip" || die "Could not download image.zip"
-  ( cd $LATEST_IMAGE_DIR && unzip -qo image.zip ) \
-      || die "Could not unzip image.zip"
-fi
-
-IMAGE_NAME=chromiumos_qemu_image.bin
-IMAGE_FILE="${LATEST_IMAGE_DIR}"/"${IMAGE_NAME}"
-ESP_DIR="${LATEST_IMAGE_DIR}/esp"
-
-cleanup() {
-  "$SCRIPTS_DIR/mount_gpt_image.sh" -u -e "${ESP_DIR}"
-}
-
-# This might seem a bit strange, but rootfs verification is already on with the
-# image, the only reason we've named this flag 'enable_rootfs_verfication'
-# versus 'disable_xyz' is to stay constant with the
-# 'noenable_rootfs_verification' flag used in build image to disable it.
-if [ "${FLAGS_enable_rootfs_verification}" -eq "${FLAGS_FALSE}" ] ; then
-  trap cleanup INT TERM EXIT
-  # We only need to touch the ESP part
-  "$SCRIPTS_DIR/mount_gpt_image.sh" -i chromiumos_qemu_image.bin \
-    -f "${LATEST_IMAGE_DIR}" -e "${ESP_DIR}"
-
-  # Change the default to boot from the usb instead of vusb, usb is set
-  # to boot from /dev/sda
-  sudo sed -i -e 's/vusb/usb/g' "${ESP_DIR}/syslinux/default.cfg"
-
-  sync; sync
-fi
-
-echo $LATEST_IMAGE_DIR
-exit 0

bin/cros_image_to_target.py

@@ -35,8 +35,8 @@ from dev import autoupdate_lib
 
 
 # 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
 UPDATE_FILENAME = 'update.gz'

bin/cros_make_image_bootable

@@ -79,8 +79,8 @@ DEFINE_string image_type "base" \
   "Type of image we're building for (base/factory_install)."
 DEFINE_string output_dir "/tmp" \
   "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" \
   "Architecture to make bootable for: arm, x86, or amd64"
 DEFINE_boolean cleanup_dirs ${FLAGS_TRUE} \

bin/cros_resign_image.sh

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

bin/cros_sign_to_ssd

@@ -1,92 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Script to resign the kernel partition generated in the output of build_image
-# with SSD keys.
-
-# --- BEGIN COMMON.SH BOILERPLATE ---
-# Load common CrOS utilities.  Inside the chroot this file is installed in
-# /usr/lib/crosutils.  Outside the chroot we find it relative to the script's
-# location.
-find_common_sh() {
-  local common_paths=("$(dirname "$(readlink -f "$0")")/.." /usr/lib/crosutils)
-  local path
-
-  SCRIPT_ROOT="${common_paths[0]}"
-  for path in "${common_paths[@]}"; do
-    if [ -r "${path}/common.sh" ]; then
-      SCRIPT_ROOT="${path}"
-      break
-    fi
-  done
-}
-
-find_common_sh
-. "${SCRIPT_ROOT}/common.sh" || exit 1
-# --- END COMMON.SH BOILERPLATE ---
-
-# Need to be inside the chroot to load chromeos-common.sh
-assert_inside_chroot
-
-# Load functions and constants for chromeos-install
-. /usr/lib/installer/chromeos-common.sh || exit 1
-
-locate_gpt
-
-DEFINE_string from "chromiumos_image.bin" \
-  "Input file name of Chrome OS image to re-sign."
-
-# Parse command line
-FLAGS "$@" || exit 1
-eval set -- "${FLAGS_ARGV}"
-
-failure() {
-  echo "SIGNING HAD FAILED"
-  exit 1
-}
-
-# Abort on error
-switch_to_strict_mode
-
-trap "failure" EXIT
-
-if [ -z "${FLAGS_from}" ] || [ ! -f "${FLAGS_from}" ] ; then
-  echo "Error: invalid flag --from"
-  exit 1
-fi
-
-# Example commandline is as follows:
-# ./sign_official_build.sh \
-# ssd \
-# /.../build/images/x86-mario/0.8.68.2/chromiumos_test_image.bin \
-# ../../tests/devkeys/ \
-# /.../build/images/x86-mario/0.8.68.2/chromiumos_test_ssd_image.bin
-
-VBOOT_DIR="${SRC_ROOT}/platform/vboot_reference"
-if [ ! -d "${VBOOT_DIR}" ]; then
-  die_notrace "VBOOT DIR NOT FOUND at \'${VBOOT_DIR}\' .."
-fi
-
-TMP_IMAGE=$(mktemp)
-VBOOT_KEYS="${VBOOT_DIR}/tests/devkeys"
-if [ ! -d "${VBOOT_KEYS}" ]; then
-  die_notrace "VBOOT KEYS NOT FOUND at \'${VBOOT_KEYS}\' .."
-fi
-
-VBOOT_SIGN="${VBOOT_DIR}/scripts/image_signing/sign_official_build.sh"
-if [ ! -x "${VBOOT_SIGN}" ]; then
-  die_notrace \
-      "VBOOT TOOL sign_official_build.sh NOT FOUND at \'${VBOOT_SIGN}\' .."
-fi
-
-cp "${FLAGS_from}" "${TMP_IMAGE}"
-
-${VBOOT_SIGN} ssd "${TMP_IMAGE}" "${VBOOT_KEYS}" "${FLAGS_from}"
-
-rm "${TMP_IMAGE}"
-
-set +e
-trap - EXIT

build_image

@@ -5,7 +5,7 @@
 # found in the LICENSE file.
 
 # 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
 # build the Chrome OS image using only pre-built binary packages.
 

build_library/disk_layout_util.sh

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

common.sh

@@ -399,11 +399,11 @@ DEFAULT_FAST=${FLAGS_TRUE}
 BUILD_DIR=
 
 # 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_TEST_IMAGE_NAME="chromiumos_test_image.bin"
+CHROMEOS_TEST_IMAGE_NAME="coreos_test_image.bin"
 
 COREOS_BASE_IMAGE_NAME=${CHROMEOS_BASE_IMAGE_NAME}
 COREOS_IMAGE_NAME=${CHROMEOS_IMAGE_NAME}

core_upload_update

@@ -32,7 +32,7 @@ Setting everything up for use\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
 
-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.
 "
 

lib/cros_vm_constants.sh

@@ -7,9 +7,9 @@
 # Default values for creating VM's.
 DEFAULT_MEM="1024"
 DEFAULT_VMDK="ide.vmdk"
-DEFAULT_VMX="chromiumos.vmx"
+DEFAULT_VMX="coreos.vmx"
 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.
 MIN_VDISK_SIZE_FULL=9216

mod_for_factory_scripts/100rebaseClient

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-die() {
-  echo "ERROR: $*"
-  exit 1
-}
-
-echo "Rebasing autotest/client folder for factory."
-base_dir="${ROOT_FS_DIR}/usr/local/autotest"
-
-[ -d "${base_dir}/client" ] || die "Missing client in root: ${base_dir}"
-rm -rf ${base_dir}/packages || die "Failed to wipe packages directory."
-mv "${base_dir}/client/"* "${base_dir}" || die "Failed moving client folder."
-rmdir "${base_dir}/client" || die "Failed removing client folder."
-ln -s . "${base_dir}/client" || die "Failed creating symlink."

mod_for_factory_scripts/300modifyDescription

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-echo "Modifying Release Description for Factory."
-FILE="${ROOT_FS_DIR}/etc/lsb-release"
-sed -i 's/Test/Factory/' "${FILE}"

mod_for_factory_scripts/400configAutotest

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-echo "Configure autotest setting."
-
-GLOBAL_CONFIG="${ROOT_FS_DIR}/usr/local/autotest/global_config.ini"
-
-if [ -f "${GLOBAL_CONFIG}" ]; then
-  echo -e "File ${GLOBAL_CONFIG} already exists."
-  exit 1
-fi
-
-cat >"${GLOBAL_CONFIG}" <<EOF
-[CLIENT]
-drop_caches: False
-drop_caches_between_iterations: False
-EOF

mod_for_factory_scripts/README.this_directory_is_obsolete

@@ -1,3 +0,0 @@
-Please do not add new files to this directory.  Instead, use:
-
-src/third_party/chromiumos-overlay/chromeos-base/factorytest-init/factorytest-init-9999.ebuild

mod_for_factory_scripts/factory_setup.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-echo "Modifying image for factory test..."
-set -e
-
-SCRIPT_BASE="${GCLIENT_ROOT}/src/scripts/mod_for_factory_scripts/"
-for SCRIPT in "${SCRIPT_BASE}"[0-9][0-9][0-9]*[!$~]
-do
-  echo "Apply $(basename "${SCRIPT}")..."
-  bash -e "${SCRIPT}"
-done

mount_gpt_image.sh

@@ -32,7 +32,7 @@ DEFINE_boolean unmount $FLAGS_FALSE \
   "Unmount previously mounted dir." u
 DEFINE_string from "/dev/sdc" \
   "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
 DEFINE_string "rootfs_mountpt" "/tmp/m" "Mount point for rootfs" "r"
 DEFINE_string "stateful_mountpt" "/tmp/s" \
@@ -56,7 +56,7 @@ fi
 # Check for conflicting args.
 # If --from is a block device, --image can't also be specified.
 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}"
   fi
 fi
@@ -64,7 +64,7 @@ fi
 # Allow --from /foo/file.bin
 if [ -f "${FLAGS_from}" ]; then
   # 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}"
   fi
   pathname=$(dirname "${FLAGS_from}")

sdk_lib/make_chroot.sh

@@ -237,7 +237,7 @@ init_setup () {
    # Add chromite/bin and depot_tools into the path globally; note that the
    # chromite wrapper itself might also be found in depot_tools.
    # 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}"
 PATH=${CHROOT_TRUNK_DIR}/chromite/bin:${DEPOT_TOOLS_DIR}
 CROS_WORKON_SRCROOT="${CHROOT_TRUNK_DIR}"
@@ -265,7 +265,7 @@ EOF
 
    target="${FLAGS_chroot}/etc/profile.d"
    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
 # __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

update_chroot

@@ -70,7 +70,7 @@ if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then
   fi
 
   # 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.
   EMERGE_FLAGS+=" --useoldpkg-atoms=sys-devel/binutils"
   EMERGE_FLAGS+=" --useoldpkg-atoms=sys-devel/gcc"