Menu
▾
▴
[Bacula-commits] rescue External-depkgs, NONE, 1.1 build-depkgs, NONE, 1.1 diffmkcdrec, NONE, 1.1 .cvsignore, 1.3, 1.4 Makefile.in, 1.7, 1.8 configure, 1.7, 1.8 version.h, 1.11, 1.12
|
From: Kern S. <ke...@us...> - 2006-08-29 16:55:45
|
Update of /cvsroot/bacula/rescue In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29115 Modified Files: .cvsignore Makefile.in configure version.h Added Files: External-depkgs build-depkgs diffmkcdrec Log Message: Integrate mkcdrec with Bacula Index: .cvsignore =================================================================== RCS file: /cvsroot/bacula/rescue/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .cvsignore 15 May 2005 10:11:04 -0000 1.3 +++ .cvsignore 29 Aug 2006 16:55:37 -0000 1.4 @@ -6,3 +6,5 @@ autoconf/config.log kernsconfig diff +mkcdrec +mkCDrec_* --- NEW FILE: External-depkgs --- # This file provides information about the External dependencies required by # Bacula. # # There are four fields delimited by |. Only the first two fields are # required. The other two are used when the top level directory of the # archive is not the same as the file name with any suffixes removed. # # Field 1 is the name of the dependency. It is used to define the # name of the three variables which are assigned the values of fields 2 to 4. # # Field 2 is the URL of the archive. It is assigned to the variable # URL_[field1]. # # Field 3 is the top directory of the archive or the name of a directory that # must be created and the archive extracted into it. It is assigned to the # variable DIR_[field1]. # # Field 4 indicates if the directory specified in field 3 must be created # first and the archive extracted into it. It is assigned to the variable # MKD_[field1] # MKCDREC|http://switch.dl.sourceforge.net/sourceforge/mkcdrec/mkCDrec_v0.9.4.tar.gz|mkcdrec Index: configure =================================================================== RCS file: /cvsroot/bacula/rescue/configure,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- configure 5 Apr 2006 07:51:23 -0000 1.7 +++ configure 29 Aug 2006 16:55:37 -0000 1.8 @@ -272,7 +272,7 @@ PACKAGE_BUGREPORT= ac_unique_file="version.h" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG AWK VERSION DATE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MV RM CP ECHO AR CDRECORD build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE CDSTL iso where type KERNEL bacula STATIC_FD hostname DISTNAME DISTVER LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG AWK VERSION DATE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MV RM CP ECHO AR CDRECORD build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE DEV iso where type KERNEL bacula STATIC_FD BACULA_BIN BACULA_SCRIPTS hostname DISTNAME DISTVER LIBOBJS LTLIBOBJS' ac_subst_files='MCOMMON' # Initialize some variables set by options. @@ -787,11 +787,14 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-dev=DEVICE specify device (e.g. /dev/hdc) --with-iso=PATH specify path to iso (not implemented) --with-cdrom=PATH specify path to cdrom --with-kernel=version specify complete kernel version (e.g. 2.6.14-2) --with-bacula=PATH specify path to Bacula source --with-static-fd=PATH specify path to static FD + --with-bacula-bin=PATH specify path to bacula binaries (NOT IMPLEMENTED) + --with-bacula-scripts=PATH specify path to bacula scripts _ACEOF fi @@ -2247,19 +2250,38 @@ exec_prefix=${prefix} fi +# ------------------------------------------ +# What device to use +# ------------------------------------------ +DEV= + +# Check whether --with-dev or --without-dev was given. +if test "${with_dev+set}" = set; then + withval="$with_dev" + + if test "x$withval" != "xno" ; then + DEV=$withval + fi + + +fi; + # ------------------------------------------- -# check for cdrecord writer location +# if no --with-dev given check for cdrecord writer location # get scsibus,target,lun # ------------------------------------------- -CDSTL="3,0,0" -if test ! x$CDRECORD = x ; then - CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD-RW | ${AWK} '{print $1}'` - if test x${CDSTL} = x ; then - CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD+RW | ${AWK} '{print $1}'` - fi - if test x${CDSTL} = x ; then - CDSTL="3,0,0" +if test x$DEV = x ; then + CDSTL="3,0,0" + if test ! x$CDRECORD = x ; then + CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD-RW | ${AWK} '{print $1}'` + if test x${CDSTL} = x ; then + CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD+RW | ${AWK} '{print $1}'` + fi + if test x${CDSTL} = x ; then + CDSTL="3,0,0" + fi fi + DEV="ATA:${CDSTL}" fi @@ -2353,6 +2375,42 @@ fi; +BACULA_BIN= +# ------------------------------------------ +# Where to get Bacula binaries +# ------------------------------------------ + +# Check whether --with-bacula-bin or --without-bacula-bin was given. +if test "${with_bacula_bin+set}" = set; then + withval="$with_bacula_bin" + + if test "x$withval" != "xno" ; then + BACULA_BIN=$withval + fi + + +fi; + + +BACULA_SCRIPTS= +# ------------------------------------------ +# Where to get Bacula scripts +# ------------------------------------------ + +# Check whether --with-bacula-scripts or --without-bacula-scripts was given. +if test "${with_bacula_scripts+set}" = set; then + withval="$with_bacula_scripts" + + if test "x$withval" != "xno" ; then + BACULA_SCRIPTS=$withval + fi + + +fi; + + + + if test x${bacula} = x -a x${STATIC_FD} = x ; then { { echo "$as_me:$LINENO: error: You must specify either --with-bacula=PATH or --with-static-fd=PATH" >&5 echo "$as_me: error: You must specify either --with-bacula=PATH or --with-static-fd=PATH" >&2;} @@ -2456,6 +2514,7 @@ MCOMMON=./autoconf/Make.common +./build-depkgs ac_config_files="$ac_config_files autoconf/Make.common Makefile linux/Makefile linux/cdrom/Makefile linux/cdrom/bacula/Makefile linux/cdrom/cdtree/boot/isolinux/boot.msg knoppix/cdrom/Makefile knoppix/cdrom/bacula/Makefile freebsd/Makefile solaris/Makefile $PFILES" ac_config_commands="$ac_config_commands default" @@ -3156,13 +3215,15 @@ s,@HAVE_IRIX_OS_FALSE@,$HAVE_IRIX_OS_FALSE,;t t s,@HAVE_DARWIN_OS_TRUE@,$HAVE_DARWIN_OS_TRUE,;t t s,@HAVE_DARWIN_OS_FALSE@,$HAVE_DARWIN_OS_FALSE,;t t -s,@CDSTL@,$CDSTL,;t t +s,@DEV@,$DEV,;t t s,@iso@,$iso,;t t s,@where@,$where,;t t s,@type@,$type,;t t s,@KERNEL@,$KERNEL,;t t s,@bacula@,$bacula,;t t s,@STATIC_FD@,$STATIC_FD,;t t +s,@BACULA_BIN@,$BACULA_BIN,;t t +s,@BACULA_SCRIPTS@,$BACULA_SCRIPTS,;t t s,@hostname@,$hostname,;t t s,@DISTNAME@,$DISTNAME,;t t s,@DISTVER@,$DISTVER,;t t @@ -3559,14 +3620,17 @@ + echo " Configuration on `date`: Host: $host -- ${DISTNAME} ${DISTVER} Rescue version: ${VERSION} (${DATE}) + Bacula scripts location: ${BACULA_SCRIPTS} Source code location: ${bacula} Static FD location: ${STATIC_FD} Specific kernel version: ${KERNEL} + CDROM device: ${DEV} " > config.out Index: Makefile.in =================================================================== RCS file: /cvsroot/bacula/rescue/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.in 22 Dec 2005 11:30:17 -0000 1.7 +++ Makefile.in 29 Aug 2006 16:55:37 -0000 1.8 @@ -49,19 +49,23 @@ clean: @$(RMF) *~ 1 2 3 diff - @$(RMF) config.log config.out config.status + @$(RMF) config.log config.out config.status *.log @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) \ + (cd $${subdir}; $(MAKE) clean) \ fi; \ done + @if [ -d mkcdrec ]; then \ + (cd mkcdrec; $(MAKE) clean) \ + fi # clean for distribution distclean: clean @$(RMF) -r CVS - + @rm -rf mkcdrec mkCDrec_* + devclean: clean @for subdir in freebsd linux solaris; do \ if [ -f $${subdir}/Makefile ]; then \ --- NEW FILE: build-depkgs --- #!/bin/sh usage() { echo "usage: $0 [-h] [-C] [<dependency 1>] [<dependency 2>] ..." echo " -h Displays this usage" echo " -C Clobbers (overwrites) the source code by " echo " reextracting the archive and reapplying any" echo " patches." echo "" echo "<dependency N> Optional dependency, If none are given then all" echo " of them will be built." echo "" echo "Valid dependencies are:" grep -v '^#' < External-depkgs | cut -d'|' -f1 | cut -d'_' -f1 | tr A-Z a-z | sort -u | awk '{ print " " $1 }' } CLOBBER_SOURCE= while getopts "hHC" opt; do case ${opt} in H|h|\?) usage;exit 1;; C) CLOBBER_SOURCE=true;; esac done [ ${OPTIND} -gt 1 ] && shift `expr ${OPTIND} - 1` cwd=`pwd` cd `dirname $0` SCRIPT_DIR=`pwd` TOP_DIR=`pwd` DEPPKG_DIR=`pwd` export PATH=${BIN_DIR}:${PATH} OLD_IFS=${IFS};IFS="|"; while read package url dir mkd; do case ${package} in \#*) ;; *) eval "URL_${package}=${url};DIR_${package}=${dir};MKD_${package}=${mkd}";; esac done < ${SCRIPT_DIR}/External-depkgs IFS=${OLD_IFS};unset OLD_IFS get_source() { URL=$1 SRC_DIR=$2 MAKE_DIR=$3 ARCHIVE=`basename ${URL}` case ${ARCHIVE} in *.tar.gz) ARCHIVER="tar xzf"; [ -z "${SRC_DIR}" ] && SRC_DIR=`expr "${ARCHIVE}" : '\(.*\)\.tar\.gz'`;; *.tar.bz2) ARCHIVER="tar xjf"; [ -z "${SRC_DIR}" ] && SRC_DIR=`expr "${ARCHIVE}" : '\(.*\)\.tar\.bz2'`;; *.zip) ARCHIVER="unzip -q"; [ -z "${SRC_DIR}" ] && SRC_DIR=`expr "${ARCHIVE}" : '\(.*\)\.zip'`;; *) echo Unsupported archive type - $ARCHIVE; exit 1;; esac if [ ! -e "${ARCHIVE}" ] then echo Downloading "${URL}" if wget --passive-ftp "${URL}" then : else echo Unable to download ${ARCHIVE} exit 1 fi fi if [ ! -e "${SRC_DIR}" -o "${CLOBBER_SOURCE}" = "true" ] then rm -rf ${SRC_DIR} [ "${MAKE_DIR}" = "true" ] && mkdir ${SRC_DIR} && cd ${SRC_DIR} echo Extracting ${ARCHIVE} ${ARCHIVER} ${ARCHIVE} &> ${ARCHIVE}.log cd ${SRC_DIR} return 0 fi cd ${SRC_DIR} return 1 } process_mkcdrec() { if get_source "${URL_MKCDREC}" "${DIR_MKCDREC}" "${MKD_MKCDREC}" then echo "Have mkcdrec source" fi } if [ "$#" -eq 0 ] then process_mkcdrec else for dependency in "$@" do eval "process_${dependency}" done fi --- NEW FILE: diffmkcdrec --- #!/bin/sh diff -ur mkcdrec ../mkcdrec >diff Index: version.h =================================================================== RCS file: /cvsroot/bacula/rescue/version.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- version.h 1 Jul 2006 14:32:52 -0000 1.11 +++ version.h 29 Aug 2006 16:55:37 -0000 1.12 @@ -1,5 +1,5 @@ /* */ #undef VERSION -#define VERSION "1.8.6" -#define BDATE "01 July 2006" -#define LSMDATE "01Jul06" +#define VERSION "2.0.0" +#define BDATE "29 August 2006" +#define LSMDATE "29Aug06" |