run: rename 'check_installed' to 'installed_command'
Also remove 'requires_installation_of', while also checking sbin directories in 'have_installed'. The run scripts have been adjusted accordingly. Fixes #2853
This commit is contained in:
committed by
Norman Feske
parent
365d0bccd5
commit
10485b0d39
@@ -19,7 +19,7 @@ create_boot_directory
|
||||
|
||||
catch { exec dd if=/dev/zero of=bin/ext2.img bs=1024 count=8192 }
|
||||
|
||||
set mkfs_cmd [check_installed mkfs.ext2]
|
||||
set mkfs_cmd [installed_command mkfs.ext2]
|
||||
|
||||
catch { exec $mkfs_cmd -F bin/ext2.img }
|
||||
|
||||
@@ -131,6 +131,7 @@ set boot_modules {
|
||||
rump.lib.so
|
||||
timer
|
||||
vfs
|
||||
vfs.lib.so
|
||||
vfs_rump.lib.so
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
set mkfs_cmd [check_installed mke2fs]
|
||||
set mkfs_cmd [installed_command mke2fs]
|
||||
set mkfs_opts "-F"
|
||||
|
||||
set test_build_components "lib/vfs/rump"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
set mkfs_cmd [check_installed mke2fs]
|
||||
set mkfs_cmd [installed_command mke2fs]
|
||||
set mkfs_opts "-F"
|
||||
|
||||
set test_build_components "lib/vfs/rump"
|
||||
|
||||
@@ -5,8 +5,8 @@ if {[have_spec arm]} {
|
||||
#
|
||||
# Check used commands
|
||||
#
|
||||
set mke2fs [check_installed mke2fs]
|
||||
set dd [check_installed dd]
|
||||
set mke2fs [installed_command mke2fs]
|
||||
set dd [installed_command dd]
|
||||
|
||||
#
|
||||
# Build
|
||||
|
||||
@@ -5,8 +5,8 @@ if {[have_spec arm]} {
|
||||
#
|
||||
# Check used commands
|
||||
#
|
||||
set mkfs [check_installed mkfs.vfat]
|
||||
set dd [check_installed dd]
|
||||
set mkfs [installed_command mkfs.vfat]
|
||||
set dd [installed_command dd]
|
||||
|
||||
#
|
||||
# Build
|
||||
@@ -58,7 +58,7 @@ append config {
|
||||
<config file="fs.raw" block_size="512"/>
|
||||
</start>
|
||||
<start name="rump_fs" caps="200">
|
||||
<resource name="RAM" quantum="8M" />
|
||||
<resource name="RAM" quantum="10M" />
|
||||
<provides><service name="File_system"/></provides>
|
||||
<config fs="msdos"><default-policy root="/" writeable="yes"/></config>
|
||||
</start>
|
||||
|
||||
@@ -5,7 +5,7 @@ if {[have_spec arm]} {
|
||||
#
|
||||
# Check used commands
|
||||
#
|
||||
set mkisofs [check_installed mkisofs]
|
||||
set mkisofs [installed_command mkisofs]
|
||||
|
||||
#
|
||||
# Build
|
||||
@@ -51,7 +51,7 @@ append config {
|
||||
<config file="fs.iso" block_size="2048"/>
|
||||
</start>
|
||||
<start name="rump_fs" caps="200">
|
||||
<resource name="RAM" quantum="8M" />
|
||||
<resource name="RAM" quantum="10M" />
|
||||
<provides><service name="File_system"/></provides>
|
||||
<config fs="cd9660"><policy label_prefix="fs_rom" root="/" writeable="no"/></config>
|
||||
</start>
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
#
|
||||
# Check used commands
|
||||
#
|
||||
set mke2fs [check_installed mke2fs]
|
||||
set dd [check_installed dd]
|
||||
set mke2fs [installed_command mke2fs]
|
||||
set dd [installed_command dd]
|
||||
|
||||
build "core init drivers/timer test/vfs_stress server/ram_blk lib/vfs/rump"
|
||||
|
||||
@@ -55,7 +55,8 @@ install_config {
|
||||
|
||||
set boot_modules {
|
||||
core init ld.lib.so timer vfs_stress
|
||||
rump.lib.so rump_fs.lib.so vfs_rump.lib.so
|
||||
rump.lib.so rump_fs.lib.so
|
||||
vfs.lib.so vfs_rump.lib.so
|
||||
ram_blk ext2.raw
|
||||
}
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
#
|
||||
# Check used commands
|
||||
#
|
||||
set mke2fs [check_installed mke2fs]
|
||||
set dd [check_installed dd]
|
||||
set mke2fs [installed_command mke2fs]
|
||||
set dd [installed_command dd]
|
||||
|
||||
build "core init drivers/timer test/vfs_stress server/ram_blk server/rump_fs"
|
||||
|
||||
@@ -63,7 +63,7 @@ install_config {
|
||||
set boot_modules {
|
||||
core init ld.lib.so timer vfs_stress
|
||||
rump.lib.so rump_fs.lib.so rump_fs
|
||||
ram_blk ext2.raw
|
||||
ram_blk ext2.raw vfs.lib.so
|
||||
}
|
||||
|
||||
build_boot_image $boot_modules
|
||||
|
||||
Reference in New Issue
Block a user