From owner-svn-src-releng@freebsd.org Thu Dec 6 18:39:50 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 F1620130E89A for ; Thu, 6 Dec 2018 18:39:49 +0000 (UTC) (envelope-from bounce+c4e04e.b1b642-svn-src-releng=freebsd.org@home.dimapanov.com) Received: from mail2.static.mailgun.info (mail2.static.mailgun.info [104.130.122.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 669B379D7B for ; Thu, 6 Dec 2018 18:39:38 +0000 (UTC) (envelope-from bounce+c4e04e.b1b642-svn-src-releng=freebsd.org@home.dimapanov.com) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=home.dimapanov.com; q=dns/txt; s=smtp; t=1544121578; h=Content-Transfer-Encoding: Content-Type: In-Reply-To: MIME-Version: Date: Message-ID: From: References: Cc: To: Subject: Reply-To: Sender; bh=ujF98rQczjE375DTHm02+Mw2fYYUyFrQzEO02IsMr4s=; b=TaPKk2RiP6KOBd9GX4bIZwnQBvR8k6BDUVMQSP9usuyWq/VrPE+YZ5Hc75f9jG4by29urEEu Jp9HnDOdJWQt5ESNL2dLuOwydM7MZmieOzLpPsrxY/nOYhXgrEj0dWfmCzLpH1bkYoBGZ6vC AAv7pH73zkL1vA2+N6oA+mN7DjI= X-Mailgun-Sending-Ip: 104.130.122.2 X-Mailgun-Sid: WyIwYTU2NSIsICJzdm4tc3JjLXJlbGVuZ0BmcmVlYnNkLm9yZyIsICJiMWI2NDIiXQ== Sender: fluffy=freebsd.org@home.dimapanov.com Received: from iMac-Fluffy.local (Unknown [172.111.245.169]) by mxa.mailgun.org with ESMTP id 5c096cea.7fc010d590a0-smtp-out-n03; Thu, 06 Dec 2018 18:39:38 -0000 (UTC) Reply-To: fluffy@FreeBSD.org Subject: Re: svn commit: r341266 - in releng/12.0: . sys/modules/iavf To: Marius Strobl Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org References: <201811292159.wATLx9Bb099604@repo.freebsd.org> <31493546-f2a6-8ad4-5c6e-5e8d835debeb@FreeBSD.org> <20181206172506.GU93591@alchemy.franken.de> From: Dima Panov Message-ID: <8cdcbd76-64c0-4bb5-e37c-2102d5a70a7c@FreeBSD.org> Date: Fri, 7 Dec 2018 04:39:33 +1000 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0) Gecko/20100101 PostboxApp/6.1.6 MIME-Version: 1.0 In-Reply-To: <20181206172506.GU93591@alchemy.franken.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: ru Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 669B379D7B X-Spamd-Result: default: False [3.47 / 15.00]; HAS_REPLYTO(0.00)[fluffy@FreeBSD.org]; MX_INVALID(0.50)[greylisted]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:104.130.122.0/23]; REPLYTO_ADDR_EQ_FROM(0.00)[]; DKIM_TRACE(0.00)[home.dimapanov.com:+]; NEURAL_HAM_SHORT(-0.75)[-0.754,0]; FORGED_SENDER(0.30)[fluffy@FreeBSD.org,bounce@home.dimapanov.com]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-0.59)[ipnet: 104.130.120.0/22(0.56), asn: 27357(-3.41), country: US(-0.09)]; ASN(0.00)[asn:27357, ipnet:104.130.120.0/22, country:US]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[c4e04e.b1b642-svn-src-releng=freebsd.org]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.86)[-0.856,0]; R_DKIM_ALLOW(-0.20)[home.dimapanov.com]; FROM_NEQ_ENVFROM(0.00)[fluffy@FreeBSD.org,bounce@home.dimapanov.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-0.63)[-0.633,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_MISSING(3.50)[requested record is not found]; RCVD_IN_DNSWL_NONE(0.00)[2.122.130.104.list.dnswl.org : 127.0.15.0]; FORGED_MUA_MOZILLA_MAIL_MSGID_UNKNOWN(2.50)[]; RCVD_COUNT_TWO(0.00)[2]; GREYLIST(0.00)[pass,meta] 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 18:39:50 -0000 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 >> >> >> 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@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@EFNet, fluffykhv@FreeNode