From b3eb570c67f474aa40224c10fbffd6a27d77480d Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 29 Aug 2005 11:09:17 +0000 Subject: [PATCH] Create make release + add README --- rescue/Makefile.in | 22 +++++++++- rescue/README | 74 ++++++++++++++++++++++++++++++++ rescue/autoconf/configure.in | 2 +- rescue/configure | 2 +- rescue/linux/Makefile.in | 1 + rescue/linux/cdrom/makekernel | 1 - rescue/linux/cdrom/rootsbin.list | 2 + 7 files changed, 100 insertions(+), 4 deletions(-) create mode 100644 rescue/README diff --git a/rescue/Makefile.in b/rescue/Makefile.in index e1bb125..27d653f 100755 --- a/rescue/Makefile.in +++ b/rescue/Makefile.in @@ -47,7 +47,15 @@ Makefiles: $(SHELL) config.status clean: - @$(RMF) *~ 1 2 3 + @$(RMF) *~ 1 2 3 diff + @$(RMF) config.log config.out config.status + @rm -rf autom4te.cache + @rm -rf bacula-rescue-$(VERSION).tar.gz + @for subdir in freebsd linux solaris; do \ + if [ -f $${subdir}/Makefile ]; then \ + (cd $${subdir}; $(MAKE) clean) \ + fi; \ + done # clean for distribution distclean: clean @@ -58,4 +66,16 @@ devclean: clean if [ -f $${subdir}/Makefile ]; then \ (cd $${subdir}; $(MAKE) devclean) \ fi; \ + done + +release: clean + (cwd=`pwd`; rm -rf /tmp/bacula-rescue-$(VERSION); \ + cd ..; cp -rp $$cwd /tmp/bacula-rescue-$(VERSION); \ + cd /tmp; \ + tar cvfz $$cwd/bacula-rescue-$(VERSION).tar.gz bacula-rescue-$(VERSION); \ + rm -rf /tmp/bacula-rescue-$(VERSION); \ + echo " "; \ + echo "Release is in: $$cwd/bacula-rescue-$(VERSION).tar.gz"; \ + echo " ") + # ------------------------------------------------------------------------ diff --git a/rescue/README b/rescue/README new file mode 100644 index 0000000..4e1da78 --- /dev/null +++ b/rescue/README @@ -0,0 +1,74 @@ + +This is the Bacula CDROM rescue directory. It currently contains +the following subdirectories: + + Directory Contents + autoconf Configuration files + freebsd The FreeBSD rescue code (not much) + linux The Linux rescue code -- working + cdrom The Linux CDROM rescue code -- working + floppy The Linux Floppy rescue code deprecated, + probably not working. + solaris The Solaris rescue code (not much) + +Build instructions: + +First, you must configure with: + + cd + ./configure --with-bacula= + + This will find the current Bacula version, and create + all the Makefiles from Makefile.in + + Do not edit the Makefiles or your changes will be lost. Always + edit Makefile.in + + There is also a --with-iso= option on configure + that allows you to specify a location of an ISO image that + already exists, presumably built by your Linux vendor. + This option permits remastering of that image and including + the Bacula files. However, this work is incomplete, and I am + a bit unsure what its state it. + +To actually build the CDROM (Linux only): + + cd + + (configure and make your Bacula distribution, if + you have not already done this. + !!!!!!! Important !!!!!!!!!! + You should not configure OpenSSL because there are + no static libraries for some of the components. The + same may be true for Python + !!!!!!!!!!!!!!!!!!!!!!!!!!!!) + + cd rescue/linux/cdrom + (read the README in this directory) + (become root) + make + make burn + make clean + (optionally, you might want to cd to your Bacula + source directory and do a "make clean" to remove + any files created by root) + (become normal user) + + See the README in linux/cdrom for more detailed information + on possible modifications for your site or more of the + details of building the CDROM. + + The documentation for actually using the CDROM can be found + in the Rescue chapter of the Bacula manual. + + +To create a distribution tar file: + cd + ./configure --with-bacula= + make clean + make + make release + + The output will be a .tar.gz file in the current directory + with the name bacula-doc-.tar.gz + It will print the name. diff --git a/rescue/autoconf/configure.in b/rescue/autoconf/configure.in index 2402877..9099786 100644 --- a/rescue/autoconf/configure.in +++ b/rescue/autoconf/configure.in @@ -140,7 +140,7 @@ AC_SUBST(type) # Where to get Bacula source # ------------------------------------------ AC_ARG_WITH(bacula, - [ --with-bacula=PATH specify path to bacula], + [ --with-bacula=PATH specify path to Bacula source], [ if test "x$withval" != "xno" ; then bacula=$withval diff --git a/rescue/configure b/rescue/configure index 2b35ded..26ae9f9 100755 --- a/rescue/configure +++ b/rescue/configure @@ -794,7 +794,7 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-iso=PATH specify path to iso --with-cdrom=PATH specify path to cdrom - --with-bacula=PATH specify path to bacula + --with-bacula=PATH specify path to Bacula source _ACEOF fi diff --git a/rescue/linux/Makefile.in b/rescue/linux/Makefile.in index cca1530..f6b06c7 100644 --- a/rescue/linux/Makefile.in +++ b/rescue/linux/Makefile.in @@ -6,6 +6,7 @@ install: uninstall: clean: + (cd cdrom; make clean) distclean: diff --git a/rescue/linux/cdrom/makekernel b/rescue/linux/cdrom/makekernel index f2aaab5..bc0f3c8 100755 --- a/rescue/linux/cdrom/makekernel +++ b/rescue/linux/cdrom/makekernel @@ -6,7 +6,6 @@ TOPDIR=`pwd` KERNEL=`uname -r` -KERNEL=2.6.11-1.14_FC3 rm -rf roottree/dev tar xfz dev.tar.gz -C roottree diff --git a/rescue/linux/cdrom/rootsbin.list b/rescue/linux/cdrom/rootsbin.list index 035649e..2f55e39 100644 --- a/rescue/linux/cdrom/rootsbin.list +++ b/rescue/linux/cdrom/rootsbin.list @@ -31,6 +31,7 @@ roottree/sbin/dosfsck roottree/sbin/du roottree/sbin/dump roottree/sbin/e2fsck +roottree/sbin/e2label roottree/sbin/egrep roottree/sbin/eject roottree/sbin/false @@ -117,6 +118,7 @@ roottree/sbin/nm roottree/sbin/nmap roottree/sbin/nologin roottree/sbin/od +roottree/sbin/parted roottree/sbin/passwd roottree/sbin/ping roottree/sbin/portmap -- 2.39.5