Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Sep 2019 23:28:12 -0000
From:      Warner Losh <imp@bsdimp.com>
To:        Cy Schubert <Cy.Schubert@cschubert.com>
Cc:        Josh Paetzel <jpaetzel@freebsd.org>, Ryan Stone <rysto32@gmail.com>,  Niclas Zeising <zeising@freebsd.org>, Charlie Li <ml+freebsd@vishwin.info>,  Kyle Evans <self@kyle-evans.net>, svn-src-head <svn-src-head@freebsd.org>,  Charlie Li via svn-src-all <svn-src-all@freebsd.org>, Gleb Smirnoff <glebius@freebsd.org>,  src-committers <src-committers@freebsd.org>,  FreeBSD X11 mailing list <freebsd-x11@freebsd.org>
Subject:   Re: svn commit: r352707 - in head/sys: conf kern net sys
Message-ID:  <CANCZdfqNc_hgWLn5daBk-sCxhsbPcJP2ZP_8GWdFnLLef%2Bq9cg@mail.gmail.com>
In-Reply-To: <201909262008.x8QK8GPB008931@slippy.cwsent.com>
References:  <201909251826.x8PIQVUN095257@repo.freebsd.org> <605f210b-cce2-d842-cc0c-53b76ef7dbd5@vishwin.info> <CACNAnaGYSEi5xBzJMrf1U%2Bx6t3NmvphWLCTksKFH92auu%2BaFwA@mail.gmail.com> <1681db78-6a0c-55cf-1e01-65e06f145975@vishwin.info> <18644033-d01e-1bc7-02eb-42999033d8fd@freebsd.org> <CANCZdfpZP--7Hk0L5s=v6=T39XQiEwd_DPF6vG_QSh8XJu0g3A@mail.gmail.com> <CAFMmRNyG2EWNmoK84AOBA6O0e5dWb%2BO%2Bvd3oQPV49jSVH61zTw@mail.gmail.com> <CANCZdfrLrNhtL_bULx3%2B20axQcoVkWRTB0dTF1gVPY=ituU3pA@mail.gmail.com> <6f50f518-0f8e-4e82-a9e9-b9db14cdb648@www.fastmail.com> <201909262008.x8QK8GPB008931@slippy.cwsent.com>

next in thread | previous in thread | raw e-mail | index | archive | help
I talked to Gleb and this will move to opt_global.h. this will fix all
these problems.

Warner

On Thu, Sep 26, 2019, 2:08 PM Cy Schubert <Cy.Schubert@cschubert.com> wrote:

