From 5b429971c16137d3cb0fa3941bfcbdd6c3593dc8 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 31 May 2023 13:47:19 +0200 Subject: [PATCH 1/2] app-admin/locksmith: Stop using deprecates resource control options --- .../{locksmith-0.7.0.ebuild => locksmith-0.7.0-r1.ebuild} | 0 .../coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/{locksmith-0.7.0.ebuild => locksmith-0.7.0-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.7.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.7.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.7.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-0.7.0-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild index dc9ca55b4ee..bf2a9993df1 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild @@ -11,7 +11,7 @@ inherit cros-workon systemd coreos-go if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="b5fb1347fa5c5be5ce3cb39c80e4d3ae599675d1" # flatcar-master + CROS_WORKON_COMMIT="439d44f24b24f679d08f309399f6bb2f82614637" # flatcar-master KEYWORDS="amd64 arm64" fi From f484fbf13ead18f2825481536e766bf533f41c19 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Thu, 29 Jun 2023 17:40:06 +0200 Subject: [PATCH 2/2] changelog: Add an entry --- changelog/changes/2023-06-29-locksmith-cgroup.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/changes/2023-06-29-locksmith-cgroup.md diff --git a/changelog/changes/2023-06-29-locksmith-cgroup.md b/changelog/changes/2023-06-29-locksmith-cgroup.md new file mode 100644 index 00000000000..d1cf89185fd --- /dev/null +++ b/changelog/changes/2023-06-29-locksmith-cgroup.md @@ -0,0 +1 @@ +- Updated locksmith to use non-deprecated resource control options in the systemd unit ([Locksmith#20](https://github.com/flatcar/locksmith/pull/20))