From owner-freebsd-bugs@FreeBSD.ORG Sat Apr 26 13:30:50 2003 Return-Path: Delivered-To: freebsd-bugs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F21FB37B401 for ; Sat, 26 Apr 2003 13:30:49 -0700 (PDT) Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 770F843F93 for ; Sat, 26 Apr 2003 13:30:46 -0700 (PDT) (envelope-from ru@whale.sunbay.crimea.ua) Received: from whale.sunbay.crimea.ua (ru@localhost [127.0.0.1]) h3QKUF62067077 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 26 Apr 2003 23:30:16 +0300 (EEST) (envelope-from ru@whale.sunbay.crimea.ua) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.12.9/8.12.8/Submit) id h3QKU2fe067059; Sat, 26 Apr 2003 23:30:02 +0300 (EEST) (envelope-from ru) Date: Sat, 26 Apr 2003 23:30:02 +0300 From: Ruslan Ermilov To: Darren Reed Message-ID: <20030426203002.GA66677@sunbay.com> References: <20030426052507.N40408@gamplex.bde.org> <200304260556.PAA10193@avalon.reed.wattle.id.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="NMuMz9nt05w80d4+" Content-Disposition: inline In-Reply-To: <200304260556.PAA10193@avalon.reed.wattle.id.au> User-Agent: Mutt/1.5.4i cc: simon@comsys.ntu-kpi.kiev.ua cc: freebsd-bugs@freebsd.org Subject: Re: misc/44148: installworld in 4.7-STABLE does not install IPFilter related header files X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Apr 2003 20:30:50 -0000 --NMuMz9nt05w80d4+ Content-Type: multipart/mixed; boundary="XsQoSWH+UP9D9v3l" Content-Disposition: inline --XsQoSWH+UP9D9v3l Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Apr 26, 2003 at 03:56:54PM +1000, Darren Reed wrote: > In some email I received from Bruce Evans, sie wrote: > >=20 > > > So, I'd like to either do this on a directory level, or kill > > > the SHARED=3Dsymlinks concept. > >=20 > > I depend on SHARED=3Dsymlinks a lot. However, the number of things that > > must be installed manually when not using makeworld is large so another > > set of includes wouldn't make much difference. >=20 > So are we agreed then that we can move to netinet being created as a > directory and populated with symbolic links ? >=20 Here's an implementation (without ipfilter). Please review. Cheers, --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software AG, ru@FreeBSD.org FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age --XsQoSWH+UP9D9v3l Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=p Content-Transfer-Encoding: quoted-printable Index: Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/include/Makefile,v retrieving revision 1.196 diff -u -r1.196 Makefile --- Makefile 17 Apr 2003 14:14:21 -0000 1.196 +++ Makefile 26 Apr 2003 20:22:19 -0000 @@ -43,10 +43,6 @@ security/mac_biba security/mac_bsdextended security/mac_lomac\ security/mac_mls security/mac_partition ufs/ffs ufs/ufs =20 -# For SHARED=3Dsymlinks, cam, netatm, and netgraph are symlinks, so cam/sc= si, -# netatm/*, and netgraph/* are taken care of -LSYMSUBDIRS=3D ${LSUBDIRS:Ncam/scsi:Nnetatm/*:Nnetgraph/*} - # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies''). ``symlinks'' is # probably only useful for developers and should be avoided if you do not @@ -80,48 +76,74 @@ INCSLINKS+=3D posix4/$i ${INCLUDEDIR}/$i .endfor =20 -copies: -.for i in ${LDIRS} ${LSYMSUBDIRS} machine crypto - if [ -L ${DESTDIR}/usr/include/$i ]; then \ - rm -f ${DESTDIR}/usr/include/$i; \ +.include + +installincludes: ${SHARED} +${SHARED}: compat + +compat: +.for i in ${LDIRS} ${LSUBDIRS} machine crypto + if [ -L ${DESTDIR}${INCLUDEDIR}/$i ]; then \ + rm -f ${DESTDIR}${INCLUDEDIR}/$i; \ fi .endfor mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/../etc/mtree/BSD.inclu= de.dist \ -p ${DESTDIR}/usr/include + +# INCLUDEDIR is defined only here. +copies: +.for i in ${LDIRS} ${LSUBDIRS} crypto machine machine/pc +.if exists(${DESTDIR}${INCLUDEDIR}/$i) + cd ${DESTDIR}${INCLUDEDIR}/$i; \ + for h in *.h; do \ + if [ -L $$h ]; then \ + rm -f $$h; \ + fi; \ + done +.endif +.endfor .for i in ${LDIRS} ${LSUBDIRS} cd ${.CURDIR}/../sys; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \ - ${DESTDIR}/usr/include/$i + ${DESTDIR}${INCLUDEDIR}/$i .endfor cd ${.CURDIR}/../sys; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 opencrypto/*.h \ - ${DESTDIR}/usr/include/crypto -.if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include) + ${DESTDIR}${INCLUDEDIR}/crypto cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ - ${DESTDIR}/usr/include/machine + ${DESTDIR}${INCLUDEDIR}/machine .if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc) cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ - ${DESTDIR}/usr/include/machine/pc -.endif + ${DESTDIR}${INCLUDEDIR}/machine/pc .endif =20 symlinks: @${ECHO} "Setting up symlinks to kernel source tree..." .for i in ${LDIRS} - rm -rf ${DESTDIR}/usr/include/$i - ln -s ../../sys/$i ${DESTDIR}/usr/include/$i -.endfor - rm -rf ${DESTDIR}/usr/include/crypto - ln -s ../../sys/opencrypto ${DESTDIR}/usr/include/crypto -.for i in ${LSYMSUBDIRS} - rm -rf ${DESTDIR}/usr/include/$i - ln -s ../../../sys/$i ${DESTDIR}/usr/include/$i -.endfor - rm -rf ${DESTDIR}/usr/include/machine - ln -s ../../sys/${MACHINE_ARCH}/include ${DESTDIR}/usr/include/machine - -.include - -installincludes: ${SHARED} + cd ${.CURDIR}/../sys/$i; \ + for h in *.h; do \ + ln -fs ../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ + done +.endfor +.for i in ${LSUBDIRS} + cd ${.CURDIR}/../sys/$i; \ + for h in *.h; do \ + ln -fs ../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ + done +.endfor + cd ${.CURDIR}/../sys/opencrypto; \ + for h in *.h; do \ + ln -fs ../../../sys/opencrypto/$$h ${DESTDIR}${INCLUDEDIR}/crypto; \ + done + cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \ + for h in *.h; do \ + ln -fs ../../../sys/${MACHINE_ARCH}/include/$$h ${DESTDIR}${INCLUDEDIR}/= machine; \ + done +.if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc) + cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc; \ + for h in *.h; do \ + ln -fs ../../../../sys/${MACHINE_ARCH}/include/$$h ${DESTDIR}${INCLUDEDI= R}/machine/pc; \ + done +.endif --XsQoSWH+UP9D9v3l-- --NMuMz9nt05w80d4+ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE+quxKUkv4P6juNwoRAtU6AJ90Z78u1b03Andf/SIhHas/nk7i2gCfSQFt IdtQTKz2n5oNSRMcYMibmgc= =GOcS -----END PGP SIGNATURE----- --NMuMz9nt05w80d4+--