From f4e01419084b3a552e41b7f6573f22b90e8bc25a Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Wed, 16 Jul 2025 14:19:50 +0200 Subject: [PATCH] portage-stable, azure-oem: add inotify-tools, urllib3 to azure OEM (#3116) This change adds inotify-tools to portage-stable, and to the azure OEM sysext. It also adds urllib3 to the azure OEM sysext. Both are added to satisfy optional dependencies in Azure cloud. Signed-off-by: Thilo Fromm --- .../workflows/portage-stable-packages-list | 1 + changelog/changes/2025-07-16-azure-oem.md | 1 + ...r86.ebuild => coreos-dev-0.1.0-r87.ebuild} | 0 .../coreos-dev/coreos-dev-0.1.0.ebuild | 2 + ...r1.ebuild => oem-azure-2.12.0.4-r2.ebuild} | 4 +- .../sys-fs/inotify-tools/Manifest | 1 + .../inotify-tools-4.23.9.0.ebuild | 43 +++++++++++++++++++ .../sys-fs/inotify-tools/metadata.xml | 16 +++++++ 8 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 changelog/changes/2025-07-16-azure-oem.md rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/{coreos-dev-0.1.0-r86.ebuild => coreos-dev-0.1.0-r87.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/{oem-azure-2.12.0.4-r1.ebuild => oem-azure-2.12.0.4-r2.ebuild} (94%) create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/inotify-tools/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/inotify-tools/inotify-tools-4.23.9.0.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/inotify-tools/metadata.xml diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 710b51c36a..7ea7b64a97 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -669,6 +669,7 @@ sys-fs/e2fsprogs sys-fs/fuse sys-fs/fuse-common sys-fs/fuse-overlayfs +sys-fs/inotify-tools sys-fs/lsscsi sys-fs/lvm2 sys-fs/lxcfs diff --git a/changelog/changes/2025-07-16-azure-oem.md b/changelog/changes/2025-07-16-azure-oem.md new file mode 100644 index 0000000000..b5ea3ac45a --- /dev/null +++ b/changelog/changes/2025-07-16-azure-oem.md @@ -0,0 +1 @@ +- Azure OEM: add inotify-tools, python urllib3 ([flatcar/scripts#3116](https://github.com/flatcar/scripts/pull/3116)) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r86.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r87.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r86.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r87.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild index 889e44e3b0..b1fcfa044b 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild @@ -17,6 +17,7 @@ KEYWORDS="amd64 arm arm64 x86" # and debugging failures. RDEPEND=" app-portage/gentoolkit + dev-python/urllib3 coreos-base/coreos coreos-base/emerge-gitclone dev-debug/gdb @@ -41,6 +42,7 @@ RDEPEND=" sys-apps/smartmontools sys-apps/which sys-devel/gcc + sys-fs/inotify-tools sys-fs/lvm2 sys-fs/squashfs-tools sys-process/procps diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.12.0.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.12.0.4-r2.ebuild similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.12.0.4-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.12.0.4-r2.ebuild index 5e04e16569..d32ccde945 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.12.0.4-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.12.0.4-r2.ebuild @@ -16,8 +16,10 @@ IUSE="" RDEPEND=" ~app-emulation/wa-linux-agent-${PV} - net-misc/chrony app-emulation/hv-daemons + dev-python/urllib3 + net-misc/chrony + sys-fs/inotify-tools " # for coreos-base/common-oem-files diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/inotify-tools/Manifest b/sdk_container/src/third_party/portage-stable/sys-fs/inotify-tools/Manifest new file mode 100644 index 0000000000..7f795aecf1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/inotify-tools/Manifest @@ -0,0 +1 @@ +DIST inotify-tools-4.23.9.0.tar.gz 93281 BLAKE2B eddb0e44721cd8674f2309046998de16a030ed9ad84c49bc5950b9362055db9242dc0de1c615c3bd6c1f2835c83fc55446c9f8e6da52a98870c53f4e6cfa31f9 SHA512 8f44037a482fa39978b845b4989834e8c897ad872913c6cb8c4a987e0d13f9177b05f593332b859d7adde228fdc3512fd45d66cab65368c38926f41d57e22d13 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/inotify-tools/inotify-tools-4.23.9.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/inotify-tools/inotify-tools-4.23.9.0.ebuild new file mode 100644 index 0000000000..b90ed2b8c3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/inotify-tools/inotify-tools-4.23.9.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Set of command-line programs providing a simple interface to inotify" +HOMEPAGE="https://github.com/inotify-tools/inotify-tools/" +SRC_URI=" + https://github.com/inotify-tools/inotify-tools/archive/${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv sparc x86" +IUSE="doc" + +BDEPEND="doc? ( app-text/doxygen )" + +src_prepare() { + default + + sed -i 's/ -Werror//' {,libinotifytools/}src/Makefile.am || die #745069 + + eautoreconf +} + +src_configure() { + local econfargs=( + --docdir="${EPREFIX}"/usr/share/doc/${PF}/html + $(use_enable doc doxygen) + ) + + econf "${econfargs[@]}" +} + +src_install() { + default + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/inotify-tools/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-fs/inotify-tools/metadata.xml new file mode 100644 index 0000000000..5a392e4fed --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/inotify-tools/metadata.xml @@ -0,0 +1,16 @@ + + + + + ionen@gentoo.org + Ionen Wolkens + + +inotify-tools is a set of command-line programs for Linux providing a simple +interface to inotify. These programs can be used to monitor and act upon +filesystem events. Requires a Linux kernel supporting inotify. + + + inotify-tools/inotify-tools + +