Skip to contentSkip to conversation

diod: Remove the dependency on tcp-wrappers

PATCH In review Peter Kjellerstedt 3 participants 5 messages Apr 3, 2025 – Apr 9, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 diod: Remove the dependency on tcp-wrappers

Use of tcp-wrappers was removed from the diod repository in commit 59b221f7b5eb24a20fdd886fdd1f8ff9810bdb73.

---
 recipes-extended/diod/diod_1.0.24.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-extended/diod/diod_1.0.24.bb +1 -1
index 89e79df9..a33b9a66 100644
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/chaos/diod.git;protocol=https;branch=master \
            file://diod.conf \
            file://0001-build-Find-lua-with-pkg-config.patch \
            "
-DEPENDS = "libcap ncurses tcp-wrappers lua"
+DEPENDS = "libcap ncurses lua"
 
 EXTRA_OEMAKE += "systemddir=${systemd_unitdir}/system"
 EXTRA_OECONF = "--disable-auth \
#1 lore raw

PATCH 2/2 diod: No need to pass systemddir via EXTRA_OEMAKE

Use of the systemddir variable was removed from the diod repository in commit c081e851744d33025ff2626029a9ac2a5f9ccf8d.

---
 recipes-extended/diod/diod_1.0.24.bb | 1 -
 1 file changed, 1 deletion(-)
recipes-extended/diod/diod_1.0.24.bb +0 -1
index a33b9a66..72a31a68 100644
@@ -17,7 +17,6 @@ SRC_URI = "git://github.com/chaos/diod.git;protocol=https;branch=master \
            "
 DEPENDS = "libcap ncurses lua"
 
-EXTRA_OEMAKE += "systemddir=${systemd_unitdir}/system"
 EXTRA_OECONF = "--disable-auth \
                 --with-systemdsystemunitdir=${systemd_unitdir}/system"
 
#2 lore raw
In reply to Peter Kjellerstedt

Thanks for the patches! I'll stage them shortly.

I am curious how you managed to detect that the dependency and systemd parameter were no longer necessary. Since I'd add checks like that to my update steps at the M1/M3 points in the cycle.

Bruce

Quoted 35 lines · Peter Kjellerstedt via lists.yoctoproject.org

Use of tcp-wrappers was removed from the diod repository in commit 59b221f7b5eb24a20fdd886fdd1f8ff9810bdb73.

---
 recipes-extended/diod/diod_1.0.24.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-extended/diod/ renamed from recipes-extended/diod/diod_1.0.24.bb +0 -0

diod_1.0.24.bb
index 89e79df9..a33b9a66 100644

recipes-extended/diod/diod_1.0.24.bb +1 -1
@@ -15,7 +15,7 @@ SRC_URI = "git://
 github.com/chaos/diod.git;protocol=https;branch=master \
            file://diod.conf \
            file://0001-build-Find-lua-with-pkg-config.patch \
            "
-DEPENDS = "libcap ncurses tcp-wrappers lua"
+DEPENDS = "libcap ncurses lua"
 
 EXTRA_OEMAKE += "systemddir=${systemd_unitdir}/system"

EXTRA_OECONF = "--disable-auth \

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#9197):
https://lists.yoctoproject.org/g/meta-virtualization/message/9197
Mute This Topic: https://lists.yoctoproject.org/mt/112061247/1050810
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II
#3 lore raw

What piqued my curiosity was that you added --with-systemdsystemunitdir=${systemd_unitdir}/system without removing the systemddir=${systemd_unitdir}/system as they looked very much like they were used for the same purpose. As for tcp-wrappers, I do not really remember. It may have been that I saw something while digging around the upstream commits related to the systemd changes. We have had them disabled via a bbappend in our builds for a long time, so it may also have been that I just took the opportunity to check if our override was still needed, which it turned out it wasn’t. :)

//Peter

From: Bruce Ashfield <[email protected]>
Sent: den 4 april 2025 16:56
To: Peter Kjellerstedt <[email protected]>
Cc: [email protected]
Subject: Re: [meta-virtualization] [PATCH 1/2] diod: Remove the dependency on tcp-wrappers

Thanks for the patches! I'll stage them shortly.

