mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-09 14:06:58 +02:00
*: Make catalyst and emerge verbose by default
That way we can see a report of what emerge is going to do and the status of the use flags for the installed packages. The downside is that we are going to have reports about using deprecated and unsupported profile in even more places.
This commit is contained in:
parent
520b92ad7e
commit
fa48f70a37
@ -185,6 +185,7 @@ build_stage1() {
|
|||||||
# take the "portage directory" (portage-stable copy) snapshot
|
# take the "portage directory" (portage-stable copy) snapshot
|
||||||
catalyst \
|
catalyst \
|
||||||
"${DEBUG[@]}" \
|
"${DEBUG[@]}" \
|
||||||
|
--verbose \
|
||||||
--config "$TEMPDIR/catalyst-stage1.conf" \
|
--config "$TEMPDIR/catalyst-stage1.conf" \
|
||||||
--snapshot "$FLAGS_version-stage1"
|
--snapshot "$FLAGS_version-stage1"
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ local load=$((NUM_JOBS * 2))
|
|||||||
cat <<EOF
|
cat <<EOF
|
||||||
export TERM='${TERM}'
|
export TERM='${TERM}'
|
||||||
export MAKEOPTS='--jobs=${NUM_JOBS} --load-average=${load}'
|
export MAKEOPTS='--jobs=${NUM_JOBS} --load-average=${load}'
|
||||||
export EMERGE_DEFAULT_OPTS="\$MAKEOPTS"
|
export EMERGE_DEFAULT_OPTS="--verbose \$MAKEOPTS"
|
||||||
export PORTAGE_USERNAME=portage
|
export PORTAGE_USERNAME=portage
|
||||||
export PORTAGE_GRPNAME=portage
|
export PORTAGE_GRPNAME=portage
|
||||||
export GENTOO_MIRRORS='$(portageq envvar GENTOO_MIRRORS)'
|
export GENTOO_MIRRORS='$(portageq envvar GENTOO_MIRRORS)'
|
||||||
@ -180,7 +180,7 @@ catalyst_init() {
|
|||||||
|
|
||||||
DEBUG=()
|
DEBUG=()
|
||||||
if [[ ${FLAGS_debug} -eq ${FLAGS_TRUE} ]]; then
|
if [[ ${FLAGS_debug} -eq ${FLAGS_TRUE} ]]; then
|
||||||
DEBUG=( --debug --verbose )
|
DEBUG=("--debug")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Create output dir, expand path for easy comparison later
|
# Create output dir, expand path for easy comparison later
|
||||||
@ -264,6 +264,7 @@ build_stage() {
|
|||||||
info "Starting $stage"
|
info "Starting $stage"
|
||||||
catalyst \
|
catalyst \
|
||||||
"${DEBUG[@]}" \
|
"${DEBUG[@]}" \
|
||||||
|
--verbose \
|
||||||
--config "$TEMPDIR/catalyst.conf" \
|
--config "$TEMPDIR/catalyst.conf" \
|
||||||
--file "$TEMPDIR/${stage}.spec" \
|
--file "$TEMPDIR/${stage}.spec" \
|
||||||
--cli "source_subpath=$srcpath"
|
--cli "source_subpath=$srcpath"
|
||||||
@ -284,6 +285,7 @@ build_snapshot() {
|
|||||||
info "Creating snapshot ${snapshot_path}"
|
info "Creating snapshot ${snapshot_path}"
|
||||||
catalyst \
|
catalyst \
|
||||||
"${DEBUG[@]}" \
|
"${DEBUG[@]}" \
|
||||||
|
--verbose \
|
||||||
--config "$TEMPDIR/catalyst.conf" \
|
--config "$TEMPDIR/catalyst.conf" \
|
||||||
--snapshot "$FLAGS_version"
|
--snapshot "$FLAGS_version"
|
||||||
fi
|
fi
|
||||||
|
@ -77,7 +77,7 @@ esac
|
|||||||
if [[ $BOARD_GRUB -eq 1 ]]; then
|
if [[ $BOARD_GRUB -eq 1 ]]; then
|
||||||
info "Updating GRUB in ${BOARD_ROOT}"
|
info "Updating GRUB in ${BOARD_ROOT}"
|
||||||
emerge-${BOARD} \
|
emerge-${BOARD} \
|
||||||
--nodeps --select --quiet --update --getbinpkg --usepkgonly --newuse \
|
--nodeps --select --verbose --update --getbinpkg --usepkgonly --newuse \
|
||||||
sys-boot/grub
|
sys-boot/grub
|
||||||
GRUB_SRC="${BOARD_ROOT}/usr/lib/grub/${FLAGS_target}"
|
GRUB_SRC="${BOARD_ROOT}/usr/lib/grub/${FLAGS_target}"
|
||||||
fi
|
fi
|
||||||
|
@ -18,7 +18,7 @@ get_binary_pkg() {
|
|||||||
|
|
||||||
# Nothing? Maybe we can fetch it.
|
# Nothing? Maybe we can fetch it.
|
||||||
if [[ -z "${version}" && ${FLAGS_getbinpkg} -eq ${FLAGS_TRUE} ]]; then
|
if [[ -z "${version}" && ${FLAGS_getbinpkg} -eq ${FLAGS_TRUE} ]]; then
|
||||||
emerge-${BOARD} --getbinpkg --usepkgonly --fetchonly --nodeps "${name}" >&2
|
emerge-${BOARD} --verbose --getbinpkg --usepkgonly --fetchonly --nodeps "${name}" >&2
|
||||||
version=$(pkg_version binary "${name}")
|
version=$(pkg_version binary "${name}")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -37,6 +37,6 @@ for oem in "${VALID_OEM_PACKAGES[@]/#/oem-}"; do
|
|||||||
for use in "${uses[@]}"; do
|
for use in "${uses[@]}"; do
|
||||||
info "Checking ${oem}${use:+[${use}]}"
|
info "Checking ${oem}${use:+[${use}]}"
|
||||||
USE="${use}" emerge-${BOARD} --usepkg --getbinpkg \
|
USE="${use}" emerge-${BOARD} --usepkg --getbinpkg \
|
||||||
--emptytree --pretend --quiet "coreos-base/${oem}"
|
--emptytree --pretend --verbose "coreos-base/${oem}"
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
@ -471,7 +471,7 @@ install_oem_package() {
|
|||||||
info "Building ${oem_pkg}"
|
info "Building ${oem_pkg}"
|
||||||
USE="${oem_use}" emerge-${BOARD} \
|
USE="${oem_use}" emerge-${BOARD} \
|
||||||
--nodeps --buildpkgonly --usepkg n \
|
--nodeps --buildpkgonly --usepkg n \
|
||||||
--quiet "${oem_pkg}"
|
--verbose "${oem_pkg}"
|
||||||
|
|
||||||
local getbinpkg
|
local getbinpkg
|
||||||
if [[ ${FLAGS_getbinpkg} -eq ${FLAGS_TRUE} ]]; then
|
if [[ ${FLAGS_getbinpkg} -eq ${FLAGS_TRUE} ]]; then
|
||||||
@ -482,7 +482,7 @@ install_oem_package() {
|
|||||||
USE="${oem_use}" emerge-${BOARD} \
|
USE="${oem_use}" emerge-${BOARD} \
|
||||||
--root="${oem_tmp}" --sysroot="${oem_tmp}" \
|
--root="${oem_tmp}" --sysroot="${oem_tmp}" \
|
||||||
--root-deps=rdeps --usepkgonly ${getbinpkg} \
|
--root-deps=rdeps --usepkgonly ${getbinpkg} \
|
||||||
--quiet --jobs=2 "${oem_pkg}"
|
--verbose --jobs=2 "${oem_pkg}"
|
||||||
sudo rsync -a "${oem_tmp}/usr/share/oem/" "${VM_TMP_ROOT}/usr/share/oem/"
|
sudo rsync -a "${oem_tmp}/usr/share/oem/" "${VM_TMP_ROOT}/usr/share/oem/"
|
||||||
sudo rm -rf "${oem_tmp}"
|
sudo rm -rf "${oem_tmp}"
|
||||||
}
|
}
|
||||||
@ -734,7 +734,7 @@ _write_qemu_uefi_conf() {
|
|||||||
arm64-usr)
|
arm64-usr)
|
||||||
# Get edk2 files into local build workspace.
|
# Get edk2 files into local build workspace.
|
||||||
info "Updating edk2 in /build/${BOARD}"
|
info "Updating edk2 in /build/${BOARD}"
|
||||||
emerge-${BOARD} --nodeps --select --quiet --update --getbinpkg --newuse sys-firmware/edk2-aarch64
|
emerge-${BOARD} --nodeps --select --verbose --update --getbinpkg --newuse sys-firmware/edk2-aarch64
|
||||||
# Create 64MiB flash device image files.
|
# Create 64MiB flash device image files.
|
||||||
dd if=/dev/zero bs=1M count=64 of="$(_dst_dir)/${flash_rw}" \
|
dd if=/dev/zero bs=1M count=64 of="$(_dst_dir)/${flash_rw}" \
|
||||||
status=none
|
status=none
|
||||||
|
@ -131,7 +131,7 @@ fi
|
|||||||
|
|
||||||
# Setup all the emerge command/flags.
|
# Setup all the emerge command/flags.
|
||||||
EMERGE_FLAGS=( --update --deep --newuse --verbose --backtrack=30 --select )
|
EMERGE_FLAGS=( --update --deep --newuse --verbose --backtrack=30 --select )
|
||||||
REBUILD_FLAGS=()
|
REBUILD_FLAGS=( --verbose )
|
||||||
EMERGE_CMD=( "emerge-${FLAGS_board}" )
|
EMERGE_CMD=( "emerge-${FLAGS_board}" )
|
||||||
if [[ "${FLAGS_fetchonly}" -eq "${FLAGS_TRUE}" ]]; then
|
if [[ "${FLAGS_fetchonly}" -eq "${FLAGS_TRUE}" ]]; then
|
||||||
EMERGE_CMD+=( --fetchonly )
|
EMERGE_CMD+=( --fetchonly )
|
||||||
@ -285,7 +285,7 @@ info "Merging board packages now"
|
|||||||
sudo -E "${EMERGE_CMD[@]}" "${EMERGE_FLAGS[@]}" "$@"
|
sudo -E "${EMERGE_CMD[@]}" "${EMERGE_FLAGS[@]}" "$@"
|
||||||
|
|
||||||
info "Removing obsolete packages"
|
info "Removing obsolete packages"
|
||||||
sudo -E "${EMERGE_CMD[@]}" --quiet --depclean @unavailable
|
sudo -E "${EMERGE_CMD[@]}" --verbose --depclean @unavailable
|
||||||
|
|
||||||
if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_FALSE}" ]]; then
|
if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_FALSE}" ]]; then
|
||||||
if "portageq-${BOARD}" list_preserved_libs "${BOARD_ROOT}" >/dev/null; then
|
if "portageq-${BOARD}" list_preserved_libs "${BOARD_ROOT}" >/dev/null; then
|
||||||
|
@ -80,7 +80,7 @@ function torcx_build() (
|
|||||||
--buildpkgonly \
|
--buildpkgonly \
|
||||||
--nodeps \
|
--nodeps \
|
||||||
--oneshot \
|
--oneshot \
|
||||||
--quiet \
|
--verbose \
|
||||||
--root-deps=rdeps \
|
--root-deps=rdeps \
|
||||||
"${pkgs[@]}"
|
"${pkgs[@]}"
|
||||||
|
|
||||||
@ -89,7 +89,7 @@ function torcx_build() (
|
|||||||
--jobs="${NUM_JOBS}" \
|
--jobs="${NUM_JOBS}" \
|
||||||
--nodeps \
|
--nodeps \
|
||||||
--oneshot \
|
--oneshot \
|
||||||
--quiet \
|
--verbose \
|
||||||
--root="${tmproot}" \
|
--root="${tmproot}" \
|
||||||
--root-deps=rdeps \
|
--root-deps=rdeps \
|
||||||
--sysroot="${tmproot}" \
|
--sysroot="${tmproot}" \
|
||||||
|
@ -74,7 +74,7 @@ if [[ "${#rebuild_atoms[@]}" -eq 0 ]]; then
|
|||||||
info "No ebuild changes detected"
|
info "No ebuild changes detected"
|
||||||
else
|
else
|
||||||
info "Rebuilding ${#rebuild_atoms[@]} packages..."
|
info "Rebuilding ${#rebuild_atoms[@]} packages..."
|
||||||
emerge-$BOARD "--jobs=${NUM_JOBS}" "${rebuild_atoms[@]}"
|
emerge-$BOARD --verbose "--jobs=${NUM_JOBS}" "${rebuild_atoms[@]}"
|
||||||
|
|
||||||
info "Checking build root"
|
info "Checking build root"
|
||||||
test_image_content "${BOARD_ROOT}"
|
test_image_content "${BOARD_ROOT}"
|
||||||
|
@ -269,7 +269,7 @@ PORTAGE_BINHOST="${BOARD_BINHOST}"
|
|||||||
|
|
||||||
# Generally there isn't any need to add packages to @world by default.
|
# Generally there isn't any need to add packages to @world by default.
|
||||||
# You can use --select to override this.
|
# You can use --select to override this.
|
||||||
EMERGE_DEFAULT_OPTS="--oneshot"
|
EMERGE_DEFAULT_OPTS="--oneshot --verbose"
|
||||||
|
|
||||||
# Enable provenance reporting by default. Produced files are in /usr/share/SLSA
|
# Enable provenance reporting by default. Produced files are in /usr/share/SLSA
|
||||||
GENERATE_SLSA_PROVENANCE="true"
|
GENERATE_SLSA_PROVENANCE="true"
|
||||||
@ -297,7 +297,7 @@ ${EMAINT_WRAPPER} --fix moveinst
|
|||||||
${EMAINT_WRAPPER} --fix world
|
${EMAINT_WRAPPER} --fix world
|
||||||
|
|
||||||
if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then
|
if [[ ${FLAGS_regen_configs} -eq ${FLAGS_FALSE} ]]; then
|
||||||
EMERGE_FLAGS=( --select --quiet --root-deps=rdeps )
|
EMERGE_FLAGS=( --select --verbose --root-deps=rdeps )
|
||||||
EMERGE_FLAGS+=( "--jobs=${NUM_JOBS}" )
|
EMERGE_FLAGS+=( "--jobs=${NUM_JOBS}" )
|
||||||
EMERGE_TOOLCHAIN_FLAGS=( "${EMERGE_FLAGS[@]}" )
|
EMERGE_TOOLCHAIN_FLAGS=( "${EMERGE_FLAGS[@]}" )
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@ MAKEOPTS="--jobs=${NUM_JOBS} --load-average=$((NUM_JOBS * 2))"
|
|||||||
|
|
||||||
# Generally there isn't any need to add packages to @world by default.
|
# Generally there isn't any need to add packages to @world by default.
|
||||||
# You can use --select to override this.
|
# You can use --select to override this.
|
||||||
EMERGE_DEFAULT_OPTS="--oneshot"
|
EMERGE_DEFAULT_OPTS="--verbose --oneshot"
|
||||||
|
|
||||||
# Allow the user to override or define additional settings.
|
# Allow the user to override or define additional settings.
|
||||||
source "/etc/portage/make.conf.user"
|
source "/etc/portage/make.conf.user"
|
||||||
@ -184,7 +184,7 @@ done
|
|||||||
"${BUILD_LIBRARY_DIR}/set_lsb_release" --root /
|
"${BUILD_LIBRARY_DIR}/set_lsb_release" --root /
|
||||||
|
|
||||||
EMERGE_FLAGS=( --update --newuse --verbose --with-bdeps=y --select )
|
EMERGE_FLAGS=( --update --newuse --verbose --with-bdeps=y --select )
|
||||||
REBUILD_FLAGS=()
|
REBUILD_FLAGS=( --verbose )
|
||||||
if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then
|
if [ "${FLAGS_usepkg}" -eq "${FLAGS_TRUE}" ]; then
|
||||||
EMERGE_FLAGS+=( --usepkg )
|
EMERGE_FLAGS+=( --usepkg )
|
||||||
if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_TRUE}" ]]; then
|
if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_TRUE}" ]]; then
|
||||||
@ -208,7 +208,7 @@ EMERGE_CMD="emerge"
|
|||||||
# In first pass, update portage and toolchains. Lagged updates of both
|
# In first pass, update portage and toolchains. Lagged updates of both
|
||||||
# can cause serious issues later.
|
# can cause serious issues later.
|
||||||
info "Updating basic system packages"
|
info "Updating basic system packages"
|
||||||
sudo -E ${EMERGE_CMD} --quiet "${EMERGE_FLAGS[@]}" \
|
sudo -E ${EMERGE_CMD} "${EMERGE_FLAGS[@]}" \
|
||||||
sys-apps/portage \
|
sys-apps/portage \
|
||||||
sys-devel/crossdev \
|
sys-devel/crossdev \
|
||||||
sys-devel/sysroot-wrappers \
|
sys-devel/sysroot-wrappers \
|
||||||
@ -230,7 +230,7 @@ if [[ "${FLAGS_skip_toolchain_update}" -eq "${FLAGS_FALSE}" && \
|
|||||||
|
|
||||||
for cross_chost in "${CROSS_CHOSTS[@]}"; do
|
for cross_chost in "${CROSS_CHOSTS[@]}"; do
|
||||||
info "Updating cross ${cross_chost} toolchain"
|
info "Updating cross ${cross_chost} toolchain"
|
||||||
install_cross_toolchain "${cross_chost}" --quiet "${EMERGE_FLAGS[@]}"
|
install_cross_toolchain "${cross_chost}" "${EMERGE_FLAGS[@]}"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -259,7 +259,7 @@ sudo -E ${EMERGE_CMD} "${EMERGE_FLAGS[@]}" \
|
|||||||
coreos-devel/sdk-depends world
|
coreos-devel/sdk-depends world
|
||||||
|
|
||||||
info "Removing obsolete packages"
|
info "Removing obsolete packages"
|
||||||
sudo -E ${EMERGE_CMD} --quiet --depclean @unavailable
|
sudo -E ${EMERGE_CMD} --verbose --depclean @unavailable
|
||||||
|
|
||||||
if portageq list_preserved_libs / >/dev/null; then
|
if portageq list_preserved_libs / >/dev/null; then
|
||||||
info "Rebuilding packages linked against old libraries"
|
info "Rebuilding packages linked against old libraries"
|
||||||
|
Loading…
Reference in New Issue
Block a user