1keyos · netboy88 · Oct 25, 2017 · Nov 14, 2017 · Feb 6, 2018 · Apr 6, 2018
diff --git a/bin/cros_au_test_harness b/bin/cros_au_test_harness
diff --git a/bin/cros_run_vm_test b/bin/cros_run_vm_test
diff --git a/bin/cros_run_vm_update b/bin/cros_run_vm_update
diff --git a/bin/cros_start_vm b/bin/cros_start_vm
diff --git a/bin/cros_stop_vm b/bin/cros_stop_vm
diff --git a/bin/cros_workon_make b/bin/cros_workon_make
diff --git a/bin/ctest b/bin/ctest
diff --git a/bin/proxy-gw b/bin/proxy-gw
diff --git a/build_docker_aci b/build_docker_aci
@@ -11,7 +11,7 @@ SCRIPT_ROOT=$(dirname $(readlink -f "$0"))
 . "${SCRIPT_ROOT}/common.sh" || exit 1
 
 # Script must run inside the chroot
-restart_in_chroot_if_needed "$@"
+assert_inside_chroot
 
 assert_not_root_user
 

diff --git a/build_image b/build_image
@@ -13,7 +13,7 @@ SCRIPT_ROOT=$(dirname $(readlink -f "$0"))
 . "${SCRIPT_ROOT}/common.sh" || exit 1
 
 # Script must run inside the chroot
-restart_in_chroot_if_needed "$@"
+assert_inside_chroot
 
 assert_not_root_user
 
@@ -31,7 +31,7 @@ DEFINE_boolean enable_rootfs_verification ${FLAGS_TRUE} \
 DEFINE_string base_pkg "coreos-base/coreos" \
   "The base portage package to base the build off of (only applies to prod images)"
 DEFINE_string base_dev_pkg "coreos-base/coreos-dev" \
-  "The base portage package to base the build off of (only applies to dev images)"
+  "The base portage package to base the build off of (only applies to dev containers)"
 DEFINE_string torcx_manifest "${DEFAULT_BUILD_ROOT}/torcx/${DEFAULT_BOARD}/latest/torcx_manifest.json" \
   "The torcx manifest describing torcx packages for this image (or blank for none)"
 DEFINE_string torcx_root "${DEFAULT_BUILD_ROOT}/torcx" \
@@ -57,12 +57,11 @@ This script is used to build a CoreOS image. CoreOS comes in many
 different forms.  This scripts can be used to build the following:
 
 prod - Production image for CoreOS. This image is for booting.
-dev - Developer image. Like base but with additional developer packages.
 container - Developer image with single filesystem, bootable by nspawn.
 
 Examples:
 
-build_image --board=<board> [dev] [prod] [container] - builds developer and production images.
+build_image --board=<board> [prod] [container] - builds developer and production images.
 ...
 "
 show_help_if_requested "$@"
@@ -107,18 +106,16 @@ fi
 . "${BUILD_LIBRARY_DIR}/board_options.sh" || exit 1
 . "${BUILD_LIBRARY_DIR}/build_image_util.sh" || exit 1
 . "${BUILD_LIBRARY_DIR}/prod_image_util.sh" || exit 1
-. "${BUILD_LIBRARY_DIR}/dev_image_util.sh" || exit 1
+. "${BUILD_LIBRARY_DIR}/dev_container_util.sh" || exit 1
 . "${BUILD_LIBRARY_DIR}/test_image_content.sh" || exit 1
 . "${BUILD_LIBRARY_DIR}/torcx_manifest.sh" || exit 1
 . "${BUILD_LIBRARY_DIR}/vm_image_util.sh" || exit 1
 
 PROD_IMAGE=0
-DEV_IMAGE=0
 CONTAINER=0
 for arg in "$@"; do
   case "${arg}" in
     prod) PROD_IMAGE=1 ;;
-    dev)  DEV_IMAGE=1 ;;
     container) CONTAINER=1 ;;
     *)    die_notrace "Unknown image type ${arg}" ;;
   esac
@@ -146,8 +143,6 @@ fi
 mkdir -p "${BUILD_DIR}"
 
 DISK_LAYOUT="${FLAGS_disk_layout:-base}"
-DEV_DISK_LAYOUT="${FLAGS_disk_layout:-devel}"
-
 CONTAINER_LAYOUT="${FLAGS_disk_layout:-container}"
 
 if [[ -n "${FLAGS_developer_data}" ]]; then
@@ -169,17 +164,9 @@ fi
 
 fix_mtab
 
