From owner-svn-src-all@freebsd.org Tue Jul 30 14:54:19 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6BB2CA57FA; Tue, 30 Jul 2019 14:54:19 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8889CC72; Tue, 30 Jul 2019 14:54:19 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2286D1AA97; Tue, 30 Jul 2019 14:54:19 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6UEsI5d045134; Tue, 30 Jul 2019 14:54:18 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6UEsIVC045133; Tue, 30 Jul 2019 14:54:18 GMT (envelope-from br@FreeBSD.org) Message-Id: <201907301454.x6UEsIVC045133@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Tue, 30 Jul 2019 14:54:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r350444 - head/stand/efi/loader X-SVN-Group: head X-SVN-Commit-Author: br X-SVN-Commit-Paths: head/stand/efi/loader X-SVN-Commit-Revision: 350444 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4D8889CC72 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Tue, 30 Jul 2019 14:54:19 -0000 Author: br Date: Tue Jul 30 14:54:18 2019 New Revision: 350444 URL: https://svnweb.freebsd.org/changeset/base/350444 Log: Fix EFI loader build when LOADER_NET_SUPPORT=no. Sponsored by: DARPA, AFRL Modified: head/stand/efi/loader/conf.c Modified: head/stand/efi/loader/conf.c ============================================================================== --- head/stand/efi/loader/conf.c Tue Jul 30 14:21:00 2019 (r350443) +++ head/stand/efi/loader/conf.c Tue Jul 30 14:54:18 2019 (r350444) @@ -40,7 +40,9 @@ struct devsw *devsw[] = { &efipart_cddev, &efipart_hddev, &efihttp_dev, /* ordering with efinet_dev matters */ +#if defined(LOADER_NET_SUPPORT) &efinet_dev, +#endif &vdisk_dev, #ifdef EFI_ZFS_BOOT &zfs_dev, @@ -64,7 +66,9 @@ struct fs_ops *file_system[] = { }; struct netif_driver *netif_drivers[] = { +#if defined(LOADER_NET_SUPPORT) &efinetif, +#endif NULL };