Skip to content

Commit f4e0141

Browse files
authored
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 <thilofromm@microsoft.com>
1 parent 0514e51 commit f4e0141

File tree

8 files changed

+67
-1
lines changed

8 files changed

+67
-1
lines changed

.github/workflows/portage-stable-packages-list

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,7 @@ sys-fs/e2fsprogs
669669
sys-fs/fuse
670670
sys-fs/fuse-common
671671
sys-fs/fuse-overlayfs
672+
sys-fs/inotify-tools
672673
sys-fs/lsscsi
673674
sys-fs/lvm2
674675
sys-fs/lxcfs
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Azure OEM: add inotify-tools, python urllib3 ([flatcar/scripts#3116](https://github.com/flatcar/scripts/pull/3116))

sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ KEYWORDS="amd64 arm arm64 x86"
1717
# and debugging failures.
1818
RDEPEND="
1919
app-portage/gentoolkit
20+
dev-python/urllib3
2021
coreos-base/coreos
2122
coreos-base/emerge-gitclone
2223
dev-debug/gdb
@@ -41,6 +42,7 @@ RDEPEND="
4142
sys-apps/smartmontools
4243
sys-apps/which
4344
sys-devel/gcc
45+
sys-fs/inotify-tools
4446
sys-fs/lvm2
4547
sys-fs/squashfs-tools
4648
sys-process/procps

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.12.0.4-r1.ebuild renamed to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.12.0.4-r2.ebuild

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ IUSE=""
1616

1717
RDEPEND="
1818
~app-emulation/wa-linux-agent-${PV}
19-
net-misc/chrony
2019
app-emulation/hv-daemons
20+
dev-python/urllib3
21+
net-misc/chrony
22+
sys-fs/inotify-tools
2123
"
2224

2325
# for coreos-base/common-oem-files
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DIST inotify-tools-4.23.9.0.tar.gz 93281 BLAKE2B eddb0e44721cd8674f2309046998de16a030ed9ad84c49bc5950b9362055db9242dc0de1c615c3bd6c1f2835c83fc55446c9f8e6da52a98870c53f4e6cfa31f9 SHA512 8f44037a482fa39978b845b4989834e8c897ad872913c6cb8c4a987e0d13f9177b05f593332b859d7adde228fdc3512fd45d66cab65368c38926f41d57e22d13
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Copyright 1999-2024 Gentoo Authors
2+
# Distributed under the terms of the GNU General Public License v2
3+
4+
EAPI=8
5+
6+
inherit autotools
7+
8+
DESCRIPTION="Set of command-line programs providing a simple interface to inotify"
9+
HOMEPAGE="https://github.com/inotify-tools/inotify-tools/"
10+
SRC_URI="
11+
https://github.com/inotify-tools/inotify-tools/archive/${PV}.tar.gz
12+
-> ${P}.tar.gz
13+
"
14+
15+
LICENSE="GPL-2"
16+
SLOT="0"
17+
KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv sparc x86"
18+
IUSE="doc"
19+
20+
BDEPEND="doc? ( app-text/doxygen )"
21+
22+
src_prepare() {
23+
default
24+
25+
sed -i 's/ -Werror//' {,libinotifytools/}src/Makefile.am || die #745069
26+
27+
eautoreconf
28+
}
29+
30+
src_configure() {
31+
local econfargs=(
32+
--docdir="${EPREFIX}"/usr/share/doc/${PF}/html
33+
$(use_enable doc doxygen)
34+
)
35+
36+
econf "${econfargs[@]}"
37+
}
38+
39+
src_install() {
40+
default
41+
42+
find "${ED}" -type f -name '*.la' -delete || die
43+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
3+
<pkgmetadata>
4+
<maintainer type="person">
5+
<email>ionen@gentoo.org</email>
6+
<name>Ionen Wolkens</name>
7+
</maintainer>
8+
<longdescription>
9+
inotify-tools is a set of command-line programs for Linux providing a simple
10+
interface to inotify. These programs can be used to monitor and act upon
11+
filesystem events. Requires a Linux kernel supporting inotify.
12+
</longdescription>
13+
<upstream>
14+
<remote-id type="github">inotify-tools/inotify-tools</remote-id>
15+
</upstream>
16+
</pkgmetadata>

0 commit comments

Comments
 (0)