Merge pull request #2132 from flatcar/kai/flatcar-org-rename

Prepare github org rename to flatcar
This commit is contained in:
Kai Lüke 2022-09-14 14:53:58 +02:00 committed by GitHub
commit 0629286e4c
35 changed files with 46 additions and 46 deletions

View File

@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
CROS_WORKON_PROJECT="flatcar-linux/locksmith" CROS_WORKON_PROJECT="flatcar/locksmith"
CROS_WORKON_LOCALNAME="locksmith" CROS_WORKON_LOCALNAME="locksmith"
CROS_WORKON_REPO="https://github.com" CROS_WORKON_REPO="https://github.com"
COREOS_GO_PACKAGE="github.com/flatcar-linux/locksmith" COREOS_GO_PACKAGE="github.com/flatcar/locksmith"
inherit cros-workon systemd coreos-go inherit cros-workon systemd coreos-go
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then

View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
CROS_WORKON_PROJECT="flatcar-linux/mayday" CROS_WORKON_PROJECT="flatcar/mayday"
CROS_WORKON_LOCALNAME="mayday" CROS_WORKON_LOCALNAME="mayday"
CROS_WORKON_REPO="https://github.com" CROS_WORKON_REPO="https://github.com"
COREOS_GO_PACKAGE="github.com/coreos/mayday" COREOS_GO_PACKAGE="github.com/coreos/mayday"

View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
CROS_WORKON_PROJECT="flatcar-linux/toolbox" CROS_WORKON_PROJECT="flatcar/toolbox"
CROS_WORKON_LOCALNAME="toolbox" CROS_WORKON_LOCALNAME="toolbox"
CROS_WORKON_REPO="https://github.com" CROS_WORKON_REPO="https://github.com"
@ -16,7 +16,7 @@ fi
inherit cros-workon inherit cros-workon
DESCRIPTION="toolbox" DESCRIPTION="toolbox"
HOMEPAGE="https://github.com/flatcar-linux/toolbox" HOMEPAGE="https://github.com/flatcar/toolbox"
SRC_URI="" SRC_URI=""
LICENSE="Apache-2.0" LICENSE="Apache-2.0"

View File

@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
CROS_WORKON_PROJECT="flatcar-linux/torcx" CROS_WORKON_PROJECT="flatcar/torcx"
CROS_WORKON_LOCALNAME="torcx" CROS_WORKON_LOCALNAME="torcx"
CROS_WORKON_REPO="https://github.com" CROS_WORKON_REPO="https://github.com"
COREOS_GO_PACKAGE="github.com/flatcar-linux/torcx" COREOS_GO_PACKAGE="github.com/flatcar/torcx"
COREOS_GO_GO111MODULE="off" COREOS_GO_GO111MODULE="off"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
@ -18,7 +18,7 @@ fi
inherit coreos-go cros-workon systemd inherit coreos-go cros-workon systemd
DESCRIPTION="torcx is a boot-time addon manager for immutable systems" DESCRIPTION="torcx is a boot-time addon manager for immutable systems"
HOMEPAGE="https://github.com/flatcar-linux/torcx" HOMEPAGE="https://github.com/flatcar/torcx"
LICENSE="Apache-2.0" LICENSE="Apache-2.0"
SLOT="0" SLOT="0"

View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
CROS_WORKON_PROJECT="flatcar-linux/coreos-cloudinit" CROS_WORKON_PROJECT="flatcar/coreos-cloudinit"
CROS_WORKON_LOCALNAME="coreos-cloudinit" CROS_WORKON_LOCALNAME="coreos-cloudinit"
CROS_WORKON_REPO="https://github.com" CROS_WORKON_REPO="https://github.com"
COREOS_GO_PACKAGE="github.com/coreos/coreos-cloudinit" COREOS_GO_PACKAGE="github.com/coreos/coreos-cloudinit"

View File

@ -3,7 +3,7 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
CROS_WORKON_PROJECT="flatcar-linux/init" CROS_WORKON_PROJECT="flatcar/init"
CROS_WORKON_LOCALNAME="init" CROS_WORKON_LOCALNAME="init"
CROS_WORKON_REPO="https://github.com" CROS_WORKON_REPO="https://github.com"