-if [[ "${DEV_IMAGE}" -eq 1 ]]; then
-  IMAGE_BUILD_TYPE="dev"
-  create_dev_image ${COREOS_DEVELOPER_IMAGE_NAME} ${DEV_DISK_LAYOUT} ${FLAGS_group} ${FLAGS_base_dev_pkg}
-  if [[ ${FLAGS_extract_update} -eq ${FLAGS_TRUE} ]]; then
-    extract_update "${COREOS_DEVELOPER_IMAGE_NAME}" "${DEV_DISK_LAYOUT}"
-  fi
-fi
-
 if [[ "${CONTAINER}" -eq 1 ]]; then
   IMAGE_BUILD_TYPE="container"
-  create_dev_image "${COREOS_DEVELOPER_CONTAINER_NAME}" "${CONTAINER_LAYOUT}" "${FLAGS_group}" ${FLAGS_base_dev_pkg}
+  create_dev_container "${COREOS_DEVELOPER_CONTAINER_NAME}" "${CONTAINER_LAYOUT}" "${FLAGS_group}" ${FLAGS_base_dev_pkg}
 fi
 
 if [[ "${PROD_IMAGE}" -eq 1 ]]; then
@@ -236,10 +223,6 @@ if [[ "${PROD_IMAGE}" -eq 1 ]]; then
   echo "CoreOS Production image created as ${COREOS_PRODUCTION_IMAGE_NAME}"
   print_image_to_vm
 fi
-if [[ "${DEV_IMAGE}" -eq 1 ]]; then
-  echo "Developer image created as ${COREOS_DEVELOPER_IMAGE_NAME}"
-  print_image_to_vm dev
-fi
 
 command_completed
 

diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh
@@ -103,8 +103,6 @@ generate_update() {
 run_ldconfig() {
   local root_fs_dir=$1
   case ${ARCH} in
-  arm64)
-    sudo qemu-aarch64 "${root_fs_dir}"/usr/sbin/ldconfig -r "${root_fs_dir}";;
   x86|amd64)
     sudo ldconfig -r "${root_fs_dir}";;
   *)
@@ -115,8 +113,6 @@ run_ldconfig() {
 run_localedef() {
   local root_fs_dir="$1" loader=()
   case ${ARCH} in
-  arm64)
-    loader=( qemu-aarch64 -L "${root_fs_dir}" );;
   amd64)
     loader=( "${root_fs_dir}/usr/lib64/ld-linux-x86-64.so.2" \
                --library-path "${root_fs_dir}/usr/lib64" );;
@@ -460,7 +456,6 @@ finish_image() {
   # Only enable rootfs verification on supported boards.
   case "${FLAGS_board}" in
     amd64-usr) verity_offset=64 ;;
-    arm64-usr) verity_offset=512 ;;
     *) disable_read_write=${FLAGS_FALSE} ;;
   esac
 
@@ -532,7 +527,6 @@ EOF
     # Magic alert!  Root hash injection works by writing the hash value to a
     # known unused SHA256-sized location in the kernel image.
     # For amd64 the rdev error message is used.
-    # For arm64 an area between the EFI headers and the kernel text is used.
     # Our modified GRUB extracts the hash and adds it to the cmdline.
     printf %s "$(cat ${BUILD_DIR}/${image_name%.bin}_verity.txt)" | \
         sudo dd of="${root_fs_dir}/boot/coreos/vmlinuz-a" conv=notrunc \
@@ -570,9 +564,6 @@ EOF
   if [[ "${install_grub}" -eq 1 ]]; then
     local target
     local target_list="i386-pc x86_64-efi x86_64-xen"
-    if [[ ${BOARD} == "arm64-usr" ]]; then
-      target_list="arm64-efi"
-    fi
     local grub_args=()
     if [[ ${disable_read_write} -eq ${FLAGS_TRUE} ]]; then
       grub_args+=(--verity)

diff --git a/build_library/catalyst.sh b/build_library/catalyst.sh
@@ -59,7 +59,7 @@ contents="auto"
 digests="md5 sha1 sha512 whirlpool"
 hash_function="crc32"
 options="pkgcache"
-sharedir="/usr/lib/catalyst"
+sharedir="/usr/share/catalyst"
 storedir="$CATALYST_ROOT"
 distdir="$DISTDIR"
 envscript="$TEMPDIR/catalystrc"

diff --git a/build_library/catalyst_default_stage4.sh b/build_library/catalyst_default_stage4.sh
@@ -4,3 +4,6 @@ source /tmp/chroot-functions.sh
 
 echo "Double checking everything is fresh and happy."
 run_merge -uDN --with-bdeps=y world
