head 1.3; access; symbols perseant-exfatfs-base-20250801:1.3 perseant-exfatfs-base-20240630:1.3 perseant-exfatfs:1.3.0.26 perseant-exfatfs-base:1.3 cjep_sun2x:1.3.0.24 cjep_sun2x-base:1.3 cjep_staticlib_x-base1:1.3 cjep_staticlib_x:1.3.0.22 cjep_staticlib_x-base:1.3 phil-wifi-20200421:1.3 phil-wifi-20200411:1.3 phil-wifi-20200406:1.3 pgoyette-compat-merge-20190127:1.3 pgoyette-compat-20190127:1.3 pgoyette-compat-20190118:1.3 pgoyette-compat-1226:1.3 pgoyette-compat-1126:1.3 pgoyette-compat-1020:1.3 pgoyette-compat-0930:1.3 pgoyette-compat-0906:1.3 pgoyette-compat-0728:1.3 pgoyette-compat-0625:1.3 pgoyette-compat-0521:1.3 pgoyette-compat-0502:1.3 pgoyette-compat-0422:1.3 pgoyette-compat-0415:1.3 pgoyette-compat-0407:1.3 pgoyette-compat-0330:1.3 pgoyette-compat-0322:1.3 pgoyette-compat-0315:1.3 pgoyette-compat:1.3.0.20 pgoyette-compat-base:1.3 perseant-stdc-iso10646:1.3.0.18 perseant-stdc-iso10646-base:1.3 prg-localcount2-base3:1.3 prg-localcount2-base2:1.3 prg-localcount2-base1:1.3 prg-localcount2:1.3.0.16 prg-localcount2-base:1.3 pgoyette-localcount-20170426:1.3 bouyer-socketcan-base1:1.3 pgoyette-localcount-20170320:1.3 bouyer-socketcan:1.3.0.14 bouyer-socketcan-base:1.3 pgoyette-localcount-20170107:1.3 pgoyette-localcount-20161104:1.3 localcount-20160914:1.3 pgoyette-localcount-20160806:1.3 pgoyette-localcount-20160726:1.3 pgoyette-localcount:1.3.0.12 pgoyette-localcount-base:1.3 netbsd-5-2-3-RELEASE:1.1 netbsd-5-1-5-RELEASE:1.1 yamt-pagecache-base9:1.3 yamt-pagecache-tag8:1.3 tls-earlyentropy:1.3.0.8 tls-earlyentropy-base:1.3 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.3 riastradh-drm2-base3:1.3 netbsd-5-2-2-RELEASE:1.1 netbsd-5-1-4-RELEASE:1.1 netbsd-5-2-1-RELEASE:1.1 netbsd-5-1-3-RELEASE:1.1 agc-symver:1.3.0.10 agc-symver-base:1.3 tls-maxphys-base:1.3 yamt-pagecache-base8:1.3 netbsd-5-2:1.1.0.4 yamt-pagecache-base7:1.3 netbsd-5-2-RELEASE:1.1 netbsd-5-2-RC1:1.1 yamt-pagecache-base6:1.3 yamt-pagecache-base5:1.3 yamt-pagecache-base4:1.3 netbsd-5-1-2-RELEASE:1.1 netbsd-5-1-1-RELEASE:1.1 yamt-pagecache-base3:1.3 yamt-pagecache-base2:1.3 yamt-pagecache:1.3.0.6 yamt-pagecache-base:1.3 bouyer-quota2-nbase:1.3 bouyer-quota2:1.3.0.4 bouyer-quota2-base:1.3 matt-nb5-pq3:1.1.0.12 matt-nb5-pq3-base:1.1 netbsd-5-1:1.1.0.10 netbsd-5-1-RELEASE:1.1 netbsd-5-1-RC4:1.1 netbsd-5-1-RC3:1.1 netbsd-5-1-RC2:1.1 netbsd-5-1-RC1:1.1 netbsd-5-0-2-RELEASE:1.1 netbsd-5-0-1-RELEASE:1.1 jym-xensuspend-nbase:1.3 netbsd-5-0:1.1.0.8 netbsd-5-0-RELEASE:1.1 netbsd-5-0-RC4:1.1 netbsd-5-0-RC3:1.1 netbsd-5-0-RC2:1.1 jym-xensuspend:1.3.0.2 jym-xensuspend-base:1.3 netbsd-5-0-RC1:1.1 haad-dm-base:1.1 haad-dm-base2:1.1 haad-nbase2:1.1 netbsd-5:1.1.0.6 netbsd-5-base:1.1 haad-dm-base1:1.1 haad-dm:1.1.0.2; locks; strict; comment @# @; 1.3 date 2008.12.22.01.07.33; author haad; state dead; branches; next 1.2; 1.2 date 2008.12.19.15.24.18; author haad; state Exp; branches; next 1.1; 1.1 date 2008.07.15.14.32.26; author haad; state dead; branches 1.1.2.1; next ; 1.1.2.1 date 2008.07.15.14.32.26; author haad; state Exp; branches; next 1.1.2.2; 1.1.2.2 date 2008.07.15.21.41.09; author haad; state Exp; branches; next 1.1.2.3; 1.1.2.3 date 2008.07.23.13.44.02; author lukem; state Exp; branches; next 1.1.2.4; 1.1.2.4 date 2008.07.23.14.27.03; author lukem; state Exp; branches; next 1.1.2.5; 1.1.2.5 date 2008.09.04.01.06.11; author haad; state Exp; branches; next 1.1.2.6; 1.1.2.6 date 2008.09.04.01.25.24; author haad; state Exp; branches; next 1.1.2.7; 1.1.2.7 date 2008.12.16.01.17.12; author haad; state Exp; branches; next ; desc @@ 1.3 log @Remove broken merged sources of haad-dm. lvm2tools are now in gpl2/lvm2 and libdevmapper is not needed anymore. @ text @ USE_FORT?= no NOLINT= #defined .include "../../lvm2tools.mk" .PATH: ${LVM2TOOLS_DISTDIR}/man PROG= lvm BINDIR= /sbin SRCS= dumpconfig.c formats.c lvchange.c lvconvert.c lvcreate.c \ lvdisplay.c lvextend.c lvmchange.c lvmcmdline.c \ lvmdiskscan.c lvreduce.c lvremove.c lvrename.c lvresize.c \ lvscan.c polldaemon.c pvchange.c pvck.c pvcreate.c \ pvdisplay.c pvmove.c pvremove.c pvresize.c pvscan.c \ reporter.c segtypes.c toollib.c vgcfgbackup.c \ vgcfgrestore.c vgchange.c vgck.c vgconvert.c vgcreate.c \ vgdisplay.c vgexport.c vgextend.c vgimport.c vgmerge.c \ vgmknodes.c vgreduce.c vgremove.c vgrename.c vgscan.c \ vgsplit.c lvm.c CFLAGS+= -fno-inline CPPFLAGS+= -I${LVM2TOOLS_DISTDIR}/lib -I${LVM2TOOLS_DISTDIR}/include \ -I. -I${LIBDM_INCLUDE} -I${LVM2TOOLS_DISTDIR}/tools -I${LVM2TOOLS_DISTDIR}/libdm CPPFLAGS+= -DLVM_SHARED_PATH=\"$(BINDIR)/lvm\" MAN= lvchange.8 lvconvert.8 lvcreate.8 lvdisplay.8 lvextend.8 \ lvm.8 lvm.conf.5 lvmchange.8 lvmdiskscan.8 lvmdump.8 \ lvreduce.8 lvremove.8 lvrename.8 lvresize.8 lvs.8 \ lvscan.8 pvchange.8 pvck.8 pvcreate.8 pvdisplay.8 \ pvmove.8 pvremove.8 pvresize.8 pvs.8 pvscan.8 \ vgcfgbackup.8 vgcfgrestore.8 vgchange.8 vgck.8 vgconvert.8 \ vgcreate.8 vgdisplay.8 vgexport.8 vgextend.8 vgimport.8 \ vgmerge.8 vgmknodes.8 vgreduce.8 vgremove.8 vgrename.8 \ vgs.8 vgscan.8 vgsplit.8 MKLINKS+= lvchange.8 lvchange.1 \ lvconvert.8 lvconvert.1 \ lvcreate.8 lvcreate.1 \ lvdisplay.8 lvdisplay.1 \ lvextend.8 lvextend.1 \ lvm.8 lvm.1 \ lvm.conf lvm.1 \ lvmchange.8 lvmchange.1 \ lvmdiskscan.8 lvmdiskscan.1 \ lvmdump.8 lvmdump.1 \ lvreduce.8 lvreduce.1 \ lvremove.8 lvremove.1 \ lvrename.8 lvrename.1 \ lvresize.8 lvresize.1 \ lvs.8 lvs.1 \ lvscan.8 lvscan.1 \ pvchange.8 pvchange.1 \ pvck.8 pvck.1 \ pvcreate.8 pvcreate.1 \ pvdisplay.8 pvdisplay.1 \ pvmove.8 pvmove.1 \ pvremove.8 pvremove.1 \ pvresize.8 pvresize.1 \ pvs.8 pvs.1 \ pvscan.8 pvscan.1 \ vgcfgbackup.8 vgcfgbackup.1 \ vgcfgrestore.8 vgcfgrestore.1 \ vgchange.8 vgchange.1 \ vgck.8 vgck.1 \ vgconvert.8 vgconvert.1 \ vgcreate.8 vgcreate.1 \ vgdisplay.8 vgdisplay.1 \ vgexport.8 vgexport.1 \ vgextend.8 vgextend.1 \ vgimport.8 vgimport.1 \ vgmerge.8 vgmerge.1 \ vgmknodes.8 vgmknodes.1 \ vgreduce.8 vgreduce.1 \ vgremove.8 vgremove.1 \ vgrename.8 vgrename.1 \ vgs.8 vgs.1 \ vgscan.8 vgscan.1 \ vgsplit.8 vgsplit.1 LIBLVM_OBJDIR!= cd ${LVM2TOOLS_SRCDIR}/lib/liblvm && ${PRINTOBJDIR} LDADD+= -L${LIBLVM_OBJDIR} -llvm DPADD+= ${LIBLVM_OBJDIR}/liblvm.a LIBDM_OBJDIR!= cd ${LVM2TOOLS_SRCDIR}/lib/libdevmapper && ${PRINTOBJDIR} LDADD+= -L${LIBDM_OBJDIR} -ldevmapper DPADD+= ${LIBDM_OBJDIR}/libdevmapper.a LDADD+= -lprop .PATH: ${LVM2TOOLS_DISTDIR}/tools .include @ 1.2 log @Merge the haad-dm branch to -current. This branch adds LVM functionality to the base NetBSD system. It uses Linux LVM2 tools and our BSD licensed device-mapper driver. The device-mapper driver can be used to create virtual block devices which maps virtual blocks to real with target mapping called target. Currently these targets are available a linear, zero, error and a snapshot (this is work in progress and doesn't work yet). The lvm2tools adds lvm and dmsetup binary to based system, where the lvm tool is used to manage and administer whole LVM and the dmestup is used to communicate iwith device-mapper kernel driver. With these tools also a libdevmapper library is instaled to the base system. Building of tools and driver is currently disable and can be enabled with MKLVM=yes in mk.conf. I will add sets lists and rc.d script soon. Oked by agc@@ and cube@@. @ text @@ 1.1 log @file Makefile was initially added on branch haad-dm. @ text @d1 102 @ 1.1.2.1 log @Add reachover Makefiles for libdevmapper and lvm2tools. TODO: Find how to install dmsetup and lvm utilities manual pages. Ok'ed by blymn@@. @ text @a0 42 USE_FORT ?= no MKLINT = no .include "../../lvm2tools.mk" PROG= lvm BINDIR= /sbin SRCS= dumpconfig.c formats.c lvchange.c lvconvert.c lvcreate.c lvdisplay.c \ lvextend.c lvmchange.c lvmcmdline.c lvmdiskscan.c lvreduce.c \ lvremove.c lvrename.c lvresize.c lvscan.c polldaemon.c pvchange.c \ pvck.c pvcreate.c pvdisplay.c pvmove.c pvremove.c pvresize.c pvscan.c \ reporter.c segtypes.c toollib.c vgcfgbackup.c vgcfgrestore.c \ vgchange.c vgck.c vgconvert.c vgcreate.c vgdisplay.c vgexport.c \ vgextend.c vgimport.c vgmerge.c vgmknodes.c vgreduce.c vgremove.c \ vgrename.c vgscan.c vgsplit.c lvm.c CPPFLAGS+= -I${LVM2TOOLS_DISTDIR}/lib -I${LVM2TOOLS_DISTDIR}/include\ -I. -I${LIBDM_INCLUDE} CFLAGS+= -I${LVM2TOOLS_DISTDIR}/lib -I${LVM2TOOLS_DISTDIR}/include\ -I. -I${LIBDM_INCLUDE} CFLAGS+= -DLVM_SHARED_PATH=\"$(BINDIR)/lvm\" LDADD+= -L${LVM2TOOLSOBJDIR.liblvm} -llvm DPADD+= ${LVM2TOOLSOBJDIR.liblvm} LDADD+= -L${LIBDM_OBJDIR.libdevmapper} -ldevmapper LDADD+= -lprop .PATH: ${LVM2TOOLS_DISTDIR}/tools .PATH: ${LVM2TOOLS_DISTDIR}/man #MAN= dmsetup.8 #MLINKS= dmsetup.8 dmsetup.1 .include .include @ 1.1.2.2 log @Disable building of manual pages for now. @ text @a2 1 MKMAN = no @ 1.1.2.3 log @rototill, per discussion with haad@@ * remove unnecessary .includes * fix the whitespace ! * fix determining OBJDIRS * refactor Makefiles; moving OBJDIR setting to the only place they're used * remove unnecessary variables * use NOxxx= instead of MKxxx=no * .WAIT for libdevmapper before lvm2tools @ text @d1 3 a3 1 # $NetBSD$ d5 17 a21 3 USE_FORT?= no NOLINT= #defined NOMAN= #defined d23 9 a31 1 .include "../../lvm2tools.mk" d33 1 a33 1 PROG= lvm d35 2 a36 1 BINDIR= /sbin d38 1 a38 25 SRCS= dumpconfig.c formats.c lvchange.c lvconvert.c lvcreate.c \ lvdisplay.c lvextend.c lvmchange.c lvmcmdline.c \ lvmdiskscan.c lvreduce.c lvremove.c lvrename.c lvresize.c \ lvscan.c polldaemon.c pvchange.c pvck.c pvcreate.c \ pvdisplay.c pvmove.c pvremove.c pvresize.c pvscan.c \ reporter.c segtypes.c toollib.c vgcfgbackup.c \ vgcfgrestore.c vgchange.c vgck.c vgconvert.c vgcreate.c \ vgdisplay.c vgexport.c vgextend.c vgimport.c vgmerge.c \ vgmknodes.c vgreduce.c vgremove.c vgrename.c vgscan.c \ vgsplit.c lvm.c CPPFLAGS+= -I${LVM2TOOLS_DISTDIR}/lib -I${LVM2TOOLS_DISTDIR}/include \ -I. -I${LIBDM_INCLUDE} CPPFLAGS+= -DLVM_SHARED_PATH=\"$(BINDIR)/lvm\" LDADD+= -lprop LIBDM_OBJDIR!= cd ${LIBDM_SRCDIR}/lib/libdevmapper && ${PRINTOBJDIR} LDADD+= -L${LIBDM_OBJDIR} -ldevmapper DPADD+= ${LIBDM_OBJDIR}/libdevmapper.a LIBLVM_OBJDIR!= cd ${LVM2TOOLS_SRCDIR}/lib/liblvm && ${PRINTOBJDIR} LDADD+= -L${LIBLVM_OBJDIR} -llvm DPADD+= ${LIBLVM_OBJDIR}/liblvm.a d40 1 a40 2 .PATH: ${LVM2TOOLS_DISTDIR}/tools .PATH: ${LVM2TOOLS_DISTDIR}/man d43 1 @ 1.1.2.4 log @Fix thinko in my previous, and order the LDADD lines appropriately so that LDSTATIC=-static builds work again. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1.2.3 2008/07/23 13:44:02 lukem Exp $ d29 1 a29 3 LIBLVM_OBJDIR!= cd ${LVM2TOOLS_SRCDIR}/lib/liblvm && ${PRINTOBJDIR} LDADD+= -L${LIBLVM_OBJDIR} -llvm DPADD+= ${LIBLVM_OBJDIR}/liblvm.a d35 3 a37 1 LDADD+= -lprop @ 1.1.2.5 log @Enable building of lvm2tools manual pages. They are build and installed as part of System Manager Manual. @ text @d1 1 a1 1 d5 1 a8 2 .PATH: ${LVM2TOOLS_DISTDIR}/man a23 13 MAN= lvchange.8 lvconvert.8 lvcreate.8 lvdisplay.8 lvextend.8 \ lvm.8 lvm.conf.5 lvmchange.8 lvmdiskscan.8 lvmdump.8 \ lvreduce.8 lvremove.8 lvrename.8 lvresize.8 lvs.8 \ lvscan.8 pvchange.8 pvck.8 pvcreate.8 pvdisplay.8 \ pvmove.8 pvremove.8 pvresize.8 pvs.8 pvscan.8 \ vgcfgbackup.8 vgcfgrestore.8 vgchange.8 vgck.8 vgconvert.8 \ vgcreate.8 vgdisplay.8 vgexport.8 vgextend.8 vgimport.8 \ vgmerge.8 vgmknodes.8 vgreduce.8 vgremove.8 vgrename.8 \ vgs.8 vgscan.8 vgsplit.8 CFLAGS+= -fno-inline d40 1 @ 1.1.2.6 log @Add manual page links to section 1. @ text @a24 7 CFLAGS+= -fno-inline CPPFLAGS+= -I${LVM2TOOLS_DISTDIR}/lib -I${LVM2TOOLS_DISTDIR}/include \ -I. -I${LIBDM_INCLUDE} CPPFLAGS+= -DLVM_SHARED_PATH=\"$(BINDIR)/lvm\" d36 1 d38 2 a39 43 MKLINKS+= lvchange.8 lvchange.1 \ lvconvert.8 lvconvert.1 \ lvcreate.8 lvcreate.1 \ lvdisplay.8 lvdisplay.1 \ lvextend.8 lvextend.1 \ lvm.8 lvm.1 \ lvm.conf lvm.1 \ lvmchange.8 lvmchange.1 \ lvmdiskscan.8 lvmdiskscan.1 \ lvmdump.8 lvmdump.1 \ lvreduce.8 lvreduce.1 \ lvremove.8 lvremove.1 \ lvrename.8 lvrename.1 \ lvresize.8 lvresize.1 \ lvs.8 lvs.1 \ lvscan.8 lvscan.1 \ pvchange.8 pvchange.1 \ pvck.8 pvck.1 \ pvcreate.8 pvcreate.1 \ pvdisplay.8 pvdisplay.1 \ pvmove.8 pvmove.1 \ pvremove.8 pvremove.1 \ pvresize.8 pvresize.1 \ pvs.8 pvs.1 \ pvscan.8 pvscan.1 \ vgcfgbackup.8 vgcfgbackup.1 \ vgcfgrestore.8 vgcfgrestore.1 \ vgchange.8 vgchange.1 \ vgck.8 vgck.1 \ vgconvert.8 vgconvert.1 \ vgcreate.8 vgcreate.1 \ vgdisplay.8 vgdisplay.1 \ vgexport.8 vgexport.1 \ vgextend.8 vgextend.1 \ vgimport.8 vgimport.1 \ vgmerge.8 vgmerge.1 \ vgmknodes.8 vgmknodes.1 \ vgreduce.8 vgreduce.1 \ vgremove.8 vgremove.1 \ vgrename.8 vgrename.1 \ vgs.8 vgs.1 \ vgscan.8 vgscan.1 \ vgsplit.8 vgsplit.1 d41 1 a52 1 @ 1.1.2.7 log @Add Work in progress support for updated lvm2tools. XXX: lvm can't be linked because of some missing symbols. @ text @d28 1 a28 1 -I. -I${LIBDM_INCLUDE} -I${LVM2TOOLS_DISTDIR}/tools -I${LVM2TOOLS_DISTDIR}/libdm d88 8 a95 7 LIBLVM_OBJDIR!= cd ${LVM2TOOLS_SRCDIR}/lib/liblvm && ${PRINTOBJDIR} LDADD+= -L${LIBLVM_OBJDIR} -llvm DPADD+= ${LIBLVM_OBJDIR}/liblvm.a LIBDM_OBJDIR!= cd ${LVM2TOOLS_SRCDIR}/lib/libdevmapper && ${PRINTOBJDIR} LDADD+= -L${LIBDM_OBJDIR} -ldevmapper DPADD+= ${LIBDM_OBJDIR}/libdevmapper.a a101 1 @