View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
CROS_WORKON_PROJECT="flatcar-linux/flatcar-dev-util" CROS_WORKON_PROJECT="flatcar/flatcar-dev-util"
CROS_WORKON_REPO="https://github.com" CROS_WORKON_REPO="https://github.com"
CROS_WORKON_LOCALNAME="dev" CROS_WORKON_LOCALNAME="dev"
CROS_WORKON_LOCALDIR="src/platform" CROS_WORKON_LOCALDIR="src/platform"
@ -19,7 +19,7 @@ PYTHON_COMPAT=( python3_{6..10} )
inherit cros-workon python-single-r1 inherit cros-workon python-single-r1
DESCRIPTION="emerge utilities for Flatcar developer images" DESCRIPTION="emerge utilities for Flatcar developer images"
HOMEPAGE="https://github.com/flatcar-linux/flatcar-dev-util/" HOMEPAGE="https://github.com/flatcar/flatcar-dev-util/"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"

View File

@ -2,4 +2,4 @@ ID=azure
VERSION_ID=@@OEM_VERSION_ID@@ VERSION_ID=@@OEM_VERSION_ID@@
NAME="Microsoft Azure" NAME="Microsoft Azure"
HOME_URL="https://azure.microsoft.com/" HOME_URL="https://azure.microsoft.com/"
BUG_REPORT_URL="https://issues.flatcar-linux.org" BUG_REPORT_URL="https://issues.flatcar.org"

View File

@ -18,4 +18,4 @@ coreos:
name: CloudSigma name: CloudSigma
version-id: @@OEM_VERSION_ID@@ version-id: @@OEM_VERSION_ID@@
home-url: https://www.cloudsigma.com/ home-url: https://www.cloudsigma.com/
bug-report-url: https://issues.flatcar-linux.org bug-report-url: https://issues.flatcar.org

View File

@ -2,4 +2,4 @@ ID=digitalocean
VERSION_ID=@@OEM_VERSION_ID@@ VERSION_ID=@@OEM_VERSION_ID@@
NAME="DigitalOcean" NAME="DigitalOcean"
HOME_URL="https://www.digitalocean.com/" HOME_URL="https://www.digitalocean.com/"
BUG_REPORT_URL="https://issues.flatcar-linux.org" BUG_REPORT_URL="https://issues.flatcar.org"

View File

@ -2,4 +2,4 @@ ID=@@OEM_ID@@
VERSION_ID=@@OEM_VERSION_ID@@ VERSION_ID=@@OEM_VERSION_ID@@
NAME="@@OEM_NAME@@" NAME="@@OEM_NAME@@"
HOME_URL="@@OEM_HOME_URL@@" HOME_URL="@@OEM_HOME_URL@@"
BUG_REPORT_URL="https://issues.flatcar-linux.org" BUG_REPORT_URL="https://issues.flatcar.org"

View File

@ -2,4 +2,4 @@ ID=gce
VERSION_ID=@@OEM_VERSION_ID@@ VERSION_ID=@@OEM_VERSION_ID@@
NAME="Google Compute Engine" NAME="Google Compute Engine"
HOME_URL="https://cloud.google.com/products/compute-engine/" HOME_URL="https://cloud.google.com/products/compute-engine/"
BUG_REPORT_URL="https://issues.flatcar-linux.org" BUG_REPORT_URL="https://issues.flatcar.org"

View File

@ -1,4 +1,4 @@
ID=hyperv ID=hyperv
VERSION_ID=@@OEM_VERSION_ID@@ VERSION_ID=@@OEM_VERSION_ID@@
NAME="Microsoft Hyper-V" NAME="Microsoft Hyper-V"
BUG_REPORT_URL="https://issues.flatcar-linux.org" BUG_REPORT_URL="https://issues.flatcar.org"

View File

@ -58,4 +58,4 @@ coreos:
name: Interoute name: Interoute
version-id: @@OEM_VERSION_ID@@ version-id: @@OEM_VERSION_ID@@
home-url: http://interoute.com/ home-url: http://interoute.com/
bug-report-url: https://issues.flatcar-linux.org bug-report-url: https://issues.flatcar.org

View File

@ -54,4 +54,4 @@ coreos:
name: NIFTY Cloud name: NIFTY Cloud
version-id: @@OEM_VERSION_ID@@ version-id: @@OEM_VERSION_ID@@
home-url: http://cloud.nifty.com/ home-url: http://cloud.nifty.com/
bug-report-url: https://issues.flatcar-linux.org bug-report-url: https://issues.flatcar.org

