mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-04 19:56:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

sdk_lib: Use new manifests location

Browse Source
This commit is contained in:
Krzesimir Nowak 2023-10-24 18:31:03 +02:00
parent 2074fcd62f
commit e5d0cba49e
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sdk_lib/Dockerfile.lean-arch
View File

@ -13,8 +13,11 @@ RUN if [ -n "$RMARCH" ]; then \
sudo rm -f /usr/local/bin/*-$RMARCH; \
fi
# Note: .repo/manifests/version.txt will survive this. That's intended.
# Note: Preserve manifests.
RUN sudo mv /mnt/host/source/src/scripts/manifests /manifests
RUN sudo rm -rf /mnt/host/source/*
RUN sudo mkdir -p /mnt/host/source/src/scripts
RUN sudo mv /manifests /mnt/host/source/src/scripts/manifests
FROM scratch

2
sdk_lib/sdk_container_common.sh
View File

@ -7,7 +7,7 @@
#
# globals
#
sdk_container_common_versionfile="sdk_container/.repo/manifests/version.txt"
sdk_container_common_versionfile="manifests/version.txt"
sdk_container_common_registry="ghcr.io/flatcar"
sdk_container_common_env_file="sdk_container/.sdkenv"

2
sdk_lib/sdk_entry.sh
View File

@ -15,7 +15,7 @@ chown -R sdk:sdk /home/sdk
# chroot portage conf to point to the correct binhost.
(
source /etc/lsb-release # SDK version in DISTRIB_RELEASE
source /mnt/host/source/.repo/manifests/version.txt # OS image version in FLATCAR_VERSION_ID
source /mnt/host/source/src/scripts/manifests/version.txt # OS image version in FLATCAR_VERSION_ID
version="${FLATCAR_VERSION_ID}"
# If this is a nightly build tag we can use pre-built binaries directly from the

4
sdk_lib/sdk_init_selfcontained.sh
View File

@ -26,8 +26,10 @@ function clone_version() {
}
# --
version="$(source /mnt/host/source/.repo/manifests/version.txt; echo $FLATCAR_VERSION)"
version=$(source /mnt/host/source/src/scripts/manifests/version.txt; echo "$FLATCAR_VERSION")
mkdir -p /home/sdk/trunk/src/third_party/
# Drop the manifests dir, it will be replaced by one from scripts repo.
rm -rf /home/sdk/trunk/src/scripts
clone_version scripts /home/sdk/trunk/src/scripts "$version"