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

Merge pull request #194 from flatcar-linux/krnowak/replace-kinvolk

Browse Source 
*: Replace kinvolk github org with flatcar-linux
This commit is contained in:
Krzesimir Nowak 2021-12-22 17:35:33 +01:00 committed by GitHub
commit edcc436445
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap_sdk
View File

@ -151,7 +151,7 @@ stage_repo() {
info "Using git ref '$gitref' for ebuild repo '$repo' ('$gitname') in stage 1." info "Using git ref '$gitref' for ebuild repo '$repo' ('$gitname') in stage 1."
mkdir "$dest/$repo" mkdir "$dest/$repo"
( cd "$dest/$repo" \ ( cd "$dest/$repo" \
&& git clone "https://github.com/kinvolk/$gitname.git" . \ && git clone "https://github.com/flatcar-linux/$gitname.git" . \
&& git fetch --all \ && git fetch --all \
&& git checkout "$gitref" ) && git checkout "$gitref" )
fi fi

12
build_library/build_image_util.sh
View File

@ -310,7 +310,7 @@ get_metadata() {
if [ "${key}" = "SRC_URI" ]; then if [ "${key}" = "SRC_URI" ]; then
local package_name="$(echo "${pkg%%:*}" | cut -d / -f 2)" local package_name="$(echo "${pkg%%:*}" | cut -d / -f 2)"
local ebuild_path="${prefix}/var/db/pkg/${pkg%%:*}/${package_name}.ebuild" local ebuild_path="${prefix}/var/db/pkg/${pkg%%:*}/${package_name}.ebuild"
# SRC_URI is empty for the special github.com/kinvolk projects # SRC_URI is empty for the special github.com/flatcar-linux projects
if [ -z "${val}" ]; then if [ -z "${val}" ]; then
# The grep invocation gives errors when the ebuild file is not present. # The grep invocation gives errors when the ebuild file is not present.
# This can happen if a "scripts" branch does not match the "coreos-overlay" branch # This can happen if a "scripts" branch does not match the "coreos-overlay" branch
@ -318,7 +318,7 @@ get_metadata() {
val="$(grep "CROS_WORKON_PROJECT=" "${ebuild_path}" | cut -d '"' -f 2)" val="$(grep "CROS_WORKON_PROJECT=" "${ebuild_path}" | cut -d '"' -f 2)"
if [ -n "${val}" ]; then if [ -n "${val}" ]; then
val="https://github.com/${val}" val="https://github.com/${val}"
# All github.com/kinvolk projects specify their commit # All github.com/flatcar-linux projects specify their commit
local commit="" local commit=""
commit="$(grep "CROS_WORKON_COMMIT=" "${ebuild_path}" | cut -d '"' -f 2)" commit="$(grep "CROS_WORKON_COMMIT=" "${ebuild_path}" | cut -d '"' -f 2)"
if [ -n "${commit}" ]; then if [ -n "${commit}" ]; then
@ -358,7 +358,7 @@ get_metadata() {
# "licenses": ["GPL-2", "LGPL-2.1", "MIT", "public-domain"], # "licenses": ["GPL-2", "LGPL-2.1", "MIT", "public-domain"],
# "description": "System and service manager for Linux", # "description": "System and service manager for Linux",
# "homepage": "https://www.freedesktop.org/wiki/Software/systemd", # "homepage": "https://www.freedesktop.org/wiki/Software/systemd",
# "source": "https://github.com/kinvolk/systemd ", # "source": "https://github.com/flatcar-linux/systemd ",
# "files": "somefile 63a5736879fa647ac5a8d5317e7cb8b0\nsome -> link\n" # "files": "somefile 63a5736879fa647ac5a8d5317e7cb8b0\nsome -> link\n"
# } # }
# ] # ]
@ -454,9 +454,9 @@ You can read it with "less licenses.json.bz2" or convert it to a text format wit
bzcat licenses.json.bz2 | jq -r '.[] | "\(.project):\nDescription: \(.description)\nLicenses: \(.licenses)\nHomepage: \(.homepage)\nSource code: \(.source)\nFiles:\n\(.files)\n"' bzcat licenses.json.bz2 | jq -r '.[] | "\(.project):\nDescription: \(.description)\nLicenses: \(.licenses)\nHomepage: \(.homepage)\nSource code: \(.source)\nFiles:\n\(.files)\n"'
The license texts are available under /usr/share/licenses/common/ and can be read with "less NAME.gz". The license texts are available under /usr/share/licenses/common/ and can be read with "less NAME.gz".
Build system files and patches used to build these projects are located at: Build system files and patches used to build these projects are located at:
https://github.com/kinvolk/coreos-overlay/ https://github.com/flatcar-linux/coreos-overlay/
https://github.com/kinvolk/portage-stable/ https://github.com/flatcar-linux/portage-stable/
https://github.com/kinvolk/flatcar-scripts/ https://github.com/flatcar-linux/scripts/
Information on how to build Flatcar Container Linux can be found under: Information on how to build Flatcar Container Linux can be found under:
https://docs.flatcar-linux.org/os/sdk-modifying-flatcar/ https://docs.flatcar-linux.org/os/sdk-modifying-flatcar/
EOF EOF

4
build_library/dev_container_util.sh
View File

@ -50,12 +50,12 @@ disabled = true
[coreos] [coreos]
location = /var/lib/portage/coreos-overlay location = /var/lib/portage/coreos-overlay
sync-type = git sync-type = git
sync-uri = https://github.com/kinvolk/coreos-overlay.git sync-uri = https://github.com/flatcar-linux/coreos-overlay.git
[portage-stable] [portage-stable]
location = /var/lib/portage/portage-stable location = /var/lib/portage/portage-stable
sync-type = git sync-type = git
sync-uri = https://github.com/kinvolk/portage-stable.git sync-uri = https://github.com/flatcar-linux/portage-stable.git
EOF EOF
# Now set the correct profile # Now set the correct profile

1
changelog/bugfixes/2021-12-22-fix-dev-container.md Normal file
View File

@ -0,0 +1 @@
- dev container: Fix github URL for coreos-overlay and portage-stable to use repos from flatcar-linux org directly instead of relying on redirects from the kinvolk org. This fixes checkouts with emerge-gitclone inside dev-container. [PR#194](https://github.com/flatcar-linux/scripts/pull/194)