mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- apply patch from Br'fin

Browse Source 
[ 643874 ] MacOSX: diskimage.pl fix
This commit is contained in:
Bryce Denney 2002-11-26 04:12:15 +00:00
parent bcd57bdcaf
commit e334d500d2
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/Makefile.in
View File

@ -239,7 +239,7 @@ $(BX_OBJS): $(BX_INCLUDES)
bxversion.h:
$(RM) -f bxversion.h
echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h
echo '// $$Id: Makefile.in,v 1.121 2002-11-25 18:00:04 bdenney Exp $$' >> bxversion.h
echo '// $$Id: Makefile.in,v 1.122 2002-11-26 04:12:14 bdenney Exp $$' >> bxversion.h
echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h
echo '// This file is generated by "make bxversion.h"' >> bxversion.h
echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h
@ -629,8 +629,8 @@ install_macosx: all download_dlx
cat $(srcdir)/build/macosx/README.macosx-binary $(prefix)/README.orig > $(prefix)/README
rm -f $(prefix)/README.orig
for i in $(TEXT_FILE_LIST); do mv $(prefix)/$$i $(prefix)/$$i.txt; done
# make the disk image (doesn't work yet)
#perl $(srcdir)/build/macosx/diskimage.pl $(prefix)
# make the disk image
perl $(srcdir)/build/macosx/diskimage.pl $(prefix)
###########################################
# dependencies generated by

42
bochs/build/macosx/diskimage.pl
View File

@ -33,6 +33,8 @@ local $imageName = "'$fullfolderPath.dmg'";
local $imageSectors = undef;
local $imageTemp = "'$fullfolderPath-tmp.dmg'";
local $mount_point = "bochs-image-mount";
die "err: $folderName is not a directory\n" if(!-d $fullfolderPath);
# Know a better way to get the first value from du?
@ -53,8 +55,8 @@ if($imageSectors < $fiveMBImage)
die "err: hdiutil create failed with $?\n" if($?);
# Initialize the image
local $hdid_info=`hdid -nomount $imageTemp`;
die "err: hdid -nomount failed with $?\n" if($?);
local $hdid_info=`hdiutil attach -nomount $imageTemp`;
die "err: hdiutil attach -nomount failed with $?\n" if($?);
$hdid_info =~ s/( |\t|\n)+/~!/g;
local (@hdid_info) = split(m/~!/, $hdid_info);
@ -63,6 +65,7 @@ local ($disk_dev, $hfs_dev);
$disk_dev = $hdid_info[0];
$hfs_dev = $hdid_info[4];
$mount_dev = $hdid_info[4];
$disk_dev =~ s{/dev/}{};
$hfs_dev =~ s/disk/rdisk/;
@ -71,31 +74,38 @@ $hfs_dev =~ s/disk/rdisk/;
if($?)
{
local $err = $?;
`hdiutil eject $disk_dev`;
`hdiutil detach $disk_dev`;
die "err: newfs_hfs failed with $err\n";
}
`hdiutil eject $disk_dev`;
# Fill the image
$hdid_info = `hdid $imageTemp`;
die "err: hdid failed with $?\n" if($?);
$hdid_info =~ s/( |\t|\n)+/~!/g;
@hdid_info = split(m/~!/, $hdid_info);
$disk_dev = $hdid_info[0];
$disk_dev =~ s{/dev/}{};
`ditto -rsrcFork "$fullfolderPath" "/Volumes/$folderName"`;
`mkdir $mount_point`;
`/sbin/mount -t hfs $mount_dev $mount_point`;
if($?)
{
local $err = $?;
`hdiutil eject $disk_dev`;
`hdiutil detach $disk_dev`;
die "err: mount failed with $err\n";
}
`ditto -rsrcFork "$fullfolderPath" $mount_point`;
if($?)
{
local $err = $?;
`umount $mount_dev`;
`hdiutil detach $disk_dev`;
`rmdir $mount_point`;
die "err: ditto failed with $err\n";
}
`hdiutil eject $disk_dev`;
`umount $mount_dev`;
`hdiutil detach $disk_dev`;
`rmdir $mount_point`;
# Create the compressed image
`hdiutil convert $imageTemp -format UDCO -o $imageName`;
die "err: hdiutil convert failed with $?\n" if($?);
`rm $imageTemp`;
print "$imageName is your new diskimage\n";