git://git.onelab.eu
/
bootcd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
02949c5
)
move the merge_hw_tables.py script to the bootmanager, and call it from there
author
Aaron Klingaman
<alk@cs.princeton.edu>
Fri, 27 May 2005 14:51:22 +0000
(14:51 +0000)
committer
Aaron Klingaman
<alk@cs.princeton.edu>
Fri, 27 May 2005 14:51:22 +0000
(14:51 +0000)
build.sh
patch
|
blob
|
history
diff --git
a/build.sh
b/build.sh
index
409dda8
..
ef1ffbd
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-8,7
+8,7
@@
CONFIGURATIONS_DIR=configurations/
# where built files are stored
BUILD_DIR=build/
# where built files are stored
BUILD_DIR=build/
-BOOTCD_VERSION="3.0-beta0.
4
"
+BOOTCD_VERSION="3.0-beta0.
5
"
FULL_VERSION_STRING="PlanetLab BootCD"
OUTPUT_IMAGE_NAME='PlanetLab-BootCD'
FULL_VERSION_STRING="PlanetLab BootCD"
OUTPUT_IMAGE_NAME='PlanetLab-BootCD'
@@
-27,6
+27,17
@@
RAMDISK_SIZE=64
INITRD_BYTES_PER_INODE=1024
INITRD_BYTES_PER_INODE=1024
+# make sure the boot manager source is checked out in the same directory
+# as the bootcd_v3 repository
+BOOTMANAGER_DIR=../bootmanager/
+
+if [ ! -d $BOOTMANAGER_DIR ]; then
+ echo "the bootmanager repository needs to be checked out at the same"
+ echo "level as this directory, for the merge_hw_tables.py script"
+ exit
+fi
+
+
function usage()
{
echo "Usage: build.sh <action> [<configuration>]"
function usage()
{
echo "Usage: build.sh <action> [<configuration>]"
@@
-209,8
+220,8
@@
function build_initrd()
pci_map_file=`find $CD_ROOT/lib/modules/ -name modules.pcimap | head -1`
module_dep_file=`find $CD_ROOT/lib/modules/ -name modules.dep | head -1`
pci_table=$CD_ROOT/usr/share/hwdata/pcitable
pci_map_file=`find $CD_ROOT/lib/modules/ -name modules.pcimap | head -1`
module_dep_file=`find $CD_ROOT/lib/modules/ -name modules.dep | head -1`
pci_table=$CD_ROOT/usr/share/hwdata/pcitable
-
./scripts/rewrite-pcitable.py $module_dep_file $pci_map_file $pci_table
\
- $CD_ROOT/etc/pl_pcitable
+
$BOOTMANAGER_DIR/source/merge_hw_tables.py
\
+ $
module_dep_file $pci_map_file $pci_table $
CD_ROOT/etc/pl_pcitable
dd if=/dev/zero of=$INITRD bs=1M count=$RAMDISK_SIZE
mkfs.ext2 -F -m 0 -i $INITRD_BYTES_PER_INODE $INITRD
dd if=/dev/zero of=$INITRD bs=1M count=$RAMDISK_SIZE
mkfs.ext2 -F -m 0 -i $INITRD_BYTES_PER_INODE $INITRD