From owner-svn-src-all@freebsd.org Fri Mar 10 18:41:44 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 45555D06C7A; Fri, 10 Mar 2017 18:41:44 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: from mail-it0-x232.google.com (mail-it0-x232.google.com [IPv6:2607:f8b0:4001:c0b::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0A54F1E64; Fri, 10 Mar 2017 18:41:44 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: by mail-it0-x232.google.com with SMTP id m27so1524952iti.0; Fri, 10 Mar 2017 10:41:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=lNeNGNQAQzyul8uT/SkelbMUMBYJlJ1+Ihtj3i+9wAk=; b=hBnvtb7P1js99F/AnmOJCLYRshHrrguHPVHuHwchLoxzfc+nNVi24Ajbh4xsGcRB3k iHFw6hclgKyBlke3E5BibBixc2oV/6acU60SNlMm+H8I7k8TwH5yGAG3F/Cd7/mjTUBW WPOmHKmGPfN/4b1ldo+kzKJBquPWGQosyVN9XLQ5FhL0OlcIlMz8ad4iWhoUuEKNAsqV Yyz6d42qIysH4nYqzIHIbRMXz80aliFziEBw9E3RM/8QIr/m/yvu45a7EKm/Vuf/yNGg dxsnMj6+w6ZuC+QyBMzT3VIHDMmqhJbk9hlnhk5gjzeYOvGmN9u2KYQ0TFrCHq9MR2N/ 4flA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=lNeNGNQAQzyul8uT/SkelbMUMBYJlJ1+Ihtj3i+9wAk=; b=H0QZqN5rf1oefFVEj21UVGWr3rTDOXfTaC3InBIvNVmZOD4j096LzumbBs8uiUqsUb kQnkDECi7IL3k/0wHWcRZoC4vezUVjsVmgB1NagggjPAe5DoslfbxiNvVJzLm54J4dF6 6Z0Clx/5kOrCJk/7b1AtCDuPBeHfk1QgujWgBZqeL+vBCIzH9/UuQbTLMHFD4J3gsg9Q 8A2vahbBUfzVEjE1qwn2LqEZeULzMcfcKvV0psOSlK2MSyf/BuhG9C4pcR7Jy5UQObC8 Kox2UhhPG/47CM/T4x3I4Wu/L40A1x5wLOXE0LxwQjIWHm+m3tLT+DUUzF+Im8uzr2jY Bu3w== X-Gm-Message-State: AFeK/H2BPwdR8VSezcEnrLulZTS9SJnmhEvABkovgpKgVyrUlSgwQhlOZ7H/5IGgfyFuI5Zhc+LO+WppmyUt0w== X-Received: by 10.36.79.15 with SMTP id c15mr433035itb.98.1489171303515; Fri, 10 Mar 2017 10:41:43 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.190.71 with HTTP; Fri, 10 Mar 2017 10:41:43 -0800 (PST) In-Reply-To: References: <201701100323.v0A3NMAI045868@repo.freebsd.org> <20170215100637.2xsyyu46odzig4c4@dhcp-3-221.uk.xensource.com> From: Ryan Stone Date: Fri, 10 Mar 2017 13:41:43 -0500 Message-ID: Subject: Re: svn commit: r311849 - in head: . sys/amd64/conf sys/arm64/conf sys/conf sys/dev/e1000 sys/i386/conf sys/mips/conf sys/modules sys/modules/em sys/modules/igb sys/powerpc/conf To: Warner Losh Cc: Sean Bruno , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Fri, 10 Mar 2017 18:41:44 -0000 There's also the issue that running "ifconfig igb0 blah" during startup will cause if_igb to be automatically loaded by ifconfig. I guess we could add a dummy if_igb.ko that just has a dependency on if_em.ko On Fri, Mar 10, 2017 at 1:13 PM, Warner Losh wrote: > On Fri, Mar 10, 2017 at 11:06 AM, Sean Bruno wrote: > > > > > > On 02/15/17 03:06, Roger Pau Monn=C3=A9 wrote: > >> On Tue, Jan 10, 2017 at 03:23:22AM +0000, Sean Bruno wrote: > >>> Author: sbruno > >>> Date: Tue Jan 10 03:23:22 2017 > >>> New Revision: 311849 > >>> URL: https://svnweb.freebsd.org/changeset/base/311849 > >>> > >>> Log: > >>> Migrate e1000 to the IFLIB framework: > >>> - em(4) igb(4) and lem(4) > >>> - deprecate the igb device from kernel configurations > >>> - create a symbolic link in /boot/kernel from if_em.ko to if_igb.ko > >> > >> This linking causes mfsBSD to choke when building an image from HEAD. > It tries > >> to issue the following command: > >> > >> ${_v}${CP} -rp ${_BOOTDIR}/kernel ${WRKDIR}/disk/boot > >> > >> Which fails when finding the symbol link. I can send a patch to change > that to > >> -Rp, which would work fine, but wouldn't it be better to either > completely > >> remove if_igb.ko, or simply copy if_em.ko to if_igb.ko? > >> > >> I'm wondering if for example anyone strips down it's /boot/kernel/ > manually, by > >> removing unused modules, and what would happen if if_em.ko is removed > but not > >> if_igb.ko. > >> > >> Roger. > >> > >> > > > > Well, this was my naive attempt to make upgrades for users to be > > non-eventful in the event they have "if_igb_load=3DYES" in their > > loader.conf instead of having it built into their kernel. > > > > If the -Rp works, I'll add that instead. > > The module name is encoded in the module itself. The boot loader looks > it up to see which module to load. Maybe there's a way to fix it so > both load from one file? > > Warner > >