mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-22 22:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #697 from bgilbert/generic

Browse Source 
Drop ISO/PXE support for amd64-generic, and an unused variable
This commit is contained in:
Benjamin Gilbert 2017-06-21 13:28:55 -07:00 committed by GitHub
commit ab4705f9dc
3 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build_library/dev_image_util.sh
View File

@ -18,7 +18,6 @@ configure_dev_portage() {
# make.conf for CoreOS dev images # make.conf for CoreOS dev images
ARCH=$(get_board_arch $BOARD) ARCH=$(get_board_arch $BOARD)
CHOST=$(get_board_chost $BOARD) CHOST=$(get_board_chost $BOARD)
BOARD_USE="$BOARD"
# Use /var/lib/portage instead of /usr/portage # Use /var/lib/portage instead of /usr/portage
DISTDIR="/var/lib/portage/distfiles" DISTDIR="/var/lib/portage/distfiles"

20
build_library/vm_image_util.sh
View File

@ -577,25 +577,11 @@ _write_cpio_common() {
local dst_dir=$(_dst_dir) local dst_dir=$(_dst_dir)
local vmlinuz_name="$(_dst_name ".vmlinuz")" local vmlinuz_name="$(_dst_name ".vmlinuz")"
local base_dir="${VM_TMP_ROOT}/usr" local base_dir="${VM_TMP_ROOT}/usr"
local squashfs="usr.squashfs"
sudo mkdir -p "${cpio_target}/etc" sudo mkdir -p "${cpio_target}/etc"
# If not a /usr image pack up root instead # Inject /usr/.noupdate into squashfs to disable update_engine
if ! mountpoint -q "${base_dir}"; then echo "/.noupdate f 444 root root echo -n" >"${VM_TMP_DIR}/extra"
base_dir="${VM_TMP_ROOT}"
squashfs="newroot.squashfs"
# The STATE partition and all of its bind mounts shouldn't be
# packed into the squashfs image. Just ROOT.
sudo umount --all-targets "${VM_TMP_ROOT}/media/state"
# Inject /usr/.noupdate into squashfs to disable update_engine
echo "/usr/.noupdate f 444 root root echo -n" >"${VM_TMP_DIR}/extra"
else
# Inject /usr/.noupdate into squashfs to disable update_engine
echo "/.noupdate f 444 root root echo -n" >"${VM_TMP_DIR}/extra"
fi
# Set correct group for PXE/ISO, which has no writeable /etc # Set correct group for PXE/ISO, which has no writeable /etc
echo /usr/share/coreos/update.conf f 644 root root \ echo /usr/share/coreos/update.conf f 644 root root \
@ -604,7 +590,7 @@ _write_cpio_common() {
# Build the squashfs, embed squashfs into a gzipped cpio # Build the squashfs, embed squashfs into a gzipped cpio
pushd "${cpio_target}" >/dev/null pushd "${cpio_target}" >/dev/null
sudo mksquashfs "${base_dir}" "./${squashfs}" -pf "${VM_TMP_DIR}/extra" sudo mksquashfs "${base_dir}" "./usr.squashfs" -pf "${VM_TMP_DIR}/extra"
find . | cpio -o -H newc | gzip > "$2" find . | cpio -o -H newc | gzip > "$2"
popd >/dev/null popd >/dev/null

1
setup_board
View File

@ -256,7 +256,6 @@ PORTAGE_USERNAME="$(portageq envvar PORTAGE_USERNAME)"
# Board specific settings # Board specific settings
CHOST="${BOARD_CHOST}" CHOST="${BOARD_CHOST}"
ROOT="${BOARD_ROOT}/" ROOT="${BOARD_ROOT}/"
BOARD_USE="${BOARD_VARIANT}"
PKGDIR="${BOARD_ROOT}/var/lib/portage/pkgs" PKGDIR="${BOARD_ROOT}/var/lib/portage/pkgs"
PORT_LOGDIR="${BOARD_ROOT}/var/log/portage" PORT_LOGDIR="${BOARD_ROOT}/var/log/portage"
PORTAGE_TMPDIR="${BOARD_ROOT}/var/tmp" PORTAGE_TMPDIR="${BOARD_ROOT}/var/tmp"