# # # patch "daemons/clvmd/Makefile.in" # from [9f0cef508a20f94b2e4be66778466ad35724d62b] # to [080f647412bfaa46b4b512aef1bee52a21cdb5df] # # patch "dmeventd/mirror/Makefile.in" # from [22944fc436de82989629fe817f916f8d963d40aa] # to [09163198fb747c6c503d50fe8808d38382ec5762] # # patch "dmeventd/snapshot/Makefile.in" # from [4f03116db6ff65b90fe2ee908837e755f80200db] # to [bc93fd1e6ab522a7297c19060041a90b40f69303] # # patch "doc/Makefile.in" # from [26b8d9ac22cf59f881a2c6280ecb8cc991ed05ed] # to [ec57858cecaa612f3d70eeb2a19ce37ba5f72f2e] # # patch "include/.symlinks" # from [f122f20a5897634d5750c8cdb004606d7bdac5ed] # to [f66698c1dde7067879967129e49fb4dc00271680] # # patch "lib/Makefile.in" # from [8266808da1ca6173fcf97aa1f91ac7a1468aefaf] # to [f4fe935e5039787f54a116e4a7b0aa5b98f20284] # # patch "lib/format1/Makefile.in" # from [a5273965ebae6fc3bd3189bf62249b2fea748cbb] # to [cb353ee84422e01eb25ac4ea04c99757f68c7656] # # patch "lib/format_pool/Makefile.in" # from [337ced5efacce6c19c1b5b2416be94d71ea54997] # to [75e00838ccc240e507bd2b2a847f660303386db0] # # patch "lib/locking/Makefile.in" # from [1158294dd354f1140b571bc575a24048c0bafa8e] # to [2b33eeaf3fb01c7d13ee80b54f119d16b6467046] # # patch "lib/mirror/Makefile.in" # from [e9556e9e12a3795ffb06c82d91d4b8bc2507eee1] # to [ca29680002a515e39e472aa2a66f57e490af732c] # # patch "lib/snapshot/Makefile.in" # from [d3b52ca6343276bf08c95d5b056d3a13d33aeba9] # to [c61e3ef857029dc4f837e6710bd3754dfe5bae25] # # patch "make.tmpl.in" # from [19b7dd2111400a634b5fab775f9151e6f90c4f9b] # to [b317a3a8fc6c3af3bba4daf72955134da9245bd9] # # patch "man/Makefile.in" # from [834510d35c11e31c941d554ef15073a9b943a8f1] # to [653e663359395e3a805bf9ff9576d477eb57455b] # # patch "po/Makefile.in" # from [6e01c927a7d2c2ed6c8d542f17d9c5b2ebd09a7f] # to [f655d60edd44baf6e2cde4f27f338057dcd936c5] # # patch "scripts/Makefile.in" # from [5cc3812a6e1bd4b1ca576633a0feec877b16ce28] # to [e3b4f9b9fff73aa5e5b1a0f92d6f04f04a125c53] # # patch "tools/Makefile.in" # from [6f947656a94638fd7db34c436846bebc02842054] # to [6c1dc6a8a0552653d02da020e0cec8b8e9cce3c6] # ============================================================ --- daemons/clvmd/Makefile.in 9f0cef508a20f94b2e4be66778466ad35724d62b +++ daemons/clvmd/Makefile.in 080f647412bfaa46b4b512aef1bee52a21cdb5df @@ -89,7 +89,7 @@ install_clvmd: $(TARGETS) .PHONY: install_clvmd install_clvmd: $(TARGETS) - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) clvmd \ + $(INSTALL) $(OWNERSHIP) -m 555 $(STRIP) clvmd \ $(sbindir)/clvmd install: $(INSTALL_TARGETS) ============================================================ --- dmeventd/mirror/Makefile.in 22944fc436de82989629fe817f916f8d963d40aa +++ dmeventd/mirror/Makefile.in 09163198fb747c6c503d50fe8808d38382ec5762 @@ -30,6 +30,6 @@ install: libdevmapper-event-lvm2mirror.$ include $(top_srcdir)/make.tmpl install: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX) - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ + $(INSTALL) $(OWNERSHIP) -m 555 $(STRIP) $< \ $(libdir)/$<.$(LIB_VERSION) $(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$< ============================================================ --- dmeventd/snapshot/Makefile.in 4f03116db6ff65b90fe2ee908837e755f80200db +++ dmeventd/snapshot/Makefile.in bc93fd1e6ab522a7297c19060041a90b40f69303 @@ -30,6 +30,6 @@ install: libdevmapper-event-lvm2snapshot include $(top_srcdir)/make.tmpl install: libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX) - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ + $(INSTALL) $(OWNERSHIP) -m 555 $(STRIP) $< \ $(libdir)/$<.$(LIB_VERSION) $(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$< ============================================================ --- doc/Makefile.in 26b8d9ac22cf59f881a2c6280ecb8cc991ed05ed +++ doc/Makefile.in ec57858cecaa612f3d70eeb2a19ce37ba5f72f2e @@ -23,7 +23,7 @@ install: install: @if [ ! -e $(confdir)/$(CONFDEST) ]; then \ echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \ - @INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \ + @INSTALL@ $(OWNERSHIP) -m 644 $(CONFSRC) \ $(confdir)/$(CONFDEST); \ fi ============================================================ --- include/.symlinks f122f20a5897634d5750c8cdb004606d7bdac5ed +++ include/.symlinks f66698c1dde7067879967129e49fb4dc00271680 @@ -46,6 +46,7 @@ ../lib/misc/lvm-string.h ../lib/misc/lvm-wrappers.h ../lib/misc/sharedlib.h +../lib/netbsd/netbsd.h ../lib/report/report.h ../lib/uuid/uuid.h ../po/pogen.h ============================================================ --- lib/Makefile.in 8266808da1ca6173fcf97aa1f91ac7a1468aefaf +++ lib/Makefile.in f4fe935e5039787f54a116e4a7b0aa5b98f20284 @@ -51,7 +51,6 @@ SOURCES =\ filters/filter-regex.c \ filters/filter-sysfs.c \ filters/filter-md.c \ - filters/filter.c \ format_text/archive.c \ format_text/archiver.c \ format_text/export.c \ @@ -111,6 +110,16 @@ endif SOURCES += locking/cluster_locking.c endif +OPSYS=$(shell uname -s) + +ifeq ("${OPSYS}", "NetBSD") + SOURCES += \ + netbsd/dev.c \ + filters/filter_netbsd.c +else + SOURCES += filters/filter.c +endif + ifeq ("@CLUSTER@", "shared") SUBDIRS += locking endif ============================================================ --- lib/format1/Makefile.in a5273965ebae6fc3bd3189bf62249b2fea748cbb +++ lib/format1/Makefile.in cb353ee84422e01eb25ac4ea04c99757f68c7656 @@ -30,7 +30,7 @@ install: liblvm2format1.so include $(top_srcdir)/make.tmpl install: liblvm2format1.so - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ + $(INSTALL) $(OWNERSHIP) -m 555 $(STRIP) $< \ $(libdir)/liblvm2format1.so.$(LIB_VERSION) $(LN_S) -f liblvm2format1.so.$(LIB_VERSION) $(libdir)/liblvm2format1.so ============================================================ --- lib/format_pool/Makefile.in 337ced5efacce6c19c1b5b2416be94d71ea54997 +++ lib/format_pool/Makefile.in 75e00838ccc240e507bd2b2a847f660303386db0 @@ -27,7 +27,7 @@ install: liblvm2formatpool.so include $(top_srcdir)/make.tmpl install: liblvm2formatpool.so - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ + $(INSTALL) $(OWNERSHIP) -m 555 $(STRIP) $< \ $(libdir)/liblvm2formatpool.so.$(LIB_VERSION) $(LN_S) -f liblvm2formatpool.so.$(LIB_VERSION) \ $(libdir)/liblvm2formatpool.so ============================================================ --- lib/locking/Makefile.in 1158294dd354f1140b571bc575a24048c0bafa8e +++ lib/locking/Makefile.in 2b33eeaf3fb01c7d13ee80b54f119d16b6467046 @@ -23,7 +23,7 @@ install install_cluster: liblvm2clusterl include $(top_srcdir)/make.tmpl install install_cluster: liblvm2clusterlock.so - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ + $(INSTALL) $(OWNERSHIP) -m 555 $(STRIP) $< \ $(libdir)/liblvm2clusterlock.so.$(LIB_VERSION) $(LN_S) -f liblvm2clusterlock.so.$(LIB_VERSION) \ $(libdir)/liblvm2clusterlock.so ============================================================ --- lib/mirror/Makefile.in e9556e9e12a3795ffb06c82d91d4b8bc2507eee1 +++ lib/mirror/Makefile.in ca29680002a515e39e472aa2a66f57e490af732c @@ -23,7 +23,7 @@ install: liblvm2mirror.so include $(top_srcdir)/make.tmpl install: liblvm2mirror.so - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ + $(INSTALL) $(OWNERSHIP) -m 555 $(STRIP) $< \ $(libdir)/liblvm2mirror.so.$(LIB_VERSION) $(LN_S) -f liblvm2mirror.so.$(LIB_VERSION) $(libdir)/liblvm2mirror.so ============================================================ --- lib/snapshot/Makefile.in d3b52ca6343276bf08c95d5b056d3a13d33aeba9 +++ lib/snapshot/Makefile.in c61e3ef857029dc4f837e6710bd3754dfe5bae25 @@ -23,7 +23,7 @@ install: liblvm2snapshot.so include $(top_srcdir)/make.tmpl install: liblvm2snapshot.so - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ + $(INSTALL) $(OWNERSHIP) -m 555 $(STRIP) $< \ $(libdir)/liblvm2snapshot.so.$(LIB_VERSION) $(LN_S) -f liblvm2snapshot.so.$(LIB_VERSION) \ $(libdir)/liblvm2snapshot.so ============================================================ --- make.tmpl.in 19b7dd2111400a634b5fab775f9151e6f90c4f9b +++ make.tmpl.in b317a3a8fc6c3af3bba4daf72955134da9245bd9 @@ -34,6 +34,8 @@ LIB_SUFFIX = @LIB_SUFFIX@ LDFLAGS += @LDFLAGS@ LIB_SUFFIX = @LIB_SUFFIX@ +OPSYS=$(shell uname -s) + # Setup directory variables prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -94,6 +96,15 @@ STRIP= STRIP= #STRIP = -s +ifeq ("${OPSYS}", "NetBSD") + LIBS += -lprop + CFLAGS += -D__NetBSD__ + OWNERSHIP = +else + OWNERSHIP = -D $(OWNER) $(GROUP) + +endif + LIB_VERSION := $(shell cat $(top_srcdir)/VERSION | \ awk -F '.' '{printf "%s.%s",$$1,$$2}') ============================================================ --- man/Makefile.in 834510d35c11e31c941d554ef15073a9b943a8f1 +++ man/Makefile.in 653e663359395e3a805bf9ff9576d477eb57455b @@ -46,14 +46,14 @@ install: @for f in $(MAN8); \ do \ $(RM) $(MAN8DIR)/$$f; \ - @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \ + @INSTALL@ $(OWNERSHIP) -m 444 $$f $(MAN8DIR)/$$f; \ done @echo "Installing $(MAN5) in $(MAN5DIR)" @for f in $(MAN5); \ do \ $(RM) $(MAN5DIR)/$$f; \ - @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN5DIR)/$$f; \ + @INSTALL@ $(OWNERSHIP) -m 444 $$f $(MAN5DIR)/$$f; \ done install_cluster: @@ -61,5 +61,5 @@ install_cluster: @for f in $(MAN8CLUSTER); \ do \ $(RM) $(MAN8DIR)/$$f; \ - @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \ + @INSTALL@ $(OWNERSHIP) -m 444 $$f $(MAN8DIR)/$$f; \ done ============================================================ --- po/Makefile.in 6e01c927a7d2c2ed6c8d542f17d9c5b2ebd09a7f +++ po/Makefile.in f655d60edd44baf6e2cde4f27f338057dcd936c5 @@ -25,7 +25,7 @@ install: $(TARGETS) @echo Installing translation files in $(localedir) @( \ for lang in $(LANGS); do \ - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $$lang.mo \ + $(INSTALL) $(OWNERSHIP) -m 444 $$lang.mo \ $(localedir)/$$lang/LC_MESSAGES/@INTL_PACKAGE@.mo;\ done; \ ) ============================================================ --- scripts/Makefile.in 5cc3812a6e1bd4b1ca576633a0feec877b16ce28 +++ scripts/Makefile.in e3b4f9b9fff73aa5e5b1a0f92d6f04f04a125c53 @@ -18,8 +18,8 @@ install: include $(top_srcdir)/make.tmpl install: - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm_dump.sh \ + $(INSTALL) $(OWNERSHIP) -m 555 $(STRIP) lvm_dump.sh \ $(sbindir)/lvmdump - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) fsadm.sh \ + $(INSTALL) $(OWNERSHIP) -m 555 $(STRIP) fsadm.sh \ $(sbindir)/fsadm ============================================================ --- tools/Makefile.in 6f947656a94638fd7db34c436846bebc02842054 +++ tools/Makefile.in 6c1dc6a8a0552653d02da020e0cec8b8e9cce3c6 @@ -141,21 +141,21 @@ install_cmdlib_dynamic: liblvm2cmd.so endif install_cmdlib_dynamic: liblvm2cmd.so - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.so \ + $(INSTALL) $(OWNERSHIP) -m 555 $(STRIP) liblvm2cmd.so \ $(libdir)/liblvm2cmd.so.$(LIB_VERSION) $(LN_S) -f liblvm2cmd.so.$(LIB_VERSION) $(libdir)/liblvm2cmd.so - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \ + $(INSTALL) $(OWNERSHIP) -m 444 lvm2cmd.h \ $(includedir)/lvm2cmd.h install_cmdlib_static: liblvm2cmd-static.a - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \ + $(INSTALL) $(OWNERSHIP) -m 555 $(STRIP) liblvm2cmd-static.a \ $(libdir)/liblvm2cmd.a.$(LIB_VERSION) $(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \ + $(INSTALL) $(OWNERSHIP) -m 444 lvm2cmd.h \ $(includedir)/lvm2cmd.h install_tools_dynamic: lvm .commands - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm \ + $(INSTALL) $(OWNERSHIP) -m 555 $(STRIP) lvm \ $(sbindir)/lvm @echo Creating symbolic links for individual commands in $(sbindir) @( \ @@ -166,7 +166,7 @@ install_tools_static: lvm.static ) install_tools_static: lvm.static - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \ + $(INSTALL) $(OWNERSHIP) -m 555 $(STRIP) lvm.static \ $(staticdir)/lvm.static install: $(INSTALL_TARGETS)