Ensure that libtool directory always cleaned + reduce

     unnecessary output during make clean.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8464 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/manpages/Makefile.in b/bacula/manpages/Makefile.in
index daaecf5986b08fda0ebe359afc8aa6cfa6ff838c..5f9b4c96dc5695424cc28ed2813bc1ded76cb7b2 100644 (file)
--- a/bacula/manpages/Makefile.in
+++ b/bacula/manpages/Makefile.in
@@ -40,7 +40,7 @@ uninstall:
        done
 
 clean:
-       $(RMF) *~ 1 2 3 *.bak
+       @$(RMF) *~ 1 2 3 *.bak
        @find . -name .#* -exec $(RMF) {} \;
 
 depend:      

diff --git a/bacula/patches/2.4.4-sd-deadlock.patch b/bacula/patches/2.4.4-sd-deadlock.patch
new file mode 100644 (file)
index 0000000..ed60e68
--- /dev/null
+++ b/bacula/patches/2.4.4-sd-deadlock.patch
@@ -0,0 +1,67 @@
+
+ This patch is backported from the development SVN and should fix
+ bug #1213, which is a deadlock in the SD when a volume is on the
+ wrong drive.
+
+ Apply it to version 2.4.4 with:
+
+ cd <bacula-source>
+ patch -p0 <2.4.4-sd-deadlock.patch
+ ./configure <your options>
+ make
+ ...
+ make install
+
+
+Index: src/stored/reserve.c
+===================================================================
+--- src/stored/reserve.c       (revision 8426)
++++ src/stored/reserve.c       (working copy)
+@@ -1,7 +1,7 @@
+ /*
+    Bacula® - The Network Backup Solution
+ 
+-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
++   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+ 
+    The main author of Bacula is Kern Sibbald, with contributions from
+    many others, a complete list can be found in the file AUTHORS.
+@@ -498,7 +498,6 @@
+ void DCR::unreserve_device()
+ {
+    lock_volumes();
+-   dev->dlock();
+    if (is_reserved()) {
+       clear_reserved();
+       reserved_volume = false;
+@@ -514,7 +513,6 @@
+          volume_unused(this);
+       }
+    }
+-   dev->dunlock();
+    unlock_volumes();
+ }
+ 
+Index: src/stored/acquire.c
+===================================================================
+--- src/stored/acquire.c       (revision 8426)
++++ src/stored/acquire.c       (working copy)
+@@ -1,7 +1,7 @@
+ /*
+    Bacula® - The Network Backup Solution
+ 
+-   Copyright (C) 2002-2008 Free Software Foundation Europe e.V.
++   Copyright (C) 2002-2009 Free Software Foundation Europe e.V.
+ 
+    The main author of Bacula is Kern Sibbald, with contributions from
+    many others, a complete list can be found in the file AUTHORS.
+@@ -647,8 +647,8 @@
+ 
+    /* Detach this dcr only if attached */
+    if (dcr->attached_to_dev && dev) {
++      dev->dlock();
+       dcr->unreserve_device();
+-      dev->dlock();
+       dcr->dev->attached_dcrs->remove(dcr);  /* detach dcr from device */
+       dcr->attached_to_dev = false;
+ //    remove_dcr_from_dcrs(dcr);      /* remove dcr from jcr list */

diff --git a/bacula/platforms/Makefile.in b/bacula/platforms/Makefile.in
index 103cd034d0544574f3e528ee721119fc889d0918..1a7b89408bd0e92d4e01ec1036cf28b3a583c93d 100644 (file)
--- a/bacula/platforms/Makefile.in
+++ b/bacula/platforms/Makefile.in
@@ -87,7 +87,7 @@ clean:
                    (cd $${subdir}; $(MAKE) clean) \
            fi; \
        done
-       rm -f 1 2 3
+       @rm -f 1 2 3
 
 distclean:
        @rm -f Makefile

diff --git a/bacula/src/cats/Makefile.in b/bacula/src/cats/Makefile.in
index 204b2e3d90c9ad9db5b74ce4f4bdf7bf16aa0a7a..221648698ea612b2eeac6cf21327cab640989df4 100644 (file)
--- a/bacula/src/cats/Makefile.in
+++ b/bacula/src/cats/Makefile.in
@@ -67,12 +67,12 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 libtool-clean:
-       find . -name '*.lo' -print | xargs $(LIBTOOL_CLEAN) $(RMF)
-       $(RMF) *.la
-       $(RMF) -r .libs _libs
+       @find . -name '*.lo' -print | xargs $(LIBTOOL_CLEAN) $(RMF)
+       @$(RMF) *.la
+       @$(RMF) -r .libs _libs
 
-clean: @LIBTOOL_CLEAN_TARGET@
-       $(RMF) core a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
+clean: libtool-clean
+       @$(RMF) core a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
 
 realclean: clean
        $(RMF) tags

diff --git a/bacula/src/console/Makefile.in b/bacula/src/console/Makefile.in
index bdc77244d8dcca30eca7850d69d9c26a2aeab275..04117c049e9346c76d5865ccec3ca4a33dcc6310 100644 (file)
--- a/bacula/src/console/Makefile.in
+++ b/bacula/src/console/Makefile.in
@@ -63,9 +63,9 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 libtool-clean:
-       $(RMF) -r .libs _libs
+       @$(RMF) -r .libs _libs
 
-clean: @LIBTOOL_CLEAN_TARGET@
+clean: libtool-clean
        @$(RMF) console bconsole core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
        @$(RMF) static-console static-bconsole gmon.out
 

diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in
index 3bf5d6c9abaa6d8ff657a71c88d71627b84388f1..076dea1ac86ab8aa49c132b203a07a8947be6866 100644 (file)
--- a/bacula/src/dird/Makefile.in
+++ b/bacula/src/dird/Makefile.in
@@ -77,9 +77,9 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 libtool-clean:
-       $(RMF) -r .libs _libs
+       @$(RMF) -r .libs _libs
 
-clean: @LIBTOOL_CLEAN_TARGET@
+clean: libtool-clean
        @$(RMF) dird bacula-dir core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
        @$(RMF) static-bacula-dir
 

diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
index 27bb660a4887c1c1924127a444edd99e355dbdd9..e19a727702cb813053e86aedc0d667748775d942 100644 (file)
--- a/bacula/src/filed/Makefile.in
+++ b/bacula/src/filed/Makefile.in
@@ -100,9 +100,9 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 libtool-clean:
-       $(RMF) -r .libs _libs
+       @$(RMF) -r .libs _libs
 
-clean: @LIBTOOL_CLEAN_TARGET@
+clean: libtool-clean
        @$(RMF) bacula-fd filed core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
        @$(RMF) static-bacula-fd
        @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \

diff --git a/bacula/src/findlib/Makefile.in b/bacula/src/findlib/Makefile.in
index 59e027bba69793a26927f37e41a397ee9528b610..a4e3a59362d66e8bef1b78dd4e8de9ea53baaf36 100644 (file)
--- a/bacula/src/findlib/Makefile.in
+++ b/bacula/src/findlib/Makefile.in
@@ -91,7 +91,7 @@ libtool-clean:
        @$(RMF) *.la
        @$(RMF) -r .libs _libs
 
-clean: @LIBTOOL_CLEAN_TARGET@
+clean: libtool-clean
        @$(RMF) find core a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
 
 realclean: clean

diff --git a/bacula/src/gnome2-console/Makefile.in b/bacula/src/gnome2-console/Makefile.in
index 3c4a7716809aefb0e51249552dfe07056aab4938..ba737939c4b43d362c9c4f26108137d3d33d8d51 100644 (file)
--- a/bacula/src/gnome2-console/Makefile.in
+++ b/bacula/src/gnome2-console/Makefile.in
@@ -78,9 +78,9 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 libtool-clean:
-       $(RMF) -r .libs _libs
+       @$(RMF) -r .libs _libs
 
-clean: @LIBTOOL_CLEAN_TARGET@
+clean: libtool-clean
        @$(RMF) bgnome-console core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
        @$(RMF) static-bgnome-console gmon.out Makefile.am
 

diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in
index 68009e8d827bc22e8fb942037d7f3d1d0e808097..b699900a28ad4bf76bfbfc64a9976c2c0925440d 100644 (file)
--- a/bacula/src/lib/Makefile.in
+++ b/bacula/src/lib/Makefile.in
@@ -206,7 +206,7 @@ libtool-clean:
        @$(RMF) *.la
        @$(RMF) -r .libs _libs
 
-clean: @LIBTOOL_CLEAN_TARGET@
+clean: libtool-clean
        @$(RMF) core a.out *.o *.bak *.tex *.pdf *~ *.intpro *.extpro 1 2 3
        @$(RMF) rwlock_test md5sum sha1sum
 

diff --git a/bacula/src/plugins/fd/Makefile.in b/bacula/src/plugins/fd/Makefile.in
index f23d3b6881056e4f27015a7170c7d258ddd42e14..eccbc7e770c024b3fd21d45bc8c4a11abd4d1016 100644 (file)
--- a/bacula/src/plugins/fd/Makefile.in
+++ b/bacula/src/plugins/fd/Makefile.in
@@ -54,15 +54,15 @@ install: all
        $(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.la
 
 libtool-clean:
-       find . -name '*.lo' -print | xargs $(LIBTOOL_CLEAN) $(RMF)
-       $(RMF) *.la
-       $(RMF) -r .libs _libs
+       @find . -name '*.lo' -print | xargs $(LIBTOOL_CLEAN) $(RMF)
+       @$(RMF) *.la
+       @$(RMF) -r .libs _libs
 
-clean: @LIBTOOL_CLEAN_TARGET@
-       rm -f main *.so *.o 1 2 3
+clean: libtool-clean
+       @rm -f main *.so *.o 1 2 3
 
 distclean: clean
-       rm -f Makefile
+       @rm -f Makefile
 
 uninstall:
        $(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.so

diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in
index d9a74e41d169685d99fc2a9673a183800f0af210..80ccf46145c66f473557ffdb20eb5422ee01fac8 100644 (file)
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -180,9 +180,9 @@ uninstall:
        (cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-sd.conf bacula-sd.conf.new)
 
 libtool-clean:
-       $(RMF) -r .libs _libs
+       @$(RMF) -r .libs _libs
 
-clean: @LIBTOOL_CLEAN_TARGET@
+clean: libtool-clean
        @$(RMF) bacula-sd stored bls bextract bpool btape shmfree core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
        @$(RMF) bscan bcopy static-bacula-sd
 

diff --git a/bacula/src/tools/Makefile.in b/bacula/src/tools/Makefile.in
index b1572ddc835bd598dacc2bb35acf329ae08347a7..d7b3139e8690b98d64dcebee2d3ebf7222225789 100644 (file)
--- a/bacula/src/tools/Makefile.in
+++ b/bacula/src/tools/Makefile.in
@@ -117,9 +117,9 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 libtool-clean:
-       $(RMF) -r .libs _libs
+       @$(RMF) -r .libs _libs
 
-clean: @LIBTOOL_CLEAN_TARGET@
+clean: libtool-clean
        @$(RMF) bsmtp core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
        @$(RMF) $(DIRTOOLS)
 

diff --git a/bacula/src/wx-console/Makefile.in b/bacula/src/wx-console/Makefile.in
index 03c8d6e6f5d350d4b1e4c5cf0d7f17c752b2d17e..7f832b9eb2b4f527bffc76178259f707f8d339f3 100644 (file)
--- a/bacula/src/wx-console/Makefile.in
+++ b/bacula/src/wx-console/Makefile.in
@@ -92,9 +92,9 @@ bwx-console_private.res: bwx-console_private.rc
        windres.exe -i bwx-console_private.rc -I rc -o bwx-console_private.res -O coff 
 
 libtool-clean:
-       $(RMF) -r .libs _libs
+       @$(RMF) -r .libs _libs
 
-clean: @LIBTOOL_CLEAN_TARGET@
+clean: libtool-clean
        @$(RMF) $(CONSOBJS) bwx-console $(WIN32RES)
 
 distclean: clean

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 36115c50908d5ab8dc9f288d76e15e1b59078063..45aa8b931ade875ffa81b1dcb9582b413fd58993 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -25,6 +25,9 @@ filepattern (restore with regex in bsr)
 mixed priorities
 
 General:
+18Feb09
+kes  Ensure that libtool directory always cleaned + reduce 
+     unnecessary output during make clean.
 15Feb09
 ebl  Check postgresql database encoding that should be SQL_ASCII
      and print a warning if it's something else.