Changeset 1121


Ignore:
Timestamp:
Feb 9, 2007, 6:49:33 PM (13 years ago)
Author:
bruno
Message:
  • 1722 Floppies are NOT supported anymore (allows for mindi to become noarch)
  • mindi is now a noarch type of package
  • RPM Packaging improvements for Fedora
Location:
branches/stable
Files:
1 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/distributions/rpm/mindi.spec

    r1060 r1121  
    1010Url:        http://www.mondorescue.org
    1111Source:     SSS
     12BuildArch:  noarch
    1213BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
    13 ExcludeArch: ppc
    1414Requires:   bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools, mindi-busybox DDD
    1515OBS
     
    2424
    2525%prep
    26 %setup -n %name-%{version}
     26%setup -q
    2727
    2828%build
    29 %ifarch ia64
    30 %{__make} -f Makefile.parted2fdisk clean
    31 %{__make} -f Makefile.parted2fdisk
    32 %endif
    3329
    3430%install
     
    3834export HEAD=${RPM_BUILD_ROOT}
    3935export PREFIX=%{_exec_prefix}
    40 # Bug on x86_64 on _sysconfdir on rhel4 at least
    41 %ifarch x86_64
    42 export CONFDIR=/etc
    43 %else
    4436export CONFDIR=%{_sysconfdir}
    45 %endif
    4637export MANDIR=%{_mandir}
    4738export DOCDIR=%{_docdir}
  • branches/stable/mindi/mindi

    r1099 r1121  
    18341834    if [ "$disksize" -eq "2880" ] ; then
    18351835        echo -en "bios=0x00\nsectors=36\nheads=2\ncylinders=80\n"
    1836     elif [ "$disksize" -eq "1722" ] ; then
    1837         echo -en "bios=0x00\nsectors=21\nheads=2\ncylinders=82\n"
    18381836    elif [ "$disksize" -gt "2880" ] ; then
    18391837        /bin/true
     
    19131911    TurnTgzIntoRdz $MINDI_LIB/rootfs $MINDI_TMP/mindi.rdz $ramdisksize $disksize `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into mindi.rdz; are you SURE your kernel supports loopfs?"
    19141912    if [ "$ARCH" != "ia64" ] ; then
    1915         [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
     1913        [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
    19161914    fi
    19171915    echo -en "..."
     
    20822080    echo -en "Making "$disksize"KB boot disk..."
    20832081    TurnTgzIntoRdz $MINDI_LIB/rootfs $MINDI_TMP/mindi.rdz $ramdisksize $disksize `du -sk $kernelpath | cut -f1` || Die "Could not turn rootfs into mindi.rdz; are you SURE your kernel supports loopfs?"
    2084     [ "$disksize" != "1722" ] && [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
     2082    [ "$disksize" != "2880" ] && [ "$disksize" != "5760" ] && Die "PDBI - disksize is $disksize - bad size"
    20852083    echo -en "..."
    20862084    imagefile=$imagesdir/mindi-bootroot.$disksize.img
    20872085    mountpoint=$MINDI_TMP/mountpoint.$$
    20882086    mkdir -p $mountpoint
    2089 # If I format a 1722KB data file & run syslinux on it, the resultant image
    2090 # won't boot. So, I have formatted a floppy, called syslinux on/to it, and
    2091 # used 'dd' to copy it to sys-disk.raw (zipped to sys-disk.raw.gz).
    2092 # If I extract it, mount it, copy my files to it, etc. then the resultant
    2093 # image _is_ bootable. I don't know why syslinux and/or mkfs.vfat won't
    2094 # play nicely and I don't care. :) I have worked around the problem. -Hugo, 06/27/2002
    2095     if [ "$disksize" = "1722" ] ; then
    2096         gzip -dc $MINDI_LIB/sys-disk.raw.gz > $imagefile || Die "Cannot dd blank file"
    2097     else
    2098         dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
    2099         echo "Creating vfat filesystem on $imagefile" >> $LOGFILE
    2100         mkfs.vfat $imagefile >> $LOGFILE 2>> $LOGFILE
    2101         syslinux $imagefile >> $LOGFILE 2>> $LOGFILE
    2102     fi
     2087    dd if=/dev/zero of=$imagefile bs=1k count=$disksize &> /dev/null || Die "Cannot dd blank file"
     2088    echo "Creating vfat filesystem on $imagefile" >> $LOGFILE
     2089    mkfs.vfat $imagefile >> $LOGFILE 2>> $LOGFILE
     2090    syslinux $imagefile >> $LOGFILE 2>> $LOGFILE
     2091
    21032092    mount -t vfat -o loop $imagefile $mountpoint || LogIt "Cannot mount (PBDI)"
    21042093
     
    32793268        PrepareBootDiskImage_LILO $MINDI_CACHE $IA64_BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
    32803269    else
    3281         if ! PrepareBootDiskImage_LILO $MINDI_CACHE 1722 $kernelpath $ramdisk_size ; then
    3282             LogIt "WARNING - failed to create 1.72MB boot image."
    3283             LogIt "Please reduce your kernel's size if you want to make a 1.72MB floppy disk."
    3284         fi
    32853270        if ! PrepareBootDiskImage_LILO $MINDI_CACHE 2880 $kernelpath $ramdisk_size ;  then
    32863271            LogIt "WARNING - failed to create 2.88MB floppy disk image."
     
    32903275    fi
    32913276else
    3292     if ! PrepareBootDiskImage_SYSLINUX $MINDI_CACHE 1722 $kernelpath $ramdisk_size ; then
    3293         LogIt "WARNING - failed to create 1.72MB boot image."
    3294         LogIt "Please reduce your kernel's size if you want to make a 1.72MB floppy disk."
    3295         if ! PrepareBootDiskImage_SYSLINUX $MINDI_CACHE 2880 $kernelpath $ramdisk_size ; then
    3296             LogIt "WARNING - failed to create 2.88MB floppy disk image."
    3297             LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
    3298             PrepareBootDiskImage_SYSLINUX $MINDI_CACHE 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
    3299         fi
     3277    if ! PrepareBootDiskImage_SYSLINUX $MINDI_CACHE 2880 $kernelpath $ramdisk_size ; then
     3278        LogIt "WARNING - failed to create 2.88MB floppy disk image."
     3279        LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
     3280        PrepareBootDiskImage_SYSLINUX $MINDI_CACHE 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
    33003281    fi
    33013282fi
     
    33063287if [ _"$MONDO_SHARE" = _"" ]; then
    33073288    ListImagesForUser $MINDI_CACHE
    3308     boot_dev=/dev/fd0u1722
    3309     [ ! -e "$boot_dev" ] && mknod $boot_dev b 2 60
    3310     [ ! -e "$boot_dev" ] && boot_dev=/dev/fd0H1722
    3311     [ ! -e "$boot_dev" ] && Die "Will you PLEASE tell your distribution maker to create the 1.72MB devices in /dev?"
    33123289    if [ "$PROMPT_WRITE_BOOT_FLOPPIES" = "yes" ]; then
    33133290        OfferToCopyImagesToDisks $MINDI_CACHE $boot_dev $FDDEVICE
  • branches/stable/mondo/distributions/rpm/mondo.spec

    r1076 r1121  
    5555
    5656%prep
    57 %setup -q -n %name-%{version}
     57%setup -q
    5858
    5959%build
  • branches/stable/mondo/src/include/my-stuff.h

    r1103 r1121  
    319319#define VANILLA_SCSI_CDROM  "/dev/scd0"
    320320#define VANILLA_SCSI_TAPE   "/dev/st"
    321 #define VANILLA_USB_DEVICE  "/dev/hda"
     321#define VANILLA_USB_DEVICE  "/dev/sda"
    322322#define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/md"
    323323#define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE
  • branches/stable/tools/build2pkg

    r1063 r1121  
    6464
    6565    if [  _"$dtype" = _"rpm" ]; then
    66         if [ _"$p" = _"mondo-doc" ]; then
     66        if [ _"$p" = _"mondo-doc" ] || [ _"$p" = _"mindi" ]; then
    6767            ar="noarch"
    6868        else
  • branches/stable/tools/pkg2fc

    r1042 r1121  
    1818. $TOOLHOME/distro-env
    1919. $TOOLHOME/fc-env
     20
     21export LANGUAGE="C"
    2022
    2123# We need to get $VER and $TAG
  • branches/stable/tools/pkg2ftp

    r1042 r1121  
    5555    tag=`cat $MONDOTMP/$pv/TAG`
    5656    if [  _"$dtype" = _"rpm" ]; then
    57         if [ _"$p" = _"mondo-doc" ]; then
     57        if [ _"$p" = _"mondo-doc" ] || [ _"$p" = _"mindi" ]; then
    5858            ar="noarch"
    5959        else
  • branches/stable/tools/svn2build

    r1063 r1121  
    8787            fi
    8888            m4 $MONDOTMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec $MONDOTMP/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
     89            if [ _"`/bin/arch`" = _"x86_64" ] && [ $ddir = "rhel" ]; then
     90                # Bug on x86_64 on _sysconfdir on rhel4 at least
     91                perl -pi -e 's~^export CONFDIR=.*~export CONFDIR=/etc~' $dest/distributions/${ddir}-$dver/$p.spec
     92            fi
    8993
    9094            rm -f $MONDOTMP/$p.spec
Note: See TracChangeset for help on using the changeset viewer.