| Message ID | 20250418234942.2344036-1-kuba@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] tools: ynl: add missing header deps | expand |
On 04/18, Jakub Kicinski wrote: > Various new families and my recent work on rtnetlink missed > adding dependencies on C headers. If the system headers are > up to date or don't include a given header at all this doesn't > make a difference. But if the system headers are in place but > stale - compilation will break. > > Reported-by: Kory Maincent <kory.maincent@bootlin.com> > Fixes: 29d34a4d785b ("tools: ynl: generate code for rt-addr and add a sample") > Link: https://lore.kernel.org/20250418190431.69c10431@kmaincent-XPS-13-7390 > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > --- > CC: donald.hunter@gmail.com > CC: jacob.e.keller@intel.com > --- > tools/net/ynl/Makefile.deps | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/tools/net/ynl/Makefile.deps b/tools/net/ynl/Makefile.deps > index 385783489f84..8b7bf673b686 100644 > --- a/tools/net/ynl/Makefile.deps > +++ b/tools/net/ynl/Makefile.deps > @@ -20,15 +20,18 @@ CFLAGS_ethtool:=$(call get_hdr_inc,_LINUX_ETHTOOL_H,ethtool.h) \ > $(call get_hdr_inc,_LINUX_ETHTOOL_NETLINK_H_,ethtool_netlink.h) \ > $(call get_hdr_inc,_LINUX_ETHTOOL_NETLINK_GENERATED_H,ethtool_netlink_generated.h) > CFLAGS_handshake:=$(call get_hdr_inc,_LINUX_HANDSHAKE_H,handshake.h) > +CFLAGS_lockd_netlink:=$(call get_hdr_inc,_LINUX_LOCKD_NETLINK_H,lockd_netlink.h) > CFLAGS_mptcp_pm:=$(call get_hdr_inc,_LINUX_MPTCP_PM_H,mptcp_pm.h) > CFLAGS_net_shaper:=$(call get_hdr_inc,_LINUX_NET_SHAPER_H,net_shaper.h) > CFLAGS_netdev:=$(call get_hdr_inc,_LINUX_NETDEV_H,netdev.h) > CFLAGS_nl80211:=$(call get_hdr_inc,__LINUX_NL802121_H,nl80211.h) > CFLAGS_nlctrl:=$(call get_hdr_inc,__LINUX_GENERIC_NETLINK_H,genetlink.h) > CFLAGS_nfsd:=$(call get_hdr_inc,_LINUX_NFSD_NETLINK_H,nfsd_netlink.h) > +CFLAGS_ovpn:=$(call get_hdr_inc,_LINUX_OVPN,ovpn.h) > CFLAGS_ovs_datapath:=$(call get_hdr_inc,__LINUX_OPENVSWITCH_H,openvswitch.h) > CFLAGS_ovs_flow:=$(call get_hdr_inc,__LINUX_OPENVSWITCH_H,openvswitch.h) > CFLAGS_ovs_vport:=$(call get_hdr_inc,__LINUX_OPENVSWITCH_H,openvswitch.h) > -CFLAGS_rt-addr:=$(call get_hdr_inc,__LINUX_RTNETLINK_H,rtnetlink.h) > +CFLAGS_rt-addr:=$(call get_hdr_inc,__LINUX_RTNETLINK_H,rtnetlink.h) \ > + $(call get_hdr_inc,__LINUX_IF_ADDR_H,if_addr.h) > CFLAGS_rt-route:=$(call get_hdr_inc,__LINUX_RTNETLINK_H,rtnetlink.h) > CFLAGS_tcp_metrics:=$(call get_hdr_inc,_LINUX_TCP_METRICS_H,tcp_metrics.h) Acked-by: Stanislav Fomichev <sdf@fomichev.me> (mostly checked that XXX_H defines listed here match the ones in the header files)
On Fri, 18 Apr 2025 16:49:42 -0700 Jakub Kicinski <kuba@kernel.org> wrote: > Various new families and my recent work on rtnetlink missed > adding dependencies on C headers. If the system headers are > up to date or don't include a given header at all this doesn't > make a difference. But if the system headers are in place but > stale - compilation will break. > > Reported-by: Kory Maincent <kory.maincent@bootlin.com> > Fixes: 29d34a4d785b ("tools: ynl: generate code for rt-addr and add a sample") > Link: https://lore.kernel.org/20250418190431.69c10431@kmaincent-XPS-13-7390 > Signed-off-by: Jakub Kicinski <kuba@kernel.org> Tested-by: Kory Maincent <kory.maincent@bootlin.com> Thank you!
diff --git a/tools/net/ynl/Makefile.deps b/tools/net/ynl/Makefile.deps index 385783489f84..8b7bf673b686 100644 --- a/tools/net/ynl/Makefile.deps +++ b/tools/net/ynl/Makefile.deps @@ -20,15 +20,18 @@ CFLAGS_ethtool:=$(call get_hdr_inc,_LINUX_ETHTOOL_H,ethtool.h) \ $(call get_hdr_inc,_LINUX_ETHTOOL_NETLINK_H_,ethtool_netlink.h) \ $(call get_hdr_inc,_LINUX_ETHTOOL_NETLINK_GENERATED_H,ethtool_netlink_generated.h) CFLAGS_handshake:=$(call get_hdr_inc,_LINUX_HANDSHAKE_H,handshake.h) +CFLAGS_lockd_netlink:=$(call get_hdr_inc,_LINUX_LOCKD_NETLINK_H,lockd_netlink.h) CFLAGS_mptcp_pm:=$(call get_hdr_inc,_LINUX_MPTCP_PM_H,mptcp_pm.h) CFLAGS_net_shaper:=$(call get_hdr_inc,_LINUX_NET_SHAPER_H,net_shaper.h) CFLAGS_netdev:=$(call get_hdr_inc,_LINUX_NETDEV_H,netdev.h) CFLAGS_nl80211:=$(call get_hdr_inc,__LINUX_NL802121_H,nl80211.h) CFLAGS_nlctrl:=$(call get_hdr_inc,__LINUX_GENERIC_NETLINK_H,genetlink.h) CFLAGS_nfsd:=$(call get_hdr_inc,_LINUX_NFSD_NETLINK_H,nfsd_netlink.h) +CFLAGS_ovpn:=$(call get_hdr_inc,_LINUX_OVPN,ovpn.h) CFLAGS_ovs_datapath:=$(call get_hdr_inc,__LINUX_OPENVSWITCH_H,openvswitch.h) CFLAGS_ovs_flow:=$(call get_hdr_inc,__LINUX_OPENVSWITCH_H,openvswitch.h) CFLAGS_ovs_vport:=$(call get_hdr_inc,__LINUX_OPENVSWITCH_H,openvswitch.h) -CFLAGS_rt-addr:=$(call get_hdr_inc,__LINUX_RTNETLINK_H,rtnetlink.h) +CFLAGS_rt-addr:=$(call get_hdr_inc,__LINUX_RTNETLINK_H,rtnetlink.h) \ + $(call get_hdr_inc,__LINUX_IF_ADDR_H,if_addr.h) CFLAGS_rt-route:=$(call get_hdr_inc,__LINUX_RTNETLINK_H,rtnetlink.h) CFLAGS_tcp_metrics:=$(call get_hdr_inc,_LINUX_TCP_METRICS_H,tcp_metrics.h)
Various new families and my recent work on rtnetlink missed adding dependencies on C headers. If the system headers are up to date or don't include a given header at all this doesn't make a difference. But if the system headers are in place but stale - compilation will break. Reported-by: Kory Maincent <kory.maincent@bootlin.com> Fixes: 29d34a4d785b ("tools: ynl: generate code for rt-addr and add a sample") Link: https://lore.kernel.org/20250418190431.69c10431@kmaincent-XPS-13-7390 Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- CC: donald.hunter@gmail.com CC: jacob.e.keller@intel.com --- tools/net/ynl/Makefile.deps | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)