From owner-svn-src-stable-11@freebsd.org Sun Dec 11 02:01:58 2016 Return-Path: Delivered-To: svn-src-stable-11@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 854BEC65FFD; Sun, 11 Dec 2016 02:01:58 +0000 (UTC) (envelope-from rpokala@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 mx1.freebsd.org (Postfix) with ESMTPS id 4D9EC1B16; Sun, 11 Dec 2016 02:01:58 +0000 (UTC) (envelope-from rpokala@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBB21vA4068791; Sun, 11 Dec 2016 02:01:57 GMT (envelope-from rpokala@FreeBSD.org) Received: (from rpokala@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBB21vvF068789; Sun, 11 Dec 2016 02:01:57 GMT (envelope-from rpokala@FreeBSD.org) Message-Id: <201612110201.uBB21vvF068789@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rpokala set sender to rpokala@FreeBSD.org using -f From: Ravi Pokala Date: Sun, 11 Dec 2016 02:01:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r309841 - in stable/11/sys/modules: . bios X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Dec 2016 02:01:58 -0000 Author: rpokala Date: Sun Dec 11 02:01:57 2016 New Revision: 309841 URL: https://svnweb.freebsd.org/changeset/base/309841 Log: MFC r309491: Build smbios.ko as a module for amd64 and i386 For whatever reason, smapi, smbios, vpd are all under the "bios" directory. smapi is only for i386, so the entire "bios" directory is only built for i386. Break smapi out, and make only it i386-specific. Then, build the "bios" directory for both amd64 and i386. Modified: stable/11/sys/modules/Makefile stable/11/sys/modules/bios/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/modules/Makefile ============================================================================== --- stable/11/sys/modules/Makefile Sat Dec 10 23:58:14 2016 (r309840) +++ stable/11/sys/modules/Makefile Sun Dec 11 02:01:57 2016 (r309841) @@ -544,6 +544,7 @@ _igb= igb _agp= agp _an= an _aout= aout +_bios= bios _bktr= bktr _bxe= bxe _cardbus= cardbus @@ -726,7 +727,6 @@ _wds= wds .if ${MK_EISA} != "no" _ahb= ahb .endif -_bios= bios _cm= cm .if ${MK_SOURCELESS_UCODE} != "no" _ctau= ctau Modified: stable/11/sys/modules/bios/Makefile ============================================================================== --- stable/11/sys/modules/bios/Makefile Sat Dec 10 23:58:14 2016 (r309840) +++ stable/11/sys/modules/bios/Makefile Sun Dec 11 02:01:57 2016 (r309841) @@ -1,6 +1,10 @@ # $FreeBSD$ # -SUBDIR= smapi smbios vpd +SUBDIR= smbios vpd + +.if ${MACHINE_ARCH} == "i386" +SUBDIR+= smapi +.endif .include