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

Merge pull request #2739 from bgilbert/oracle

Browse Source 
Add OEM package for Oracle OCI; bump several dependencies
This commit is contained in:
Benjamin Gilbert 2017-08-30 18:54:33 -07:00 committed by GitHub
commit 22afdf3caf
11 changed files with 70 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r148.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r149.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild vendored
View File

@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else
CROS_WORKON_COMMIT="9008a3d0457d7e0a303fbee9610723b1c5a66cf2"
CROS_WORKON_COMMIT="69831fec5e1e93ad6319a99f405188cf3e72a2e1"
KEYWORDS="amd64 arm arm64 x86"
fi

8
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-oracle-oci/files/grub.cfg vendored Normal file
View File

@ -0,0 +1,8 @@
# CoreOS Container Linux GRUB settings
set oem_id="oracle-oci"
set linux_console="console=ttyS0,9600"
serial com0 --speed=9600
terminal_input serial_com0
terminal_output serial_com0

5
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-oracle-oci/files/oem-release vendored Normal file
View File

@ -0,0 +1,5 @@
ID=oracle-oci
VERSION_ID=@@OEM_VERSION_ID@@
NAME="Oracle Cloud Infrastructure"
HOME_URL="https://cloud.oracle.com/en_US/bare-metal"
BUG_REPORT_URL="https://issues.coreos.com"

22
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-oracle-oci/files/units/oracle-oci-root-setup.service vendored Normal file
View File

@ -0,0 +1,22 @@
[Unit]
Description=Configure Oracle OCI Root Disk
ConditionPathExists=!/etc/iscsi/nodes/iqn.2015-02.oracle.boot:uefi
Before=iscsid.service
[Service]
Type=oneshot
# This starts its own iscsid until the unit finishes and systemd kills it
# again. That's not ideal, but sequencing this unit after iscsid.service
# has been observed to result in parameters not propagating to the kernel
# iSCSI session (presumably due to a race with session recovery).
ExecStart=/usr/sbin/iscsiadm -m node -o new -T iqn.2015-02.oracle.boot:uefi -p 169.254.0.2:3260,1
# Never automatically log out of the root disk
ExecStart=/usr/sbin/iscsiadm -m node -T iqn.2015-02.oracle.boot:uefi -o update -n node.startup -v onboot
# Root-on-iSCSI settings from open-iscsi README
ExecStart=/usr/sbin/iscsiadm -m node -T iqn.2015-02.oracle.boot:uefi -o update -n node.conn[0].timeo.noop_out_interval -v 0
ExecStart=/usr/sbin/iscsiadm -m node -T iqn.2015-02.oracle.boot:uefi -o update -n node.conn[0].timeo.noop_out_timeout -v 0
ExecStart=/usr/sbin/iscsiadm -m node -T iqn.2015-02.oracle.boot:uefi -o update -n node.session.timeo.replacement_timeout -v 86400
[Install]
RequiredBy=iscsid.service

4
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-oracle-oci/metadata.xml vendored Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
</pkgmetadata>

27
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-oracle-oci/oem-oracle-oci-0.1.0.ebuild vendored Normal file
View File

@ -0,0 +1,27 @@
# Copyright (c) 2017 CoreOS, Inc.. All rights reserved.
# Distributed under the terms of the GNU General Public License v2
EAPI=5
DESCRIPTION="OEM suite for Oracle OCI images"
HOMEPAGE=""
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 arm64 x86"
# no source directory
S="${WORKDIR}"
src_prepare() {
sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \
"${FILESDIR}/oem-release" > "${T}/oem-release" || die
}
src_install() {
insinto "/usr/share/oem"
doins "${FILESDIR}/grub.cfg"
doins "${T}/oem-release"
doins -r "${FILESDIR}/units"
}

0
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-234-r1.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-234-r2.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild vendored
View File

@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
# Use ~arch instead of empty keywords for compatibility with cros-workon
KEYWORDS="~amd64 ~arm64 ~arm ~x86"
else
CROS_WORKON_COMMIT="73d5ae8ae66a40772b735e01b407060a84b1e023" # v234-coreos
CROS_WORKON_COMMIT="86c388465b686bb23cede68c226d00f5ff31c3b3" # v234-coreos
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi

0
sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.25.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.26.ebuild vendored
View File

3
sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild vendored
View File

@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else
CROS_WORKON_COMMIT="36abc4dce769c93d9fcd9218f48ec2b4d7f19110"
CROS_WORKON_COMMIT="9d8413f020421ff93df534e656097b961577cdf2"
KEYWORDS="amd64 arm arm64 x86"
fi
@ -33,6 +33,7 @@ src_install() {
"${D}"/usr/lib/dracut/modules.d/10diskless-generator/diskless-btrfs \
"${D}"/usr/lib/dracut/modules.d/30ignition/ignition-generator \
"${D}"/usr/lib/dracut/modules.d/30ignition/retry-umount.sh \
"${D}"/usr/lib/dracut/modules.d/90iscsi-root/iscsi-root-generator \
"${D}"/usr/lib/dracut/modules.d/99setup-root/initrd-setup-root \
|| die chmod
}