Build compat code only when specified by RUMP_COMPATdiff -r1.4 -r1.5 src/sys/rump/dev/lib/libraidframe/Makefile
(pooka)
--- src/sys/rump/dev/lib/libraidframe/Makefile 2014/03/13 01:49:59 1.4
+++ src/sys/rump/dev/lib/libraidframe/Makefile 2015/04/22 17:57:49 1.5
@@ -1,29 +1,35 @@ | @@ -1,29 +1,35 @@ | |||
1 | # $NetBSD: Makefile,v 1.4 2014/03/13 01:49:59 pooka Exp $ | 1 | # $NetBSD: Makefile,v 1.5 2015/04/22 17:57:49 pooka Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | .include <bsd.init.mk> | |||
5 | ||||
4 | .PATH: ${.CURDIR}/../../../../dev/raidframe | 6 | .PATH: ${.CURDIR}/../../../../dev/raidframe | |
5 | 7 | |||
6 | LIB= rumpdev_raidframe | 8 | LIB= rumpdev_raidframe | |
7 | 9 | |||
8 | SRCS= rf_acctrace.c rf_alloclist.c rf_aselect.c rf_callback.c \ | 10 | SRCS= rf_acctrace.c rf_alloclist.c rf_aselect.c rf_callback.c \ | |
9 | rf_chaindecluster.c rf_copyback.c rf_cvscan.c rf_dagdegrd.c \ | 11 | rf_chaindecluster.c rf_copyback.c rf_cvscan.c rf_dagdegrd.c \ | |
10 | rf_dagdegwr.c rf_dagffrd.c rf_dagffwr.c rf_dagfuncs.c \ | 12 | rf_dagdegwr.c rf_dagffrd.c rf_dagffwr.c rf_dagfuncs.c \ | |
11 | rf_dagutils.c rf_debugMem.c rf_debugprint.c rf_decluster.c \ | 13 | rf_dagutils.c rf_debugMem.c rf_debugprint.c rf_decluster.c \ | |
12 | rf_declusterPQ.c rf_diskqueue.c rf_disks.c rf_driver.c \ | 14 | rf_declusterPQ.c rf_diskqueue.c rf_disks.c rf_driver.c \ | |
13 | rf_engine.c rf_evenodd.c rf_evenodd_dagfuncs.c rf_evenodd_dags.c\ | 15 | rf_engine.c rf_evenodd.c rf_evenodd_dagfuncs.c rf_evenodd_dags.c\ | |
14 | rf_fifo.c rf_interdecluster.c rf_invertq.c rf_layout.c \ | 16 | rf_fifo.c rf_interdecluster.c rf_invertq.c rf_layout.c \ | |
15 | rf_map.c rf_mcpair.c rf_netbsdkintf.c rf_nwayxor.c rf_options.c \ | 17 | rf_map.c rf_mcpair.c rf_netbsdkintf.c rf_nwayxor.c rf_options.c \ | |
16 | rf_paritylog.c rf_paritylogDiskMgr.c rf_paritylogging.c \ | 18 | rf_paritylog.c rf_paritylogDiskMgr.c rf_paritylogging.c \ | |
17 | rf_parityloggingdags.c rf_parityscan.c rf_pq.c rf_pqdeg.c \ | 19 | rf_parityloggingdags.c rf_parityscan.c rf_pq.c rf_pqdeg.c \ | |
18 | rf_pqdegdags.c rf_psstatus.c rf_raid0.c rf_raid1.c rf_raid4.c \ | 20 | rf_pqdegdags.c rf_psstatus.c rf_raid0.c rf_raid1.c rf_raid4.c \ | |
19 | rf_raid5.c rf_raid5_rotatedspare.c rf_reconbuffer.c \ | 21 | rf_raid5.c rf_raid5_rotatedspare.c rf_reconbuffer.c \ | |
20 | rf_reconmap.c rf_reconstruct.c rf_reconutil.c rf_revent.c \ | 22 | rf_reconmap.c rf_reconstruct.c rf_reconutil.c rf_revent.c \ | |
21 | rf_shutdown.c rf_sstf.c rf_states.c rf_stripelocks.c \ | 23 | rf_shutdown.c rf_sstf.c rf_states.c rf_stripelocks.c \ | |
22 | rf_strutils.c rf_utils.c rf_compat50.c rf_paritymap.c | 24 | rf_strutils.c rf_utils.c rf_paritymap.c | |
23 | 25 | |||
24 | SRCS+= raidframe_component.c | 26 | SRCS+= raidframe_component.c | |
25 | 27 | |||
28 | .if !empty(RUMP_COMPAT:M50) | |||
29 | SRCS+= rf_compat50.c | |||
30 | .endif | |||
31 | ||||
26 | CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs | 32 | CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs | |
27 | 33 | |||
28 | .include <bsd.lib.mk> | 34 | .include <bsd.lib.mk> | |
29 | .include <bsd.klinks.mk> | 35 | .include <bsd.klinks.mk> |
--- src/sys/rump/kern/lib/libtty/Makefile 2014/03/13 02:02:30 1.3
+++ src/sys/rump/kern/lib/libtty/Makefile 2015/04/22 17:57:49 1.4
@@ -1,17 +1,22 @@ | @@ -1,17 +1,22 @@ | |||
1 | # $NetBSD: Makefile,v 1.3 2014/03/13 02:02:30 pooka Exp $ | 1 | # $NetBSD: Makefile,v 1.4 2015/04/22 17:57:49 pooka Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | .include <bsd.init.mk> | |||
5 | ||||
4 | .PATH: ${.CURDIR}/../../../../kern \ | 6 | .PATH: ${.CURDIR}/../../../../kern \ | |
5 | ${.CURDIR}/../../../../compat/common | 7 | ${.CURDIR}/../../../../compat/common | |
6 | 8 | |||
7 | LIB= rumpkern_tty | 9 | LIB= rumpkern_tty | |
8 | 10 | |||
9 | SRCS= tty.c tty_bsdpty.c tty_conf.c tty_ptm.c tty_pty.c tty_tty.c tty_subr.c | 11 | SRCS= tty.c tty_bsdpty.c tty_conf.c tty_ptm.c tty_pty.c tty_tty.c tty_subr.c | |
12 | ||||
13 | .if !empty(RUMP_COMPAT:M60) | |||
10 | SRCS+= tty_60.c | 14 | SRCS+= tty_60.c | |
15 | .endif | |||
11 | 16 | |||
12 | SRCS+= tty_component.c | 17 | SRCS+= tty_component.c | |
13 | 18 | |||
14 | CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpvfs | 19 | CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpvfs | |
15 | 20 | |||
16 | .include <bsd.lib.mk> | 21 | .include <bsd.lib.mk> | |
17 | .include <bsd.klinks.mk> | 22 | .include <bsd.klinks.mk> |
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern 2015/04/22 16:49:42 1.156
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern 2015/04/22 17:57:49 1.157
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile.rumpkern,v 1.156 2015/04/22 16:49:42 pooka Exp $ | 1 | # $NetBSD: Makefile.rumpkern,v 1.157 2015/04/22 17:57:49 pooka Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | .include "${RUMPTOP}/Makefile.rump" | 4 | .include "${RUMPTOP}/Makefile.rump" | |
5 | 5 | |||
6 | .include <bsd.own.mk> | 6 | .include <bsd.own.mk> | |
7 | 7 | |||
8 | LIB= rump | 8 | LIB= rump | |
9 | 9 | |||
10 | MAN= rump.3 rump_lwproc.3 | 10 | MAN= rump.3 rump_lwproc.3 | |
11 | 11 | |||
12 | .PATH: ${RUMPTOP}/librump/rumpkern \ | 12 | .PATH: ${RUMPTOP}/librump/rumpkern \ | |
13 | ${RUMPTOP}/librump/rumpkern/arch/generic \ | 13 | ${RUMPTOP}/librump/rumpkern/arch/generic \ | |
14 | ${RUMPTOP}/../kern \ | 14 | ${RUMPTOP}/../kern \ | |
@@ -143,29 +143,31 @@ SRCS+= vnode_if.c | @@ -143,29 +143,31 @@ SRCS+= vnode_if.c | |||
143 | # sys/dev | 143 | # sys/dev | |
144 | SRCS+= clock_subr.c | 144 | SRCS+= clock_subr.c | |
145 | 145 | |||
146 | # sys/dev/crypto | 146 | # sys/dev/crypto | |
147 | # Note: these are here only for cprng. More crypto algos for drivers | 147 | # Note: these are here only for cprng. More crypto algos for drivers | |
148 | # are available from the rumpkern_crypto component | 148 | # are available from the rumpkern_crypto component | |
149 | SRCS+= nist_ctr_drbg.c | 149 | SRCS+= nist_ctr_drbg.c | |
150 | SRCS+= rijndael-alg-fst.c | 150 | SRCS+= rijndael-alg-fst.c | |
151 | SRCS+= rijndael-api-fst.c | 151 | SRCS+= rijndael-api-fst.c | |
152 | SRCS+= rijndael.c | 152 | SRCS+= rijndael.c | |
153 | SRCS+= cprng_fast.c | 153 | SRCS+= cprng_fast.c | |
154 | 154 | |||
155 | # compat | 155 | # compat | |
156 | .if !empty(RUMP_COMPAT:M50) | |||
156 | SRCS+= kern_select_50.c | 157 | SRCS+= kern_select_50.c | |
157 | SRCS+= kern_time_50.c | 158 | SRCS+= kern_time_50.c | |
158 | SRCS+= rndpseudo_50.c | 159 | SRCS+= rndpseudo_50.c | |
160 | .endif | |||
159 | 161 | |||
160 | # Set RUMP_UNREAL_ALLOCATORS to "yes" to use memory allocation hypercalls | 162 | # Set RUMP_UNREAL_ALLOCATORS to "yes" to use memory allocation hypercalls | |
161 | # directly instead of the kmem/pool allocators backed by hypercalls. | 163 | # directly instead of the kmem/pool allocators backed by hypercalls. | |
162 | # Direct hypercalls may be a few percent faster, but don't emulate | 164 | # Direct hypercalls may be a few percent faster, but don't emulate | |
163 | # all kernel corner cases as well (not to mention if you want to debug the | 165 | # all kernel corner cases as well (not to mention if you want to debug the | |
164 | # allocators themselves). | 166 | # allocators themselves). | |
165 | .if defined(RUMP_UNREAL_ALLOCATORS) && ${RUMP_UNREAL_ALLOCATORS} == "yes" | 167 | .if defined(RUMP_UNREAL_ALLOCATORS) && ${RUMP_UNREAL_ALLOCATORS} == "yes" | |
166 | SRCS+= memalloc.c | 168 | SRCS+= memalloc.c | |
167 | .else | 169 | .else | |
168 | SRCS+= subr_kmem.c subr_pool.c | 170 | SRCS+= subr_kmem.c subr_pool.c | |
169 | .endif | 171 | .endif | |
170 | 172 | |||
171 | .ifdef RUMP_LOCKDEBUG | 173 | .ifdef RUMP_LOCKDEBUG |
--- src/sys/rump/librump/rumpvfs/Makefile.rumpvfs 2015/04/22 17:00:59 1.44
+++ src/sys/rump/librump/rumpvfs/Makefile.rumpvfs 2015/04/22 17:57:49 1.45
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: Makefile.rumpvfs,v 1.44 2015/04/22 17:00:59 pooka Exp $ | 1 | # $NetBSD: Makefile.rumpvfs,v 1.45 2015/04/22 17:57:49 pooka Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | .include "${RUMPTOP}/Makefile.rump" | 4 | .include "${RUMPTOP}/Makefile.rump" | |
5 | 5 | |||
6 | .include <bsd.own.mk> | 6 | .include <bsd.own.mk> | |
7 | 7 | |||
8 | LIB= rumpvfs | 8 | LIB= rumpvfs | |
9 | 9 | |||
10 | MAN= rump_etfs.3 rumpfs.4 | 10 | MAN= rump_etfs.3 rumpfs.4 | |
11 | 11 | |||
12 | .PATH: ${RUMPTOP}/librump/rumpvfs ${RUMPTOP}/librump \ | 12 | .PATH: ${RUMPTOP}/librump/rumpvfs ${RUMPTOP}/librump \ | |
13 | ${RUMPTOP}/../kern \ | 13 | ${RUMPTOP}/../kern \ | |
14 | ${RUMPTOP}/../miscfs/genfs ${RUMPTOP}/../miscfs/syncfs \ | 14 | ${RUMPTOP}/../miscfs/genfs ${RUMPTOP}/../miscfs/syncfs \ | |
@@ -60,21 +60,23 @@ SRCS+= mfs_miniroot.c | @@ -60,21 +60,23 @@ SRCS+= mfs_miniroot.c | |||
60 | # ktrace vfs part | 60 | # ktrace vfs part | |
61 | .if ${RUMP_KTRACE} == "yes" | 61 | .if ${RUMP_KTRACE} == "yes" | |
62 | SRCS+= kern_ktrace_vfs.c | 62 | SRCS+= kern_ktrace_vfs.c | |
63 | .endif | 63 | .endif | |
64 | 64 | |||
65 | #quota2 plists | 65 | #quota2 plists | |
66 | SRCS+= quota1_subr.c vfs_quotactl.c | 66 | SRCS+= quota1_subr.c vfs_quotactl.c | |
67 | 67 | |||
68 | # dev | 68 | # dev | |
69 | # firmload is technically part of rumpdev, but it's pure vfs in nature. | 69 | # firmload is technically part of rumpdev, but it's pure vfs in nature. | |
70 | SRCS+= firmload.c | 70 | SRCS+= firmload.c | |
71 | 71 | |||
72 | # compat syscalls | 72 | # compat syscalls | |
73 | .if !empty(RUMP_COMPAT:M50) | |||
73 | SRCS+= vfs_syscalls_50.c rumpvfs_compat50.c | 74 | SRCS+= vfs_syscalls_50.c rumpvfs_compat50.c | |
75 | .endif | |||
74 | 76 | |||
75 | SRCS+= rumpvnode_if.c | 77 | SRCS+= rumpvnode_if.c | |
76 | 78 | |||
77 | CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern | 79 | CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern | |
78 | 80 | |||
79 | .include <bsd.lib.mk> | 81 | .include <bsd.lib.mk> | |
80 | .include <bsd.klinks.mk> | 82 | .include <bsd.klinks.mk> |
--- src/sys/rump/net/lib/libnet/Makefile 2014/03/13 02:06:32 1.20
+++ src/sys/rump/net/lib/libnet/Makefile 2015/04/22 17:57:49 1.21
@@ -1,22 +1,28 @@ | @@ -1,22 +1,28 @@ | |||
1 | # $NetBSD: Makefile,v 1.20 2014/03/13 02:06:32 pooka Exp $ | 1 | # $NetBSD: Makefile,v 1.21 2015/04/22 17:57:49 pooka Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | .include <bsd.init.mk> | |||
5 | ||||
4 | .PATH: ${.CURDIR}/../../../../net ${.CURDIR}/../../../../compat/common | 6 | .PATH: ${.CURDIR}/../../../../net ${.CURDIR}/../../../../compat/common | |
5 | 7 | |||
6 | LIB= rumpnet_net | 8 | LIB= rumpnet_net | |
7 | 9 | |||
8 | # iffy stuff | 10 | # iffy stuff | |
9 | SRCS= if.c if_loop.c route.c rtsock.c rtsock_50.c raw_usrreq.c \ | 11 | SRCS= if.c if_loop.c route.c rtsock.c raw_usrreq.c \ | |
10 | raw_cb.c if_media.c link_proto.c net_stats.c if_ethersubr.c | 12 | raw_cb.c if_media.c link_proto.c net_stats.c if_ethersubr.c | |
11 | SRCS+= if_43.c pfil.c uipc_syscalls_50.c | 13 | SRCS+= if_43.c pfil.c | |
12 | SRCS+= net_component.c | 14 | SRCS+= net_component.c | |
13 | 15 | |||
16 | .if !empty(RUMP_COMPAT:M50) | |||
17 | SRCS+= rtsock_50.c uipc_syscalls_50.c | |||
18 | .endif | |||
19 | ||||
14 | CPPFLAGS+= -I${.CURDIR}/opt -I${.CURDIR}/../libnetinet/opt | 20 | CPPFLAGS+= -I${.CURDIR}/opt -I${.CURDIR}/../libnetinet/opt | |
15 | CPPFLAGS+= -DCOMPAT_OIFREQ -DCOMPAT_OIFDATA | 21 | CPPFLAGS+= -DCOMPAT_OIFREQ -DCOMPAT_OIFDATA | |
16 | 22 | |||
17 | .include "${.CURDIR}/../libnetinet/Makefile.inc" | 23 | .include "${.CURDIR}/../libnetinet/Makefile.inc" | |
18 | .include "${.CURDIR}/../libnetinet6/Makefile.inc" | 24 | .include "${.CURDIR}/../libnetinet6/Makefile.inc" | |
19 | .include "${.CURDIR}/../libnetmpls/Makefile.inc" | 25 | .include "${.CURDIR}/../libnetmpls/Makefile.inc" | |
20 | 26 | |||
21 | .include <bsd.lib.mk> | 27 | .include <bsd.lib.mk> | |
22 | .include <bsd.klinks.mk> | 28 | .include <bsd.klinks.mk> |