From owner-svn-src-all@freebsd.org Thu Dec 6 17:25:16 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7FBAB130C44E; Thu, 6 Dec 2018 17:25:16 +0000 (UTC) (envelope-from marius@alchemy.franken.de) Received: from alchemy.franken.de (alchemy.franken.de [194.94.249.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "alchemy.franken.de", Issuer "alchemy.franken.de" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 8806A76711; Thu, 6 Dec 2018 17:25:14 +0000 (UTC) (envelope-from marius@alchemy.franken.de) Received: from alchemy.franken.de (localhost [127.0.0.1]) by alchemy.franken.de (8.15.2/8.15.2/ALCHEMY.FRANKEN.DE) with ESMTPS id wB6HP64t015300 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 6 Dec 2018 18:25:06 +0100 (CET) (envelope-from marius@alchemy.franken.de) Received: (from marius@localhost) by alchemy.franken.de (8.15.2/8.15.2/Submit) id wB6HP6KH015299; Thu, 6 Dec 2018 18:25:06 +0100 (CET) (envelope-from marius) Date: Thu, 6 Dec 2018 18:25:06 +0100 From: Marius Strobl To: Dima Panov Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: Re: svn commit: r341266 - in releng/12.0: . sys/modules/iavf Message-ID: <20181206172506.GU93591@alchemy.franken.de> References: <201811292159.wATLx9Bb099604@repo.freebsd.org> <31493546-f2a6-8ad4-5c6e-5e8d835debeb@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <31493546-f2a6-8ad4-5c6e-5e8d835debeb@FreeBSD.org> User-Agent: Mutt/1.9.2 (2017-12-15) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (alchemy.franken.de [0.0.0.0]); Thu, 06 Dec 2018 18:25:06 +0100 (CET) X-Rspamd-Queue-Id: 8806A76711 X-Spamd-Result: default: False [-4.57 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; AUTH_NA(1.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-2.77)[ip: (-9.53), ipnet: 194.94.0.0/15(-4.18), asn: 680(-0.11), country: DE(-0.01)]; MX_GOOD(-0.01)[alchemy.franken.de,hub-r.franken.de,rachael.franken.de]; NEURAL_HAM_SHORT(-1.00)[-0.996,0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[marius@freebsd.org,marius@alchemy.franken.de]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:680, ipnet:194.94.0.0/15, country:DE]; FROM_NEQ_ENVFROM(0.00)[marius@freebsd.org,marius@alchemy.franken.de] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Dec 2018 17:25:16 -0000 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 > > > 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"? Marius