I am curious how you managed to detect that the dependency and systemd parameter were no longer necessary. Since I'd add checks like that to my update steps at the M1/M3 points in the cycle.

Bruce

On Thu, Apr 3, 2025 at 2:25 AM Peter Kjellerstedt via lists.yoctoproject.org<http://lists.yoctoproject.org> <[email protected]<mailto:[email protected]>> wrote:
Use of tcp-wrappers was removed from the diod repository in commit
59b221f7b5eb24a20fdd886fdd1f8ff9810bdb73.

---
 recipes-extended/diod/diod_1.0.24.bb<http://diod_1.0.24.bb> | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-extended/diod/diod_1.0.24.bb<http://diod_1.0.24.bb> +1 -1
index 89e79df9..a33b9a66 100644
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/chaos/diod.git;protocol=https;branch=master<http://github.com/chaos/diod.git;protocol=https;branch=master> \
            file://diod.conf \
            file://0001-build-Find-lua-with-pkg-config.patch \
            "
-DEPENDS = "libcap ncurses tcp-wrappers lua"
+DEPENDS = "libcap ncurses lua"
 
 EXTRA_OEMAKE += "systemddir=${systemd_unitdir}/system"
 EXTRA_OECONF = "--disable-auth \

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9197): https://lists.yoctoproject.org/g/meta-virtualization/message/9197
Mute This Topic: https://lists.yoctoproject.org/mt/112061247/1050810
Group Owner: [email protected]<mailto:meta-virtualization%[email protected]>
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]<mailto:[email protected]>]
-=-=-=-=-=-=-=-=-=-=-=-

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

#4 lore raw
Quoted 12 lines · Peter Kjellerstedt

What piqued my curiosity was that you added --with-systemdsystemunitdir=${systemd_unitdir}/system without removing the systemddir=${systemd_unitdir}/system as they looked very much like they were used for the same purpose. As for tcp-wrappers, I do not really remember. It may have been that I saw something while digging around the upstream commits related to the systemd changes. We have had them disabled via a bbappend in our builds for a long time, so it may also have been that I just took the opportunity to check if our override was still needed, which it turned out it wasn’t. :)

Fair enough!

I'm just glad to hear that I wasn't missing anything obvious by not seeing these myself.

They are now staged on master-next, and will appear in master in the next day or so.

Bruce

Quoted 76 lines

//Peter

*From:* Bruce Ashfield <[email protected]> *Sent:* den 4 april 2025 16:56
*To:* Peter Kjellerstedt <[email protected]> *Cc:* [email protected] *Subject:* Re: [meta-virtualization] [PATCH 1/2] diod: Remove the dependency on tcp-wrappers

Thanks for the patches! I'll stage them shortly.

I am curious how you managed to detect that the dependency and

systemd parameter were no longer necessary. Since I'd add checks like

that to my update steps at the M1/M3 points in the cycle.

Bruce

On Thu, Apr 3, 2025 at 2:25 AM Peter Kjellerstedt via lists.yoctoproject.org <[email protected]> wrote:

Use of tcp-wrappers was removed from the diod repository in commit 59b221f7b5eb24a20fdd886fdd1f8ff9810bdb73.

---
 recipes-extended/diod/diod_1.0.24.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-extended/diod/ renamed from recipes-extended/diod/diod_1.0.24.bb +0 -0

diod_1.0.24.bb
index 89e79df9..a33b9a66 100644

recipes-extended/diod/diod_1.0.24.bb +1 -1
@@ -15,7 +15,7 @@ SRC_URI = "git://
 github.com/chaos/diod.git;protocol=https;branch=master \
            file://diod.conf \
            file://0001-build-Find-lua-with-pkg-config.patch \
            "
-DEPENDS = "libcap ncurses tcp-wrappers lua"
+DEPENDS = "libcap ncurses lua"
 
 EXTRA_OEMAKE += "systemddir=${systemd_unitdir}/system"

EXTRA_OECONF = "--disable-auth \

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#9197):
https://lists.yoctoproject.org/g/meta-virtualization/message/9197
Mute This Topic: https://lists.yoctoproject.org/mt/112061247/1050810
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

--

- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II