Changeset 550 in MondoRescue for branches


Ignore:
Timestamp:
May 14, 2006, 7:54:15 PM (19 years ago)
Author:
bcornec
Message:

Cleanup in build process continue

  • removal of most small scripts
  • based on one main svn2build script
  • spec files reviewed for fedora remarks
  • changelog and TAG integrated
Location:
branches/stable
Files:
1 added
8 deleted
13 edited
1 moved

Legend:

Unmodified
Added
Removed

  • branches/stable/mindi/distributions/mandriva/spec.m4

    r388 r550  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `%{name}-%{version}.tar.bz2')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    6 define(`DDD', `%{addreqb}, which, grep >= 2.5')dnl
     6define(`DDD', `, which, grep >= 2.5')dnl
    77dnl GRP is replaced by the RPM group of apps
    88define(`GRP', `Archiving/Backup')dnl

  • branches/stable/mindi/distributions/redhat/spec.m4

    r542 r550  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', ftp://ftp.mondorescue.org/src/%{name}-%{version}.tgz)dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tgz')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    6 define(`DDD', %{addreqb}, which, grep >= 2.5)dnl
     6define(`DDD', `, which, grep >= 2.5')dnl
    77dnl GRP is replaced by the RPM group of apps
    8 define(`GRP', Applications/Archiving)dnl
     8define(`GRP', `Applications/Archiving')dnl

  • branches/stable/mindi/distributions/rpm/mindi.spec

    r542 r550  
    22# $Id$
    33#
    4 %define name    mindi
    5 %define version VVV
    64%define mrel    RRR
    7 %define src     SSS
    8 %define grp     GRP
    9 %define addreqb bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools
    10 %define addreq  DDD
    11 %define rel     %{mrel}
    125
    136Summary:    Mindi creates emergency boot disks/CDs using your kernel, tools and modules
    14 Name:       %name
    15 Version:    %version
    16 Release:    %rel
     7Name:       mindi
     8Version:    VVV
     9Release:    %mrel
    1710License:    GPL
    18 Group:      %{grp}
     11Group:      GRP
    1912Url:        http://www.mondorescue.org
    20 Source:     %{src}
     13Source:     SSS
    2114BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
    22 Requires:   %{addreq}
    23 Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
     15Requires:   bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools DDD
    2416# Not on all systems
    2517#Conflicts: bonnie++

  • branches/stable/mindi/distributions/suse/spec.m4

    r401 r550  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', %{name}-%{version}.tgz)dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tgz')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    6 define(`DDD', %{addreqb}, syslinux)dnl
     6define(`DDD', `, syslinux')dnl
    77dnl GRP is replaced by the RPM group of apps
    8 define(`GRP', Productivity/Archiving/Backup)dnl
     8define(`GRP', `Productivity/Archiving/Backup')dnl

  • branches/stable/mondo/distributions/mandriva/changelog

    r424 r550  
    99- Add -p option
    1010
    11 * Tue May 03 2005 Hugo Rabson <hugorabson@msn.com> 2.04_cvs_20050503
    12 
    13 - made mondo more clever about finding its home. Avoids mondo considering
    14   directories like '/usr/share/doc/momdo' as its home.
    15 
    16 * Wed Aug 04 2004 Hugo Rabson <hugorabson@msn.com> 2.03
    17 
    18 - test sanity of user-specified tempdir
    19 - better SLES8 support
    20 
    21 * Mon Jun 28 2004 Hugo Rabson <hugorabson@msn.com> 2.02
    22 
    23 - instead of using 'dd' to erase partition table, delete existing
    24   partitions w/ the same call to fdisk that is used to create the
    25   new partitions; this should avoids locking up the partition table
    26 - set bootable partition in the above same call to fdisk, for
    27   the same reason (avoids locking up the partition table)
    28 - better software RAID support
    29 - mount ext3 partitions as ext2 when restoring - better for Debian
    30 - better star, ACL support
    31 - added ACL, xattr support for afio users
    32 
    33 * Sat Jun 26 2004 Hugo Rabson <hugorabson@msn.com> 2.01
    34 
    35 - fixed cvs for SuSE systems
    36 - fixed NTFS backup/restore bug relating to partimagehack
    37   log file overflow and NTFS v non-NTFS differentiation
    38 - more reliable extraction of config info from CDs, floppies
    39 - better support of ISO dirs at restore-time (Conor Daly)
    40 - fixed spec file for SuSE users
    41 - added ldconfig to install section
    42 
    43 * Sat Jun 19 2004 Hugo Rabson <hugorabson@msn.com> 2.00
    44 
    45 - first 2.0 release
    46 - updated grub-install.patched to support SuSE and Red Hat
    47 - call 'mt' to set block size to 32K before opening in/out tape
    48 - updated mondo-prep.c to create each disk's partitions all at once
    49   (one call per drive) instead of one call to fdisk per partition
    50 - when extracting cfg file and mountlist from all.tar.gz (tape copy),
    51   use block size of INTERNAL_TAPE_BLK_SIZE, not TAPE_BLOCK_SIZE
    52 - added star and rudimentary SELinux support
    53 - fixed lots of bugs
    54 - all logging now goes to /var/log/mondo-archive.log, with symlink
    55   to /tmp/mondo-restore.log for restore-time log-tracking
    56 - added grub-install.patched
    57 - removed embleer & other binaries
    58 - added '-b' to specify block size
    59 - added '-R' for star support
    60 
    61 * Thu Mar 25 2004 Bruno Cornec <Bruno.Cornec@hp.com> 1.7_cvs-20040325
    62 
    63 - ia64 fixes
    64 
    65 * Fri Nov 07 2003 Joshua Oreman <oremanj@get-linux.org> 1.7_cvs-20031107
    66 
    67 - fixed symbolic links for libraries
    68 - added support for boot/root multi floppies
    69 
    70 - added kdelibs as xmondo dependency
    71 - added xmondo pixmap installation
    72 - better find_cdrom_device(), to cope w/ multiple CD writers
    73 - fixed -m and -Vc flags
    74 - fixed NTFS support!
    75 - bootable CD uses native, not El Torito, support now
    76 - removed mondo-makefilelist
    77 - added 2.6 kernel support
    78 - if 2.6 kernel, insist that the user specify CD device
    79 - drop Embleer; insist on ms-sys and parted if Windows partition
    80 
    81 * Wed Nov 05 2003 Jesse Keating <jkeating@j2solutions.net> 1.7_cvs-20031105.1
    82 
    83 - added -devel package
    84 
    85 * Tue Nov 04 2003 Jesse Keating <jkeating@j2solutions.net> 1.7_cvs-20031104.1
    86 
    87 - made xmondo a second package
    88 - added ability to specify --without xmondo at build time
    89 
    90 * Sun Nov 02 2003 Jesse Keating <jkeating@j2solutions.net> 1.7_cvs-20031102.1
    91 
    92 - Clean up, added spanish translation
    93 - Set prefix to be /usr
    94 - added/fixed Requires
    95 - remove CVS directories prior to building
    96 
    97 * Thu Oct 23 2003 Hugo Rabson <hugorabson@msn.com> 1.75_cvs_20031023
    98 
    99 - nothing yet
    100 
    101 * Wed Oct 22 2003 Hugo Rabson <hugorabson@msn.com> 1.75
    102 
    103 - fixed chmod/chown bug (Jens Richter)
    104 - ask user to confirm NFS mountpoint in Interactive Mode
    105 - rewritten format_everything() to make sure LVMs, RAIDs and
    106   regular partitions are prepped in the correct order
    107 - better magicdev support
    108 - rewritten external binary caller subroutine
    109 - DVD support added
    110 - better backup-time control gui; offer to exclude nfs if appl.
    111 - fixed multi-tape support
    112 - re-implemented -D and -J
    113 - fixed bug in extract_config_file_from_ramdisk() which
    114   affected tape+floppy users
    115 - updated is_incoming_block_valid() to make it
    116   return end-of-tape if >300 flotsam blocks
    117 - unmount CD-ROM before burning (necessary for RH8/9)
    118 - fixed some stray assert()'s
    119 - fixed bug in grub-MR (Christian)
    120 - make user remove floppy/CD before restoring interactively from tape
    121 - fixed bug in am_I_in_disaster_recovery_mode()
    122 - added code to nuke_mode() to make sure NFS
    123   (backup) share is mounted in Nuke Mode
    124 - improved tape device detection code
    125 - better GRUB support
    126 - better logging of changed bigfiles at compare-time
    127 - better NTFS support, thanks to partimagehack-static
    128 - better logging
    129 - rewrote tape-handling code, breaking compatibility w/ previous versions
    130 - fixed ISO/CD biggiefile verification bug in mondoarchive
    131 - fixed bug which stopped boot/compare-time changelist from popping up
    132 - replaced mondo-makefilelist with C code - faster, cleaner
    133 - tweaked GUI - better feedback
    134 
    135 * Wed May 28 2003 Anonymous <root@rohan> 1.74
    136 
    137 - misc fixes (Michael Hanscho's friend)
    138 - added rudimentary support for SME
    139 - added better label support
    140 - fixed biggietime atime/ctime restoration bug 73
    141 - fixed 'default boot loader' detection bug (Joshua Oreman)
    142 - use single-threaded make_afioballs_and_images() if FreeBSD
    143 - fixed mondoarchive -Vi multi-CD verify bug (Tom Mortell)
    144 - superior get_phys_size_of_drive() (Joshua Oreman)
    145 - fixed RAID-related bug in where_is_root_mounted()
    146 - ISO tweaks
    147 - fixed silly bug in load_filelist() which stopped
    148   funny German filenames from being handled properly
    149 - fixed various calls to popup_and_get_string()
    150 - fixed spec file
    151 - reject -E /
    152 - added partimagehack to the mix
    153 
    154 * Tue May 20 2003 Anonymous <root@rohan> 1.73
    155 
    156 - mark devices as bootable _after_ unmounting them
    157 - resolve boot device (-f) if softlink
    158 - post_param_configuration() --- store iso-dev and isodir
    159 - added post-nuke-sample.tgz to package
    160 - Nuke Mode now checks mountlist against hardware; offer user
    161   opportunity to edit mountlist if insane; if user declines, abort
    162 - added lots of assert()'s and other checks
    163 - ran code thru Valgrind to catch & fix some memory leaks
    164 - made mondo-restore.c smaller by moving some subroutines to
    165   common/libmondo-raid.c and mondorestore/mondo-rstr-compare.c
    166 - added '-Q' to let user test mondoarchive's ability to find
    167   their boot loader and type
    168 - improved which_boot_loader()
    169 - when burning or comparing to a CD, defeat autorun if it is
    170   running, to avoid confusing mondoarchive and the user
    171 - if original backup media no longer available at boot-time
    172   then offer user chance to choose another media source
    173 - when booting, type 'nuke noresize' to nuke w/o resizing
    174   mountlist to fill your drives
    175 - add 'textonly' when booting, to avoid using Newt gui
    176 - run nice(20) to prioritize mondoarchive at start
    177 - don't pause and wait for next blank CD at backup-time
    178   unless necessary (e.g. previous CD has not been removed)
    179 - get_phys_size_of_drive() --- better support of older drives
    180 - don't eject if "donteject" is in kernel's command line
    181 - cleaned up segfault-handling
    182 - added Conor's strip_path() to improve file list display
    183 - added Herman Kuster's multi-level bkp patch
    184 - better boot-time screen/message
    185 - added Joshua Oreman's FreeBSD patches x3
    186 - fixed interactive/textonly support
    187 - fixed support for subdir-within-NFS-mount
    188 - fixed "Can't backup if ramdisk not mounted" bug
    189 - try to work around eccentricities of multi-CD drive PCs
    190 - misc clean-ups (Steve Hindle)
    191 
    192 * Tue Apr 08 2003 Hugo Rabson <hugorabson@msn.com> 1.72
    193 
    194 - LVM/RAID bugs fixed (Brian Borgeson)
    195 - major clean-up of code (Stan Benoit)
    196 - make-me-bootable fix (Juraj Ziegler)
    197 - fixed problem w/ multi-ISO verify cycle (Tom Mortell)
    198 - removed duplicate entry from makefile
    199 - if root is /dev/root then assume not a ramdisk
    200 - reject relative paths if -d flag (Alessandro Polverini)
    201 - fixed potentially infinite loop in log_to_screen (Tom Mortell)
    202 - add '/' to custom filelist as workaround for obscure bug
    203 - ask user speed of CDRW if writing to CD
    204 - find_cdrom_device() --- if nonexistent/not found then
    205   make sure to return '' as dev str and 1 as res
    206 - tweaked restore scripts tgz
    207 - cleaned up find_cdrom_device()
    208 - if user creates /usr/share/mondo/payload.tgz then untar
    209   payload to CD at backup-time
    210 - fixed insist_on_this_cd_number()
    211 - fixed am_i_in_disaster_recovery_mode()
    212 - misc clean-up (Tom Mortell)
    213 - made code more legible
    214 - fixed post-nuke support
    215 - added -e support
    216 - fixed nfs support
    217 - fixed iso support
    218 - at restore-time, only sort mountlist internally,
    219   in mount_all_devices() and unmount_all_devices()
    220 - fixed cosmetic bug in label-partitions-as-necessary
    221 - updated documentation
    222 - fixed fstab-hacking scripts
    223 
    224 * Wed Feb 12 2003 Hugo Rabson <hugorabson@msn.com> 1.71
    225 
    226 - log newt, slang, ncurses info
    227 - updated man page
    228 - handle % chars in issue.net properly (Heiko Schlittermann)
    229 - fixed serious NFS restore bug
    230 - cleaned up spec file; it should cause fewer problems now (Jesse Keating)
    231 - changed various strcpy() calls to strncpy() calls
    232 - added mondo-makefilelist to makefile (Mikael Hultgren)
    233 - mount_cdrom() better at handling multiple CD drives
    234 - exclude /media/cdrom,cdrecorder,floppy
    235 - sensibly_set_tmpdir_and_scratchdir() --- exclude smb and smbfs
    236 - better logging by eval_call_to_make_ISO()
    237 - accept -J <fname> to let user provide their own fs catalog
    238   instead of -I <paths> to backup
    239 - if dir excluded with -E or included with -I and dir is actually
    240   a softlink then exclude/include the dir pointed to, as well
    241 - better location for manpage
    242 - adjusted block size of tarball at start of tape, to help
    243   users w/ broken tape driver firmware
    244 - sort -u fstab after modifying it
    245 - if backup type is nfs then don't estimate noof media
    246 - fixed Makefile (Mikael Hultgren)
    247 - updated manpage
    248 
    249 * Sat Dec 07 2002 Hugo Rabson <hugo@firstlinux.net> 1.70
    250 
    251 - new devel branch opened
    252 
    253 * Mon Dec 02 2002 Hugo Rabson <hugo@firstlinux.net> 1.52
    254 
    255 - fixed bug in multithreading
    256 - use new grub-MR instead of grub-install
    257 - wipe only the partition table (not the MBR) when partitioning drives
    258 - ignore lilo.conf.anaconda when looking for lilo.conf file
    259 - accepts '-l RAW' to backup/restore original boot sector instead
    260   of running grub or lilo to init it after restoring
    261 - fixed&updated stabgrub-me script; software RAID + GRUB work now
    262 - mount/unmount /boot partition for Gentoo 1.2 users
    263 - re-enabled extra tape checksums
    264 - disabled spurious warnings
    265 - unmount/remount supermounts at start/end of live restore, if nec.
    266 - cleaned up mondo's tape block handling (now, TAPE_BLOCK_SIZE=128K
    267   and I've added INTERNAL_TAPE_BLK_SIZE=32K variable for buffering)
    268 - added Makefile
    269 - added -l RAW, to backup and restore original MBR
    270 - cleaned up iso_mode() and nfs restoring
    271 - create /mnt/RESTORING/mnt/.boot.d for Gentoo users
    272 - made mondorestore CD bootable for ArkLinux users
    273 - if user runs as 'su' not 'su -' then work around
    274 
    275 * Sun Nov 17 2002 Hugo Rabson <hugo@firstlinux.net> 1.51
    276 
    277 - pop-up list of changed files, at end of verification phase
    278 - better handling of changed.files list at restore-time
    279 - lots of CD-related fixes
    280 - added '-N' flag --- to let user exclude all NFS-related mounts&devices
    281 - better handling of 'kill'
    282 - restructuring of code to ease integration of mondo w/XMondo
    283 - fixed obscure bug in find_and_mount_actual_cd()
    284 - if / or /root has <50MB free then abort & complain
    285 - fixed install.sh
    286 - fixed .spec file
    287 - updated documentation
    288 - commented code
    289 - updated man page
    290 - added -v / --version flag
    291 - replace convoluted grep with wc (KP)
    292 - fixed bug affecting restoration of bigfiles from CD's created w/0 compression
    293 - fixed BurnProof-related bug
    294 - better at figuring out which is the best partition for temp/scratchdir
    295 - added do-not-compress-these (text file) to RPM
    296 - do not compress files of types listed in do-not-compress-these
    297 - dropped -U from call to afio - saves 20-30% runtime (Cosgrove)
    298 - added Cosgrove's do-not-compress-these list
    299 - included various patches from KP
    300 - chmod tmpdir, scratchdir to 700 before using
    301 - restore from specified backup device, even if its own cfg file disagrees
    302 - fixed multi-tape bug
    303 - fixed "Can't find first ISO when verifying nonbootable ISO" bug
    304 - multithreaded make_afioballs_and_images()
    305 - tmpdir and scratchdir are set sensibly whether mondoarchive is called with
    306   command-line parameters or not
    307 - fixed bug in strip_spaces() which stopped it from handling
    308   small strings correctly - affected mountlist editor
    309 - create a repaired copy of grub-install which is RAID-friendly;
    310   use it when initializing boot sector with run_grub()
    311 - fixed bug in mondo-makefilelist
    312 
    313 * Sun Sep 08 2002 Hugo Rabson <hugo@firstlinux.net> 1.50
    314 
    315 - if restoring, don't try to find SCSI node of CD-ROM drive; find /dev entry
    316 - during selective restore, skip filesets which don't contain relevant archives
    317 - set /dev/null's perms to 777, just in case devfs-enabled kernel mangles it
    318 - remove /var/run/*.pid after restoring
    319 - move spurious lockfiles from /home/* to /home/*/.disabled
    320 - ask user to confirm the tape/CD device name
    321 - lots of multitape-related fixes
    322 - added code to autodetect the hardware of the user, if possible
    323 - if isodir does not exist then abort
    324 - more sanity-checking for -d flag
    325 - doubled 'biggiefile' threshold... to 32MB
    326 - exclude /root/images/mindi
    327 - fixed multi-imagedev bug (Emmanuel Druon)
    328 - unmount/remount /mnt/floppy before/after backing up, if Mandrake
    329 - restructured the source files
    330 - fixed serious bug in line 1546 - should have been !=, not ==; stopped
    331   mondorestore from correctly restoring big files
    332 - added '#include <signal.h>' to my-stuff.h
    333 - exclude "incheckentry xwait()" from changed.files
    334 - fixed minor bug in find_cdrom_device()
    335 - fixed bug in friendly_sizestr...
    336 - insist on tape #1 when start verifying
    337 - added internal buffering, replacing the external 'buffer' exe
    338 - if differential backup then don't permit formatting or fdisking,
    339   whether Interactive or Nuke mode
    340 - if mondorestore is run on live filesystem (or from ramdisk) without
    341   parameters then mondorestore will ask which backup media (tape, CD, etc.)
    342   was used; it will read the config file from the media and proceed from there
    343 - if tape streamer is softlink then resolve it first
    344 - incorporate post-nuke tarball
    345 - if user doesn't specify tape size, proceed anyway; behave intelligently
    346   in the event of end-of-tape
    347 - prefix bkpinfo->restore_path to biggiefile fname before generating
    348   checksum & comparing to archived biggiefile
    349 - if /etc/lilo.conf not found not /etc/lilo.conf.anaconda found
    350   then create a softlink from the former to the latter, to work
    351   around RH7.3's b0rken LILO support
    352 - LFS support (mharris, michele, hugo)
    353 - fixed verify bug --- CD#1 was being verified again & again & ...
    354 - differential mode fixed; supported again
    355 - ask user for boot loader + device if not detectible
    356 - list up to 512 files in file selection window at once (was 128)
    357 - better handling of bigfiles' checksums, perms and owns
    358 - delete final filelist if <=2 bytes long
    359 - if kernel not found and mondo in graphics mode then popup and ask
    360   for kernel path+filename
    361 
    362 * Sun Jul 14 2002 Hugo Rabson <hugo@firstlinux.net> 1.45-1
    363 
    364 - 1.5x branch forked off from 1.4x branch
    365 

  • branches/stable/mondo/distributions/mandriva/spec.m4

    r543 r550  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `%{name}-%{version}.tar.bz2')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    6 define(`DDD', `%{addreqb}')dnl
     6define(`DDD', )dnl
    77dnl GRP is replaced by the RPM group of apps
    88define(`GRP', `Archiving/Backup')dnl

  • branches/stable/mondo/distributions/redhat/changelog

    r543 r550  
    1 * Fri Feb 17 2006 Bruno Cornec <bruno@mondorescue.org> VVV
     1* Fri Feb 17 2006 Bruno Cornec <bruno@mondorescue.org> 2.0.7-1
    22- Updated to 2.0.7
    33- RPM sepc files are now generated

  • branches/stable/mondo/distributions/redhat/spec.m4

    r543 r550  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', ftp://ftp.mondorescue.org/src/%{name}-%{version}.tgz)dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tgz')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    6 define(`DDD', %{addreqb})dnl
     6define(`DDD', )dnl
    77dnl GRP is replaced by the RPM group of apps
    8 define(`GRP', Applications/Archiving)dnl
     8define(`GRP', `Applications/Archiving')dnl
    99dnl OBS is replaced vy what is being obsoleted
    1010define(`OBS', )dnl

  • branches/stable/mondo/distributions/rpm/mondo.spec

    r543 r550  
    33#
    44
    5 %define name    mondo
    6 %define version VVV
    75%define mrel    RRR
    86# if mandriva official build (rpm --with is_official)
    97%{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
    10 %define src     SSS
    11 %define grp     GRP
    12 %define addreqb mindi >= 1.0.7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
    13 %define addreq  DDD
    14 %define rel     %{mrel}
     8%define addreq  mindi >= 1.0.7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1 DDD
    159
    1610Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape
    … …  
    1913Summary(sp):    Un programa para los usuarios de Linux por crear una CD/cinta de restoracion/rescate
    2014
    21 Name:       %{name}
    22 Version:    %{version}
    23 Release:    %{rel}
     15Name:       mondo
     16Version:    VVV
     17Release:    %{mrel}
    2418License:    GPL
    25 Group:      %{grp}
     19Group:      GRP
    2620Url:        http://www.mondorescue.org
    27 Source:     %{src}
     21Source:     SSS
    2822BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
    2923BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
    30 Epoch:      %(echo EEE | cut -d- -f1 | sed "s~M~~")
    3124OBS
    3225%ifarch ia64

  • branches/stable/mondo/distributions/suse/spec.m4

    r542 r550  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', %{name}-%{version}.tgz)dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}.tgz')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    6 define(`DDD', %{addreqb}, buffer, cdrecord)dnl
     6define(`DDD', `, buffer, cdrecord')dnl
    77dnl GRP is replaced by the RPM group of apps
    8 define(`GRP', Productivity/Archiving/Backup)dnl
     8define(`GRP', `Productivity/Archiving/Backup')dnl
    99dnl OBS is replaced vy what is being obsoleted
    1010define(`OBS', )dnl

  • branches/stable/tools/build-env

    r549 r550  
    11#!/bin/bash
    22#
    3 # Creates RPMs environment from SVN repository
     3# Creates build environment for packages
     4# Executed on a VM (non-SVN)
    45#
    56# $Id$
    67#
    7 
    8 dname=`dirname $0`
    9 prem=`echo $dname |cut -c1`
    10 if [ ${prem} == "/" ]; then
    11     export TOOLHOME=$dname
    12 else
    13     export TOOLHOME=${PWD}/$dname
    14 fi
    15 
    16 . $TOOLHOME/common-env
    17 
    18 export ARCH=`rpm --showrc | egrep "^build arch" | awk '{print $4}'`
    198
    209# Should not be modified below
    … …  
    2211export opt=""
    2312
    24 if [ -f ${HOME}/.rpmmacros ]; then
    25     export TOPDIR=`egrep '^%_topdir' ${HOME}/.rpmmacros | awk '{print $2}'`
    26 else
    27     export TOPDIR=${BASE}/RPMS
    28 fi
    29 mkdir -p ${TOPDIR}
    30 cd ${TOPDIR}
    31 mkdir -p RPMS SRPMS SPECS SOURCES BUILD
    32 
    3313if [ -e /etc/mandriva-release ]; then
     14    export dtype="rpm"
    3415    export dfam="mandriva"
    3516    export ddir="mandriva"
    … …  
    3718    export suf=".`echo $dver | sed 's/\.//'`mdk"
    3819elif [ -e /etc/mandrake-release ]; then
     20    export dtype="rpm"
    3921    export dfam="mandriva"
    4022    export ddir="mandrake"
    … …  
    4224    export suf=".`echo $dver | sed 's/\.//'`mdk"
    4325elif [ -e /etc/redhat-release ]; then
     26    export dtype="rpm"
    4427    grep -q Enterprise /etc/redhat-release
    4528    if [ $? -eq 0 ]; then
    … …  
    6043    fi
    6144elif [ -e /etc/SuSE-release ]; then
     45    export dtype="rpm"
    6246    grep -q Enterprise /etc/SuSE-release
    6347    if [ $? -eq 0 ]; then
    … …  
    7155    fi
    7256else
     57    export dtype="unknown"
    7358    export dfam="generic"
    7459    export dver=""
    … …  
    7964    export suf=".${ddir}${dver}"
    8065fi
     66
     67if [ $dtype == "rpm" ]; then
     68    export ARCH=`rpm --showrc | egrep "^build arch" | awk '{print $4}'`
     69    if [ -f ${HOME}/.rpmmacros ]; then
     70        export TOPDIR=`egrep '^%_topdir' ${HOME}/.rpmmacros | awk '{print $2}'`
     71    else
     72        export TOPDIR=${BASE}/build
     73    fi
     74    mkdir -p ${TOPDIR}
     75    cd ${TOPDIR}
     76    mkdir -p RPMS SRPMS SPECS SOURCES BUILD
     77fi
     78

  • branches/stable/tools/common-env

    r549 r550  
    88# Adapt to your needs
    99export BASE=${HOME}/mondo
    10 export TOPDIR=${BASE}/RPMS
     10export TOPDIR=${BASE}/build
    1111mkdir -p ${TOPDIR}
    1212export TMP=${BASE}/tmp

  • branches/stable/tools/svn-env

    r549 r550  
    1313cd $TOOLHOME/..
    1414export REVISION=`svnversion .`
    15 export TAG=`cat ${TOOLHOME}/TAG
     15export TAG=`cat ${TOOLHOME}/TAG`

  • branches/stable/tools/svn2build

    r549 r550  
    11#!/bin/bash
    22#
    3 # Creates build file for packages from SVN repository
     3# Creates build environment and files for packages creation from SVN repository
    44#
    55# $Id$
    66#
    7 
    87
    98umask 022
    … …  
    2019. ./svn-env
    2120
    22 mkdir -p ${TOPDIR}/SPECS
     21mkdir -p ${TOPDIR}/SOURCES
    2322
    2423if [ "$1" = "" ]; then
    … …  
    3534cd ${BASE}/svn
    3635
    37 for d in `cat $TOOLHOME/DISTROS`; do
    38     for p in $c; do
    39         v=`cat ${SVNBRANCH}/$p/VERSION`
    40         echo "Management of build of $v-$REVISION"
    41         rm -fr $p-$v
    42         svn export ${SVNBRANCH}/$p $p-$v
    43         echo "$REVISION" > $p-$v/REVISION
    44         echo "Generating SVN log file ..."
    45         svn log -v ${SVNBRANCH}/$p > $p-$v/svn.log
    46    
    47         if [ _"`echo $p | grep mondo-doc`" != _"" ]; then
    48             cd ${p}-${v}
    49             $TOOLHOME/expandver mondorescue-howto.sgml *8
    50             make -f Makefile.howto
    51             if [ $? != 0 ]; then
     36for p in $c; do
     37    v=`cat ${SVNBRANCH}/$p/VERSION`
     38    echo "Management of $p $v-$REVISION"
     39    rm -fr $p-$v
     40    svn export ${SVNBRANCH}/$p $p-$v
     41    echo "$REVISION" > $p-$v/REVISION
     42    echo "Generating SVN log file ..."
     43    svn log -v ${SVNBRANCH}/$p > $p-$v/svn.log
     44
     45    for d in `cat ${TOOLHOME}/DISTROS`; do
     46        ddir=`echo $d | cut -f'_' -d1`
     47        dver=`echo $d | cut -f'_' -d2`
     48        echo "Generating build files for $ddir ($dver)"
     49        if [ $ddir = "debian" ]; then
     50            dfam="debian"
     51            dtype="deb"
     52            suf=".${dfam}${dver}"
     53            BUILDDIR=${TOPDIR}/debian
     54        elif [ $ddir = "gentoo" ]; then
     55            dfam="gentoo"
     56            dtype="ebuild"
     57            suf=".${ddir}${dver}"
     58            BUILDDIR=${TOPDIR}/ebuild
     59        elif [ $ddir = "slackware" ]; then
     60            dfam="slack"
     61            dtype="tgz"
     62            suf=".${dfam}${dver}"
     63            BUILDDIR=${TOPDIR}/slack
     64        elif [ $ddir = "sles" || $ddir = "suse" ]; then
     65            dfam="suse"
     66            dtype="rpm"
     67            suf=".${ddir}${dver}"
     68            BUILDDIR=${TOPDIR}/SPECS
     69        elif [ $ddir = "fedora" || $ddir = "redhat" || $ddir = "rhel" ]; then
     70            dfam="redhat"
     71            dtype="rpm"
     72            dver=`echo ${dver} | sed "s/\.//"`
     73            if [ $ddir = "fedora" ]; then
     74                suf=".fc${dver}"
     75            elif [ $ddir = "redhat" ]; then
     76                suf=".rh${dver}"
     77            else
     78                suf=".rhel${dver}"
     79            fi
     80            BUILDDIR=${TOPDIR}/SPECS
     81        elif [ $ddir = "mandrake" || $ddir = "mandriva" ]; then
     82            dfam="mandriva"
     83            dtype="rpm"
     84            suf=".`echo $dver | sed 's/\.//'`mdk"
     85            BUILDDIR=${TOPDIR}/SPECS
     86        else
     87            dfam="unknown"
     88            dtype="unknown"
     89            BUILDDIR=${TOPDIR}/SPECS
     90            suf="unknown"
     91        fi
     92
     93        # Create conf file dir
     94        mkdir -p ${BUILDDIR}
     95
     96        if [ $dtype = "rpm" ]; then
     97            if [ -f $p-$v/distributions/$ddir/spec.m4 ]; then
     98                inc=$p-$v/distributions/$ddir/spec.m4
     99            elif [ -f $p-$v/distributions/$dfam/spec.m4 ]; then
     100                inc=$p-$v/distributions/$dfam/spec.m4
     101            else
     102                echo "Unable to build the RPM specfile for this distro. Please report to authors"
    52103                exit -1
    53104            fi
    54             make -f Makefile.man
    55             if [ $? != 0 ]; then
     105            cp $inc /tmp/mondorescue.mc
     106            ddd=`LANG=C ; date '+%Y-%m-%d'`
     107            cat >> /tmp/mondorescue.mc << EOF
     108define(\`RRR', ${TAG}${suf})dnl
     109define(\`VVV', ${v})dnl
     110define(\`DDD', ${ddd})dnl
     111EOF
     112            echo "Using $inc customization to build SPEC file"
     113            m4 /tmp/mondorescue.mc $p-$v/distributions/rpm/$p.spec > $p-$v/distributions/$ddir/$p.spec
     114
     115            if [ -f $p-$v/distributions/$ddir/changelog ]; then
     116                log=$p-$v/distributions/$ddir/changelog
     117            elif [ -f $p-$v/distributions/$dfam/changelog ]; then
     118                log=$p-$v/distributions/$dfam/changelog
     119            else
     120                echo "Unable to build RPM changelog for this distro. Please report to authors"
    56121                exit -1
    57122            fi
    58             cd ..
     123
     124            echo "Using $log customization to build changelog file"
     125            ddate=`LANG=C ; date "+%a %b %d %Y"`
     126            cat > $p-$v/distributions/$ddir/$p.changelog.new << EOF
     127* $ddate Bruno Cornec <bruno@mondorescue.org> VVV-RRR
     128- Updated to VVV-r${REVISION}
     129
     130EOF
     131            cat $log >> $p-$v/distributions/$ddir/$p.changelog.new
     132            m4 /tmp/mondorescue.mc $p-$v/distributions/$ddir/$p.changelog.new > $p-$v/distributions/$ddir/$p.changelog
     133            rm -f $p-$v/distributions/$ddir/$p.changelog.new
     134
     135        elif [ $dtype = "ebuild" ]; then
     136            echo "Gentoo Buid"
     137        else
     138            echo "Unknown Buid"
    59139        fi
    60    
    61         if [ _"`echo $p | grep -v kernel | grep mindi`" != _"" ]; then
    62             v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
    63             if [ ! -d mondo-doc-$v1 ]; then
    64                 echo "mondo-doc should be created before $p"
    65                 exit -1
    66             fi
    67             (cd mondo-doc-$v1 ; make -f Makefile.man install-$p INSTALLDIR=../$p-$v)
    68             rm -f $p-$v/rootfs/sbin/parted2fdisk-ia64
     140    done
     141
     142    if [ _"`echo $p | grep mondo-doc`" != _"" ]; then
     143        cd ${p}-${v}
     144        for f in mondorescue-howto.sgml *8; do
     145            m4 /tmp/mondorescue.mc $f > ${f}.new
     146            mv ${f}.new $f
     147        done
     148        make -f Makefile.howto
     149        if [ $? != 0 ]; then
     150            exit -1
    69151        fi
    70         if [ "`echo $p | grep -v doc | grep  mondo`" != "" ]; then
    71             v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
    72             if [ ! -d mondo-doc-$v1 ]; then
    73                 echo "mondo-doc should be created before $p"
    74                 exit -1
    75             fi
    76             (cd mondo-doc-$v1 ; make -f Makefile.howto install INSTALLDIR=../$p-$v/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$p-$v/docs/man)
    77             (cd $p-$v ; echo "Bootstraping mondo ... " ; ./bootstrap)
     152        make -f Makefile.man
     153        if [ $? != 0 ]; then
     154            exit -1
    78155        fi
    79    
    80         # Finally creates the tar files
    81         echo "Creating $p tar files"
    82         tar cfhz ${TOPDIR}/SOURCES/$p-$v-$TAG.tgz $p-$v
    83         tar cfhj ${TOPDIR}/SOURCES/$p-$v-$TAG.tar.bz2 $p-$v
    84     done
     156        cd ..
     157    fi
     158
     159    if [ _"`echo $p | grep -v kernel | grep mindi`" != _"" ]; then
     160        v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
     161        if [ ! -d mondo-doc-$v1 ]; then
     162            echo "mondo-doc should be created before $p"
     163            exit -1
     164        fi
     165        (cd mondo-doc-$v1 ; make -f Makefile.man install-$p INSTALLDIR=../$p-$v)
     166        rm -f $p-$v/rootfs/sbin/parted2fdisk-ia64
     167    fi
     168    if [ "`echo $p | grep -v doc | grep  mondo`" != "" ]; then
     169        v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
     170        if [ ! -d mondo-doc-$v1 ]; then
     171            echo "mondo-doc should be created before $p"
     172            exit -1
     173        fi
     174        (cd mondo-doc-$v1 ; make -f Makefile.howto install INSTALLDIR=../$p-$v/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$p-$v/docs/man)
     175        (cd $p-$v ; echo "Bootstraping mondo ... " ; ./bootstrap)
     176    fi
     177
     178    # Finally creates the tar files
     179    echo "Creating $p tar files"
     180    tar cfhz ${TOPDIR}/SOURCES/$p-$v-$TAG.tgz $p-$v
     181    tar cfhj ${TOPDIR}/SOURCES/$p-$v-$TAG.tar.bz2 $p-$v
    85182done
     183
     184rm -f /tmp/mondorescue.mc
Note: See TracChangeset for help on using the changeset viewer.