View File

@ -2,4 +2,4 @@ ID=packet
VERSION_ID=@@OEM_VERSION_ID@@ VERSION_ID=@@OEM_VERSION_ID@@
NAME="Packet" NAME="Packet"
HOME_URL="https://packet.net" HOME_URL="https://packet.net"
BUG_REPORT_URL="https://issues.flatcar-linux.org" BUG_REPORT_URL="https://issues.flatcar.org"

View File

@ -2,4 +2,4 @@ ID=qemu
VERSION_ID=@@OEM_VERSION_ID@@ VERSION_ID=@@OEM_VERSION_ID@@
NAME="QEMU" NAME="QEMU"
HOME_URL="https://www.qemu.org/" HOME_URL="https://www.qemu.org/"
BUG_REPORT_URL="https://issues.flatcar-linux.org" BUG_REPORT_URL="https://issues.flatcar.org"

View File

@ -39,4 +39,4 @@ coreos:
name: Rackspace OnMetal name: Rackspace OnMetal
version-id: @@OEM_VERSION_ID@@ version-id: @@OEM_VERSION_ID@@
home-url: http://www.rackspace.com/ home-url: http://www.rackspace.com/
bug-report-url: https://issues.flatcar-linux.org bug-report-url: https://issues.flatcar.org

View File

@ -34,4 +34,4 @@ coreos:
name: Rackspace Cloud Servers name: Rackspace Cloud Servers
version-id: @@OEM_VERSION_ID@@ version-id: @@OEM_VERSION_ID@@
home-url: https://www.rackspace.com/cloud/servers/ home-url: https://www.rackspace.com/cloud/servers/
bug-report-url: https://issues.flatcar-linux.org bug-report-url: https://issues.flatcar.org

View File

@ -1,4 +1,4 @@
ID=virtualbox ID=virtualbox
VERSION_ID=@@OEM_VERSION_ID@@ VERSION_ID=@@OEM_VERSION_ID@@
NAME="Oracle VirtualBox" NAME="Oracle VirtualBox"
BUG_REPORT_URL="https://issues.flatcar-linux.org" BUG_REPORT_URL="https://issues.flatcar.org"

View File

@ -2,4 +2,4 @@ ID=vmware
VERSION_ID=@@OEM_VERSION_ID@@ VERSION_ID=@@OEM_VERSION_ID@@
NAME="VMware" NAME="VMware"
HOME_URL="https://www.vmware.com/" HOME_URL="https://www.vmware.com/"
BUG_REPORT_URL="https://issues.flatcar-linux.org" BUG_REPORT_URL="https://issues.flatcar.org"

View File

@ -4,7 +4,7 @@
EAPI=7 EAPI=7
DESCRIPTION="OEM suite for VMware" DESCRIPTION="OEM suite for VMware"
HOMEPAGE="https://github.com/flatcar-linux/coreos-overlay/tree/main/coreos-base" HOMEPAGE="https://github.com/flatcar/coreos-overlay/tree/main/coreos-base"
SRC_URI="" SRC_URI=""
LICENSE="Apache-2.0" LICENSE="Apache-2.0"

View File

@ -3,7 +3,7 @@
EAPI=8 EAPI=8
CROS_WORKON_PROJECT="flatcar-linux/update-ssh-keys" CROS_WORKON_PROJECT="flatcar/update-ssh-keys"
CROS_WORKON_LOCALNAME="update-ssh-keys" CROS_WORKON_LOCALNAME="update-ssh-keys"
CROS_WORKON_REPO="https://github.com" CROS_WORKON_REPO="https://github.com"
@ -52,7 +52,7 @@ winapi-x86_64-pc-windows-gnu-0.4.0
inherit coreos-cargo cros-workon inherit coreos-cargo cros-workon
DESCRIPTION="Utility for managing OpenSSH authorized public keys" DESCRIPTION="Utility for managing OpenSSH authorized public keys"
HOMEPAGE="https://github.com/flatcar-linux/update-ssh-keys" HOMEPAGE="https://github.com/flatcar/update-ssh-keys"
SRC_URI="$(cargo_crate_uris ${CRATES})" SRC_URI="$(cargo_crate_uris ${CRATES})"
LICENSE="Apache-2.0" LICENSE="Apache-2.0"

