Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Mar 2023 00:09:33 +0300
From:      Dmitry Chagin <dchagin@freebsd.org>
To:        "Alexander V. Chernikov" <melifaro@freebsd.org>
Cc:        src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org
Subject:   Re: git: b894193501a7 - main - netlink: fix linux module build w/ netlink.
Message-ID:  <ZCIGDTxp11U5LxZv@heemeyer.club>
In-Reply-To: <202303271821.32RILYvC048054@gitrepo.freebsd.org>
References:  <202303271821.32RILYvC048054@gitrepo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Mar 27, 2023 at 06:21:34PM +0000, Alexander V. Chernikov wrote:
> The branch main has been updated by melifaro:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=b894193501a7cb6ce5eed3cf86be5dd773cbbb2d
> 
> commit b894193501a7cb6ce5eed3cf86be5dd773cbbb2d
> Author:     Alexander V. Chernikov <melifaro@FreeBSD.org>
> AuthorDate: 2023-03-27 18:20:38 +0000
> Commit:     Alexander V. Chernikov <melifaro@FreeBSD.org>
> CommitDate: 2023-03-27 18:21:26 +0000
> 
>     netlink: fix linux module build w/ netlink.
>     
>     Reported by:    Marek Zarychta <zarychtam@plan-b.pwste.edu.pl>
>     MFC after:      2 weeks
> ---
>  sys/compat/linux/linux_netlink.c | 1 +
>  sys/modules/linux/Makefile       | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c
> index 9edfbfc2c031..0e8188d4cdf6 100644
> --- a/sys/compat/linux/linux_netlink.c
> +++ b/sys/compat/linux/linux_netlink.c
> @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
>  
>  #include "opt_inet.h"
>  #include "opt_inet6.h"
> +#include "opt_netlink.h"
>  
>  #include <sys/types.h>
>  #include <sys/ck.h>
> diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
> index be2c60a42847..43d7f2c240b8 100644
> --- a/sys/modules/linux/Makefile
> +++ b/sys/modules/linux/Makefile
> @@ -36,6 +36,7 @@ SRCS=	linux${SFX}_dummy_machdep.c \
>  	linux_vdso.c \
>  	opt_inet6.h \
>  	opt_ktrace.h \
> +	opt_netlink.h \
>  	opt_posix.h \
>  	bus_if.h \
>  	device_if.h \

Hi, I think this is wrong, and should be near
SRCS+=  linux_netlink.c
and also unconditionally included in the linux_common module




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ZCIGDTxp11U5LxZv>