From owner-freebsd-stable@FreeBSD.ORG Thu Nov 8 21:55:33 2007 Return-Path: Delivered-To: freebsd-stable@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A70FD16A421; Thu, 8 Nov 2007 21:55:33 +0000 (UTC) (envelope-from rermilov@team.vega.ru) Received: from mail.vega.ru (infra.dev.vega.ru [90.156.167.14]) by mx1.freebsd.org (Postfix) with ESMTP id 413AD13C48E; Thu, 8 Nov 2007 21:55:32 +0000 (UTC) (envelope-from rermilov@team.vega.ru) Received: from [87.242.97.68] (port=64963 helo=edoofus.dev.vega.ru) by mail.vega.ru with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68 (FreeBSD)) (envelope-from ) id 1IqEnR-000PfG-Si; Thu, 08 Nov 2007 21:20:17 +0000 Received: from edoofus.dev.vega.ru (localhost [127.0.0.1]) by edoofus.dev.vega.ru (8.14.1/8.14.1) with ESMTP id lA8LJTs4084158; Fri, 9 Nov 2007 00:19:29 +0300 (MSK) (envelope-from rermilov@team.vega.ru) Received: (from ru@localhost) by edoofus.dev.vega.ru (8.14.1/8.14.1/Submit) id lA8LJS0p084157; Fri, 9 Nov 2007 00:19:28 +0300 (MSK) (envelope-from rermilov@team.vega.ru) X-Authentication-Warning: edoofus.dev.vega.ru: ru set sender to rermilov@team.vega.ru using -f Date: Fri, 9 Nov 2007 00:19:28 +0300 From: Ruslan Ermilov To: Mars G Miro Message-ID: <20071108211926.GB83503@team.vega.ru> References: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="PEIAKu/WMn1b1Hv9" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.16 (2007-06-09) Cc: freebsd-stable@FreeBSD.org, Ken Smith Subject: Re: src-install.sh and compat/opensolaris/ X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Nov 2007 21:55:33 -0000 --PEIAKu/WMn1b1Hv9 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Nov 07, 2007 at 04:59:45PM +0800, Mars G Miro wrote: > Hiya > > I think there might be a need to add 'compat' in $dists in > src-install.sh. When the src is extracted from the ISO, compat is left > out and buildworld fails at: > > mkdep -f .depend -a > -I/usr/src/cddl/lib/libnvpair/../../../sys/compat/opensolaris > -I/usr/src/cddl/lib/libnvpair/../../../include > -I/usr/src/cddl/lib/libnvpair/../../../sys/contrib/opensolaris/uts/common > -D_SOLARIS_C_SOURCE > /usr/src/cddl/lib/libnvpair/../../../contrib/opensolaris/lib/libnvpair/libnvpair.c > /usr/src/cddl/lib/libnvpair/../../../contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c > /usr/src/cddl/lib/libnvpair/../../../sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c > /usr/src/cddl/lib/libnvpair/../../../sys/contrib/opensolaris/common/nvpair/nvpair.c > ===> cddl/lib/libumem (depend) > make: don't know how to make umem.c. Stop > *** Error code 2 > > Stop in /usr/src/cddl/lib. > *** Error code 1 > > because there's no more cddl/ [0]. Of course when csupping it can be > checked out but for those that do not csup, they may not be able to > rebuild their world. For instance, I have a 7.0-PRERELEASE box and not > able to rebuild my world using the 7.0-BETA2 src from the ISO. > > Thanks ;-) Try the attached patch. Cheers, -- Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --PEIAKu/WMn1b1Hv9 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=p Index: release/scripts/src-install.sh =================================================================== RCS file: /home/ncvs/src/release/scripts/src-install.sh,v retrieving revision 1.11 diff -u -p -r1.11 src-install.sh --- release/scripts/src-install.sh 28 Jun 2007 18:26:35 -0000 1.11 +++ release/scripts/src-install.sh 8 Nov 2007 21:11:45 -0000 @@ -11,8 +11,8 @@ if [ $# -lt 1 ]; then echo "You must specify which components of src to extract" echo "possible subcomponents are:" echo - echo "base bin cddl contrib crypto etc games gnu include krb5 lib" - echo "libexec release rescue sbin secure share sys tools ubin" + echo "base bin cddl compat contrib crypto etc games gnu include krb5" + echo "lib libexec release rescue sbin secure share sys tools ubin" echo "usbin" echo echo "You may also specify all to extract all subcomponents." @@ -20,7 +20,7 @@ if [ $# -lt 1 ]; then fi if [ "$1" = "all" ]; then - dists="base bin cddl contrib crypto etc games gnu include krb5 lib libexec release rescue sbin secure share sys tools ubin usbin" + dists="base bin cddl compat contrib crypto etc games gnu include krb5 lib libexec release rescue sbin secure share sys tools ubin usbin" else dists="$*" fi Index: usr.sbin/sysinstall/dist.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/dist.c,v retrieving revision 1.250 diff -u -p -r1.250 dist.c --- usr.sbin/sysinstall/dist.c 8 Nov 2007 15:40:40 -0000 1.250 +++ usr.sbin/sysinstall/dist.c 8 Nov 2007 21:14:17 -0000 @@ -109,6 +109,7 @@ static Distribution KernelDistTable[] = static Distribution SrcDistTable[] = { DTE_TARBALL("sbase", &SrcDists, SRC_BASE, "/usr/src"), DTE_TARBALL("scddl", &SrcDists, SRC_CDDL, "/usr/src"), + DTE_TARBALL("scompat", &SrcDists, SRC_COMPAT, "/usr/src"), DTE_TARBALL("scontrib", &SrcDists, SRC_CONTRIB, "/usr/src"), DTE_TARBALL("scrypto", &SrcDists, SRC_SCRYPTO, "/usr/src"), DTE_TARBALL("sgnu", &SrcDists, SRC_GNU, "/usr/src"), Index: usr.sbin/sysinstall/dist.h =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/dist.h,v retrieving revision 1.68 diff -u -p -r1.68 dist.h --- usr.sbin/sysinstall/dist.h 8 Nov 2007 15:40:40 -0000 1.68 +++ usr.sbin/sysinstall/dist.h 8 Nov 2007 21:13:45 -0000 @@ -44,6 +44,7 @@ #define DIST_SRC_SKERBEROS5 0x40000 #define DIST_SRC_RESCUE 0x80000 #define DIST_SRC_CDDL 0x100000 +#define DIST_SRC_COMPAT 0x200000 #define DIST_SRC_ALL 0x1FFFFF /* Subtypes for X.Org packages */ Index: usr.sbin/sysinstall/menus.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/menus.c,v retrieving revision 1.426 diff -u -p -r1.426 menus.c --- usr.sbin/sysinstall/menus.c 8 Nov 2007 15:40:40 -0000 1.426 +++ usr.sbin/sysinstall/menus.c 8 Nov 2007 21:15:30 -0000 @@ -1066,6 +1066,8 @@ DMenu MenuSrcDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE }, { " cddl", "/usr/src/cddl (software from Sun)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CDDL }, + { " compat", "/usr/src/compat (compatibility software)", + dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_COMPAT }, { " contrib", "/usr/src/contrib (contributed software)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB }, { " crypto", "/usr/src/crypto (contrib encryption sources)", --PEIAKu/WMn1b1Hv9--