> In message <6f50f518-0f8e-4e82-a9e9-b9db14cdb648@www.fastmail.com>, "Josh
> Paetz
> el" writes:
> >
> >
> > On Thu, Sep 26, 2019, at 12:34 PM, Warner Losh wrote:
> > > Kinda my point exactly...
> > >
> > > Warner
> > >
> > > On Thu, Sep 26, 2019 at 11:25 AM Ryan Stone <rysto32@gmail.com> wrote:
> > >> We also shouldn't have ifdef's that change the size of a kernel
> > >>  structure that's part of the KBI. Isn't struct epoch_tracker part of
> > >>  the KBI?
> > >>
> > >>  On Thu, Sep 26, 2019 at 12:46 PM Warner Losh <imp@bsdimp.com> wrote:
> > >>  >
> > >>  > But we shouldn't be including opt_foo.h files in sys/*.h files.
> That's
> > the root cause of trouble here.
> > >>  >
> > >>  > Warner
> > >>  >
> > >>  > On Thu, Sep 26, 2019 at 9:11 AM Niclas Zeising <
> zeising@freebsd.org> wr
> > ote:
> > >>  >>
> > >>  >> On 2019-09-26 17:03, Charlie Li via freebsd-x11 wrote:
> > >>  >> > Kyle Evans wrote:
> > >>  >> >> On Thu, Sep 26, 2019 at 9:49 AM Charlie Li wrote:
> > >>  >> >>> This breaks building the drm-kmod ports, as the build cannot
> find
> > >>  >> >>> opt_epoch.h (drm-devel-kmod example shown, drm-current-kmod
> dies t
> > he
> > >>  >> >>> exact same way):
> > >>  >> >>>
> > >>  >> >>> --- linux_anon_inodes.o ---
> > >>  >> >>> cc -O2 -pipe -fno-strict-aliasing -include
> > >>  >> >>>
> /wrkdirs/usr/ports/graphics/drm-devel-kmod/work/kms-drm-dc414a9/dr
> > ivers/gpu/drm/drm_os_config.h
> > >>  >> >>> '-DKBUILD_MODNAME="linuxkpi_gplv2"' -Werror -D_KERNEL
> -DKLD_MODULE
> > >>  >> >>> -nostdinc
> > >>  >> >>>
> -I/wrkdirs/usr/ports/graphics/drm-devel-kmod/work/kms-drm-dc414a9/
> > include
> -I/wrkdirs/usr/ports/graphics/drm-devel-kmod/work/kms-drm-dc414a9/lin
> > uxkpi/dummy/include
> > >>  >> >>>
> -I/wrkdirs/usr/ports/graphics/drm-devel-kmod/work/kms-drm-dc414a9/
> > linuxkpi/gplv2/include
> > >>  >> >>> -I/usr/src/sys/compat/linuxkpi/common/include -I.
> -I/usr/src/sys
> > >>  >> >>> -I/usr/src/sys/contrib/ck/include -fno-common
> -fno-omit-frame-poin
> > ter
> > >>  >> >>> -mno-omit-leaf-frame-pointer
> > >>  >> >>> -fdebug-prefix-map=./machine=/usr/src/sys/amd64/include
> > >>  >> >>> -fdebug-prefix-map=./x86=/usr/src/sys/x86/include -MD
> > >>  >> >>> -MF.depend.linux_anon_inodes.o -MTlinux_anon_inodes.o
> -mcmodel=ker
> > nel
> > >>  >> >>> -mno-red-zone -mno-mmx -mno-sse -msoft-float
> > >>  >> >>> -fno-asynchronous-unwind-tables -ffreestanding -fwrapv
> -fstack-pro
> > tector
> > >>  >> >>> -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes
> > >>  >> >>> -Wmissing-prototypes -Wpointer-arith -Wcast-qual -Wundef
> > >>  >> >>> -Wno-pointer-sign -D__printf__=__freebsd_kprintf__
> > >>  >> >>> -Wmissing-include-dirs -fdiagnostics-show-option
> -Wno-unknown-prag
> > mas
> > >>  >> >>> -Wno-error-tautological-compare -Wno-error-empty-body
> > >>  >> >>> -Wno-error-parentheses-equality -Wno-error-unused-function
> > >>  >> >>> -Wno-error-pointer-sign -Wno-error-shift-negative-value
> > >>  >> >>> -Wno-address-of-packed-member -Wno-format-zero-length
> -Wno-pointer
> > -arith
> > >>  >> >>> -mno-aes -mno-avx -std=iso9899:1999 -c
> > >>  >> >>>
> /wrkdirs/usr/ports/graphics/drm-devel-kmod/work/kms-drm-dc414a9/li
> > nuxkpi/gplv2/src/linux_anon_inodes.c
> > >>  >> >>> -o linux_anon_inodes.o
> > >>  >> >>> In file included from
> > >>  >> >>>
> /wrkdirs/usr/ports/graphics/drm-devel-kmod/work/kms-drm-dc414a9/li
> > nuxkpi/gplv2/src/linux_anon_inodes.c:12:
> > >>  >> >>> In file included from
> > >>  >> >>>
> /wrkdirs/usr/ports/graphics/drm-devel-kmod/work/kms-drm-dc414a9/li
> > nuxkpi/gplv2/include/linux/anon_inodes.h:4:
> > >>  >> >>> In file included from
> > >>  >> >>>
> /wrkdirs/usr/ports/graphics/drm-devel-kmod/work/kms-drm-dc414a9/li
> > nuxkpi/gplv2/include/linux/fs.h:6:
> > >>  >> >>> In file included from
> > >>  >> >>>
> /wrkdirs/usr/ports/graphics/drm-devel-kmod/work/kms-drm-dc414a9/li
> > nuxkpi/gplv2/include/linux/shrinker.h:5:
> > >>  >> >>> In file included from
> > >>  >> >>> /usr/src/sys/compat/linuxkpi/common/include/linux/list.h:56:
> > >>  >> >>> In file included from /usr/src/sys/net/if_var.h:83:
> > >>  >> >>> /usr/src/sys/sys/epoch.h:44:10: fatal error: 'opt_epoch.h'
> file no
> > t found
> > >>  >> >>> #include "opt_epoch.h"
> > >>  >> >>> ^~~~~~~~~~~~~
> > >>  >> >>> --- linux_anon_inodefs.o ---
> > >>  >> >>> In file included from
> > >>  >> >>>
> /wrkdirs/usr/ports/graphics/drm-devel-kmod/work/kms-drm-dc414a9/li
> > nuxkpi/gplv2/src/linux_anon_inodefs.c:45:
> > >>  >> >>> In file included from
> > >>  >> >>>
> /wrkdirs/usr/ports/graphics/drm-devel-kmod/work/kms-drm-dc414a9/li
> > nuxkpi/gplv2/include/linux/debugfs.h:18:
> > >>  >> >>> In file included from
> > >>  >> >>>
> /wrkdirs/usr/ports/graphics/drm-devel-kmod/work/kms-drm-dc414a9/li
> > nuxkpi/gplv2/include/linux/fs.h:6:
> > >>  >> >>> In file included from
> > >>  >> >>>
> /wrkdirs/usr/ports/graphics/drm-devel-kmod/work/kms-drm-dc414a9/li
> > nuxkpi/gplv2/include/linux/shrinker.h:5:
> > >>  >> >>> In file included from
> > >>  >> >>> /usr/src/sys/compat/linuxkpi/common/include/linux/list.h:56:
> > >>  >> >>> In file included from /usr/src/sys/net/if_var.h:83:
> > >>  >> >>> /usr/src/sys/sys/epoch.h:44:10: fatal error: 'opt_epoch.h'
> file no
> > t found
> > >>  >> >>> #include "opt_epoch.h"
> > >>  >> >>> ^~~~~~~~~~~~~
> > >>  >> >>> --- linux_anon_inodes.o ---
> > >>  >> >>> 1 error generated.
> > >>  >> >>> *** [linux_anon_inodes.o] Error code 1
> > >>  >> >>>
> > >>  >> >>> make[2]: stopped in
> > >>  >> >>>
> /wrkdirs/usr/ports/graphics/drm-devel-kmod/work/kms-drm-dc414a9/li
> > nuxkpi
> > >>  >> >>> --- linux_anon_inodefs.o ---
> > >>  >> >>> 1 error generated.
> > >>  >> >>> *** [linux_anon_inodefs.o] Error code 1
> > >>  >> >>>
> > >>  >> >>> Interestingly enough, does not happen when drm-current-kmod
> is bui
> > lt as
> > >>  >> >>> part of buildkernel (using an existing installed package with
> SOUR
> > CE on).
> > >>  >> >>>
> > >>  >> >>
> > >>  >> >> FWIW, johalun noticed this yesterday and addressed it here:
> > >>  >> >>
> https://github.com/FreeBSDDesktop/kms-drm/commit/b486949e7e9f0cfe8d
> > ac5f0ac7fe1a660300981d
> > >>  >> >>
> > >>  >> > Ah, of course I would miss these commits in the kms-drm repo,
> > >>  >> > considering that I watch them roll in. Will wait for the updated
> > >>  >> > snapshots in ports.
> > >>  >> >
> > >>  >>
> > >>  >> I'll get to updating the ports as soon as I can.
> > >>  >> Regards
> > >>  >> --
> > >>  >> Niclas Zeising
> > >>  >> _______________________________________________
> > >>  >> freebsd-x11@freebsd.org mailing list
> > >>  >> https://lists.freebsd.org/mailman/listinfo/freebsd-x11
> > >>  >> To unsubscribe, send any mail to "
> freebsd-x11-unsubscribe@freebsd.org"
> >
> > This commit broke emulators/open-vm-tools (which builds an out of tree
> if_vmx
> > )
> >
> > Should I chase a fix for it or wait for this to get resolved in src?
>
> virtualbox-ose-kmod:
>
> --- VBoxNetFlt-freebsd.o ---
> In file included from VBoxNetFlt-freebsd.c:51:
> In file included from /usr/src/sys/net/if_var.h:83:
> /usr/src/sys/sys/epoch.h:44:10: fatal error: 'opt_epoch.h' file not found
> #include "opt_epoch.h"
>          ^~~~~~~~~~~~~
> 1 error generated.
> *** [VBoxNetFlt-freebsd.o] Error code 1
>
>
> --
> Cheers,
> Cy Schubert <Cy.Schubert@cschubert.com>
> FreeBSD UNIX:  <cy@FreeBSD.org>   Web:  http://www.FreeBSD.org
>
>         The need of the many outweighs the greed of the few.
>
>
>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfqNc_hgWLn5daBk-sCxhsbPcJP2ZP_8GWdFnLLef%2Bq9cg>