svn commit: r341266 - in releng/12.0: . sys/modules/iavf

[Dima Panov]

Hello!

Marius Strobl wrote on 07/12/2018 03:25:
> On Thu, Dec 06, 2018 at 03:58:44PM +1000, Dima Panov wrote:
>> Hello!
>>
>> Marius Strobl wrote on 30/11/2018 07:59:
>>> Author: marius
>>> Date: Thu Nov 29 21:59:09 2018
>>> New Revision: 341266
>>> URL: https://svnweb.freebsd.org/changeset/base/341266
>>>
>>> Log:
>>>     MFC: r341016, MF12: r341261
>>>     
>>>     - Add a belated UPDATING entry for the ixlv(4) -> iavf(4) rename in r339338.
>>>     - Likewise, add ixlv.4.gz to OLD_FILES,
>>>     - and link if_ixlv.ko to if_iavf.ko in order to aid a bit in the transition.
>>>     
>> [cut]
>>>
>>> Modified: releng/12.0/sys/modules/iavf/Makefile
>>> ==============================================================================
>>> --- releng/12.0/sys/modules/iavf/Makefile	Thu Nov 29 21:20:53 2018	(r341265)
>>> +++ releng/12.0/sys/modules/iavf/Makefile	Thu Nov 29 21:59:09 2018	(r341266)
>>> @@ -15,4 +15,6 @@ SRCS    += i40e_common.c i40e_nvm.c i40e_adminq.c
>>>    # Enable asserts and other debugging facilities
>>>    # CFLAGS += -DINVARIANTS -DINVARIANTS_SUPPORT -DWITNESS
>>>    
>>> +LINKS=	${KMODDIR}/${KMOD}.ko ${KMODDIR}/if_ixlv.ko
>>> +
>>>    .include <bsd.kmod.mk>
>>
>>
>> And this broke poudriere jail upgrade due to missed kernel modules for
>> build purpose
>>
>> # poudriere jail -u -j fbsd12-test -t 12.0-RC3
>> [skip]
>> /usr/src/usr.sbin/newsyslog/newsyslog.c
>> To install the downloaded upgrades, run "/usr/sbin/freebsd-update.fixed
>> install".
>> Installing updates...ln: ///boot/kernel/if_iavf.ko: No such file or
>> directory
>> chflags: ///boot/kernel/if_ixlv.ko: No such file or directory
>> [00:20:27] Error: Fail to upgrade system
>> #
> 
> Hrm, apparently this doesn't trip up with a native, i. e. non-poudriere,
> environment and I'd assume that the linking of if_igb.ko to if_em.ko that
> sys/modules/em/Makefile does ever since r324500 isn't causing problems
> with poudriere either. What are poudriere and the "fixed" version of
> freebsd-update(8) doing differently than native counterparts and what do
> you mean by "missed kernel modules for build purpose"?
> 

Poudriere not install kernel/modules package into jails, only 
base|lib|src, so whole '${jail}/boot/kernel' directory is missing, but 
freebsd-update(8) unconditionaly try to link on modules.

Package building procedure is not demanding on binary kernel and modules

-- 
Dima Panov (fluffy at FreeBSD.org)
(X11, KDE, Office)@FreeBSD team

Facebook: http://www.facebook.com/fluffy.khv
twitter: fluffy_khv | skype: dima.panov | telegram: @dima_panov
IRC: fluffy at EFNet, fluffykhv at FreeNode