diff --git a/.github/workflows/mantle-releases-main.yml b/.github/workflows/mantle-releases-main.yml index 9177fe22f0..d73a410d45 100644 --- a/.github/workflows/mantle-releases-main.yml +++ b/.github/workflows/mantle-releases-main.yml @@ -31,14 +31,14 @@ jobs: - name: Fetch latest mantle hash id: fetch-latest-mantle run: | - commit=$(git ls-remote https://github.com/flatcar-linux/mantle refs/heads/flatcar-master | cut -f1) + commit=$(git ls-remote https://github.com/flatcar/mantle refs/heads/flatcar-master | cut -f1) echo ::set-output name=COMMIT::${commit} - name: Try to apply patch run: | set -x commit=${{ steps.fetch-latest-mantle.outputs.COMMIT }} - if ! grep -q "ghcr.io/flatcar-linux/mantle:git-${commit}" sdk_container/.repo/manifests/mantle-container; then - echo "ghcr.io/flatcar-linux/mantle:git-${commit}" > sdk_container/.repo/manifests/mantle-container + if ! grep -q "ghcr.io/flatcar/mantle:git-${commit}" sdk_container/.repo/manifests/mantle-container; then + echo "ghcr.io/flatcar/mantle:git-${commit}" > sdk_container/.repo/manifests/mantle-container git add sdk_container/.repo/manifests/mantle-container fi - name: Create pull request for branch diff --git a/.gitmodules b/.gitmodules index e597b0c405..e026cc5d93 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "sdk_container/src/third_party/coreos-overlay"] path = sdk_container/src/third_party/coreos-overlay - url = https://github.com/flatcar-linux/coreos-overlay.git + url = https://github.com/flatcar/coreos-overlay.git [submodule "sdk_container/src/third_party/portage-stable"] path = sdk_container/src/third_party/portage-stable - url = https://github.com/flatcar-linux/portage-stable.git + url = https://github.com/flatcar/portage-stable.git diff --git a/README.md b/README.md index 22f2ca9bd2..309d85418c 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ The SDK can be used to # Using the scripts repository: submodules and tags The repository is meant to be the entry point for Flatcar builds and development. -For building packages, there are 2 additional repositories, [coreos-overlay](https://github.com/flatcar-linux/) and [portage-stable](https://github.com/flatcar-linux/portage-stable), which contain all packages' `ebuild` (build configuration) files. +For building packages, there are 2 additional repositories, [coreos-overlay](https://github.com/flatcar/) and [portage-stable](https://github.com/flatcar/portage-stable), which contain all packages' `ebuild` (build configuration) files. These repositories are included in `scripts` via git submodules and are used by the SDK container wrapper scripts detailed on further below. The submodules reside in: ``` @@ -28,7 +28,7 @@ scripts When working with the scripts repo always make sure to initialise and to update these submodules; otherwise builds will break because build configuration is missing: ```bash -$ git clone --recurse-submodules https://github.com/flatcar-linux/scripts.git +$ git clone --recurse-submodules https://github.com/flatcar/scripts.git ``` The `scripts` repository makes ample use of tags to mark releases. @@ -46,13 +46,13 @@ $ git pull --all --tags --prune --prune-tags --force # Using the SDK container -We provide a containerised SDK via https://github.com/orgs/flatcar-linux/packages. The container comes in 3 flavours: +We provide a containerised SDK via https://github.com/orgs/flatcar/packages. The container comes in 3 flavours: * Full SDK initialised with both architectures supported by Flatcar (amd64 and arm64). This is the largest container, it's about 8GB in size (~3 GB compressed). * AMD64 SDK initialised for building AMD64 OS images. About 6GB in size (2GB compressed). * ARM64 SDK initialised for building ARM64 OS images on AMD64 hosts. Also about 6GB in size. While work on a native ARM64 native SDK is ongoing, it's unfortunately not ready yet. If you want to help, patches are welcome! -The container can be run in one of two ways - "standalone", or integrated with the [scripts](https://github.com/flatcar-linux/scripts) repo: +The container can be run in one of two ways - "standalone", or integrated with the [scripts](https://github.com/flatcar/scripts) repo: * Standalone mode will use no host volumes and will allow you to play with the SDK in a sandboxed throw-away environment. In standalone mode, you interface with Docker directly to use the SDK container. * Integrated mode will closely integrate with the scripts repo directory and bind-mount it as well as the portage-stable and coreos-overlay gitmodules into the container. Integrated mode uses wrapper scripts to interact with the SDK container. This is the recommended way for developing patches for Flatcar. @@ -61,7 +61,7 @@ The container can be run in one of two ways - "standalone", or integrated with t In standalone mode, the SDK is just another Docker container. Interaction with the container happens via use of `docker` directly. Use for experimenting and for throw-away work only, otherwise please use integrated mode (see below). * Check the list of available versions and pick a version to use. The SDK Major versions correspond to Flatcar Major release versions. - List of images: `https://github.com/orgs/flatcar-linux/packages/container/package/flatcar-sdk-all` + List of images: `https://github.com/orgs/flatcar/packages/container/package/flatcar-sdk-all` For the purpose of this example we'll use version `3033.0.0`. * Fetch the container image: `docker pull ghcr.io/flatcar/flatcar-sdk-all:3033.0.0` * Start the image in interactive (tty) mode: `docker run -ti ghcr.io/flatcar/flatcar-sdk-all:3033.0.0` @@ -88,7 +88,7 @@ Both the host's scripts repo as well as its submodules (portage-stable and coreo The wrapper scripts will re-use existing containers instead of creating new ones to preserve your work in the container, enabling consistency. To clone the scripts repo and pick a version: -* Clone the scripts repo: `git clone https://github.com/flatcar-linux/scripts.git` +* Clone the scripts repo: `git clone https://github.com/flatcar/scripts.git` * Optionally, check out a release tag to base your work on * list releases (e.g. all Alpha releases): `git tag -l alpha-*` * check out the release version, e.g. `3033.0.0`: `git checkout 3033.0.0` diff --git a/bootstrap_sdk b/bootstrap_sdk index 6f2e89229c..2bbdfbff6a 100755 --- a/bootstrap_sdk +++ b/bootstrap_sdk @@ -154,7 +154,7 @@ stage_repo() { info "Using git ref '$gitref' for ebuild repo '$repo' ('$gitname') in stage 1." mkdir "$dest/$repo" ( cd "$dest/$repo" \ - && git clone "https://github.com/flatcar-linux/$gitname.git" . \ + && git clone "https://github.com/flatcar/$gitname.git" . \ && git fetch --all \ && git checkout "$gitref" ) fi diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh index bef31bd971..4f01bb6036 100755 --- a/build_library/build_image_util.sh +++ b/build_library/build_image_util.sh @@ -351,7 +351,7 @@ get_metadata() { if [ "${key}" = "SRC_URI" ]; then local package_name="$(echo "${pkg%%:*}" | cut -d / -f 2)" local ebuild_path="${prefix}/var/db/pkg/${pkg%%:*}/${package_name}.ebuild" - # SRC_URI is empty for the special github.com/flatcar-linux projects + # SRC_URI is empty for the special github.com/flatcar projects if [ -z "${val}" ]; then # 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 @@ -359,7 +359,7 @@ get_metadata() { val="$(grep "CROS_WORKON_PROJECT=" "${ebuild_path}" | cut -d '"' -f 2)" if [ -n "${val}" ]; then val="https://github.com/${val}" - # All github.com/flatcar-linux projects specify their commit + # All github.com/flatcar projects specify their commit local commit="" commit="$(grep "CROS_WORKON_COMMIT=" "${ebuild_path}" | cut -d '"' -f 2)" if [ -n "${commit}" ]; then @@ -399,7 +399,7 @@ get_metadata() { # "licenses": ["GPL-2", "LGPL-2.1", "MIT", "public-domain"], # "description": "System and service manager for Linux", # "homepage": "https://www.freedesktop.org/wiki/Software/systemd", -# "source": "https://github.com/flatcar-linux/systemd ", +# "source": "https://github.com/systemd/systemd ", # "files": "somefile 63a5736879fa647ac5a8d5317e7cb8b0\nsome -> link\n" # } # ] @@ -495,9 +495,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"' 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: -https://github.com/flatcar-linux/coreos-overlay/ -https://github.com/flatcar-linux/portage-stable/ -https://github.com/flatcar-linux/scripts/ +https://github.com/flatcar/coreos-overlay/ +https://github.com/flatcar/portage-stable/ +https://github.com/flatcar/scripts/ Information on how to build Flatcar Container Linux can be found under: https://www.flatcar.org/docs/latest/reference/developer-guides/sdk-modifying-flatcar/ EOF diff --git a/build_library/dev_container_util.sh b/build_library/dev_container_util.sh index 34a028baef..b4a6753bde 100755 --- a/build_library/dev_container_util.sh +++ b/build_library/dev_container_util.sh @@ -50,12 +50,12 @@ disabled = true [coreos] location = /var/lib/portage/coreos-overlay sync-type = git -sync-uri = https://github.com/flatcar-linux/coreos-overlay.git +sync-uri = https://github.com/flatcar/coreos-overlay.git [portage-stable] location = /var/lib/portage/portage-stable sync-type = git -sync-uri = https://github.com/flatcar-linux/portage-stable.git +sync-uri = https://github.com/flatcar/portage-stable.git EOF # Now set the correct profile diff --git a/changelog/README.md b/changelog/README.md index 36601de68d..6a80d87058 100644 --- a/changelog/README.md +++ b/changelog/README.md @@ -15,7 +15,7 @@ The file should contain a markdown bullet point entry (`- TEXT...`). Example for the bugfix section: ``` -- The Torcx profile `docker-1.12-no` got fixed to reference the current Docker version instead of 19.03 which wasn't found on the image, causing Torcx to fail to provide Docker [scripts#1456](https://github.com/flatcar-linux/scripts/pull/1456) +- The Torcx profile `docker-1.12-no` got fixed to reference the current Docker version instead of 19.03 which wasn't found on the image, causing Torcx to fail to provide Docker [scripts#1456](https://github.com/flatcar/scripts/pull/1456) ``` The contents of the file should describe the changes in a concise manner, diff --git a/ci-automation/README.md b/ci-automation/README.md index df623147be..13187e7afb 100644 --- a/ci-automation/README.md +++ b/ci-automation/README.md @@ -121,7 +121,7 @@ Optionally, patterns matching a group of tests can be supplied (or simply a list Testing is implemented in two layers: 1. `ci-automation/test.sh` is a generic test wrapper / stub to be called from CI. -2. `ci-automation/vendor-testing/` contains low-level vendor-specific test wrappers around [`kola`](https://github.com/flatcar-linux/mantle/tree/flatcar-master/kola/), our test scenario orchestrator. +2. `ci-automation/vendor-testing/` contains low-level vendor-specific test wrappers around [`kola`](https://github.com/flatcar/mantle/tree/flatcar-master/kola/), our test scenario orchestrator. Testing relies on the SDK container and will use tools / test suites from the SDK. The low-level vendor / image specific script (layer 2. in the list above) runs inside the SDK. diff --git a/ci-automation/image_changes.sh b/ci-automation/image_changes.sh index 90a8e63271..e17eb10a0b 100644 --- a/ci-automation/image_changes.sh +++ b/ci-automation/image_changes.sh @@ -91,7 +91,7 @@ function _image_changes_impl() { NEW_VERSION=$(git tag --points-at HEAD) cd .. rm -rf flatcar-build-scripts - git clone "https://github.com/flatcar-linux/flatcar-build-scripts" + git clone "https://github.com/flatcar/flatcar-build-scripts" # Don't fail the job set +e echo "Package updates, compared to ${CHANNEL_A} ${VERSION_A}:" diff --git a/ci-automation/sdk_bootstrap.sh b/ci-automation/sdk_bootstrap.sh index f65536ed24..724acefa0d 100644 --- a/ci-automation/sdk_bootstrap.sh +++ b/ci-automation/sdk_bootstrap.sh @@ -16,7 +16,7 @@ # # 1. Version of the SEED SDK to use (string). # The seed SDK tarball must be available on https://mirror.release.flatcar-linux.net/sdk/ ... -# The seed SDK container must be available from https://github.com/orgs/flatcar-linux/packages +# The seed SDK container must be available from https://github.com/orgs/flatcar/packages # (via ghcr.io/flatcar/flatcar-sdk-all:[VERSION]). # # 2. Version of the TARGET SDK to build (string). diff --git a/sdk_lib/sdk_init_selfcontained.sh b/sdk_lib/sdk_init_selfcontained.sh index 466d3b9da3..3ddda3c5e6 100755 --- a/sdk_lib/sdk_init_selfcontained.sh +++ b/sdk_lib/sdk_init_selfcontained.sh @@ -2,7 +2,7 @@ echo "This script will initialise your Flatcar SDK container as a self-contained SDK." echo "Please note that the preferred way of using the Flatcar SDK container is by cloning" -echo " https://github.com/flatcar-linux/scripts" +echo " https://github.com/flatcar/scripts" echo "and using the ./run_sdk_container script." echo @@ -19,7 +19,7 @@ function clone_version() { local dest="$2" local version="$3" - git clone https://github.com/flatcar-linux/$repo "$dest" + git clone https://github.com/flatcar/$repo "$dest" git -C "${dest}" fetch --all local tag=$(git -C "${dest}" tag -l | grep "${version}") git -C "${dest}" checkout "$tag"