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

Merge pull request #218 from flatcar/krnowak/silence-warnings

Browse Source 
*: Try to silence the warnings
This commit is contained in:
Krzesimir Nowak 2023-02-21 13:19:54 +01:00 committed by GitHub
commit 94716d2631
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
build_library/dev_container_util.sh
View File

@ -14,18 +14,22 @@ get_binhost_url() {
} }
configure_dev_portage() { configure_dev_portage() {
local root_fs_dir="${1}"; shift
local binhost="${1}"; shift
local update_group="${1}"; shift
# Need profiles at the bare minimum # Need profiles at the bare minimum
local repo local repo
for repo in portage-stable coreos-overlay; do for repo in portage-stable coreos-overlay; do
sudo mkdir -p "$1/var/lib/portage/${repo}" sudo mkdir -p "${root_fs_dir}/var/lib/portage/${repo}"
sudo rsync -rtl --exclude=md5-cache \ sudo rsync -rtl --exclude=md5-cache \
"${SRC_ROOT}/third_party/${repo}/metadata" \ "${SRC_ROOT}/third_party/${repo}/metadata" \
"${SRC_ROOT}/third_party/${repo}/profiles" \ "${SRC_ROOT}/third_party/${repo}/profiles" \
"$1/var/lib/portage/${repo}" "${root_fs_dir}/var/lib/portage/${repo}"
done done
sudo mkdir -p "$1/etc/portage/repos.conf" sudo mkdir -p "${root_fs_dir}/etc/portage/repos.conf"
sudo_clobber "$1/etc/portage/make.conf" <<EOF sudo_clobber "${root_fs_dir}/etc/portage/make.conf" <<EOF
# make.conf for Flatcar dev images # make.conf for Flatcar dev images
ARCH=$(get_board_arch $BOARD) ARCH=$(get_board_arch $BOARD)
CHOST=$(get_board_chost $BOARD) CHOST=$(get_board_chost $BOARD)
@ -34,13 +38,11 @@ CHOST=$(get_board_chost $BOARD)
DISTDIR="/var/lib/portage/distfiles" DISTDIR="/var/lib/portage/distfiles"
PKGDIR="/var/lib/portage/pkgs" PKGDIR="/var/lib/portage/pkgs"
PORT_LOGDIR="/var/log/portage" PORT_LOGDIR="/var/log/portage"
PORTDIR="/var/lib/portage/portage-stable" PORTAGE_BINHOST="$(get_binhost_url "${binhost}" "${update_group}" 'pkgs')
PORTDIR_OVERLAY="/var/lib/portage/coreos-overlay" $(get_binhost_url "${binhost}" "${update_group}" 'toolchain')"
PORTAGE_BINHOST="$(get_binhost_url "$2" "$3" 'pkgs')
$(get_binhost_url "$2" "$3" 'toolchain')"
EOF EOF
sudo_clobber "$1/etc/portage/repos.conf/coreos.conf" <<EOF sudo_clobber "${root_fs_dir}/etc/portage/repos.conf/coreos.conf" <<EOF
[DEFAULT] [DEFAULT]
main-repo = portage-stable main-repo = portage-stable
@ -55,11 +57,18 @@ sync-type = git
sync-uri = https://github.com/flatcar/portage-stable.git sync-uri = https://github.com/flatcar/portage-stable.git
EOF EOF
# Now set the correct profile # Now set the correct profile, we do not use the eselect tool - it
sudo PORTAGE_CONFIGROOT="$1" ROOT="$1" \ # does not seem to be usable outside of the chroot without using
PORTDIR="$1/var/lib/portage/portage-stable" \ # deprecated PORTDIR and PORTDIR_OVERLAY environment variables.
PORTDIR_OVERLAY="$1/var/lib/portage/coreos-overlay" \ local profile_name=$(get_board_profile "${BOARD}")
eselect profile set --force $(get_board_profile $BOARD)/dev # Turn coreos:coreos/amd64/generic into coreos/amd64/generic/dev
profile_name="${profile_name#*:}/dev"
local profile_directory="${root_fs_dir}/var/lib/portage/coreos-overlay/profiles/${profile_name}"
if [[ ! -d "${profile_directory}" ]]; then
die "Not a valid profile: ${profile_name}"
fi
local profile_link="${root_fs_dir}/etc/portage/make.profile"
sudo ln -sfrT "${profile_directory}" "${profile_link}"
} }
create_dev_container() { create_dev_container() {

3
build_library/toolchain_util.sh
View File

@ -291,9 +291,6 @@ _configure_sysroot() {
echo "Writing make.conf for the sysroot ${SYSROOT}, root ${ROOT}" echo "Writing make.conf for the sysroot ${SYSROOT}, root ${ROOT}"
"${sudo[@]}" tee "${ROOT}/etc/portage/make.conf" <<EOF "${sudo[@]}" tee "${ROOT}/etc/portage/make.conf" <<EOF
$(portageq envvar -v CHOST CBUILD ROOT DISTDIR PKGDIR) $(portageq envvar -v CHOST CBUILD ROOT DISTDIR PKGDIR)
# TODO: These are deprecated, drop them eventually.
PORTDIR="$(portageq get_repo_path "${ROOT}" portage-stable)"
PORTDIR_OVERLAY="${coreos_path} $(portageq get_repo_path "${ROOT}" x-crossdev)"
HOSTCC=\${CBUILD}-gcc HOSTCC=\${CBUILD}-gcc
PKG_CONFIG_PATH="\${SYSROOT}/usr/lib/pkgconfig/" PKG_CONFIG_PATH="\${SYSROOT}/usr/lib/pkgconfig/"
# Enable provenance reporting by default. Produced files are in /usr/share/SLSA # Enable provenance reporting by default. Produced files are in /usr/share/SLSA

2
setup_board
View File

@ -253,8 +253,6 @@ sudo_clobber "${BOARD_ETC}/portage/make.conf" <<EOF
# Settings derived from the host environment # Settings derived from the host environment
CBUILD="$(portageq envvar CHOST)" CBUILD="$(portageq envvar CHOST)"
HOSTCC="$(portageq envvar CHOST)-gcc" HOSTCC="$(portageq envvar CHOST)-gcc"
PORTDIR="$(portageq envvar PORTDIR)"
PORTDIR_OVERLAY="$(portageq envvar PORTDIR_OVERLAY)"
DISTDIR="$(portageq envvar DISTDIR)" DISTDIR="$(portageq envvar DISTDIR)"
MAKEOPTS="$(portageq envvar MAKEOPTS)" MAKEOPTS="$(portageq envvar MAKEOPTS)"
PORTAGE_USERNAME="$(portageq envvar PORTAGE_USERNAME)" PORTAGE_USERNAME="$(portageq envvar PORTAGE_USERNAME)"

2
update_chroot
View File

@ -88,8 +88,6 @@ sudo touch /etc/portage/make.conf.user
sudo_clobber "/etc/portage/make.conf" <<EOF sudo_clobber "/etc/portage/make.conf" <<EOF
# Created by update_chroot # Created by update_chroot
PORTDIR="${PORTAGE_STABLE_OVERLAY}"
PORTDIR_OVERLAY="${CROSSDEV_OVERLAY} ${COREOS_OVERLAY}"
DISTDIR="${REPO_CACHE_DIR}/distfiles" DISTDIR="${REPO_CACHE_DIR}/distfiles"
PKGDIR="/var/lib/portage/pkgs" PKGDIR="/var/lib/portage/pkgs"
PORT_LOGDIR="/var/log/portage" PORT_LOGDIR="/var/log/portage"