From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13559 invoked by alias); 9 Apr 2010 21:42:55 -0000 Received: (qmail 13545 invoked by uid 9737); 9 Apr 2010 21:42:55 -0000 Date: Fri, 09 Apr 2010 21:42:00 -0000 Message-ID: <20100409214255.13543.qmail@sourceware.org> From: zkabelac@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW ./configure ./configure.in ./ ... Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2010-04/txt/msg00048.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2010-04-09 21:42:52 Modified files: . : WHATS_NEW configure configure.in make.tmpl.in daemons/clvmd : Makefile.in daemons/cmirrord: Makefile.in daemons/dmeventd: Makefile.in daemons/dmeventd/plugins/lvm2: Makefile.in daemons/dmeventd/plugins/mirror: Makefile.in daemons/dmeventd/plugins/snapshot: Makefile.in doc : Makefile.in lib : Makefile.in lib/format1 : Makefile.in lib/format_pool: Makefile.in lib/locking : Makefile.in lib/mirror : Makefile.in lib/snapshot : Makefile.in libdm : Makefile.in liblvm : Makefile.in man : Makefile.in po : Makefile.in scripts : Makefile.in test : Makefile.in tools : Makefile.in Log message: INSTALL rules updates Patch is inspired by Debian's extra patch. - removes OWNER & GROUP make vars they are parts of INSTALL command. - adds INSTALL_PROGRAM for executable, uses $(INSTALL) - adds INSTALL_DATA for non-executable data, uses ($INSTALL) - adds INSTALL_WDATA for writable non-executable data, uses ($INSTALL) - adds configure option --enable-write_install - to support installatin of writable files used by distribution - replaces usage of ifeq @LIB_SUFFIX@ with $(LIB_SUFFIX) - installs .a files from static builds without executable flag - installs .a files to $(usrlibdir) instead of $(libdir) - installs all static binaries to $(staticdir) - create .so links for devel package in $(usrlibdir) instead of $(libdir) - makes .so and .so.LIB_VERSION files within builddir - removes VERSIONED_SHLIB and created versioned LIB_SHARED automagicaly - install LIB_SHARED via install_lib_shared target - install plugins via install_lib_shared_plugin target - prints whole 'install' command during installation instead of less informative "Installing $(something) $(somewhere)" - install multiple man pages with one INSTALL command - use DISTCLEAN_TARGETS instead of creating multiple distclean targets Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1508&r2=1.1509 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/configure.diff?cvsroot=lvm2&r1=1.124&r2=1.125 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/configure.in.diff?cvsroot=lvm2&r1=1.134&r2=1.135 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/make.tmpl.in.diff?cvsroot=lvm2&r1=1.89&r2=1.90 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/Makefile.in.diff?cvsroot=lvm2&r1=1.39&r2=1.40 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/cmirrord/Makefile.in.diff?cvsroot=lvm2&r1=1.8&r2=1.9 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/Makefile.in.diff?cvsroot=lvm2&r1=1.40&r2=1.41 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/plugins/lvm2/Makefile.in.diff?cvsroot=lvm2&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/plugins/mirror/Makefile.in.diff?cvsroot=lvm2&r1=1.18&r2=1.19 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/dmeventd/plugins/snapshot/Makefile.in.diff?cvsroot=lvm2&r1=1.13&r2=1.14 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/doc/Makefile.in.diff?cvsroot=lvm2&r1=1.8&r2=1.9 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/Makefile.in.diff?cvsroot=lvm2&r1=1.101&r2=1.102 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format1/Makefile.in.diff?cvsroot=lvm2&r1=1.13&r2=1.14 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_pool/Makefile.in.diff?cvsroot=lvm2&r1=1.9&r2=1.10 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/locking/Makefile.in.diff?cvsroot=lvm2&r1=1.7&r2=1.8 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/mirror/Makefile.in.diff?cvsroot=lvm2&r1=1.8&r2=1.9 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/snapshot/Makefile.in.diff?cvsroot=lvm2&r1=1.8&r2=1.9 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/Makefile.in.diff?cvsroot=lvm2&r1=1.53&r2=1.54 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/liblvm/Makefile.in.diff?cvsroot=lvm2&r1=1.21&r2=1.22 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/man/Makefile.in.diff?cvsroot=lvm2&r1=1.35&r2=1.36 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/po/Makefile.in.diff?cvsroot=lvm2&r1=1.9&r2=1.10 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/scripts/Makefile.in.diff?cvsroot=lvm2&r1=1.14&r2=1.15 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.34&r2=1.35 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/Makefile.in.diff?cvsroot=lvm2&r1=1.115&r2=1.116 --- LVM2/WHATS_NEW 2010/04/09 21:34:25 1.1508 +++ LVM2/WHATS_NEW 2010/04/09 21:42:48 1.1509 @@ -1,5 +1,8 @@ Version 2.02.63 - ================================ + Install .a .so links to $(usrlibdir). + Add --enable-write_install options to install user writable files. + Use INSTALL_PROGRAM/DATA/WDATA target. Switch from using VPATH to vpath in Makefiles. Permit mimage LVs to be striped in lvcreate and lvresize. Fix pvmove allocation to take existing parallel stripes into account. --- LVM2/configure 2010/04/06 11:53:53 1.124 +++ LVM2/configure 2010/04/09 21:42:48 1.125 @@ -646,6 +646,7 @@ missingkernel kerneldir interface +WRITE_INSTALL UDEV_SYNC UDEV_RULES UDEV_LIBS @@ -657,7 +658,6 @@ PTHREAD_LIBS POOL PKGCONFIG -OWNER MIRRORS LVM_RELEASE_DATE LVM_RELEASE @@ -676,7 +676,6 @@ INTL HAVE_REALTIME HAVE_LIBDL -GROUP FSADM DM_LIB_PATCHLEVEL DM_LIB_VERSION @@ -836,6 +835,7 @@ enable_applib enable_cmdlib enable_pkgconfig +enable_write_install enable_fsadm enable_dmeventd enable_selinux @@ -1527,6 +1527,7 @@ --enable-applib Build application library --enable-cmdlib Build shared command library --enable-pkgconfig Install pkgconfig support + --enable-write_install Install user writable files --disable-fsadm Disable fsadm --enable-dmeventd Enable the device-mapper event daemon --disable-selinux Disable selinux support @@ -9083,8 +9084,6 @@ ################################################################################ { $as_echo "$as_me:$LINENO: checking file owner" >&5 $as_echo_n "checking file owner... " >&6; } -OWNER="" - # Check whether --with-user was given. if test "${with_user+set}" = set; then @@ -9095,13 +9094,12 @@ $as_echo "$OWNER" >&6; } if test x$OWNER != x; then - OWNER="-o $OWNER" + INSTALL="$INSTALL -o $OWNER" fi ################################################################################ { $as_echo "$as_me:$LINENO: checking group owner" >&5 $as_echo_n "checking group owner... " >&6; } -GROUP="" # Check whether --with-group was given. if test "${with_group+set}" = set; then @@ -9112,7 +9110,7 @@ $as_echo "$GROUP" >&6; } if test x$GROUP != x; then - GROUP="-g $GROUP" + INSTALL="$INSTALL -g $GROUP" fi ################################################################################ @@ -12451,6 +12449,15 @@ ################################################################################ +# Check whether --enable-write_install was given. +if test "${enable_write_install+set}" = set; then + enableval=$enable_write_install; WRITE_INSTALL=$enableval +else + WRITE_INSTALL=no +fi + + +################################################################################ { $as_echo "$as_me:$LINENO: checking whether to install fsadm" >&5 $as_echo_n "checking whether to install fsadm... " >&6; } # Check whether --enable-fsadm was given. @@ -15602,7 +15609,6 @@ - ################################################################################ ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile doc/Makefile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/misc/lvm-version.h lib/snapshot/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/lvm2_monitoring_init_red_hat scripts/Makefile test/Makefile test/api/Makefile tools/Makefile udev/Makefile" --- LVM2/configure.in 2010/04/06 11:53:53 1.134 +++ LVM2/configure.in 2010/04/09 21:42:48 1.135 @@ -144,28 +144,25 @@ ################################################################################ dnl -- Setup the ownership of the files AC_MSG_CHECKING(file owner) -OWNER="" - AC_ARG_WITH(user, [ --with-user=USER Set the owner of installed files [[USER=]] ], [ OWNER="$withval" ]) AC_MSG_RESULT($OWNER) if test x$OWNER != x; then - OWNER="-o $OWNER" + INSTALL="$INSTALL -o $OWNER" fi ################################################################################ dnl -- Setup the group ownership of the files AC_MSG_CHECKING(group owner) -GROUP="" AC_ARG_WITH(group, [ --with-group=GROUP Set the group owner of installed files [[GROUP=]] ], [ GROUP="$withval" ]) AC_MSG_RESULT($GROUP) if test x$GROUP != x; then - GROUP="-g $GROUP" + INSTALL="$INSTALL -g $GROUP" fi ################################################################################ @@ -733,6 +730,12 @@ PKGCONFIG=$enableval, PKGCONFIG=no) ################################################################################ +dnl -- Enable installation of writable files by user +AC_ARG_ENABLE(write_install, AC_HELP_STRING([--enable-write_install], + [Install user writable files]), + [WRITE_INSTALL=$enableval], [WRITE_INSTALL=no]) + +################################################################################ dnl -- Enable fsadm AC_MSG_CHECKING(whether to install fsadm) AC_ARG_ENABLE(fsadm, [AC_HELP_STRING([--disable-fsadm], [Disable fsadm])], @@ -1080,7 +1083,6 @@ AC_SUBST(DM_LIB_VERSION) AC_SUBST(DM_LIB_PATCHLEVEL) AC_SUBST(FSADM) -AC_SUBST(GROUP) AC_SUBST(GULM_CFLAGS) AC_SUBST(GULM_LIBS) AC_SUBST(HAVE_LIBDL) @@ -1103,7 +1105,6 @@ AC_SUBST(LVM_RELEASE_DATE) AC_SUBST(MIRRORS) AC_SUBST(MSGFMT) -AC_SUBST(OWNER) AC_SUBST(PKGCONFIG) AC_SUBST(POOL) AC_SUBST(PTHREAD_LIBS) @@ -1121,6 +1122,7 @@ AC_SUBST(UDEV_LIBS) AC_SUBST(UDEV_RULES) AC_SUBST(UDEV_SYNC) +AC_SUBST(WRITE_INSTALL) AC_SUBST(interface) AC_SUBST(kerneldir) AC_SUBST(missingkernel) --- LVM2/make.tmpl.in 2010/04/09 21:34:25 1.89 +++ LVM2/make.tmpl.in 2010/04/09 21:42:48 1.90 @@ -72,16 +72,24 @@ interface = @interface@ interfacebuilddir = $(top_builddir)/libdm/$(interface) -# setup misc variables -# define the ownership variables for the binaries and man pages -OWNER = @OWNER@ -GROUP = @GROUP@ - # The number of jobs to run, if blank, defaults to the make standard ifndef MAKEFLAGS MAKEFLAGS = @JOBS@ endif +# Handle installation of files +ifeq ("@WRITE_INSTALL@", "yes") +# leaving defaults +M_INSTALL_PROGRAM = +M_INSTALL_DATA = -m 644 +else +M_INSTALL_PROGRAM = -m 555 +M_INSTALL_DATA = -m 444 +endif +INSTALL_PROGRAM = $(INSTALL) $(M_INSTALL_PROGRAM) $(STRIP) +INSTALL_DATA = $(INSTALL) -p $(M_INSTALL_DATA) +INSTALL_WDATA = $(INSTALL) -p -m 644 + .SUFFIXES: .c .d .o .so .a .po .pot .mo .dylib CFLAGS += -fPIC -Wall -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline -Wmissing-noreturn -Wformat-security @@ -152,6 +160,7 @@ .PHONY: all pofile distclean clean cleandir cflow device-mapper .PHONY: install install_cluster install_device-mapper install_lvm2 +.PHONY: install_lib_shared install_lib_shared_plugin .PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean) .PHONY: $(SUBDIRS.pofile) $(SUBDIRS.install_cluster) $(SUBDIRS.cflow) .PHONY: $(SUBDIRS.device-mapper) $(SUBDIRS.install-device-mapper) @@ -166,7 +175,7 @@ SUBDIRS.clean := $(SUBDIRS:=.clean) SUBDIRS.distclean := $(SUBDIRS:=.distclean) -TARGETS += $(LIB_SHARED) $(LIB_STATIC) $(VERSIONED_SHLIB) +TARGETS += $(LIB_SHARED) $(LIB_STATIC) all: $(SUBDIRS) $(TARGETS) @@ -273,16 +282,30 @@ %.so: %.o $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(CLDFLAGS) $< $(LIBS) -o $@ +ifneq (,$(LIB_SHARED)) + +TARGETS += $(LIB_SHARED).$(LIB_VERSION) +$(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS) ifeq ("@LIB_SUFFIX@","so") -$(LIB_SHARED): $(OBJECTS) $(LDDEPS) - $(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \ - $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@ + $(CC) -shared -Wl,-soname,$(notdir $@) \ + $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@ endif - ifeq ("@LIB_SUFFIX@","dylib") -$(LIB_SHARED): $(OBJECTS) $(LDDEPS) $(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \ - $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@ + $(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@ +endif + +$(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION) + $(LN_S) -f $( $@ ;; \ esac -install_lvm2: - @echo "Installing $(MAN8) in $(MAN8DIR)" - @for f in $(MAN8); \ - do \ - $(RM) $(MAN8DIR)/$$f; \ - @INSTALL@ -D $(OWNER) $(GROUP) -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; \ - done - -install_cluster: - @echo "Installing $(MAN8CLUSTER) in $(MAN8DIR)" - @for f in $(MAN8CLUSTER); \ - do \ - $(RM) $(MAN8DIR)/$$f; \ - @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \ - done - -install_device-mapper: - @echo "Installing $(MAN8DM) in $(MAN8DIR)" - @for f in $(MAN8DM); \ - do \ - $(RM) $(MAN8DIR)/$$f; \ - @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \ - done +install_man5: $(MAN5) + $(INSTALL) -d $(MAN5DIR) + $(INSTALL_DATA) $(MAN5) $(MAN5DIR)/ + +install_man8: $(MAN8) + $(INSTALL) -d $(MAN8DIR) + $(INSTALL_DATA) $(MAN8) $(MAN8DIR)/ + +install_lvm2: install_man5 install_man8 + +install_cluster: $(MAN8CLUSTER) + $(INSTALL) -d $(MAN8DIR) + $(INSTALL_DATA) $(MAN8CLUSTER) $(MAN8DIR)/ + +install_device-mapper: $(MAN8DM) + $(INSTALL) -d $(MAN8DIR) + $(INSTALL_DATA) $(MAN8DM) $(MAN8DIR)/ install: install_lvm2 install_device-mapper --- LVM2/po/Makefile.in 2010/04/09 21:34:31 1.9 +++ LVM2/po/Makefile.in 2010/04/09 21:42:51 1.10 @@ -53,13 +53,13 @@ @echo Installing translation files in $(localedir) @( \ for lang in $(LANGS); do \ - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $$lang.mo \ + $(INSTALL_DATA) -D $$lang.mo \ $(localedir)/$$lang/LC_MESSAGES/lvm2.mo;\ done; \ ) @( \ for lang in $(LANGS); do \ - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $$lang.mo \ + $(INSTALL_DATA) -D $$lang.mo \ $(localedir)/$$lang/LC_MESSAGES/device-mapper.mo;\ done; \ ) --- LVM2/scripts/Makefile.in 2010/04/09 21:34:31 1.14 +++ LVM2/scripts/Makefile.in 2010/04/09 21:42:51 1.15 @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 Red Hat, Inc. All rights reserved. +# Copyright (C) 2006-2010 Red Hat, Inc. All rights reserved. # # This file is part of LVM2. # @@ -17,16 +17,18 @@ include $(top_builddir)/make.tmpl -install: - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(srcdir)/lvm_dump.sh \ - $(sbindir)/lvmdump - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(srcdir)/vgimportclone.sh \ - $(sbindir)/vgimportclone +SCRIPTS = lvm_dump.sh vgimportclone.sh ifeq ("@FSADM@", "yes") - $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(srcdir)/fsadm.sh \ - $(sbindir)/fsadm + SCRIPTS += fsadm.sh endif -install_lvm2: install +vpath %.sh $(srcdir) + +%_install: %.sh + $(INSTALL_PROGRAM) -D $< $(sbindir)/$(basename $( /dev/null | \ egrep -v '^ *(|#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands @@ -155,44 +159,37 @@ -include $(top_builddir)/lib/liblvm-internal.cflow endif -.PHONY: install_cmdlib_dynamic install_cmdlib_static \ +.PHONY: install_cmdlib_dynamic install_cmdlib_static install_cmdlib_include \ install_tools_dynamic install_tools_static \ install_dmsetup_dynamic install_dmsetup_static +install_cmdlib_include: $(srcdir)/lvm2cmd.h + $(INSTALL_DATA) -D $< $(includedir)/$(