This commit is contained in:
Flatcar Buildbot 2019-11-07 19:43:27 +01:00 committed by Iago López Galeiras
parent eec8b0cffc
commit 0d01cc4c91
100 changed files with 187 additions and 159 deletions

View File

@ -24,7 +24,7 @@ src_install() {
tag+="-${ARCH}" tag+="-${ARCH}"
fi fi
exeinto /usr/lib/coreos exeinto /usr/lib/flatcar
doexe "${FILESDIR}"/etcd-wrapper doexe "${FILESDIR}"/etcd-wrapper
sed "s|@ETCD_IMAGE_TAG@|${tag}|g" \ sed "s|@ETCD_IMAGE_TAG@|${tag}|g" \

View File

@ -17,12 +17,12 @@ Environment="ETCD_IMAGE_TAG=@ETCD_IMAGE_TAG@"
Environment="ETCD_NAME=%m" Environment="ETCD_NAME=%m"
Environment="ETCD_USER=etcd" Environment="ETCD_USER=etcd"
Environment="ETCD_DATA_DIR=/var/lib/etcd" Environment="ETCD_DATA_DIR=/var/lib/etcd"
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/coreos/etcd-member-wrapper.uuid" Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/flatcar/etcd-member-wrapper.uuid"
ExecStartPre=/usr/bin/mkdir --parents /var/lib/coreos ExecStartPre=/usr/bin/mkdir --parents /var/lib/flatcar
ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/lib/coreos/etcd-member-wrapper.uuid ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/lib/flatcar/etcd-member-wrapper.uuid
ExecStart=/usr/lib/coreos/etcd-wrapper $ETCD_OPTS ExecStart=/usr/lib/flatcar/etcd-wrapper $ETCD_OPTS
ExecStop=-/usr/bin/rkt stop --uuid-file=/var/lib/coreos/etcd-member-wrapper.uuid ExecStop=-/usr/bin/rkt stop --uuid-file=/var/lib/flatcar/etcd-member-wrapper.uuid
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@ -10,12 +10,12 @@ Before=docker.service
Type=oneshot Type=oneshot
Environment="FLANNEL_IMAGE_TAG=@FLANNEL_IMAGE_TAG@" Environment="FLANNEL_IMAGE_TAG=@FLANNEL_IMAGE_TAG@"
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/coreos/flannel-wrapper2.uuid" Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/flatcar/flannel-wrapper2.uuid"
Environment="FLANNEL_IMAGE_ARGS=--exec=/opt/bin/mk-docker-opts.sh" Environment="FLANNEL_IMAGE_ARGS=--exec=/opt/bin/mk-docker-opts.sh"
ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/lib/coreos/flannel-wrapper2.uuid ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/lib/flatcar/flannel-wrapper2.uuid
ExecStart=/usr/lib/coreos/flannel-wrapper -d /run/flannel/flannel_docker_opts.env -i ExecStart=/usr/lib/flatcar/flannel-wrapper -d /run/flannel/flannel_docker_opts.env -i
ExecStop=-/usr/bin/rkt stop --uuid-file=/var/lib/coreos/flannel-wrapper2.uuid ExecStop=-/usr/bin/rkt stop --uuid-file=/var/lib/flatcar/flannel-wrapper2.uuid
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@ -14,14 +14,14 @@ LimitNPROC=1048576
Environment="FLANNEL_IMAGE_TAG=@FLANNEL_IMAGE_TAG@" Environment="FLANNEL_IMAGE_TAG=@FLANNEL_IMAGE_TAG@"
Environment="FLANNEL_OPTS=--ip-masq=true" Environment="FLANNEL_OPTS=--ip-masq=true"
Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/coreos/flannel-wrapper.uuid" Environment="RKT_RUN_ARGS=--uuid-file-save=/var/lib/flatcar/flannel-wrapper.uuid"
EnvironmentFile=-/run/flannel/options.env EnvironmentFile=-/run/flannel/options.env
ExecStartPre=/sbin/modprobe ip_tables ExecStartPre=/sbin/modprobe ip_tables
ExecStartPre=/usr/bin/mkdir --parents /var/lib/coreos /run/flannel ExecStartPre=/usr/bin/mkdir --parents /var/lib/flatcar /run/flannel
ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/lib/coreos/flannel-wrapper.uuid ExecStartPre=-/usr/bin/rkt rm --uuid-file=/var/lib/flatcar/flannel-wrapper.uuid
ExecStart=/usr/lib/coreos/flannel-wrapper $FLANNEL_OPTS ExecStart=/usr/lib/flatcar/flannel-wrapper $FLANNEL_OPTS
ExecStop=-/usr/bin/rkt stop --uuid-file=/var/lib/coreos/flannel-wrapper.uuid ExecStop=-/usr/bin/rkt stop --uuid-file=/var/lib/flatcar/flannel-wrapper.uuid
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@ -28,7 +28,7 @@ src_install() {
tag+="-${ARCH}" tag+="-${ARCH}"
fi fi
exeinto /usr/lib/coreos exeinto /usr/lib/flatcar
doexe "${FILESDIR}"/flannel-wrapper doexe "${FILESDIR}"/flannel-wrapper
sed "s|@FLANNEL_IMAGE_TAG@|${tag}|g" \ sed "s|@FLANNEL_IMAGE_TAG@|${tag}|g" \

View File

@ -20,6 +20,6 @@ RDEPEND=">=app-emulation/rkt-1.9.1[rkt_stage1_fly]"
S=${WORKDIR} S=${WORKDIR}
src_install() { src_install() {
exeinto /usr/lib/coreos exeinto /usr/lib/flatcar
doexe "${FILESDIR}"/kubelet-wrapper doexe "${FILESDIR}"/kubelet-wrapper
} }

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="coreos/locksmith" CROS_WORKON_PROJECT="flatcar-linux/locksmith"
CROS_WORKON_LOCALNAME="locksmith" CROS_WORKON_LOCALNAME="locksmith"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
COREOS_GO_PACKAGE="github.com/coreos/locksmith" COREOS_GO_PACKAGE="github.com/coreos/locksmith"

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="coreos/mayday" CROS_WORKON_PROJECT="flatcar-linux/mayday"
CROS_WORKON_LOCALNAME="mayday" CROS_WORKON_LOCALNAME="mayday"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
COREOS_GO_PACKAGE="github.com/coreos/mayday" COREOS_GO_PACKAGE="github.com/coreos/mayday"
@ -11,7 +11,7 @@ inherit coreos-go cros-workon
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm64" KEYWORDS="~amd64 ~arm64"
else else
CROS_WORKON_COMMIT="5e2b4bcb0743ff0105cd193a8d9e4ddc78088153" # v1.0.0 CROS_WORKON_COMMIT="78318a5760bea08ff5a76779a070c2c8fbea2939" # flatcar-master
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
fi fi

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="coreos/sdnotify-proxy" CROS_WORKON_PROJECT="flatcar-linux/sdnotify-proxy"
CROS_WORKON_LOCALNAME="sdnotify-proxy" CROS_WORKON_LOCALNAME="sdnotify-proxy"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
COREOS_GO_PACKAGE="github.com/coreos/sdnotify-proxy" COREOS_GO_PACKAGE="github.com/coreos/sdnotify-proxy"
@ -11,7 +11,7 @@ inherit coreos-go cros-workon
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm64" KEYWORDS="~amd64 ~arm64"
else else
CROS_WORKON_COMMIT="f516129af110fd4a51bd5ea2654f4dc8dd02e5c4" CROS_WORKON_COMMIT="0f8ef1aa86c59fc6d54eadaffb248feaccd1018b" # flatcar-master
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
fi fi

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=4 EAPI=4
CROS_WORKON_PROJECT="coreos/toolbox" CROS_WORKON_PROJECT="flatcar-linux/toolbox"
CROS_WORKON_LOCALNAME="toolbox" CROS_WORKON_LOCALNAME="toolbox"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://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="coreos/updateservicectl" CROS_WORKON_PROJECT="flatcar-linux/updateservicectl"
CROS_WORKON_LOCALNAME="updateservicectl" CROS_WORKON_LOCALNAME="updateservicectl"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
COREOS_GO_PACKAGE="github.com/coreos/updateservicectl" COREOS_GO_PACKAGE="github.com/coreos/updateservicectl"

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="coreos/torcx" CROS_WORKON_PROJECT="flatcar-linux/torcx"
CROS_WORKON_LOCALNAME="torcx" CROS_WORKON_LOCALNAME="torcx"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
COREOS_GO_PACKAGE="github.com/coreos/torcx" COREOS_GO_PACKAGE="github.com/coreos/torcx"
@ -34,7 +34,7 @@ src_compile() {
src_install() { src_install() {
local generatordir=/usr/lib/systemd/system-generators local generatordir=/usr/lib/systemd/system-generators
local vendordir=/usr/share/torcx local vendordir=/usr/share/torcx
local libcoreosdir=/usr/lib/coreos local libcoreosdir=/usr/lib/flatcar
# Install generator and userland. # Install generator and userland.
exeinto "${generatordir}" exeinto "${generatordir}"
@ -53,6 +53,6 @@ src_install() {
for link in {docker-,}{containerd{,-shim},runc} ctr docker-{init,proxy} dockerd tini for link in {docker-,}{containerd{,-shim},runc} ctr docker-{init,proxy} dockerd tini
do ln -fns docker "${ED}/usr/bin/${link}" do ln -fns docker "${ED}/usr/bin/${link}"
done done
exeinto /usr/lib/coreos exeinto /usr/lib/flatcar
newexe "${FILESDIR}/dockerd-wrapper.sh" dockerd newexe "${FILESDIR}/dockerd-wrapper.sh" dockerd
} }

View File

@ -4,7 +4,7 @@
EAPI=5 EAPI=5
CROS_WORKON_PROJECT="coreos/docker" CROS_WORKON_PROJECT="flatcar-linux/docker"
CROS_WORKON_LOCALNAME="docker" CROS_WORKON_LOCALNAME="docker"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
COREOS_GO_VERSION="go1.7" COREOS_GO_VERSION="go1.7"
@ -269,8 +269,8 @@ src_install() {
newinitd contrib/init/openrc/docker.initd docker newinitd contrib/init/openrc/docker.initd docker
newconfd contrib/init/openrc/docker.confd docker newconfd contrib/init/openrc/docker.confd docker
exeinto /usr/lib/coreos exeinto /usr/lib/flatcar
# Create /usr/lib/coreos/dockerd script for backwards compatibility # Create /usr/lib/flatcar/dockerd script for backwards compatibility
doexe "${FILESDIR}/dockerd" doexe "${FILESDIR}/dockerd"
systemd_dounit "${FILESDIR}/docker.service" systemd_dounit "${FILESDIR}/docker.service"

View File

@ -3,7 +3,7 @@
EAPI=6 EAPI=6
CROS_WORKON_PROJECT="coreos/docker" CROS_WORKON_PROJECT="flatcar-linux/docker"
CROS_WORKON_LOCALNAME="docker" CROS_WORKON_LOCALNAME="docker"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
COREOS_GO_VERSION="go1.7" COREOS_GO_VERSION="go1.7"
@ -251,7 +251,7 @@ src_install() {
newinitd contrib/init/openrc/docker.initd docker newinitd contrib/init/openrc/docker.initd docker
newconfd contrib/init/openrc/docker.confd docker newconfd contrib/init/openrc/docker.confd docker
exeinto /usr/lib/coreos exeinto /usr/lib/flatcar
doexe "${FILESDIR}/dockerd" doexe "${FILESDIR}/dockerd"
systemd_dounit "${FILESDIR}/docker.service" systemd_dounit "${FILESDIR}/docker.service"

View File

@ -276,8 +276,8 @@ src_install() {
newinitd contrib/init/openrc/docker.initd docker newinitd contrib/init/openrc/docker.initd docker
newconfd contrib/init/openrc/docker.confd docker newconfd contrib/init/openrc/docker.confd docker
exeinto /usr/lib/coreos exeinto /usr/lib/flatcar
# Create /usr/lib/coreos/dockerd for backwards compatibility # Create /usr/lib/flatcar/dockerd for backwards compatibility
doexe "${FILESDIR}/dockerd" doexe "${FILESDIR}/dockerd"
systemd_dounit "${FILESDIR}/docker.service" systemd_dounit "${FILESDIR}/docker.service"

View File

@ -1,5 +1,5 @@
[Unit] [Unit]
Description=CoreOS Metadata Agent (SSH Keys) Description=Flatcar Metadata Agent (SSH Keys)
[Service] [Service]
Type=oneshot Type=oneshot

View File

@ -1,10 +1,10 @@
[Unit] [Unit]
Description=CoreOS Metadata Agent Description=Flatcar Metadata Agent
[Service] [Service]
Type=oneshot Type=oneshot
Environment=COREOS_METADATA_OPT_PROVIDER=--cmdline Environment=COREOS_METADATA_OPT_PROVIDER=--cmdline
ExecStart=/usr/bin/coreos-metadata ${COREOS_METADATA_OPT_PROVIDER} --attributes=/run/metadata/coreos ExecStart=/usr/bin/coreos-metadata ${COREOS_METADATA_OPT_PROVIDER} --attributes=/run/metadata/flatcar
[Install] [Install]
RequiredBy=metadata.target RequiredBy=metadata.target

View File

@ -1,9 +1,9 @@
-----BEGIN PUBLIC KEY----- -----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7pO21yN+b6yx9P+wHzS2 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw/NZ5Tvc93KynOLPDOxa
clxGs18eWxfoleETLbFVmcXu783rgBP0bFjYfqrNZNaI1Ip6bxEYkPacg0xFg7ri hyAGRKB2NvgF9l2A61SsFw5CuZc/k02u1/BvFehK4XL/eOo90Dt8A2l28D/YKs7g
lNdO/cxJV5Ltj40wFlpmzJOAH8hx5SF8KWg2NV1I6TS8pp+CQqcvvOKu6AIcWfeY 2IPUSAnA9hc5OKBbpHsDzisxlAh7kg4FpeeJJWJMzO8NDCG5NZVqXEpGjCmX0qSh
11V7eJ8rWcDsnqpTg8T1VRxytsg2UjTMfQwzcGLTb8cQ8AV39ED5WC5NdS9Bld4h 5MLiTDr9dU2YhLo93/92dKnTvsLjUVv5wnuF55Lt2wJv4CbxVn4hHwotGfSomTBO
XqS9Dx6Pe3JOQLZze6XIIwWuB2jxGpM1GWfRNm5nxvne3l7ggC970482a7STGK10 +7o6hE3VIIo1C6lkP+FAqMyWKA9s6U0x4tGxCXszW3hPWOANLIT4m0e55ayxiy5A
fD8//k8myVxleMAeQoMRXoRq9p3C84H4Bw8v2dX13kFFCgfEQj6SOZ5huXZKLPpB ESEVW/xx6Rul75u925m21AqA6wwaEB6ZPKTnUiWoNKNv1xi8LPIz12+0nuE6iT1K
LwIDAQAB jQIDAQAB
-----END PUBLIC KEY----- -----END PUBLIC KEY-----

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="coreos/coreos-cloudinit" CROS_WORKON_PROJECT="flatcar-linux/coreos-cloudinit"
CROS_WORKON_LOCALNAME="coreos-cloudinit" CROS_WORKON_LOCALNAME="coreos-cloudinit"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://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="5" EAPI="5"
CROS_WORKON_PROJECT="coreos/init" CROS_WORKON_PROJECT="flatcar-linux/init"
CROS_WORKON_LOCALNAME="init" CROS_WORKON_LOCALNAME="init"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://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="4" EAPI="4"
CROS_WORKON_PROJECT="coreos/dev-util" CROS_WORKON_PROJECT="flatcar-linux/dev-util"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
CROS_WORKON_LOCALNAME="dev" CROS_WORKON_LOCALNAME="dev"
CROS_WORKON_LOCALDIR="src/platform" CROS_WORKON_LOCALDIR="src/platform"
@ -10,7 +10,7 @@ CROS_WORKON_LOCALDIR="src/platform"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~x86" KEYWORDS="~amd64 ~arm ~x86"
else else
CROS_WORKON_COMMIT="7b9092b9f6d93f00527591a7c393e2be3099278d" CROS_WORKON_COMMIT="7b48efb82f5acfe135ea6e0ec2c9c5ee957d64d2" # flatcar-master
KEYWORDS="amd64 arm x86" KEYWORDS="amd64 arm x86"
fi fi

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=5 EAPI=5
CROS_WORKON_PROJECT="coreos/dev-util" CROS_WORKON_PROJECT="flatcar-linux/dev-util"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
CROS_WORKON_LOCALNAME="dev" CROS_WORKON_LOCALNAME="dev"
CROS_WORKON_LOCALDIR="src/platform" CROS_WORKON_LOCALDIR="src/platform"
@ -10,7 +10,7 @@ CROS_WORKON_LOCALDIR="src/platform"
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86" KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else else
CROS_WORKON_COMMIT="7b9092b9f6d93f00527591a7c393e2be3099278d" CROS_WORKON_COMMIT="7b48efb82f5acfe135ea6e0ec2c9c5ee957d64d2" # flatcar-master
KEYWORDS="amd64 arm arm64 x86" KEYWORDS="amd64 arm arm64 x86"
fi fi

View File

@ -1,4 +1,4 @@
# CoreOS GRUB settings # Flatcar GRUB settings
set oem_id="azure" set oem_id="azure"

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.coreos.com bug-report-url: https://issues.flatcar-linux.org

View File

@ -1,3 +1,3 @@
# CoreOS GRUB settings # Flatcar GRUB settings
set oem_id="cloudsigma" set oem_id="cloudsigma"

View File

@ -19,8 +19,8 @@ coreos:
content: | content: |
[Unit] [Unit]
Description=Cloudinit from CloudStack-style metadata Description=Cloudinit from CloudStack-style metadata
Requires=coreos-setup-environment.service Requires=flatcar-setup-environment.service
After=coreos-setup-environment.service After=flatcar-setup-environment.service
[Service] [Service]
Type=oneshot Type=oneshot

View File

@ -14,8 +14,8 @@ if [[ $? -ne 0 ]]; then
exit 1 exit 1
fi fi
sed -i -e '/^COREOS_PUBLIC_IPV4=/d' \ sed -i -e '/^FLATCAR_PUBLIC_IPV4=/d' \
-e '/^COREOS_PRIVATE_IPV4=/d' \ -e '/^FLATCAR_PRIVATE_IPV4=/d' \
"${ENV}" "${ENV}"
. /usr/share/oem/bin/cloudstack-dhcp . /usr/share/oem/bin/cloudstack-dhcp
@ -26,7 +26,7 @@ METADATA_URL="http://${DHCP_SERVER}/latest/meta-data/"
block-until-url "${METADATA_URL}" block-until-url "${METADATA_URL}"
PUBLIC_IP=$(curl --fail -s "${METADATA_URL}public-ipv4") PUBLIC_IP=$(curl --fail -s "${METADATA_URL}public-ipv4")
echo COREOS_PUBLIC_IPV4=${PUBLIC_IP} >> $ENV echo FLATCAR_PUBLIC_IPV4=${PUBLIC_IP} >> $ENV
PRIVATE_IP=$(curl --fail -s "${METADATA_URL}local-ipv4") PRIVATE_IP=$(curl --fail -s "${METADATA_URL}local-ipv4")
echo COREOS_PRIVATE_IPV4=${PRIVATE_IP} >> $ENV echo FLATCAR_PRIVATE_IPV4=${PRIVATE_IP} >> $ENV

View File

@ -1,3 +1,3 @@
# CoreOS GRUB settings # Flatcar GRUB settings
set oem_id="cloudstack" set oem_id="cloudstack"

View File

@ -29,7 +29,7 @@ src_install() {
dobin "${FILESDIR}/cloudstack-dhcp" dobin "${FILESDIR}/cloudstack-dhcp"
dobin "${FILESDIR}/cloudstack-ssh-key" dobin "${FILESDIR}/cloudstack-ssh-key"
dobin "${FILESDIR}/cloudstack-coreos-cloudinit" dobin "${FILESDIR}/cloudstack-coreos-cloudinit"
dobin "${FILESDIR}/coreos-setup-environment" dobin "${FILESDIR}/flatcar-setup-environment"
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"

View File

@ -1,3 +1,3 @@
# CoreOS GRUB settings # Flatcar GRUB settings
set oem_id="digitalocean" set oem_id="digitalocean"

View File

@ -1,3 +1,3 @@
# CoreOS GRUB settings for EC2 # Flatcar GRUB settings for EC2
set oem_id="brightbox" set oem_id="brightbox"

View File

@ -1,4 +1,4 @@
# CoreOS GRUB settings for EC2 # Flatcar GRUB settings for EC2
set oem_id="ec2" set oem_id="ec2"

View File

@ -1,3 +1,3 @@
# CoreOS GRUB settings for EC2 # Flatcar GRUB settings for EC2
set oem_id="openstack" set oem_id="openstack"

View File

@ -19,8 +19,8 @@ coreos:
content: | content: |
[Unit] [Unit]
Description=Cloudinit from exoscale (cloudstack-style) metadata Description=Cloudinit from exoscale (cloudstack-style) metadata
Requires=coreos-setup-environment.service Requires=flatcar-setup-environment.service
After=coreos-setup-environment.service After=flatcar-setup-environment.service
[Service] [Service]
Type=oneshot Type=oneshot

View File

@ -14,8 +14,8 @@ if [[ $? -ne 0 ]]; then
exit 1 exit 1
fi fi
sed -i -e '/^COREOS_PUBLIC_IPV4=/d' \ sed -i -e '/^FLATCAR_PUBLIC_IPV4=/d' \
-e '/^COREOS_PRIVATE_IPV4=/d' \ -e '/^FLATCAR_PRIVATE_IPV4=/d' \
"${ENV}" "${ENV}"
. /usr/share/oem/bin/exoscale-dhcp . /usr/share/oem/bin/exoscale-dhcp
@ -26,7 +26,7 @@ METADATA_URL="http://${DHCP_SERVER}/latest/"
block-until-url "${METADATA_URL}" block-until-url "${METADATA_URL}"
PUBLIC_IP=$(curl --fail -s "${METADATA_URL}public-ipv4") PUBLIC_IP=$(curl --fail -s "${METADATA_URL}public-ipv4")
echo COREOS_PUBLIC_IPV4=${PUBLIC_IP} >> $ENV echo FLATCAR_PUBLIC_IPV4=${PUBLIC_IP} >> $ENV
PRIVATE_IP=$(curl --fail -s "${METADATA_URL}local-ipv4") PRIVATE_IP=$(curl --fail -s "${METADATA_URL}local-ipv4")
echo COREOS_PRIVATE_IPV4=${PRIVATE_IP} >> $ENV echo FLATCAR_PRIVATE_IPV4=${PRIVATE_IP} >> $ENV

View File

@ -1,3 +1,3 @@
# CoreOS GRUB settings # Flatcar GRUB settings
set oem_id="exoscale" set oem_id="exoscale"

View File

@ -29,7 +29,7 @@ src_install() {
dobin "${FILESDIR}/exoscale-dhcp" dobin "${FILESDIR}/exoscale-dhcp"
dobin "${FILESDIR}/exoscale-ssh-key" dobin "${FILESDIR}/exoscale-ssh-key"
dobin "${FILESDIR}/exoscale-coreos-cloudinit" dobin "${FILESDIR}/exoscale-coreos-cloudinit"
dobin "${FILESDIR}/coreos-setup-environment" dobin "${FILESDIR}/flatcar-setup-environment"
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"

View File

@ -1,4 +1,4 @@
# CoreOS GRUB settings # Flatcar GRUB settings
set oem_id="gce" set oem_id="gce"

View File

@ -19,7 +19,7 @@ ExecStart=/usr/bin/rkt run \
--volume=etc,kind=host,source=/etc,readOnly=false \ --volume=etc,kind=host,source=/etc,readOnly=false \
--volume=home,kind=host,source=/home,readOnly=false \ --volume=home,kind=host,source=/home,readOnly=false \
--volume=runsystemd,kind=host,source=/run/systemd,readOnly=false \ --volume=runsystemd,kind=host,source=/run/systemd,readOnly=false \
/usr/share/oem/coreos-oem-gce.aci /usr/share/oem/flatcar-oem-gce.aci
ExecStopPost=/usr/bin/rkt gc --mark-only ExecStopPost=/usr/bin/rkt gc --mark-only

View File

@ -1,3 +1,3 @@
# CoreOS GRUB settings # Flatcar GRUB settings
set oem_id="hyperv" set oem_id="hyperv"

View File

@ -20,8 +20,8 @@ coreos:
content: | content: |
[Unit] [Unit]
Description=Sets SSH key from metadata Description=Sets SSH key from metadata
Requires=coreos-setup-environment.service Requires=flatcar-setup-environment.service
After=coreos-setup-environment.service After=flatcar-setup-environment.service
[Service] [Service]
Type=oneshot Type=oneshot
@ -34,8 +34,8 @@ coreos:
content: | content: |
[Unit] [Unit]
Description=Cloudinit from CloudStack-style metadata Description=Cloudinit from CloudStack-style metadata
Requires=coreos-setup-environment.service Requires=flatcar-setup-environment.service
After=coreos-setup-environment.service After=flatcar-setup-environment.service
[Service] [Service]
Type=oneshot Type=oneshot
@ -46,8 +46,8 @@ coreos:
content: | content: |
[Unit] [Unit]
Description=CloudStack Guest Password Reset Description=CloudStack Guest Password Reset
Requires=coreos-setup-environment.service Requires=flatcar-setup-environment.service
After=coreos-setup-environment.service After=flatcar-setup-environment.service
[Service] [Service]
Type=oneshot Type=oneshot
@ -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.coreos.com bug-report-url: https://issues.flatcar-linux.org

View File

@ -16,8 +16,8 @@ if [[ $? -ne 0 ]]; then
fi fi
# Clean up values # Clean up values
sed -i -e '/^COREOS_PUBLIC_IPV4=/d' \ sed -i -e '/^FLATCAR_PUBLIC_IPV4=/d' \
-e '/^COREOS_PRIVATE_IPV4=/d' \ -e '/^FLATCAR_PRIVATE_IPV4=/d' \
"${ENV}" "${ENV}"
sed -i -e '/^NIC_[0-9]*_IPV4=/d' \ sed -i -e '/^NIC_[0-9]*_IPV4=/d' \
@ -46,10 +46,10 @@ METADATA_URL="http://${DHCP_SERVER}/latest/meta-data/"
block-until-url "${METADATA_URL}" block-until-url "${METADATA_URL}"
PUBLIC_IP=$(curl --fail -s "${METADATA_URL}public-ipv4") PUBLIC_IP=$(curl --fail -s "${METADATA_URL}public-ipv4")
echo COREOS_PUBLIC_IPV4=${PUBLIC_IP} >> $ENV echo FLATCAR_PUBLIC_IPV4=${PUBLIC_IP} >> $ENV
PRIVATE_IP=$(curl --fail -s "${METADATA_URL}local-ipv4") PRIVATE_IP=$(curl --fail -s "${METADATA_URL}local-ipv4")
echo COREOS_PRIVATE_IPV4=${PRIVATE_IP} >> $ENV echo FLATCAR_PRIVATE_IPV4=${PRIVATE_IP} >> $ENV
# Loop to export interoute style info into ENV # Loop to export interoute style info into ENV
count=1 count=1

View File

@ -1,3 +1,3 @@
# CoreOS GRUB settings # Flatcar GRUB settings
set oem_id="interoute" set oem_id="interoute"

View File

@ -34,7 +34,7 @@ src_install() {
dobin "${FILESDIR}/cloudstack-set-guest-password" dobin "${FILESDIR}/cloudstack-set-guest-password"
dobin "${FILESDIR}/cloudstack-ssh-key" dobin "${FILESDIR}/cloudstack-ssh-key"
dobin "${FILESDIR}/cloudstack-coreos-cloudinit" dobin "${FILESDIR}/cloudstack-coreos-cloudinit"
dobin "${FILESDIR}/coreos-setup-environment" dobin "${FILESDIR}/flatcar-setup-environment"
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"

View File

@ -29,9 +29,9 @@ coreos:
runtime: yes runtime: yes
content: | content: |
[Unit] [Unit]
After=coreos-setup-environment.service After=flatcar-setup-environment.service
After=vmtoolsd.service After=vmtoolsd.service
Requires=coreos-setup-environment.service Requires=flatcar-setup-environment.service
Requires=vmtoolsd.service Requires=vmtoolsd.service
[Service] [Service]
@ -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.coreos.com bug-report-url: https://issues.flatcar-linux.org

View File

@ -14,8 +14,8 @@ if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
sed -i -e '/^COREOS_PUBLIC_IPV4=/d' \ sed -i -e '/^FLATCAR_PUBLIC_IPV4=/d' \
-e '/^COREOS_PRIVATE_IPV4=/d' \ -e '/^FLATCAR_PRIVATE_IPV4=/d' \
"${ENV}" "${ENV}"
function get_ip () { function get_ip () {
@ -31,5 +31,5 @@ function get_ip () {
echo $IP echo $IP
} }
echo COREOS_PUBLIC_IPV4=$(get_ip ens192) >> $ENV echo FLATCAR_PUBLIC_IPV4=$(get_ip ens192) >> $ENV
echo COREOS_PRIVATE_IPV4=$(get_ip ens224) >> $ENV echo FLATCAR_PRIVATE_IPV4=$(get_ip ens224) >> $ENV

View File

@ -1,3 +1,3 @@
# CoreOS GRUB settings # Flatcar GRUB settings
set oem_id="niftycloud" set oem_id="niftycloud"

View File

@ -7,7 +7,7 @@ else
exit 1 exit 1
fi fi
USER_DATA_DIR=/var/lib/coreos-niftycloud USER_DATA_DIR=/var/lib/flatcar-niftycloud
USER_DATA_PATH=${USER_DATA_DIR}/user-data USER_DATA_PATH=${USER_DATA_DIR}/user-data
USER_DATA_FLAG=$(${VMTOOLSD} --cmd 'info-get guestinfo.set_user_data') USER_DATA_FLAG=$(${VMTOOLSD} --cmd 'info-get guestinfo.set_user_data')

View File

@ -29,7 +29,7 @@ src_install() {
into "/usr/share/oem" into "/usr/share/oem"
dobin "${FILESDIR}/niftycloud-ssh-key" dobin "${FILESDIR}/niftycloud-ssh-key"
dobin "${FILESDIR}/niftycloud-coreos-cloudinit" dobin "${FILESDIR}/niftycloud-coreos-cloudinit"
dobin "${FILESDIR}/coreos-setup-environment" dobin "${FILESDIR}/flatcar-setup-environment"
insinto "/usr/share/oem" insinto "/usr/share/oem"
doins "${T}/cloud-config.yml" doins "${T}/cloud-config.yml"

View File

@ -1,7 +1,7 @@
# CoreOS GRUB settings # Flatcar GRUB settings
set oem_id="packet" set oem_id="packet"
set linux_append="coreos.autologin" set linux_append="flatcar.autologin"
if [ "$grub_cpu" = i386 ]; then if [ "$grub_cpu" = i386 ]; then
set gfxpayload="1024x768x8,1024x768" set gfxpayload="1024x768x8,1024x768"

View File

@ -5,7 +5,7 @@ Requires=coreos-metadata.service
After=coreos-metadata.service After=coreos-metadata.service
[Service] [Service]
EnvironmentFile=/run/metadata/coreos EnvironmentFile=/run/metadata/flatcar
ExecStart=/usr/bin/curl --header "Content-Type: application/json" --request POST "${COREOS_PACKET_PHONE_HOME_URL}" ExecStart=/usr/bin/curl --header "Content-Type: application/json" --request POST "${COREOS_PACKET_PHONE_HOME_URL}"
Restart=on-failure Restart=on-failure
RestartSec=2 RestartSec=2

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.coreos.com bug-report-url: https://issues.flatcar-linux.org

View File

@ -1,4 +1,4 @@
# CoreOS GRUB settings # Flatcar GRUB settings
set oem_id="rackspace-onmetal" set oem_id="rackspace-onmetal"

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.coreos.com bug-report-url: https://issues.flatcar-linux.org

View File

@ -13,8 +13,8 @@ if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
sed -i -e '/^COREOS_PUBLIC_IPV4=/d' \ sed -i -e '/^FLATCAR_PUBLIC_IPV4=/d' \
-e '/^COREOS_PRIVATE_IPV4=/d' \ -e '/^FLATCAR_PRIVATE_IPV4=/d' \
"${ENV}" "${ENV}"
# We spin loop until the nova-agent sets up the ip addresses # We spin loop until the nova-agent sets up the ip addresses
@ -31,5 +31,5 @@ function get_ip () {
echo $IP echo $IP
} }
echo COREOS_PUBLIC_IPV4=$(get_ip eth0) >> $ENV echo FLATCAR_PUBLIC_IPV4=$(get_ip eth0) >> $ENV
echo COREOS_PRIVATE_IPV4=$(get_ip eth1) >> $ENV echo FLATCAR_PRIVATE_IPV4=$(get_ip eth1) >> $ENV

View File

@ -1,3 +1,3 @@
# CoreOS GRUB settings # Flatcar GRUB settings
set oem_id="rackspace" set oem_id="rackspace"

View File

@ -34,5 +34,5 @@ src_install() {
doins "${FILESDIR}/grub.cfg" doins "${FILESDIR}/grub.cfg"
into "/usr/share/oem" into "/usr/share/oem"
dobin "${FILESDIR}/coreos-setup-environment" dobin "${FILESDIR}/flatcar-setup-environment"
} }

View File

@ -1,3 +1,3 @@
# CoreOS GRUB settings # Flatcar GRUB settings
set oem_id="vagrant" set oem_id="vagrant"

View File

@ -1,3 +1,3 @@
# CoreOS GRUB settings # Flatcar GRUB settings
set oem_id="vagrant-virtualbox" set oem_id="vagrant-virtualbox"

View File

@ -16,8 +16,8 @@ BASE_CLOUD_CONFIG = <<EOF
write_files: write_files:
- path: /etc/environment - path: /etc/environment
content: | content: |
COREOS_PUBLIC_IPV4=%s FLATCAR_PUBLIC_IPV4=%s
COREOS_PRIVATE_IPV4=%s FLATCAR_PRIVATE_IPV4=%s
coreos: coreos:
units: units:
EOF EOF

View File

@ -7,14 +7,14 @@ coreos:
content: | content: |
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=/bin/mkdir -p /var/lib/coreos-vagrant ExecStart=/bin/mkdir -p /var/lib/flatcar-vagrant
- name: coreos-cloudinit-vagrant-user.path - name: coreos-cloudinit-vagrant-user.path
command: start command: start
runtime: yes runtime: yes
content: | content: |
[Path] [Path]
PathExists=/var/lib/coreos-vagrant/vagrantfile-user-data PathExists=/var/lib/flatcar-vagrant/vagrantfile-user-data
Unit=user-cloudinit@var-lib-coreos\x2dvagrant-vagrantfile\x2duser\x2ddata.service Unit=user-cloudinit@var-lib-flatcar\x2dvagrant-vagrantfile\x2duser\x2ddata.service
oem: oem:
id: vagrant id: vagrant
name: Vagrant name: Vagrant

View File

@ -11,12 +11,12 @@ now=$(date +%s)
timeout=$(( now + 60 )) timeout=$(( now + 60 ))
# just block until cloudinit updates environment # just block until cloudinit updates environment
while ! grep -qs ^COREOS_PUBLIC_IPV4 "$ENV"; do while ! grep -qs ^FLATCAR_PUBLIC_IPV4 "$ENV"; do
if [[ $timeout -lt $(date +%s) ]]; then if [[ $timeout -lt $(date +%s) ]]; then
echo "No network configuration provided by Vagrant!" >&2 echo "No network configuration provided by Vagrant!" >&2
echo "Using localhost, for default public and private IPs" >&2 echo "Using localhost, for default public and private IPs" >&2
echo "COREOS_PUBLIC_IPV4=127.0.0.1" >> "$ENV" echo "FLATCAR_PUBLIC_IPV4=127.0.0.1" >> "$ENV"
echo "COREOS_PRIVATE_IPV4=127.0.0.1" >> "$ENV" echo "FLATCAR_PRIVATE_IPV4=127.0.0.1" >> "$ENV"
exit exit
fi fi
sleep 0.1 sleep 0.1

View File

@ -1,3 +1,3 @@
# CoreOS GRUB settings # Flatcar GRUB settings
set oem_id="vagrant" set oem_id="vagrant"

View File

@ -27,5 +27,5 @@ src_install() {
doins "${FILESDIR}/grub.cfg" doins "${FILESDIR}/grub.cfg"
into "/usr/share/oem" into "/usr/share/oem"
dobin "${FILESDIR}/coreos-setup-environment" dobin "${FILESDIR}/flatcar-setup-environment"
} }

View File

@ -1,3 +1,3 @@
# CoreOS GRUB settings # Flatcar GRUB settings
set oem_id="virtualbox" set oem_id="virtualbox"

View File

@ -1,3 +1,3 @@
# CoreOS GRUB settings # Flatcar GRUB settings
set oem_id="vmware" set oem_id="vmware"

View File

@ -3,7 +3,7 @@
EAPI=7 EAPI=7
CROS_WORKON_PROJECT="coreos/update-ssh-keys" CROS_WORKON_PROJECT="flatcar-linux/update-ssh-keys"
CROS_WORKON_LOCALNAME="update-ssh-keys" CROS_WORKON_LOCALNAME="update-ssh-keys"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://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=5 EAPI=5
CROS_WORKON_PROJECT="coreos/update_engine" CROS_WORKON_PROJECT="flatcar-linux/update_engine"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
AUTOTOOLS_AUTORECONF=1 AUTOTOOLS_AUTORECONF=1
@ -73,9 +73,9 @@ src_install() {
autotools-utils_src_install autotools-utils_src_install
if use symlink-usr; then if use symlink-usr; then
dosym sbin/coreos-postinst /usr/postinst dosym sbin/flatcar-postinst /usr/postinst
else else
dosym usr/sbin/coreos-postinst /postinst dosym usr/sbin/flatcar-postinst /postinst
fi fi
systemd_dounit systemd/update-engine.service systemd_dounit systemd/update-engine.service

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="coreos/mantle" CROS_WORKON_PROJECT="flatcar-linux/mantle"
CROS_WORKON_LOCALNAME="mantle" CROS_WORKON_LOCALNAME="mantle"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
COREOS_GO_PACKAGE="github.com/coreos/mantle" COREOS_GO_PACKAGE="github.com/coreos/mantle"

View File

@ -8,7 +8,22 @@
: ${COREOS_SOURCE_REVISION:=} : ${COREOS_SOURCE_REVISION:=}
COREOS_SOURCE_VERSION="${PV}${COREOS_SOURCE_REVISION}" COREOS_SOURCE_VERSION="${PV}${COREOS_SOURCE_REVISION}"
COREOS_SOURCE_NAME="linux-${PV/_rc/-rc}-coreos${COREOS_SOURCE_REVISION}"
# $COREOS_KERNEL_SOURCE_NAME is the kernel source name to be used for
# $KERNEL_DIR, e.g. linux-4.19.0-coreos. This comes from upstream, so
# Flatcar should not change it.
#
# On the other hand, $COREOS_SOURCE_NAME is the kernel name to be used for
# $KV_OUT_DIR in individual coreos-kernel*.ebuild files. That one needs to
# have a flatcar-specific name. We cannot define another variable like
# $FLATCAR_SOURCE_NAME, because it will then be rewritten by upstream changes
# that set $COREOS_SOURCE_NAME by default. In the Gentoo world, the ebuild
# for each new version has a totally new file name. So it's hard to replace
# a new $COREOS_SOURCE_NAME variable for every new ebuild.
# $COREOS_SOURCE_NAME should be a name without a revision suffix (e.g. "-r1"),
# because $KV_FULL would not include such a suffix.
COREOS_KERNEL_SOURCE_NAME="linux-${PV/_rc/-rc}-coreos${COREOS_SOURCE_REVISION}"
COREOS_SOURCE_NAME="linux-${PV/_rc/-rc}-flatcar"
[[ ${EAPI} != "5" ]] && die "Only EAPI=5 is supported" [[ ${EAPI} != "5" ]] && die "Only EAPI=5 is supported"
@ -29,7 +44,9 @@ RESTRICT="binchecks strip"
QA_MULTILIB_PATHS="usr/lib/modules/.*/build/scripts/.*" QA_MULTILIB_PATHS="usr/lib/modules/.*/build/scripts/.*"
# Use source installed by coreos-sources # Use source installed by coreos-sources
KERNEL_DIR="${SYSROOT}/usr/src/${COREOS_SOURCE_NAME}" # KERNEL_DIR must find the kernel source tree under /usr/src/linux-*-coreos,
# not /usr/src/linux-*-flatcar, which does not exist at all.
KERNEL_DIR="${SYSROOT}/usr/src/${COREOS_KERNEL_SOURCE_NAME}"
# Search for an appropriate config in ${FILESDIR}. The config should reflect # Search for an appropriate config in ${FILESDIR}. The config should reflect
# the kernel version but partial matching is allowed if the config is # the kernel version but partial matching is allowed if the config is
@ -125,7 +142,7 @@ setup_keys() {
x509_extensions = myexts x509_extensions = myexts
[ req_distinguished_name ] [ req_distinguished_name ]
O = CoreOS, Inc O = Kinvolk GmbH
CN = Module signing key for ${KV_FULL} CN = Module signing key for ${KV_FULL}
[ myexts ] [ myexts ]

View File

@ -1,8 +1,8 @@
# Common pool # Common pool
server 0.coreos.pool.ntp.org server 0.flatcar.pool.ntp.org
server 1.coreos.pool.ntp.org server 1.flatcar.pool.ntp.org
server 2.coreos.pool.ntp.org server 2.flatcar.pool.ntp.org
server 3.coreos.pool.ntp.org server 3.flatcar.pool.ntp.org
# Warning: Using default NTP settings will leave your NTP # Warning: Using default NTP settings will leave your NTP
# server accessible to all hosts on the Internet. # server accessible to all hosts on the Internet.

View File

@ -7,7 +7,7 @@ Conflicts=systemd-timesyncd.service
[Service] [Service]
Type=oneshot Type=oneshot
Environment="SERVER=0.coreos.pool.ntp.org 1.coreos.pool.ntp.org 2.coreos.pool.ntp.org 3.coreos.pool.ntp.org" Environment="SERVER=0.flatcar.pool.ntp.org 1.flatcar.pool.ntp.org 2.flatcar.pool.ntp.org 3.flatcar.pool.ntp.org"
ExecStart=/usr/sbin/ntpdate -b -u $SERVER ExecStart=/usr/sbin/ntpdate -b -u $SERVER
RemainAfterExit=yes RemainAfterExit=yes

View File

@ -7,7 +7,7 @@ Conflicts=systemd-timesyncd.service
[Service] [Service]
Type=oneshot Type=oneshot
Environment="SERVER=0.coreos.pool.ntp.org 1.coreos.pool.ntp.org 2.coreos.pool.ntp.org 3.coreos.pool.ntp.org" Environment="SERVER=0.flatcar.pool.ntp.org 1.flatcar.pool.ntp.org 2.flatcar.pool.ntp.org 3.flatcar.pool.ntp.org"
ExecStart=/usr/bin/sntp -s $SERVER ExecStart=/usr/bin/sntp -s $SERVER
RemainAfterExit=yes RemainAfterExit=yes

View File

@ -9,6 +9,9 @@ sys-apps/coreutils selinux
# Enable SELinux for runc # Enable SELinux for runc
app-emulation/runc selinux app-emulation/runc selinux
# Enable SELinux for tar
app-arch/tar selinux
# Only ship microcode currently distributed by Intel # Only ship microcode currently distributed by Intel
# See https://bugs.gentoo.org/654638#c11 by iucode-tool maintainer # See https://bugs.gentoo.org/654638#c11 by iucode-tool maintainer
sys-firmware/intel-microcode vanilla sys-firmware/intel-microcode vanilla

View File

@ -0,0 +1,5 @@
# Enable SELinux for amd64 targets
app-arch/tar selinux
sys-apps/coreutils selinux
coreos-base/coreos selinux

View File

@ -0,0 +1,2 @@
# Unmask selinux so it can be enabled selectively in package.use
-selinux

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="5" EAPI="5"
CROS_WORKON_PROJECT="coreos/baselayout" CROS_WORKON_PROJECT="flatcar-linux/baselayout"
CROS_WORKON_LOCALNAME="baselayout" CROS_WORKON_LOCALNAME="baselayout"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
@ -129,11 +129,11 @@ src_install() {
rmdir "${D}${mnt}" || die rmdir "${D}${mnt}" || die
done done
doenvd "env.d/99coreos_ldpath" doenvd "env.d/99flatcar_ldpath"
# Add /sbin:/bin into the PATH when they aren't links into /usr. # Add /sbin:/bin into the PATH when they aren't links into /usr.
if ! use symlink-usr; then if ! use symlink-usr; then
echo ROOTPATH=/sbin:/bin > "${D}"/etc/env.d/99coreos_bin || die echo ROOTPATH=/sbin:/bin > "${D}"/etc/env.d/99flatcar_bin || die
fi fi
# handle multilib paths. do it here because we want this behavior # handle multilib paths. do it here because we want this behavior
@ -172,7 +172,7 @@ src_install() {
# Provided by vim in the SDK # Provided by vim in the SDK
rm -r "${D}"/etc/vim || die rm -r "${D}"/etc/vim || die
# Undesirable in the SDK # Undesirable in the SDK
rm "${D}"/etc/profile.d/coreos-profile.sh || die rm "${D}"/etc/profile.d/flatcar-profile.sh || die
else else
# Don't install /etc/issue since it is handled by coreos-init right now # Don't install /etc/issue since it is handled by coreos-init right now
rm "${D}"/etc/issue || die rm "${D}"/etc/issue || die
@ -180,10 +180,10 @@ src_install() {
"${D}"/usr/lib/tmpfiles.d/baselayout-etc.conf || die "${D}"/usr/lib/tmpfiles.d/baselayout-etc.conf || die
# Initialize /etc/passwd, group, and friends on boot. # Initialize /etc/passwd, group, and friends on boot.
bash "scripts/coreos-tmpfiles" "${D}" || die bash "scripts/flatcar-tmpfiles" "${D}" || die
dosbin "scripts/coreos-tmpfiles" dosbin "scripts/flatcar-tmpfiles"
systemd_dounit "scripts/coreos-tmpfiles.service" systemd_dounit "scripts/flatcar-tmpfiles.service"
systemd_enable_service sysinit.target coreos-tmpfiles.service systemd_enable_service sysinit.target flatcar-tmpfiles.service
fi fi
# sssd not yet building on arm64 # sssd not yet building on arm64

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="coreos/ignition" CROS_WORKON_PROJECT="flatcar-linux/ignition"
CROS_WORKON_LOCALNAME="ignition" CROS_WORKON_LOCALNAME="ignition"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
COREOS_GO_PACKAGE="github.com/coreos/ignition" COREOS_GO_PACKAGE="github.com/coreos/ignition"

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=5 EAPI=5
CROS_WORKON_PROJECT="coreos/seismograph" CROS_WORKON_PROJECT="flatcar-linux/seismograph"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
AUTOTOOLS_AUTORECONF=1 AUTOTOOLS_AUTORECONF=1

View File

@ -3,14 +3,14 @@
EAPI=7 EAPI=7
CROS_WORKON_PROJECT="coreos/systemd" CROS_WORKON_PROJECT="flatcar-linux/systemd"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
if [[ ${PV} == 9999 ]]; then if [[ ${PV} == 9999 ]]; then
# Use ~arch instead of empty keywords for compatibility with cros-workon # Use ~arch instead of empty keywords for compatibility with cros-workon
KEYWORDS="~amd64 ~arm64 ~arm ~x86" KEYWORDS="~amd64 ~arm64 ~arm ~x86"
else else
CROS_WORKON_COMMIT="f0da8f71d9894f90b60d61a3e461a8b1269295d5" # v241-coreos CROS_WORKON_COMMIT="eef3280c187daad7435aaea9180429feacbf4ca7" # v241-flatcar
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi fi
@ -274,7 +274,7 @@ multilib_src_configure() {
-Ddbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services" -Ddbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
-Ddbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services" -Ddbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
-Dntp-servers="0.coreos.pool.ntp.org 1.coreos.pool.ntp.org 2.coreos.pool.ntp.org 3.coreos.pool.ntp.org" -Dntp-servers="0.flatcar.pool.ntp.org 1.flatcar.pool.ntp.org 2.flatcar.pool.ntp.org 3.flatcar.pool.ntp.org"
-Dpamconfdir=/usr/share/pam.d -Dpamconfdir=/usr/share/pam.d
@ -371,7 +371,7 @@ multilib_src_install_all() {
fowners root:systemd-journal /var/log/journal fowners root:systemd-journal /var/log/journal
fperms 2755 /var/log/journal fperms 2755 /var/log/journal
systemd_dotmpfilesd "${FILESDIR}"/systemd-coreos.conf systemd_dotmpfilesd "${FILESDIR}"/systemd-flatcar.conf
systemd_dotmpfilesd "${FILESDIR}"/systemd-resolv.conf systemd_dotmpfilesd "${FILESDIR}"/systemd-resolv.conf
# Don't default to graphical.target # Don't default to graphical.target

View File

@ -7,4 +7,4 @@ DefaultDependencies=no
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=/bin/sh -c 'echo InitiatorName=iqn.2016-04.com.coreos.iscsi:$(</etc/machine-id) >/etc/iscsi/initiatorname.iscsi' ExecStart=/bin/sh -c 'echo InitiatorName=iqn.2016-04.com.flatcar.iscsi:$(</etc/machine-id) >/etc/iscsi/initiatorname.iscsi'

View File

@ -3,14 +3,14 @@
EAPI=6 EAPI=6
CROS_WORKON_PROJECT="coreos/grub" CROS_WORKON_PROJECT="flatcar-linux/grub"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
GRUB_AUTOGEN=1 # We start from Git, so always autogen. GRUB_AUTOGEN=1 # We start from Git, so always autogen.
if [[ ${PV} == 9999 ]]; then if [[ ${PV} == 9999 ]]; then
KEYWORDS="~amd64 ~arm64 ~x86" KEYWORDS="~amd64 ~arm64 ~x86"
else else
CROS_WORKON_COMMIT="c6b9a0af3d7483d5b5c5f79caf7ced64298bd4ac" CROS_WORKON_COMMIT="7ee80206a61de3e5ba1ea03b0054b95d891a3511" # flatcar-master
KEYWORDS="amd64 arm64 x86" KEYWORDS="amd64 arm64 x86"
fi fi
inherit cros-workon inherit cros-workon

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=5 EAPI=5
CROS_WORKON_PROJECT="coreos/shim" CROS_WORKON_PROJECT="flatcar-linux/shim"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
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=5 EAPI=5
CROS_WORKON_PROJECT="coreos/bootengine" CROS_WORKON_PROJECT="flatcar-linux/bootengine"
CROS_WORKON_LOCALNAME="bootengine" CROS_WORKON_LOCALNAME="bootengine"
CROS_WORKON_OUTOFTREE_BUILD=1 CROS_WORKON_OUTOFTREE_BUILD=1
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"

View File

@ -11,6 +11,7 @@ ETYPE="sources"
K_BASE_VER="4.19" K_BASE_VER="4.19"
inherit kernel-2 inherit kernel-2
EXTRAVERSION="-flatcar"
detect_version detect_version
DESCRIPTION="Full sources for the CoreOS Linux kernel" DESCRIPTION="Full sources for the CoreOS Linux kernel"

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="5" EAPI="5"
CROS_WORKON_PROJECT="coreos/nss-altfiles" CROS_WORKON_PROJECT="flatcar-linux/nss-altfiles"
CROS_WORKON_LOCALNAME="nss-altfiles" CROS_WORKON_LOCALNAME="nss-altfiles"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"