+
+echo "Setting the default Python interpreter to Python 2."
+eselect python set python2.7
diff --git a/build_library/catalyst_toolchains.sh b/build_library/catalyst_toolchains.sh
@@ -19,17 +19,22 @@ configure_target_root() {
     CBUILD="$(portageq envvar CBUILD)" \
         CHOST="${cross_chost}" \
         ROOT="/build/${board}" \
-        SYSROOT="/usr/${cross_chost}" \
+        SYSROOT="/build/${board}" \
         _configure_sysroot "${profile}"
 }
 
 build_target_toolchain() {
     local board="$1"
     local ROOT="/build/${board}"
+    local SYSROOT="/usr/$(get_board_chost "${board}")"
+
+    mkdir -p "${ROOT}/usr"
+    cp -at "${ROOT}" "${SYSROOT}"/lib*
+    cp -at "${ROOT}"/usr "${SYSROOT}"/usr/include "${SYSROOT}"/usr/lib*
 
     # --root is required because run_merge overrides ROOT=
     PORTAGE_CONFIGROOT="$ROOT" \
-        run_merge -u --root="$ROOT" "${TOOLCHAIN_PKGS[@]}"
+        run_merge -u --root="$ROOT" --sysroot="$ROOT" "${TOOLCHAIN_PKGS[@]}"
 }
 
 configure_crossdev_overlay / /tmp/crossdev

diff --git a/build_library/check_root b/build_library/check_root
@@ -29,32 +29,11 @@ IGNORE_MISSING = {
                                  SonameAtom("x86_64", "libc.so.6")],
 
     # RPATHs and symlinks apparently confuse the perl-5.24 package
-    "dev-lang/perl":            [SonameAtom("arm_64", "libperl.so.5.24.1"),
-                                 SonameAtom("x86_64", "libperl.so.5.24.1")],
+    "dev-lang/perl":            [SonameAtom("x86_64", "libperl.so.5.26.2")],
+    "sys-apps/texinfo":         [SonameAtom("x86_64", "libperl.so.5.26")],
 
     # https://bugs.gentoo.org/show_bug.cgi?id=554582
-    "net-firewall/ebtables":    [SonameAtom("arm_64", "libebt_802_3.so"),
-                                 SonameAtom("arm_64", "libebt_among.so"),
-                                 SonameAtom("arm_64", "libebt_arp.so"),
-                                 SonameAtom("arm_64", "libebt_arpreply.so"),
-                                 SonameAtom("arm_64", "libebt_ip.so"),
-                                 SonameAtom("arm_64", "libebt_ip6.so"),
-                                 SonameAtom("arm_64", "libebt_limit.so"),
-                                 SonameAtom("arm_64", "libebt_log.so"),
-                                 SonameAtom("arm_64", "libebt_mark.so"),
-                                 SonameAtom("arm_64", "libebt_mark_m.so"),
-                                 SonameAtom("arm_64", "libebt_nat.so"),
-                                 SonameAtom("arm_64", "libebt_nflog.so"),
-                                 SonameAtom("arm_64", "libebt_pkttype.so"),
-                                 SonameAtom("arm_64", "libebt_redirect.so"),
-                                 SonameAtom("arm_64", "libebt_standard.so"),
-                                 SonameAtom("arm_64", "libebt_stp.so"),
-                                 SonameAtom("arm_64", "libebt_ulog.so"),
-                                 SonameAtom("arm_64", "libebt_vlan.so"),
-                                 SonameAtom("arm_64", "libebtable_broute.so"),
-                                 SonameAtom("arm_64", "libebtable_filter.so"),
-                                 SonameAtom("arm_64", "libebtable_nat.so"),
-                                 SonameAtom("x86_64", "libebt_802_3.so"),
+    "net-firewall/ebtables":    [SonameAtom("x86_64", "libebt_802_3.so"),
                                  SonameAtom("x86_64", "libebt_among.so"),
                                  SonameAtom("x86_64", "libebt_arp.so"),
                                  SonameAtom("x86_64", "libebt_arpreply.so"),
@@ -77,14 +56,7 @@ IGNORE_MISSING = {
                                  SonameAtom("x86_64", "libebtable_nat.so")],
 
     # Ignore the Rust libraries in their own libdir.
-    "dev-libs/rustlib":         [SonameAtom("arm_64", "librustc_data_structures.so"),
-                                 SonameAtom("arm_64", "librustc_errors.so"),
-                                 SonameAtom("arm_64", "libserialize.so"),
-                                 SonameAtom("arm_64", "libstd.so"),
-                                 SonameAtom("arm_64", "libsyntax.so"),
-                                 SonameAtom("arm_64", "libsyntax_pos.so"),
-                                 SonameAtom("arm_64", "libterm.so"),
-                                 SonameAtom("x86_64", "librustc_data_structures.so"),
+    "dev-libs/rustlib":         [SonameAtom("x86_64", "librustc_data_structures.so"),
                                  SonameAtom("x86_64", "librustc_errors.so"),
                                  SonameAtom("x86_64", "libserialize.so"),
                                  SonameAtom("x86_64", "libstd.so"),