From owner-svn-src-stable@freebsd.org  Sun Dec 11 02:02:01 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 06581C6F01D;
 Sun, 11 Dec 2016 02:02:01 +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 C9BB11B22;
 Sun, 11 Dec 2016 02:02:00 +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 uBB2207E068837;
 Sun, 11 Dec 2016 02:02:00 GMT (envelope-from rpokala@FreeBSD.org)
Received: (from rpokala@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBB21xFX068835;
 Sun, 11 Dec 2016 02:01:59 GMT (envelope-from rpokala@FreeBSD.org)
Message-Id: <201612110201.uBB21xFX068835@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rpokala set sender to
 rpokala@FreeBSD.org using -f
From: Ravi Pokala <rpokala@FreeBSD.org>
Date: Sun, 11 Dec 2016 02:01:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r309842 - in stable/10/sys/modules: . bios
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Dec 2016 02:02:01 -0000

Author: rpokala
Date: Sun Dec 11 02:01:59 2016
New Revision: 309842
URL: https://svnweb.freebsd.org/changeset/base/309842

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.
  
  Because 'sys/modules/Makefile' was refactored after stable/10 was branched,
  the diff for that file is different from that of the original commit. They
  are functionally equivalent.

Modified:
  stable/10/sys/modules/Makefile
  stable/10/sys/modules/bios/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/modules/Makefile
==============================================================================
--- stable/10/sys/modules/Makefile	Sun Dec 11 02:01:57 2016	(r309841)
+++ stable/10/sys/modules/Makefile	Sun Dec 11 02:01:59 2016	(r309842)
@@ -683,6 +683,7 @@ _amdsbwd=	amdsbwd
 _amdtemp=	amdtemp
 _arcmsr=	arcmsr
 _asmc=		asmc
+_bios=		bios
 _bktr=		bktr
 _bxe=		bxe
 _cardbus=	cardbus

Modified: stable/10/sys/modules/bios/Makefile
==============================================================================
--- stable/10/sys/modules/bios/Makefile	Sun Dec 11 02:01:57 2016	(r309841)
+++ stable/10/sys/modules/bios/Makefile	Sun Dec 11 02:01:59 2016	(r309842)
@@ -1,6 +1,10 @@
 # $FreeBSD$
 #
 
-SUBDIR=	smapi smbios vpd
+SUBDIR=	smbios vpd
+
+.if ${MACHINE_ARCH} == "i386"
+SUBDIR+=	smapi
+.endif
 
 .include <bsd.subdir.mk>