ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-20 17:52:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

noux_tool_chain.inc: don't use '&' in XML values

Browse Source 
Was used in bash commands in the <inline> tag of the RAM FS.
Now we use an extra file and a <rom> tag instead.

Fixes #2605
This commit is contained in:
Martin Stein 2017-12-06 15:09:39 +01:00 committed by Christian Helmuth
parent dd463d3014
commit 88be272113
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
repos/ports/run/noux_tool_chain.inc
View File

@ -25,15 +25,6 @@ set build_components {
test/libports/ncurses
}
#
# Disable syntax check for config file
#
# The syntax check fails because the content of the '.bash_profile' is
# specified using an '<inline>' node but it is no valid XML. I.e., xmllint
# complains about the sequence '&&'.
#
proc check_xml_with_schema {xml_file} { }
source ${genode_dir}/repos/base/run/platform_drv.inc
append_platform_drv_build_components
@ -77,6 +68,20 @@ set noswapfile
set viminfo=}
close $vimrc_fd
# write default .bash_profile file
set bash_profile_fd [open bin/bash_profile w]
puts $bash_profile_fd "
cp /bin/make /usr/bin/
cp /bin/echo /usr/bin/
cp /bin/mkdir /usr/bin/
echo 'creating build directory...'
/genode/tool/create_builddir $platform BUILD_DIR=/home/build
cd /home/build
echo 'CROSS_DEV_PREFIX=$tool_prefix\' > etc/tools.conf
$platform_cmds
echo 'now you can type, for example, \"make core\"'"
close $bash_profile_fd
exec tar cvf bin/genode.tar -C $genode_dir tool repos/base repos/$platform_base_dir repos/os repos/demo
create_boot_directory
@ -147,21 +152,7 @@ append config {
<content>
<dir name="home">
<dir name="user">
<inline name=".bash_profile">
cp /bin/make /usr/bin/
cp /bin/echo /usr/bin/
cp /bin/mkdir /usr/bin/
echo "creating build directory..."
}
append config " /genode/tool/create_builddir $platform BUILD_DIR=/home/build"
append config {
cd /home/build
}
append config " echo \"CROSS_DEV_PREFIX=$tool_prefix\" > etc/tools.conf"
append config " $platform_cmds"
append config {
echo "now you can type, for example, \"make core\""
</inline>
<rom name="bash_profile" as=".bash_profile"/>
</dir>
</dir>
<dir name="tmp" />
@ -248,7 +239,7 @@ install_config $config
set boot_modules {
core init timer ld.lib.so noux terminal ram_fs
libc.lib.so libm.lib.so libc_noux.lib.so ncurses.lib.so stdcxx.lib.so
pcre.lib.so posix.lib.so vimrc
pcre.lib.so posix.lib.so vimrc bash_profile
}
append boot_modules { gmp.lib.so mpfr.lib.so mpc.lib.so }