diff options
Diffstat (limited to 'sys/modules/geom')
38 files changed, 47 insertions, 47 deletions
diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile index 7b79f53a13af..cbc7207b6f0e 100644 --- a/sys/modules/geom/Makefile +++ b/sys/modules/geom/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" SUBDIR= geom_bde \ diff --git a/sys/modules/geom/geom_bde/Makefile b/sys/modules/geom/geom_bde/Makefile index bcb4dbcfeb6b..a3961c2254b2 100644 --- a/sys/modules/geom/geom_bde/Makefile +++ b/sys/modules/geom/geom_bde/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/bde -.PATH: ${.CURDIR}/../../../crypto/rijndael -.PATH: ${.CURDIR}/../../../crypto/sha2 +.PATH: ${SRCTOP}/sys/geom/bde +.PATH: ${SRCTOP}/sys/crypto/rijndael +.PATH: ${SRCTOP}/sys/crypto/sha2 KMOD= geom_bde SRCS= g_bde.c g_bde_crypt.c g_bde_lock.c g_bde_work.c diff --git a/sys/modules/geom/geom_bsd/Makefile b/sys/modules/geom/geom_bsd/Makefile index b605df95d4f8..6f7b907f0289 100644 --- a/sys/modules/geom/geom_bsd/Makefile +++ b/sys/modules/geom/geom_bsd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom +.PATH: ${SRCTOP}/sys/geom KMOD= geom_bsd SRCS= geom_bsd.c geom_bsd_enc.c diff --git a/sys/modules/geom/geom_cache/Makefile b/sys/modules/geom/geom_cache/Makefile index 7ccbe98fdac9..8260f9e2b776 100644 --- a/sys/modules/geom/geom_cache/Makefile +++ b/sys/modules/geom/geom_cache/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/cache +.PATH: ${SRCTOP}/sys/geom/cache KMOD= geom_cache SRCS= g_cache.c diff --git a/sys/modules/geom/geom_ccd/Makefile b/sys/modules/geom/geom_ccd/Makefile index 18d6eeb04718..3e1c667011fa 100644 --- a/sys/modules/geom/geom_ccd/Makefile +++ b/sys/modules/geom/geom_ccd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom +.PATH: ${SRCTOP}/sys/geom KMOD= geom_ccd SRCS= geom_ccd.c diff --git a/sys/modules/geom/geom_concat/Makefile b/sys/modules/geom/geom_concat/Makefile index 3de201a79b48..5caff7117f02 100644 --- a/sys/modules/geom/geom_concat/Makefile +++ b/sys/modules/geom/geom_concat/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/concat +.PATH: ${SRCTOP}/sys/geom/concat KMOD= geom_concat SRCS= g_concat.c diff --git a/sys/modules/geom/geom_eli/Makefile b/sys/modules/geom/geom_eli/Makefile index c42ccf19f737..b3b2f926c595 100644 --- a/sys/modules/geom/geom_eli/Makefile +++ b/sys/modules/geom/geom_eli/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/eli +.PATH: ${SRCTOP}/sys/geom/eli KMOD= geom_eli SRCS= g_eli.c diff --git a/sys/modules/geom/geom_flashmap/Makefile b/sys/modules/geom/geom_flashmap/Makefile index d475860fefe6..8b56c145ea51 100644 --- a/sys/modules/geom/geom_flashmap/Makefile +++ b/sys/modules/geom/geom_flashmap/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom +.PATH: ${SRCTOP}/sys/geom KMOD= geom_flashmap SRCS= geom_flashmap.c diff --git a/sys/modules/geom/geom_fox/Makefile b/sys/modules/geom/geom_fox/Makefile index adf8c2e8e8bf..04fc63a33d12 100644 --- a/sys/modules/geom/geom_fox/Makefile +++ b/sys/modules/geom/geom_fox/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom +.PATH: ${SRCTOP}/sys/geom KMOD= geom_fox SRCS= geom_fox.c diff --git a/sys/modules/geom/geom_gate/Makefile b/sys/modules/geom/geom_gate/Makefile index 783a58ac2d82..88705a0e9511 100644 --- a/sys/modules/geom/geom_gate/Makefile +++ b/sys/modules/geom/geom_gate/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/gate +.PATH: ${SRCTOP}/sys/geom/gate KMOD= geom_gate SRCS= g_gate.c diff --git a/sys/modules/geom/geom_journal/Makefile b/sys/modules/geom/geom_journal/Makefile index 0288b4810ce9..89298a8180d7 100644 --- a/sys/modules/geom/geom_journal/Makefile +++ b/sys/modules/geom/geom_journal/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/journal +.PATH: ${SRCTOP}/sys/geom/journal KMOD= geom_journal SRCS= g_journal.c diff --git a/sys/modules/geom/geom_label/Makefile b/sys/modules/geom/geom_label/Makefile index b06e1089c803..f5f4a7c90630 100644 --- a/sys/modules/geom/geom_label/Makefile +++ b/sys/modules/geom/geom_label/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/label +.PATH: ${SRCTOP}/sys/geom/label KMOD= geom_label SRCS= g_label.c diff --git a/sys/modules/geom/geom_linux_lvm/Makefile b/sys/modules/geom/geom_linux_lvm/Makefile index 1e10e13bc57c..5d2b7a3eadd1 100644 --- a/sys/modules/geom/geom_linux_lvm/Makefile +++ b/sys/modules/geom/geom_linux_lvm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/linux_lvm +.PATH: ${SRCTOP}/sys/geom/linux_lvm KMOD= geom_linux_lvm SRCS= g_linux_lvm.c diff --git a/sys/modules/geom/geom_map/Makefile b/sys/modules/geom/geom_map/Makefile index 6b26ba9470fe..4f5b773d755a 100644 --- a/sys/modules/geom/geom_map/Makefile +++ b/sys/modules/geom/geom_map/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom +.PATH: ${SRCTOP}/sys/geom KMOD= geom_map SRCS= geom_map.c bus_if.h device_if.h diff --git a/sys/modules/geom/geom_mbr/Makefile b/sys/modules/geom/geom_mbr/Makefile index 1820f3bc3bdd..0759a649d972 100644 --- a/sys/modules/geom/geom_mbr/Makefile +++ b/sys/modules/geom/geom_mbr/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom +.PATH: ${SRCTOP}/sys/geom KMOD= geom_mbr SRCS= geom_mbr.c geom_mbr_enc.c diff --git a/sys/modules/geom/geom_mirror/Makefile b/sys/modules/geom/geom_mirror/Makefile index 3e653ce540c4..f2a11a537374 100644 --- a/sys/modules/geom/geom_mirror/Makefile +++ b/sys/modules/geom/geom_mirror/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/mirror +.PATH: ${SRCTOP}/sys/geom/mirror KMOD= geom_mirror SRCS= g_mirror.c diff --git a/sys/modules/geom/geom_mountver/Makefile b/sys/modules/geom/geom_mountver/Makefile index 8e89c9ab5dec..ff579ba3289e 100644 --- a/sys/modules/geom/geom_mountver/Makefile +++ b/sys/modules/geom/geom_mountver/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/mountver +.PATH: ${SRCTOP}/sys/geom/mountver KMOD= geom_mountver SRCS= g_mountver.c diff --git a/sys/modules/geom/geom_multipath/Makefile b/sys/modules/geom/geom_multipath/Makefile index d036fe0dec7b..27b6fdbf67e4 100644 --- a/sys/modules/geom/geom_multipath/Makefile +++ b/sys/modules/geom/geom_multipath/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/multipath +.PATH: ${SRCTOP}/sys/geom/multipath KMOD= geom_multipath SRCS= g_multipath.c diff --git a/sys/modules/geom/geom_nop/Makefile b/sys/modules/geom/geom_nop/Makefile index 139e12422ea2..d2294823488b 100644 --- a/sys/modules/geom/geom_nop/Makefile +++ b/sys/modules/geom/geom_nop/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/nop +.PATH: ${SRCTOP}/sys/geom/nop KMOD= geom_nop SRCS= g_nop.c diff --git a/sys/modules/geom/geom_part/geom_part_apm/Makefile b/sys/modules/geom/geom_part/geom_part_apm/Makefile index afd9eb6bc8dc..ee7966f1f858 100644 --- a/sys/modules/geom/geom_part/geom_part_apm/Makefile +++ b/sys/modules/geom/geom_part/geom_part_apm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../geom/part +.PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_apm SRCS= g_part_apm.c diff --git a/sys/modules/geom/geom_part/geom_part_bsd/Makefile b/sys/modules/geom/geom_part/geom_part_bsd/Makefile index f6d323c766fd..8e8cc732a9fe 100644 --- a/sys/modules/geom/geom_part/geom_part_bsd/Makefile +++ b/sys/modules/geom/geom_part/geom_part_bsd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../geom/part ${.CURDIR}/../../../../geom +.PATH: ${SRCTOP}/sys/geom/part ${SRCTOP}/sys/geom KMOD= geom_part_bsd SRCS= g_part_bsd.c geom_bsd_enc.c diff --git a/sys/modules/geom/geom_part/geom_part_bsd64/Makefile b/sys/modules/geom/geom_part/geom_part_bsd64/Makefile index abe153fe56b2..4dabbaa6fe12 100644 --- a/sys/modules/geom/geom_part/geom_part_bsd64/Makefile +++ b/sys/modules/geom/geom_part/geom_part_bsd64/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../geom/part +.PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_bsd64 SRCS= g_part_bsd64.c diff --git a/sys/modules/geom/geom_part/geom_part_ebr/Makefile b/sys/modules/geom/geom_part/geom_part_ebr/Makefile index 3b0d36bff48c..4aa8ec1c4f9f 100644 --- a/sys/modules/geom/geom_part/geom_part_ebr/Makefile +++ b/sys/modules/geom/geom_part/geom_part_ebr/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../geom/part +.PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_ebr SRCS= g_part_ebr.c diff --git a/sys/modules/geom/geom_part/geom_part_gpt/Makefile b/sys/modules/geom/geom_part/geom_part_gpt/Makefile index 26df04a09e1b..d0f7089ab13a 100644 --- a/sys/modules/geom/geom_part/geom_part_gpt/Makefile +++ b/sys/modules/geom/geom_part/geom_part_gpt/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../geom/part +.PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_gpt SRCS= g_part_gpt.c diff --git a/sys/modules/geom/geom_part/geom_part_ldm/Makefile b/sys/modules/geom/geom_part/geom_part_ldm/Makefile index 71f364d76fe2..f51049bce280 100644 --- a/sys/modules/geom/geom_part/geom_part_ldm/Makefile +++ b/sys/modules/geom/geom_part/geom_part_ldm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../geom/part +.PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_ldm SRCS= g_part_ldm.c diff --git a/sys/modules/geom/geom_part/geom_part_mbr/Makefile b/sys/modules/geom/geom_part/geom_part_mbr/Makefile index 3dfd72ecbd06..8f4e1812aa82 100644 --- a/sys/modules/geom/geom_part/geom_part_mbr/Makefile +++ b/sys/modules/geom/geom_part/geom_part_mbr/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../geom/part +.PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_mbr SRCS= g_part_mbr.c diff --git a/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile b/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile index 085648ae220d..f3aa9cb050a4 100644 --- a/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile +++ b/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../geom/part +.PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_vtoc8 SRCS= g_part_vtoc8.c diff --git a/sys/modules/geom/geom_raid/Makefile b/sys/modules/geom/geom_raid/Makefile index d2c3e4d2c8d2..b9c8f2ce219d 100644 --- a/sys/modules/geom/geom_raid/Makefile +++ b/sys/modules/geom/geom_raid/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/raid +.PATH: ${SRCTOP}/sys/geom/raid KMOD= geom_raid SRCS= g_raid.c diff --git a/sys/modules/geom/geom_raid3/Makefile b/sys/modules/geom/geom_raid3/Makefile index b202237a611f..5baa6c2df4ce 100644 --- a/sys/modules/geom/geom_raid3/Makefile +++ b/sys/modules/geom/geom_raid3/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/raid3 +.PATH: ${SRCTOP}/sys/geom/raid3 KMOD= geom_raid3 SRCS= g_raid3.c diff --git a/sys/modules/geom/geom_sched/Makefile.inc b/sys/modules/geom/geom_sched/Makefile.inc index 808d6eba89a0..a81a965bebb9 100644 --- a/sys/modules/geom/geom_sched/Makefile.inc +++ b/sys/modules/geom/geom_sched/Makefile.inc @@ -1,9 +1,9 @@ # $FreeBSD$ # included by geom_sched children -.PATH: ${.CURDIR}/../../../../geom/sched +.PATH: ${SRCTOP}/sys/geom/sched # 6.x needs this path -#CFLAGS += -I${.CURDIR}/../../../../geom/sched +#CFLAGS += -I${SRCTOP}/sys/geom/sched # .include <bsd.kmod.mk> diff --git a/sys/modules/geom/geom_shsec/Makefile b/sys/modules/geom/geom_shsec/Makefile index f229203ad87a..79d29ea4b205 100644 --- a/sys/modules/geom/geom_shsec/Makefile +++ b/sys/modules/geom/geom_shsec/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/shsec +.PATH: ${SRCTOP}/sys/geom/shsec KMOD= geom_shsec SRCS= g_shsec.c diff --git a/sys/modules/geom/geom_stripe/Makefile b/sys/modules/geom/geom_stripe/Makefile index 278d3accfdc6..947b3bb7bef5 100644 --- a/sys/modules/geom/geom_stripe/Makefile +++ b/sys/modules/geom/geom_stripe/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/stripe +.PATH: ${SRCTOP}/sys/geom/stripe KMOD= geom_stripe SRCS= g_stripe.c diff --git a/sys/modules/geom/geom_sunlabel/Makefile b/sys/modules/geom/geom_sunlabel/Makefile index 840395aaf1de..cb0d13eb0f13 100644 --- a/sys/modules/geom/geom_sunlabel/Makefile +++ b/sys/modules/geom/geom_sunlabel/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom +.PATH: ${SRCTOP}/sys/geom KMOD= geom_sunlabel SRCS= geom_sunlabel.c geom_sunlabel_enc.c diff --git a/sys/modules/geom/geom_uzip/Makefile b/sys/modules/geom/geom_uzip/Makefile index dd2bd4619d55..2a7cba7d8a7a 100644 --- a/sys/modules/geom/geom_uzip/Makefile +++ b/sys/modules/geom/geom_uzip/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/uzip ${.CURDIR}/../../../net +.PATH: ${SRCTOP}/sys/geom/uzip ${SRCTOP}/sys/net KMOD= geom_uzip SRCS= g_uzip.c g_uzip_zlib.c g_uzip_lzma.c g_uzip_wrkthr.c @@ -8,13 +8,13 @@ SRCS+= g_uzip.h g_uzip_dapi.h g_uzip_lzma.h g_uzip_zlib.h g_uzip_softc.h \ g_uzip_wrkthr.h #CFLAGS= -g -DINVARIANT_SUPPORT -DINVARIANTS -.PATH: ${.CURDIR}/../../../contrib/xz-embedded/freebsd/ \ - ${.CURDIR}/../../../contrib/xz-embedded/linux/lib/xz/ \ - ${.CURDIR}/../../../contrib/xz-embedded/linux/include/linux/ \ - ${.CURDIR}/../../../net +.PATH: ${SRCTOP}/sys/contrib/xz-embedded/freebsd/ \ + ${SRCTOP}/sys/contrib/xz-embedded/linux/lib/xz/ \ + ${SRCTOP}/sys/contrib/xz-embedded/linux/include/linux/ \ + ${SRCTOP}/sys/net -CFLAGS+= -I${.CURDIR}/../../../contrib/xz-embedded/freebsd \ - -I${.CURDIR}/../../../contrib/xz-embedded/linux/lib/xz/ +CFLAGS+= -I${SRCTOP}/sys/contrib/xz-embedded/freebsd \ + -I${SRCTOP}/sys/contrib/xz-embedded/linux/lib/xz/ SRCS+= xz_crc32.c xz_dec_bcj.c xz_dec_lzma2.c xz_dec_stream.c \ xz_malloc.c SRCS+= xz.h xz_config.h xz_lzma2.h xz_malloc.h xz_private.h xz_stream.h diff --git a/sys/modules/geom/geom_vinum/Makefile b/sys/modules/geom/geom_vinum/Makefile index 48ac962a96d4..69dd8083acce 100644 --- a/sys/modules/geom/geom_vinum/Makefile +++ b/sys/modules/geom/geom_vinum/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/vinum +.PATH: ${SRCTOP}/sys/geom/vinum KMOD= geom_vinum SRCS= geom_vinum.c geom_vinum_create.c geom_vinum_drive.c geom_vinum_plex.c \ diff --git a/sys/modules/geom/geom_virstor/Makefile b/sys/modules/geom/geom_virstor/Makefile index 3a099f2c3c17..ea2b7debe82c 100644 --- a/sys/modules/geom/geom_virstor/Makefile +++ b/sys/modules/geom/geom_virstor/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/virstor +.PATH: ${SRCTOP}/sys/geom/virstor KMOD= geom_virstor SRCS= g_virstor.c g_virstor_md.c binstream.c diff --git a/sys/modules/geom/geom_vol_ffs/Makefile b/sys/modules/geom/geom_vol_ffs/Makefile index de9b75806dfe..d7287c85752f 100644 --- a/sys/modules/geom/geom_vol_ffs/Makefile +++ b/sys/modules/geom/geom_vol_ffs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom +.PATH: ${SRCTOP}/sys/geom KMOD= geom_vol_ffs SRCS= geom_vol_ffs.c diff --git a/sys/modules/geom/geom_zero/Makefile b/sys/modules/geom/geom_zero/Makefile index 43dae09d3333..bd0a3277f267 100644 --- a/sys/modules/geom/geom_zero/Makefile +++ b/sys/modules/geom/geom_zero/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/zero +.PATH: ${SRCTOP}/sys/geom/zero KMOD= geom_zero SRCS= g_zero.c |