[haiku-commits] haiku: hrev46457 - build/jam

  • From: mattmadia@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 30 Nov 2013 14:32:50 +0100 (CET)

hrev46457 adds 1 changeset to branch 'master'
old head: 3024704a943a952e0306a6da2bc43806ae89e81c
new head: 0d9151c9ff7935d618ba4718f15136a0e185936b
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=0d9151c+%5E3024704

----------------------------------------------------------------------------

0d9151c: Add genisoimage support to actions BuildCDBootImage1.

                                        [ Matt Madia <mattmadia@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev46457
Commit:      0d9151c9ff7935d618ba4718f15136a0e185936b
URL:         http://cgit.haiku-os.org/haiku/commit/?id=0d9151c
Author:      Matt Madia <mattmadia@xxxxxxxxx>
Date:        Sat Nov 30 13:27:48 2013 UTC

----------------------------------------------------------------------------

1 file changed, 2 insertions(+), 1 deletion(-)
build/jam/ImageRules | 3 ++-

----------------------------------------------------------------------------

diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index a1b5b04..a78f1f3 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -1591,7 +1591,8 @@ rule BuildCDBootImage image : bootfloppy : extrafiles
 actions BuildCDBootImage1
 {
        $(RM) $(<)
-       mkisofs -b $(BOOTIMG) -r -J -V bootimg -o $(<) $(>[1]) $(>[2-])
+       mkisofs -b $(BOOTIMG) -r -J -V bootimg -o $(<) $(>[1]) $(>[2-]) \
+               || genisoimage  -b $(BOOTIMG) -r -J -V bootimg -o $(<) $(>[1]) 
$(>[2-])
 }
 
 


Other related posts:

  • » [haiku-commits] haiku: hrev46457 - build/jam - mattmadia