Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

Commit

Permalink
Use new github org name "flatcar"
Browse files Browse the repository at this point in the history
The "flatcar-linux" github org was renamed to "flatcar". There are no
github redirects in this case, thus we have to fix the links.
Left to do are the patch files.
  • Loading branch information
pothos committed Sep 7, 2022
1 parent b7a818e commit 0840a2d
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion app-admin/locksmith/locksmith-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ EAPI=7
CROS_WORKON_PROJECT="flatcar-linux/locksmith"
CROS_WORKON_LOCALNAME="locksmith"
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

if [[ "${PV}" == 9999 ]]; then
Expand Down
2 changes: 1 addition & 1 deletion app-admin/toolbox/toolbox-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ fi
inherit cros-workon

DESCRIPTION="toolbox"
HOMEPAGE="https://github.com/flatcar-linux/toolbox"
HOMEPAGE="https://github.com/flatcar/toolbox"
SRC_URI=""

LICENSE="Apache-2.0"
Expand Down
4 changes: 2 additions & 2 deletions app-arch/torcx/torcx-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ EAPI=7
CROS_WORKON_PROJECT="flatcar-linux/torcx"
CROS_WORKON_LOCALNAME="torcx"
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"

if [[ "${PV}" == 9999 ]]; then
Expand All @@ -18,7 +18,7 @@ fi
inherit coreos-go cros-workon systemd

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"
SLOT="0"

Expand Down
2 changes: 1 addition & 1 deletion coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ PYTHON_COMPAT=( python3_{6..10} )
inherit cros-workon python-single-r1

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"
SLOT="0"
Expand Down
2 changes: 1 addition & 1 deletion coreos-base/oem-vmware/oem-vmware-12.1.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
EAPI=7

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=""

LICENSE="Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ winapi-x86_64-pc-windows-gnu-0.4.0
inherit coreos-cargo cros-workon

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})"

LICENSE="Apache-2.0"
Expand Down
6 changes: 3 additions & 3 deletions profiles/coreos/base/profile.bashrc.slsa-provenance
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ __slsa_provenance_materials() {
# 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.
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 -n " \"digest\": {\"sha1\":\"${ebuildcsum}\"} }"

Expand Down Expand Up @@ -115,7 +115,7 @@ __slsa_provenance_materials() {

# Patches / files shipped with the ebuild (if any)
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
for file in $(cd "$FILESDIR" && find . -type f | sed 's:^./::') ; do
csum="$(sha1sum - <"${FILESDIR}/${file}")"
Expand Down Expand Up @@ -155,7 +155,7 @@ cat <<EOF
"builder": {"id": "TODO - builder ID" },
"invocation": {
"configSource": {
"uri": "https://github.com/flatcar-linux/scripts",
"uri": "https://github.com/flatcar/scripts",
"digest": {"sha1": "${scripts_hash}"}
}
},
Expand Down
4 changes: 2 additions & 2 deletions sys-apps/ignition/ignition-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ EAPI=7
CROS_WORKON_PROJECT="coreos/ignition"
CROS_WORKON_LOCALNAME="ignition"
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"
inherit coreos-go cros-workon systemd udev

Expand Down Expand Up @@ -62,7 +62,7 @@ PATCHES=(

src_compile() {
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"
}

Expand Down
2 changes: 1 addition & 1 deletion sys-apps/systemd/CHECKLIST.md
Original file line number Diff line number Diff line change
@@ -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`
2 changes: 1 addition & 1 deletion sys-apps/systemd/systemd-250.3.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ multilib_src_configure() {

# Flatcar: Set latest network interface naming scheme
# for
# https://github.com/flatcar-linux/Flatcar/issues/36
# https://github.com/flatcar/Flatcar/issues/36
-Ddefault-net-naming-scheme=latest

# Flatcar: Unported options, still needed?
Expand Down
4 changes: 2 additions & 2 deletions sys-kernel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ and only installs files modules declare as required.
# Keep kernel, kernel headers, and perf aligned

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
[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.

0 comments on commit 0840a2d

Please sign in to comment.