2317.0.1

Author: Flatcar Buildbot

bootstrap_sdk

@@ -33,7 +33,7 @@
 SCRIPT_ROOT=$(dirname $(readlink -f "$0"))
 . "${SCRIPT_ROOT}/common.sh" || exit 1
 
-TYPE="coreos-sdk"
+TYPE="flatcar-sdk"
 
 . "${BUILD_LIBRARY_DIR}/catalyst.sh" || exit 1
 
@@ -63,7 +63,7 @@ catalyst_init "$@"
 check_gsutil_opts
 
 if [[ "$STAGES" =~ stage4 ]]; then
-    info "Setting release to ${COREOS_VERSION}"
+    info "Setting release to ${FLATCAR_VERSION}"
     rm -rf "${TEMPDIR}/stage4_overlay"
     # need to setup the lib->lib64 symlink correctly
     libdir=$(get_sdk_libdir)

build_docker_aci

@@ -94,7 +94,7 @@ case "${version}" in
             "/usr/bin/docker-containerd-shim"
             "/usr/bin/docker-proxy"
             "/usr/bin/docker-runc"
-            "/usr/lib/coreos/dockerd"
+            "/usr/lib/flatcar/dockerd"
         )
         ebuild_aci_create "users.developer.core-os.net/skim/docker" \
             "coreos_docker-${BOARD}-${version}_coreos.${aci_version}" \

build_image

@@ -166,16 +166,16 @@ fix_mtab
 
 if [[ "${CONTAINER}" -eq 1 ]]; then
   IMAGE_BUILD_TYPE="container"
-  create_dev_container "${COREOS_DEVELOPER_CONTAINER_NAME}" "${CONTAINER_LAYOUT}" "${FLAGS_group}" ${FLAGS_base_dev_pkg}
+  create_dev_container "${FLATCAR_DEVELOPER_CONTAINER_NAME}" "${CONTAINER_LAYOUT}" "${FLAGS_group}" ${FLAGS_base_dev_pkg}
 fi
 
 if [[ "${PROD_IMAGE}" -eq 1 ]]; then
   IMAGE_BUILD_TYPE="prod"
-  create_prod_image ${COREOS_PRODUCTION_IMAGE_NAME} ${DISK_LAYOUT} ${FLAGS_group} ${FLAGS_base_pkg}
+  create_prod_image ${FLATCAR_PRODUCTION_IMAGE_NAME} ${DISK_LAYOUT} ${FLAGS_group} ${FLAGS_base_pkg}
   if [[ ${FLAGS_generate_update} -eq ${FLAGS_TRUE} ]]; then
-    generate_update "${COREOS_PRODUCTION_IMAGE_NAME}" ${DISK_LAYOUT}
+    generate_update "${FLATCAR_PRODUCTION_IMAGE_NAME}" ${DISK_LAYOUT}
   elif [[ ${FLAGS_extract_update} -eq ${FLAGS_TRUE} ]]; then
-    extract_update "${COREOS_PRODUCTION_IMAGE_NAME}" "${DISK_LAYOUT}"
+    extract_update "${FLATCAR_PRODUCTION_IMAGE_NAME}" "${DISK_LAYOUT}"
   fi
 fi
 
@@ -186,15 +186,15 @@ then
 fi
 
 # Write out a version.txt file, this will be used by image_to_vm.sh
-split_ver "${COREOS_VERSION_ID}" SPLIT
+split_ver "${FLATCAR_VERSION_ID}" SPLIT
 tee "${BUILD_DIR}/version.txt" <<EOF
-COREOS_BUILD=${SPLIT[0]}
-COREOS_BRANCH=${SPLIT[1]}
-COREOS_PATCH=${SPLIT[2]}
-COREOS_VERSION=${COREOS_VERSION}
-COREOS_VERSION_ID=${COREOS_VERSION_ID}
-COREOS_BUILD_ID="${COREOS_BUILD_ID}"
-COREOS_SDK_VERSION=${COREOS_SDK_VERSION}
+FLATCAR_BUILD=${SPLIT[0]}
+FLATCAR_BRANCH=${SPLIT[1]}
+FLATCAR_PATCH=${SPLIT[2]}
+FLATCAR_VERSION=${FLATCAR_VERSION}
+FLATCAR_VERSION_ID=${FLATCAR_VERSION_ID}
+FLATCAR_BUILD_ID="${FLATCAR_BUILD_ID}"
+FLATCAR_SDK_VERSION=${FLATCAR_SDK_VERSION}
 EOF
 
 upload_image "${BUILD_DIR}/version.txt"
