← Back to branch summary

~ubuntu-branches/ubuntu/raring/firebird2.5/raring-proposed

« back to all changes in this revision

Viewing changes to builds/install/arch-specific/linux/misc/makeInstallImage.sh.in

  • Committer: Bazaar Package Importer
  • Author(s): Damyan Ivanov
  • Date: 2011-09-24 14:12:19 UTC
  • mfrom: (15.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20110924141219-pkxk7486f3d8ut9f
Tags: 2.5.1.26349-0~rc1.ds4-5
http://bugs.debian.org/642555
* Medium urgency for fixing a serious bug in testing

* Import a patch from upstream SVN fixing problems in poll() usage when
  process receives signals like SIGALRM.
  Closes: #642555 -- segfault in the remote interface when using alarm() in
  the client program

Show diffs side-by-side

added added

removed removed

Lines of Context:
builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
51
51
        libTdir=$3
52
52
        libTarget=$libTdir/$libScript
53
53
 
54
 
        rm -f $libTarget
55
 
        touch $libTarget
56
 
        for i in posixLibrary.sh @FIREBIRD_ARCH_TYPE@Library.sh linuxLibrary.sh
57
 
        do
58
 
                echo "# $i" >>$libTarget
59
 
                cat $libSdir/$i >>$libTarget
60
 
                echo "" >>$libTarget    # avoid missing linefeed
61
 
        done
62
 
        cat $libSdir/$libScript >>$libTarget
 
54
        if [ -f $libSdir/$libScript ]
 
55
        then
 
56
                rm -f $libTarget
 
57
                touch $libTarget
 
58
                for i in posixLibrary.sh @FIREBIRD_ARCH_TYPE@Library.sh linuxLibrary.sh
 
59
                do
 
60
                        echo "# $i" >>$libTarget
 
61
                        cat $libSdir/$i >>$libTarget
 
62
                        echo "" >>$libTarget    # avoid missing linefeed
 
63
                done
 
64
                cat $libSdir/$libScript >>$libTarget
 
65
        fi
63
66
}
64
67
 
65
68