From owner-svn-src-releng@freebsd.org Thu Dec 6 17:30:07 2018 Return-Path: Delivered-To: svn-src-releng@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 DA51D130C572; Thu, 6 Dec 2018 17:30:06 +0000 (UTC) (envelope-from gjb@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 80A9276A36; Thu, 6 Dec 2018 17:30:06 +0000 (UTC) (envelope-from gjb@freebsd.org) Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id F034EF321; Thu, 6 Dec 2018 17:30:05 +0000 (UTC) (envelope-from gjb@freebsd.org) Date: Thu, 6 Dec 2018 17:30:03 +0000 From: Glen Barber To: Marius Strobl Cc: Dima Panov , 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: <20181206173003.GE29692@FreeBSD.org> References: <201811292159.wATLx9Bb099604@repo.freebsd.org> <31493546-f2a6-8ad4-5c6e-5e8d835debeb@FreeBSD.org> <20181206172506.GU93591@alchemy.franken.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="n+lFg1Zro7sl44OB" Content-Disposition: inline In-Reply-To: <20181206172506.GU93591@alchemy.franken.de> User-Agent: Mutt/1.10.1 (2018-07-13) X-Rspamd-Queue-Id: 80A9276A36 X-Spamd-Result: default: False [-2.50 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-0.94)[-0.936,0]; NEURAL_HAM_LONG(-0.61)[-0.609,0]; NEURAL_HAM_SHORT(-0.96)[-0.957,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Dec 2018 17:30:07 -0000 --n+lFg1Zro7sl44OB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Dec 06, 2018 at 06:25:06PM +0100, Marius Strobl wrote: > On Thu, Dec 06, 2018 at 03:58:44PM +1000, Dima Panov wrote: > > Hello! > >=20 > > 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 > > >=20 > > > Log: > > > MFC: r341016, MF12: r341261 > > > =20 > > > - Add a belated UPDATING entry for the ixlv(4) -> iavf(4) rename i= n 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 t= ransition. > > > =20 > > [cut] > > >=20 > > > Modified: releng/12.0/sys/modules/iavf/Makefile > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > > --- releng/12.0/sys/modules/iavf/Makefile Thu Nov 29 21:20:53 2018 (r= 341265) > > > +++ releng/12.0/sys/modules/iavf/Makefile Thu Nov 29 21:59:09 2018 (r= 341266) > > > @@ -15,4 +15,6 @@ SRCS +=3D i40e_common.c i40e_nvm.c i40e_adminq.c > > > # Enable asserts and other debugging facilities > > > # CFLAGS +=3D -DINVARIANTS -DINVARIANTS_SUPPORT -DWITNESS > > > =20 > > > +LINKS=3D ${KMODDIR}/${KMOD}.ko ${KMODDIR}/if_ixlv.ko > > > + > > > .include > >=20 > >=20 > > And this broke poudriere jail upgrade due to missed kernel modules for= =20 > > build purpose > >=20 > > # 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= =20 > > install". > > Installing updates...ln: ///boot/kernel/if_iavf.ko: No such file or=20 > > directory > > chflags: ///boot/kernel/if_ixlv.ko: No such file or directory > > [00:20:27] Error: Fail to upgrade system > > # >=20 > 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"? >=20 FWIW, I did not see this in all of my freebsd-update(8) tests. Glen --n+lFg1Zro7sl44OB Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAlwJXJsACgkQAxRYpUeP 4pOYdg//aDdoyYeJgzdnB26Oqmi39lSvSxq1bYWYaWpcFGA1zHJ/VtG0We4eW90s 7pZQVHpJAzk3Ym9jF89OIAB4UaxroYUP/uFRBSaOVg6/qKRb5IdJjVXMbQxFfa5y Tm4fmbevn8cA7o30o7GucbaiYwNkjTOv2vEkQ9O3RrqGAu7cKTxxdScA+eRH+sU7 XKqrbLs6g98uyOe24qWDANyJpWYMWutyGhaoiGnk19VacLUublBsJ9Yu6BwT1I7E FFk9ARPF01+nYLZO4q/MQdMJ7xGYJCyhEPUYqsX3LK0fnp2yirivEsnXyspHhcv/ +5V2FJebhlI9NPqxHwOgM31SipzI8SZKyeZpjK4Uv/Z89Ow3pbUM5tgaCaK4fqxh BTP//r39ZevLdn0Qlt1IClLjk9SjU4Y8RiXNzyNIvCRce7b5YYOBIh3LrvQBKBxM CzZMO10hANCoOa0H1La6GvFINQoLld3X8tWK2HYVRodfLzh/KqZSOsJ2HPvJID6T 2oJ1KrSg0xGz/rlDvNPb35OBxZlceanFZwePQxuhdCflO68Bv2OKzBVNi+1r+Bns pChrECYNHHG3vz2ur8HC3g9AyHW9/bYyYTxfwluIWkTua7nRYNQNtpbKCBgOA30T tAyWsMeQAr+bSTp5RZm92FPEVg7rcpWSqWaF5wajXnW7y0REVYg= =9DJV -----END PGP SIGNATURE----- --n+lFg1Zro7sl44OB--