From deee1d9be434cf201cd9eca59288b826289a1881 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 1 Mar 2023 18:28:54 +0100 Subject: [PATCH] coreos/stage1_hooks: Bump good baselayout version and update README We need baselayout with the ROOTPATH and PATH cleanups, so bump the revision to 10. --- .../0000-bump-baselayout-coreos-overlay.sh | 2 +- .../coreos/stage1_hooks/README.md | 24 ++++++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/stage1_hooks/0000-bump-baselayout-coreos-overlay.sh b/sdk_container/src/third_party/coreos-overlay/coreos/stage1_hooks/0000-bump-baselayout-coreos-overlay.sh index e294393eb8..9910b1cfef 100755 --- a/sdk_container/src/third_party/coreos-overlay/coreos/stage1_hooks/0000-bump-baselayout-coreos-overlay.sh +++ b/sdk_container/src/third_party/coreos-overlay/coreos/stage1_hooks/0000-bump-baselayout-coreos-overlay.sh @@ -5,7 +5,7 @@ set -euo pipefail stage1_repo="${1}" new_repo="${2}" -good_version="3.6.8-r9" +good_version="3.6.8-r10" stage1_version='' for f in "${stage1_repo}/sys-apps/baselayout/baselayout-"*'.ebuild'; do diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/stage1_hooks/README.md b/sdk_container/src/third_party/coreos-overlay/coreos/stage1_hooks/README.md index 5db213fca4..d31163fe6c 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/stage1_hooks/README.md +++ b/sdk_container/src/third_party/coreos-overlay/coreos/stage1_hooks/README.md @@ -1,6 +1,18 @@ -The scripts there are called when setting up the portage-stable and -coreos-overlay repos for the stage1 build. When the scripts are -invoked, they receive a path to the repository as a parameter. The -script for portage-stable should end with `-portage-stable.sh`, and -the script for coreos-overlay with '-coreos-overlay.sh`. For example -`0000-replace-ROOTPATH-coreos-overlay.sh`. +The scripts in this directory are called by the SDK bootstrapping +script when setting up the portage-stable and coreos-overlay repos for +the stage1 build. The scripts are invoked with two arguments - a path +to the stage1 repository, and a path to the current repository. The +difference between the two is that the stage1 repository is a copy of +a repository saved in the seed SDK (thus it's going to be an older +version of the repository), whereas the current repository is a +repository that will be a base of the new SDK. The idea here is that +something in the stage1 repository may be too old, thus it should be +replaced with its equivalent from the current repository. + +For more information about the bootstrap process, please see the +`bootstrap_sdk` script in [the scripts +repository](https://github.com/flatcar/scripts). + +The script for portage-stable should end with `-portage-stable.sh`, +and the script for coreos-overlay with '-coreos-overlay.sh`. For +example: `0000-replace-ROOTPATH-coreos-overlay.sh`.