From d6985267306707f62efb407756382b6d12aaac2a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 19 Jun 2023 17:18:42 +0200 Subject: [PATCH] overlay coreos-base/coreos-init: Pull in ssh config removal The configs were moved to coreos-base/misc-files. In the meantime, update python compatibility and drop unused USE flag and an obsolete README file. --- .../coreos-overlay/coreos-base/coreos-init/README | 2 -- ....0.1-r186.ebuild => coreos-init-0.0.1-r187.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-9999.ebuild | 11 +++-------- 3 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/README rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r186.ebuild => coreos-init-0.0.1-r187.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/README b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/README deleted file mode 100644 index ecfbc513fb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/README +++ /dev/null @@ -1,2 +0,0 @@ -If /etc/sshd_config changes make sure to apply the change to sys-auth/google-oslogin. -Those files must be kept in sync. diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r186.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r187.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r186.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r187.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index cf6c424bd8..4a924c6c9f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -10,11 +10,11 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="1b5a096a4d91076d0121308caa5c7dbe40f7aafe" # flatcar-master + CROS_WORKON_COMMIT="22c07b1270fb2f40dedef00f0d0fb1699727d995" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi -PYTHON_COMPAT=( python3_{6..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cros-workon systemd python-any-r1 @@ -24,9 +24,7 @@ SRC_URI="" LICENSE="BSD" SLOT="0/${PVR}" -IUSE="test symlink-usr" - -REQUIRED_USE="symlink-usr" +IUSE="test" # Daemons we enable here must installed during build/install in addition to # during runtime so the systemd unit enable step works. @@ -47,9 +45,6 @@ RDEPEND="${DEPEND} src_install() { emake DESTDIR="${D}" install - # Enable some sockets that aren't enabled by their own ebuilds. - systemd_enable_service sockets.target sshd.socket - # Enable some services that aren't enabled elsewhere. systemd_enable_service rpcbind.target rpcbind.service