View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
CROS_WORKON_PROJECT="flatcar-linux/update_engine" CROS_WORKON_PROJECT="flatcar/update_engine"
CROS_WORKON_REPO="https://github.com" CROS_WORKON_REPO="https://github.com"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then

View File

@ -67,7 +67,7 @@ __slsa_provenance_materials() {
# The ebuild. Since "configSource" in "invocation" cannot have more than one (top/level) entry # The ebuild. Since "configSource" in "invocation" cannot have more than one (top/level) entry
# we add the ebuild and git repo checksum here, as a material. # we add the ebuild and git repo checksum here, as a material.
csum="$(cat "/mnt/host/source/src/scripts/.git/modules/sdk_container/src/third_party/${repo}/HEAD")" csum="$(cat "/mnt/host/source/src/scripts/.git/modules/sdk_container/src/third_party/${repo}/HEAD")"
uri="git+https://github.com/flatcar-linux/${repo}.git@${csum}#${ebuild}" uri="git+https://github.com/flatcar/${repo}.git@${csum}#${ebuild}"
echo -e " { \"uri\": \"${uri}\"," echo -e " { \"uri\": \"${uri}\","
echo -n " \"digest\": {\"sha1\":\"${ebuildcsum}\"} }" echo -n " \"digest\": {\"sha1\":\"${ebuildcsum}\"} }"
@ -115,7 +115,7 @@ __slsa_provenance_materials() {
# Patches / files shipped with the ebuild (if any) # Patches / files shipped with the ebuild (if any)
csum="$(cat "/mnt/host/source/src/scripts/.git/modules/sdk_container/src/third_party/${repo}/HEAD")" csum="$(cat "/mnt/host/source/src/scripts/.git/modules/sdk_container/src/third_party/${repo}/HEAD")"
uri="git+https://github.com/flatcar-linux/${repo}.git@${csum}#${CATEGORY}/${PN}/files" uri="git+https://github.com/flatcar/${repo}.git@${csum}#${CATEGORY}/${PN}/files"
if [ -d "${FILESDIR}" ] ; then if [ -d "${FILESDIR}" ] ; then
for file in $(cd "$FILESDIR" && find . -type f | sed 's:^./::') ; do for file in $(cd "$FILESDIR" && find . -type f | sed 's:^./::') ; do
csum="$(sha1sum - <"${FILESDIR}/${file}")" csum="$(sha1sum - <"${FILESDIR}/${file}")"
@ -151,11 +151,11 @@ cat <<EOF
"_type": "https://in-toto.io/Statement/v0.1", "_type": "https://in-toto.io/Statement/v0.1",
"predicateType": "https://slsa.dev/provenance/v0.2", "predicateType": "https://slsa.dev/provenance/v0.2",
"predicate": { "predicate": {
"buildType": "ghcr.io/flatcar-linux/flatcar-sdk-all:${sdk_version}", "buildType": "ghcr.io/flatcar/flatcar-sdk-all:${sdk_version}",
"builder": {"id": "TODO - builder ID" }, "builder": {"id": "TODO - builder ID" },
"invocation": { "invocation": {
"configSource": { "configSource": {
"uri": "https://github.com/flatcar-linux/scripts", "uri": "https://github.com/flatcar/scripts",
"digest": {"sha1": "${scripts_hash}"} "digest": {"sha1": "${scripts_hash}"}
} }
}, },

View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
CROS_WORKON_PROJECT="flatcar-linux/baselayout" CROS_WORKON_PROJECT="flatcar/baselayout"
CROS_WORKON_LOCALNAME="baselayout" CROS_WORKON_LOCALNAME="baselayout"
CROS_WORKON_REPO="https://github.com" CROS_WORKON_REPO="https://github.com"

View File

@ -5,7 +5,7 @@ EAPI=7
CROS_WORKON_PROJECT="coreos/ignition" CROS_WORKON_PROJECT="coreos/ignition"
CROS_WORKON_LOCALNAME="ignition" CROS_WORKON_LOCALNAME="ignition"
CROS_WORKON_REPO="https://github.com" CROS_WORKON_REPO="https://github.com"
COREOS_GO_PACKAGE="github.com/flatcar-linux/ignition/v2" COREOS_GO_PACKAGE="github.com/flatcar/ignition/v2"
COREOS_GO_GO111MODULE="off" COREOS_GO_GO111MODULE="off"
inherit coreos-go cros-workon systemd udev inherit coreos-go cros-workon systemd udev
@ -62,7 +62,7 @@ PATCHES=(
src_compile() { src_compile() {
export GO15VENDOREXPERIMENT="1" export GO15VENDOREXPERIMENT="1"
GO_LDFLAGS="-X github.com/flatcar-linux/ignition/v2/internal/version.Raw=${PV} -X github.com/flatcar-linux/ignition/v2/internal/distro.selinuxRelabel=false" || die GO_LDFLAGS="-X github.com/flatcar/ignition/v2/internal/version.Raw=${PV} -X github.com/flatcar/ignition/v2/internal/distro.selinuxRelabel=false" || die
go_build "${COREOS_GO_PACKAGE}/internal" go_build "${COREOS_GO_PACKAGE}/internal"
} }

View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
CROS_WORKON_PROJECT="flatcar-linux/seismograph" CROS_WORKON_PROJECT="flatcar/seismograph"
CROS_WORKON_REPO="https://github.com" CROS_WORKON_REPO="https://github.com"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then

View File

@ -1 +1 @@
- Check that the `systemd-sysext.service`'s `ConditionDirectoryNotEmpty` entries are correctly reflected in `flatcar-linux/init:systemd/system/ensure-sysext.service` - Check that the `systemd-sysext.service`'s `ConditionDirectoryNotEmpty` entries are correctly reflected in `flatcar/init:systemd/system/ensure-sysext.service`

View File

@ -401,7 +401,7 @@ multilib_src_configure() {
# Flatcar: Set latest network interface naming scheme # Flatcar: Set latest network interface naming scheme
# for # for
# https://github.com/flatcar-linux/Flatcar/issues/36 # https://github.com/flatcar/Flatcar/issues/36
-Ddefault-net-naming-scheme=latest -Ddefault-net-naming-scheme=latest
# Flatcar: Unported options, still needed? # Flatcar: Unported options, still needed?

View File

@ -3,7 +3,7 @@
EAPI=6 EAPI=6
CROS_WORKON_PROJECT="flatcar-linux/grub" CROS_WORKON_PROJECT="flatcar/grub"
CROS_WORKON_REPO="https://github.com" CROS_WORKON_REPO="https://github.com"
GRUB_AUTOGEN=1 # We start from Git, so always autogen. GRUB_AUTOGEN=1 # We start from Git, so always autogen.

View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
CROS_WORKON_PROJECT="flatcar-linux/shim" CROS_WORKON_PROJECT="flatcar/shim"
CROS_WORKON_REPO="https://github.com" CROS_WORKON_REPO="https://github.com"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then

View File

@ -41,7 +41,7 @@ and only installs files modules declare as required.
# Keep kernel, kernel headers, and perf aligned # Keep kernel, kernel headers, and perf aligned
When updating the kernel to a new major release please make sure to also update When updating the kernel to a new major release please make sure to also update
[the kernel headers](https://github.com/flatcar-linux/portage-stable/tree/main/sys-kernel/linux-headers) [the kernel headers](https://github.com/flatcar/portage-stable/tree/main/sys-kernel/linux-headers)
and and
[perf](https://github.com/flatcar-linux/portage-stable/tree/main/dev-util/perf) [perf](https://github.com/flatcar/portage-stable/tree/main/dev-util/perf)
to the same major version. to the same major version.

View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
CROS_WORKON_PROJECT="flatcar-linux/bootengine" CROS_WORKON_PROJECT="flatcar/bootengine"
CROS_WORKON_LOCALNAME="bootengine" CROS_WORKON_LOCALNAME="bootengine"
CROS_WORKON_OUTOFTREE_BUILD=1 CROS_WORKON_OUTOFTREE_BUILD=1
CROS_WORKON_REPO="https://github.com" CROS_WORKON_REPO="https://github.com"

View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
CROS_WORKON_PROJECT="flatcar-linux/nss-altfiles" CROS_WORKON_PROJECT="flatcar/nss-altfiles"
CROS_WORKON_LOCALNAME="nss-altfiles" CROS_WORKON_LOCALNAME="nss-altfiles"
CROS_WORKON_REPO="https://github.com" CROS_WORKON_REPO="https://github.com"