@@ -220,7 +220,7 @@ EOF
 
 # Print out the images we generated.
 if [[ "${PROD_IMAGE}" -eq 1 ]]; then
-  echo "CoreOS Production image created as ${COREOS_PRODUCTION_IMAGE_NAME}"
+  echo "Flatcar Production image created as ${FLATCAR_PRODUCTION_IMAGE_NAME}"
   print_image_to_vm
 fi
 

build_library/build_image_util.sh

@@ -12,7 +12,7 @@
 # Use canonical path since some tools (e.g. mount) do not like symlinks.
 # Append build attempt to output directory.
 if [ -z "${FLAGS_version}" ]; then
-  IMAGE_SUBDIR="${FLAGS_group}-${COREOS_VERSION}-a${FLAGS_build_attempt}"
+  IMAGE_SUBDIR="${FLAGS_group}-${FLATCAR_VERSION}-a${FLAGS_build_attempt}"
 else
   IMAGE_SUBDIR="${FLAGS_group}-${FLAGS_version}"
 fi
@@ -66,7 +66,7 @@ extract_update() {
 
 zip_update_tools() {
   # There isn't a 'dev' variant of this zip, so always call it production.
-  local update_zip="coreos_production_update.zip"
+  local update_zip="flatcar_production_update.zip"
 
   info "Generating update tools zip"
   # Make sure some vars this script needs are exported
@@ -460,9 +460,9 @@ finish_image() {
   esac
 
   # Copy kernel to support dm-verity boots
-  sudo mkdir -p "${root_fs_dir}/boot/coreos"
+  sudo mkdir -p "${root_fs_dir}/boot/flatcar"
   sudo cp "${root_fs_dir}/usr/boot/vmlinuz" \
-       "${root_fs_dir}/boot/coreos/vmlinuz-a"
+       "${root_fs_dir}/boot/flatcar/vmlinuz-a"
 
   # Record directories installed to the state partition.
   # Explicitly ignore entries covered by existing configs.
@@ -483,14 +483,14 @@ finish_image() {
 
     # Create first-boot flag for grub and Ignition
     info "Writing first-boot flag"
-    sudo_clobber "${root_fs_dir}/boot/coreos/first_boot" <<EOF
+    sudo_clobber "${root_fs_dir}/boot/flatcar/first_boot" <<EOF
 If this file exists, Ignition will run and then delete the file.
 EOF
   fi
 
   if [[ -n "${FLAGS_developer_data}" ]]; then
-    local data_path="/usr/share/coreos/developer_data"
-    local unit_path="usr-share-coreos-developer_data"
+    local data_path="/usr/share/flatcar/developer_data"
+    local unit_path="usr-share-flatcar-developer_data"
     sudo cp "${FLAGS_developer_data}" "${root_fs_dir}/${data_path}"
     systemd_enable "${root_fs_dir}" system-config.target \
         "[email protected]" "system-cloudinit@${unit_path}.service"
@@ -529,30 +529,30 @@ EOF
     # For amd64 the rdev error message 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 \
+        sudo dd of="${root_fs_dir}/boot/flatcar/vmlinuz-a" conv=notrunc \
         seek=${verity_offset} count=64 bs=1 status=none
   fi
 
   # Sign the kernel after /usr is in a consistent state and verity is calculated
   if [[ ${COREOS_OFFICIAL:-0} -ne 1 ]]; then
       sudo sbsign --key /usr/share/sb_keys/DB.key \
 	   --cert /usr/share/sb_keys/DB.crt \
-	   "${root_fs_dir}/boot/coreos/vmlinuz-a"
-      sudo mv "${root_fs_dir}/boot/coreos/vmlinuz-a.signed" \
-	   "${root_fs_dir}/boot/coreos/vmlinuz-a"
+	   "${root_fs_dir}/boot/flatcar/vmlinuz-a"
+      sudo mv "${root_fs_dir}/boot/flatcar/vmlinuz-a.signed" \
+	   "${root_fs_dir}/boot/flatcar/vmlinuz-a"
   fi
 
   if [[ -n "${image_kernel}" ]]; then
     # copying kernel from vfat so ignore the permissions
     cp --no-preserve=mode \
-        "${root_fs_dir}/boot/coreos/vmlinuz-a" \
+        "${root_fs_dir}/boot/flatcar/vmlinuz-a" \
         "${BUILD_DIR}/${image_kernel}"
   fi
 
   if [[ -n "${pcr_policy}" ]]; then
     mkdir -p "${BUILD_DIR}/pcrs"
     ${BUILD_LIBRARY_DIR}/generate_kernel_hash.sh \
-        "${root_fs_dir}/boot/coreos/vmlinuz-a" ${COREOS_VERSION} \
+        "${root_fs_dir}/boot/flatcar/vmlinuz-a" ${FLATCAR_VERSION} \
         >"${BUILD_DIR}/pcrs/kernel.config"
   fi
 
@@ -587,7 +587,7 @@ EOF
 
   if [[ -n "${pcr_policy}" ]]; then
     ${BUILD_LIBRARY_DIR}/generate_grub_hashes.py \
-        "${disk_img}" /usr/lib/grub/ "${BUILD_DIR}/pcrs" ${COREOS_VERSION}
+        "${disk_img}" /usr/lib/grub/ "${BUILD_DIR}/pcrs" ${FLATCAR_VERSION}
 
     info "Generating $pcr_policy"
     pushd "${BUILD_DIR}" >/dev/null

build_library/catalyst.sh

@@ -12,7 +12,7 @@
 : ${TYPE:="coreos-sdk"}
 : ${ARCH:=$(get_sdk_arch)}
 : ${DEFAULT_CATALYST_ROOT:="${DEFAULT_BUILD_ROOT}/catalyst"}
-: ${DEFAULT_SEED:=${COREOS_SDK_TARBALL_PATH}}
+: ${DEFAULT_SEED:=${FLATCAR_SDK_TARBALL_PATH}}
 : ${DEFAULT_PROFILE:=$(get_sdk_profile)}
 # Set to something like "stage4" to restrict what to build
 # FORCE_STAGES=
@@ -34,7 +34,7 @@ DEFINE_string coreos_overlay "${SRC_ROOT}/third_party/coreos-overlay" \
     "Path to the coreos-overlay git checkout."
 DEFINE_string seed_tarball "${DEFAULT_SEED}" \
     "Path to an existing stage tarball to start from."
-DEFINE_string version "${COREOS_VERSION}" \
+DEFINE_string version "${FLATCAR_VERSION}" \
     "Version to use for portage snapshot and stage tarballs."
 DEFINE_string profile "${DEFAULT_PROFILE}" \
     "Portage profile, may be prefixed with repo:"
@@ -196,7 +196,7 @@ catalyst_init() {
     DISTDIR="$CATALYST_ROOT/distfiles"
 
     # automatically download the current SDK if it is the seed tarball.
-    if [[ "$FLAGS_seed_tarball" == "${COREOS_SDK_TARBALL_PATH}" ]]; then
+    if [[ "$FLAGS_seed_tarball" == "${FLATCAR_SDK_TARBALL_PATH}" ]]; then
         sdk_download_tarball
     fi
 

build_library/check_root

@@ -88,7 +88,9 @@ IGNORE_SYMLINK = (
     b"/etc/motd",
 
     # Other
-    b"/etc/lsb-release"  # set later in the build process
+    b"/etc/lsb-release",  # set later in the build process
+    b"/usr/share/coreos", # set later in the build process
+    b"/etc/coreos"        # set later in the build process
 )
 
 

build_library/configure_bootloaders.sh

@@ -45,11 +45,11 @@ configure_pvgrub() {
   sudo_clobber "${GRUB_DIR}/menu.lst.A" <<EOF
 timeout         0
 
-title           CoreOS A Root
+title           Flatcar A Root
 root            (hd0,0)
 kernel          /syslinux/vmlinuz.A ${grub_args} ${slot_a_args}
 
-title           CoreOS B Root
+title           Flatcar B Root
 root            (hd0,0)
 kernel          /syslinux/vmlinuz.B ${grub_args} ${slot_b_args}
 EOF

build_library/dev_container_util.sh

@@ -15,7 +15,7 @@ configure_dev_portage() {
 
     sudo mkdir -p "$1/etc/portage/repos.conf"
     sudo_clobber "$1/etc/portage/make.conf" <<EOF
-# make.conf for CoreOS dev images
+# make.conf for Flatcar dev images
 ARCH=$(get_board_arch $BOARD)
 CHOST=$(get_board_chost $BOARD)
 
@@ -25,8 +25,8 @@ PKGDIR="/var/lib/portage/pkgs"
 PORT_LOGDIR="/var/log/portage"
 PORTDIR="/var/lib/portage/portage-stable"
 PORTDIR_OVERLAY="/var/lib/portage/coreos-overlay"
-PORTAGE_BINHOST="http://builds.developer.core-os.net/boards/${BOARD}/${COREOS_VERSION_ID}/pkgs/
-http://builds.developer.core-os.net/boards/${BOARD}/${COREOS_VERSION_ID}/toolchain/"
+PORTAGE_BINHOST="http://builds.developer.core-os.net/boards/${BOARD}/${FLATCAR_VERSION_ID}/pkgs/
+http://builds.developer.core-os.net/boards/${BOARD}/${FLATCAR_VERSION_ID}/toolchain/"
 EOF
 
 sudo_clobber "$1/etc/portage/repos.conf/coreos.conf" <<EOF

build_library/disk_layout.json

@@ -131,7 +131,7 @@
         "label":"ROOT",
         "fs_label":"ROOT",
         "type":"4f68bce3-e8cd-4db1-96e7-fbcaf984b709",
-        "blocks":"8388608"
+        "blocks":"12582912"
       }
     },
     "interoute":{

build_library/ebuild_aci_util.sh

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# Expects BOARD, BUILD_DIR, BUILD_LIBRARY_DIR, and COREOS_VERSION in env.
+# Expects BOARD, BUILD_DIR, BUILD_LIBRARY_DIR, and FLATCAR_VERSION in env.
 
 # Copied from create_prod_image()
 create_ebuild_aci_image() {
@@ -59,7 +59,7 @@ ebuild_aci_create() {
     local extra_version="${1?No extra version number given}"; shift
     local pkg_files=( "${@}" )
 
-    local staging_image="coreos_pkg_staging_aci_stage.bin"
+    local staging_image="flatcar_pkg_staging_aci_stage.bin"
 
     local ebuild_atom="=${pkg}-${version}"
 
@@ -78,7 +78,7 @@ ebuild_aci_create() {
     ebuild_aci_write_manifest \
         "${aciroot}/manifest" \
         "${aci_name}" \
-        "${version}_coreos.${extra_version}"
+        "${version}_flatcar.${extra_version}"
 
     local pkg_files_in_rootfs=( "${pkg_files[@]/#/rootfs}" )
 

build_library/generate_grub_hashes.py

@@ -19,9 +19,9 @@
     corelen = bytearray(diskboot)[508] | bytearray(diskboot)[509] << 8
     f.seek(bootoffset+512)
     core = f.read(corelen * 512)
-    hashes = {"4": {"binaryvalues": [{"values": [{"value": hashlib.sha1(boot).hexdigest(), "description": "CoreOS Grub boot.img %s" % version}]}]},
-              "8": {"binaryvalues" : [{"values": [{"value": hashlib.sha1(diskboot).hexdigest(), "description": "CoreOS Grub diskboot.img %s" % version}]}]},
-              "9": {"binaryvalues": [{"values": [{"value": hashlib.sha1(core).hexdigest(), "description": "CoreOS Grub core.img %s" % version}]}]}}
+    hashes = {"4": {"binaryvalues": [{"values": [{"value": hashlib.sha1(boot).hexdigest(), "description": "Flatcar Grub boot.img %s" % version}]}]},
+              "8": {"binaryvalues" : [{"values": [{"value": hashlib.sha1(diskboot).hexdigest(), "description": "Flatcar Grub diskboot.img %s" % version}]}]},
+              "9": {"binaryvalues": [{"values": [{"value": hashlib.sha1(core).hexdigest(), "description": "Flatcar Grub core.img %s" % version}]}]}}
     with open(os.path.join(outputdir, "grub_loader.config"), "w") as f:
         f.write(json.dumps(hashes, sort_keys=True))
 
@@ -33,25 +33,25 @@
             with open(os.path.join(folder, filename), "rb") as f:
                 mod = f.read()
                 value = hashlib.sha1(mod).hexdigest()
-                description = "CoreOS Grub %s %s" % (filename, version)
+                description = "Flatcar Grub %s %s" % (filename, version)
                 hashvalues.append({"value": value, "description": description})
 
 with open(os.path.join(outputdir, "grub_modules.config"), "w") as f:
     f.write(json.dumps({"9": {"binaryvalues": [{"prefix": "grub_module", "values": hashvalues}]}}))
 
 with open(os.path.join(outputdir, "kernel_cmdline.config"), "w") as f:
-    f.write(json.dumps({"8": {"asciivalues": [{"prefix": "grub_kernel_cmdline", "values": [{"value": "rootflags=rw mount.usrflags=ro BOOT_IMAGE=/coreos/vmlinuz-[ab] mount.usr=PARTUUID=\S{36} rootflags=rw mount.usrflags=ro consoleblank=0 root=LABEL=ROOT (console=\S+)? (coreos.autologin=\S+)? verity.usrhash=\\S{64}", "description": "CoreOS kernel command line %s" % version}]}]}}))
-
-commands = [{"value": '\[.*\]', "description": "CoreOS Grub configuration %s" % version},
-            {"value": 'gptprio.next -d usr -u usr_uuid', "description": "CoreOS Grub configuration %s" % version},
-            {"value": 'insmod all_video', "description": "CoreOS Grub configuration %s" % version},
-            {"value": 'linux /coreos/vmlinuz-[ab] rootflags=rw mount.usrflags=ro consoleblank=0 root=LABEL=ROOT (console=\S+)? (coreos.autologin=\S+)?', "description": "CoreOS Grub configuration %s" % version},
-            {"value": 'menuentry CoreOS \S+ --id=coreos\S* {', "description": "CoreOS Grub configuration %s" % version},
-            {"value": 'search --no-floppy --set randomize_disk_guid --disk-uuid 00000000-0000-0000-0000-000000000001', "description": "CoreOS Grub configuration %s" % version},
-            {"value": 'search --no-floppy --set oem --part-label OEM --hint hd0,gpt1', "description": "CoreOS Grub configuration %s" % version},
-            {"value": 'set .+', "description": "CoreOS Grub configuration %s" % version},
-            {"value": 'setparams CoreOS default', "description": "CoreOS Grub configuration %s" % version},
-            {"value": 'source (hd0,gpt6)/grub.cfg', "description": "CoreOS Grub configuration %s" % version}]
+    f.write(json.dumps({"8": {"asciivalues": [{"prefix": "grub_kernel_cmdline", "values": [{"value": "rootflags=rw mount.usrflags=ro BOOT_IMAGE=/flatcar/vmlinuz-[ab] mount.usr=PARTUUID=\S{36} rootflags=rw mount.usrflags=ro consoleblank=0 root=LABEL=ROOT (console=\S+)? (flatcar.autologin=\S+)? verity.usrhash=\\S{64}", "description": "Flatcar kernel command line %s" % version}]}]}}))
+
+commands = [{"value": '\[.*\]', "description": "Flatcar Grub configuration %s" % version},
+            {"value": 'gptprio.next -d usr -u usr_uuid', "description": "Flatcar Grub configuration %s" % version},
+            {"value": 'insmod all_video', "description": "Flatcar Grub configuration %s" % version},
+            {"value": 'linux /flatcar/vmlinuz-[ab] rootflags=rw mount.usrflags=ro consoleblank=0 root=LABEL=ROOT (console=\S+)? (flatcar.autologin=\S+)?', "description": "Flatcar Grub configuration %s" % version},
+            {"value": 'menuentry Flatcar \S+ --id=flatcar\S* {', "description": "Flatcar Grub configuration %s" % version},
+            {"value": 'search --no-floppy --set randomize_disk_guid --disk-uuid 00000000-0000-0000-0000-000000000001', "description": "Flatcar Grub configuration %s" % version},
+            {"value": 'search --no-floppy --set oem --part-label OEM --hint hd0,gpt1', "description": "Flatcar Grub configuration %s" % version},
+            {"value": 'set .+', "description": "Flatcar Grub configuration %s" % version},
+            {"value": 'setparams Flatcar default', "description": "Flatcar Grub configuration %s" % version},
+            {"value": 'source (hd0,gpt6)/grub.cfg', "description": "Flatcar Grub configuration %s" % version}]
 
 with open(os.path.join(outputdir, "grub_commands.config"), "w") as f:
     f.write(json.dumps({"8": {"asciivalues": [{"prefix": "grub_cmd", "values": commands}]}}))

build_library/generate_kernel_hash.sh

@@ -10,4 +10,4 @@ version=sys.argv[2]
 
 with open(path, "rb") as f:
     kernel = f.read()
-    print json.dumps({"9": {"binaryvalues": [{"prefix": "grub_linux", "values": [{"value": hashlib.sha1(kernel).hexdigest(), "description": "coreos-%s" % version}]}]}})
+    print json.dumps({"9": {"binaryvalues": [{"prefix": "grub_linux", "values": [{"value": hashlib.sha1(kernel).hexdigest(), "description": "flatcar-%s" % version}]}]}})