From e7b2c17aad3953d1c314c1e82cb5c6cad97885cd Mon Sep 17 00:00:00 2001 From: klu2 Date: Tue, 15 Sep 2009 02:18:21 +0000 Subject: [PATCH] Apply patch from Patrick Georgi. Correct build tool path to stable version. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9263 6f19259b-4bc3-4df7-8a09-765794883524 --- DuetPkg/CreateBootDisk.sh | 15 +++++++++++++-- DuetPkg/PostBuild.sh | 16 ++++++++-------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/DuetPkg/CreateBootDisk.sh b/DuetPkg/CreateBootDisk.sh index fb54a31b0d..faa9032cc3 100644 --- a/DuetPkg/CreateBootDisk.sh +++ b/DuetPkg/CreateBootDisk.sh @@ -2,7 +2,7 @@ # Set up environment at fisrt. export BUILD_DIR=$WORKSPACE/Build/DuetPkg/DEBUG_UNIXGCC -export BASETOOLS_DIR=$WORKSPACE/Conf/BaseToolsSource/Source/C/bin +export BASETOOLS_DIR=$EDK_TOOLS_PATH/Source/C/bin export BOOTSECTOR_BIN_DIR=$WORKSPACE/DuetPkg/BootSector/bin export DISK_LABEL=DUET export PROCESS_MARK=TRUE @@ -57,12 +57,23 @@ then if [ "$4" = FAT12 ] then echo "Start to create file boot disk ..." + dd if=/dev/zero of=$EFI_BOOT_MEDIA bs=512 count=2880 2> /dev/null + mformat -i $EFI_BOOT_MEDIA -f 1440 :: echo Create boot sector ... ## Linux version of GenBootSector has not pass build yet. $BASETOOLS_DIR/GnuGenBootSector -i $EFI_BOOT_MEDIA -o FDBs.com $BASETOOLS_DIR/BootSectImage -g FDBs.com $BOOTSECTOR_BIN_DIR/bootsect.com -f - $BASETOOLS_DIR/GnuGenBootSector -o $EFI_BOOT_MEDIA -i $BOOTSECTOR_BIN_DIR/bootsect.com + $BASETOOLS_DIR/GnuGenBootSector -o tmp.$EFI_BOOT_MEDIA -i $BOOTSECTOR_BIN_DIR/bootsect.com + dd if=tmp.$EFI_BOOT_MEDIA of=$EFI_BOOT_MEDIA conv=notrunc 2> /dev/null + rm -f tmp.$EFI_BOOT_MEDIA + + mcopy -i $EFI_BOOT_MEDIA $BUILD_DIR/FV/Efildr ::/Efildr + + mmd -i $EFI_BOOT_MEDIA ::/efi + mmd -i $EFI_BOOT_MEDIA ::/efi/boot + + mcopy -i $EFI_BOOT_MEDIA $WORKSPACE/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi ::/efi/boot/bootia32.efi echo Done. else echo "Wrong FAT type" $4 "for floppy!" diff --git a/DuetPkg/PostBuild.sh b/DuetPkg/PostBuild.sh index 69a4747ecb..5218b3bb23 100644 --- a/DuetPkg/PostBuild.sh +++ b/DuetPkg/PostBuild.sh @@ -7,7 +7,7 @@ # export BUILD_DIR=$WORKSPACE/Build/DuetPkg/DEBUG_UNIXGCC -export BASETOOLS_DIR=$WORKSPACE/Conf/BaseToolsSource/Source/C/bin +export BASETOOLS_DIR=$EDK_TOOLS_PATH/Source/C/bin export BOOTSECTOR_BIN_DIR=$WORKSPACE/DuetPkg/BootSector/bin export PROCESSOR="" if [ \ @@ -51,15 +51,15 @@ echo Generate Loader Image ... if [ $PROCESSOR = IA32 ] then $BASETOOLS_DIR/EfiLdrImage -o $BUILD_DIR/FV/Efildr32 $BUILD_DIR/$PROCESSOR/EfiLoader.efi $BUILD_DIR/FV/DxeIpl.z $BUILD_DIR/FV/DxeMain.z $BUILD_DIR/FV/DUETEFIMAINFV.z - cat $BOOTSECTOR_BIN_DIR/start.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 > $BUILD_DIR/FV/Efildr + cat $BOOTSECTOR_BIN_DIR/Start.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 > $BUILD_DIR/FV/Efildr # # It is safe to use "bcat" to cat following binary file, if bcat command is avaiable for your system # - #bcat -o $BUILD_DIR/FV/Efildr.bcat $BOOTSECTOR_BIN_DIR/start.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 - cat $BOOTSECTOR_BIN_DIR/start16.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 > $BUILD_DIR/FV/Efildr16 - #bcat -o $BUILD_DIR/FV/Efildr16.bcat $BOOTSECTOR_BIN_DIR/start16.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 - cat $BOOTSECTOR_BIN_DIR/start32.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 > $BUILD_DIR/FV/Efildr20 - #bcat -o $BUILD_DIR/FV/Efildr20.bcat $BOOTSECTOR_BIN_DIR/start32.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 + #bcat -o $BUILD_DIR/FV/Efildr.bcat $BOOTSECTOR_BIN_DIR/Start.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 + cat $BOOTSECTOR_BIN_DIR/Start16.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 > $BUILD_DIR/FV/Efildr16 + #bcat -o $BUILD_DIR/FV/Efildr16.bcat $BOOTSECTOR_BIN_DIR/Start16.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 + cat $BOOTSECTOR_BIN_DIR/Start32.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 > $BUILD_DIR/FV/Efildr20 + #bcat -o $BUILD_DIR/FV/Efildr20.bcat $BOOTSECTOR_BIN_DIR/Start32.com $BOOTSECTOR_BIN_DIR/efi32.com2 $BUILD_DIR/FV/Efildr32 echo Done! fi @@ -67,7 +67,7 @@ if [ $PROCESSOR = X64 ] then $BASETOOLS_DIR/EfiLdrImage -o $BUILD_DIR/FV/Efildr64 $BUILD_DIR/$PROCESSOR/EfiLoader.efi $BUILD_DIR/FV/DxeIpl.z $BUILD_DIR/FV/DxeMain.z $BUILD_DIR/FV/DUETEFIMAINFV.z cat $BOOTSECTOR_BIN_DIR/Start64.com $BOOTSECTOR_BIN_DIR/efi64.com2 $BUILD_DIR/FV/Efildr64 > $BUILD_DIR/FV/EfildrPure - #bcat -o $BUILD_DIR/FV/EfildrPure $BOOTSECTOR_BIN_DIR/start64.com $BOOTSECTOR_BIN_DIR/efi64.com2 $BUILD_DIR/FV/Efildr64 + #bcat -o $BUILD_DIR/FV/EfildrPure $BOOTSECTOR_BIN_DIR/Start64.com $BOOTSECTOR_BIN_DIR/efi64.com2 $BUILD_DIR/FV/Efildr64 $BASETOOLS_DIR/GenPage $BUILD_DIR/FV/EfildrPure -o $BUILD_DIR/FV/Efildr cat $BOOTSECTOR_BIN_DIR/St16_64.com $BOOTSECTOR_BIN_DIR/efi64.com2 $BUILD_DIR/FV/Efildr64 > $BUILD_DIR/FV/Efildr16Pure #bcat -o $BUILD_DIR/FV/Efildr16Pure $BOOTSECTOR_BIN_DIR/st16_64.com $BOOTSECTOR_BIN_DIR/efi64.com2 $BUILD_DIR/FV/Efildr64