Adaptation to stricter label prefixing

This patch is related to the following issue:

https://github.com/genodelabs/genode/issues/2171
This commit is contained in:
Norman Feske
2016-11-24 17:10:16 +01:00
parent f428df2dee
commit 21bf74bbc8
8 changed files with 27 additions and 27 deletions

View File

@@ -15,10 +15,10 @@ source ${genode_dir}/repos/base/run/platform_drv.inc
# override default platform driver policy
proc platform_drv_policy {} {
return {
<policy label="ps2_drv"> <device name="PS2"/> </policy>
<policy label="usb_drv"> <pci class="USB"/> </policy>
<policy label="fb_drv"> <pci class="VGA"/> </policy>
<policy label="audio_drv"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>}
<policy label_prefix="ps2_drv"> <device name="PS2"/> </policy>
<policy label_prefix="usb_drv"> <pci class="USB"/> </policy>
<policy label_prefix="fb_drv"> <pci class="VGA"/> </policy>
<policy label_prefix="audio_drv"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>}
}
append_platform_drv_build_components

View File

@@ -53,7 +53,7 @@ append config {
<provides> <service name="Report"/> <service name="ROM"/> </provides>
<config verbose="yes">
<rom>
<policy label="" report="audio_player -> current_track"/>
<policy label_prefix="" report="audio_player -> current_track"/>
</rom>
</config>
</start>

View File

@@ -139,7 +139,7 @@ append config {
<provides> <service name="File_system"/> </provides>
<config>
<archive name="data.tar" />
<policy label="chocolate-doom -> wads" root="/wads" />
<policy label_prefix="chocolate-doom -> wads" root="/wads" />
</config>
</start>
<start name="chocolate-doom">

View File

@@ -72,11 +72,11 @@ append config {
<config rtt_sec="3">
<policy label="uplink" src="10.1.1.2"/>
<policy label="tor" src="10.1.2.1" nat="yes" nat-tcp-ports="100">
<policy label_prefix="tor" src="10.1.2.1" nat="yes" nat-tcp-ports="100">
<ip dst="0.0.0.0/0" label="uplink" via="10.1.1.1"/>
</policy>
<policy label="web-client -> fetchurl" src="10.1.3.1" nat="yes" nat-tcp-ports="100">
<policy label_prefix="web-client -> fetchurl" src="10.1.3.1" nat="yes" nat-tcp-ports="100">
<ip dst="10.1.3.1/32">
<tcp dst="9050" label="tor" to="10.1.2.2"/>
</ip>
@@ -101,8 +101,8 @@ SOCKSPort 10.1.2.2:9050
DataDirectory /tor
</inline></dir>
</content>
<policy label="tor -> data" root="/data" writeable="yes"/>
<policy label="tor -> conf" root="/conf" writeable="no"/>
<policy label_prefix="tor -> data" root="/data" writeable="yes"/>
<policy label_prefix="tor -> conf" root="/conf" writeable="no"/>
</config>
</start>

View File

@@ -30,10 +30,10 @@ source ${genode_dir}/repos/base/run/platform_drv.inc
# override default platform driver policy
proc platform_drv_policy {} {
return {
<policy label="ps2_drv"> <device name="PS2"/> </policy>
<policy label="usb_drv"> <pci class="USB"/> </policy>
<policy label="fb_drv"> <pci class="VGA"/> </policy>
<policy label="audio_drv"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>}
<policy label_prefix="ps2_drv"> <device name="PS2"/> </policy>
<policy label_prefix="usb_drv"> <pci class="USB"/> </policy>
<policy label_prefix="fb_drv"> <pci class="VGA"/> </policy>
<policy label_prefix="audio_drv"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>}
}
append_platform_drv_build_components

View File

@@ -116,9 +116,9 @@ append config {
<domain name="right" layer="2" origin="top_right" xpos="-340"/>
<domain name="" layer="1"/>
<policy label="left" domain="left"/>
<policy label="right" domain="right"/>
<policy label="" domain=""/>
<policy label_prefix="left" domain="left"/>
<policy label_prefix="right" domain="right"/>
<default-policy domain=""/>
</config>
</start>
@@ -170,8 +170,8 @@ append config {
<background color="#808080"/>
<domain name="pointer" layer="1" xray="no" origin="pointer" />
<domain name="" layer="2"/>
<policy label="pointer" domain="pointer"/>
<policy label="" domain=""/>
<policy label_prefix="pointer" domain="pointer"/>
<default-policy domain=""/>
</config>
</start>
<start name="pointer">
@@ -229,8 +229,8 @@ append config {
<background color="#800000"/>
<domain name="pointer" layer="1" xray="no" origin="pointer" />
<domain name="" layer="2"/>
<policy label="pointer" domain="pointer"/>
<policy label="" domain=""/>
<policy label_prefix="pointer" domain="pointer"/>
<default-policy domain=""/>
</config>
</start>
<start name="pointer">

View File

@@ -87,8 +87,8 @@ append config {
DataDirectory /tor
</inline></dir>
</content>
<policy label="tor -> data" root="/data" writeable="yes"/>
<policy label="tor -> conf" root="/conf" writeable="no"/>
<policy label_prefix="tor -> data" root="/data" writeable="yes"/>
<policy label_prefix="tor -> conf" root="/conf" writeable="no"/>
</config>
</start>

View File

@@ -23,10 +23,10 @@ source ${genode_dir}/repos/base/run/platform_drv.inc
# override default platform driver policy
proc platform_drv_policy {} {
return {
<policy label="ps2_drv"> <device name="PS2"/> </policy>
<policy label="usb_drv"> <pci class="USB"/> </policy>
<policy label="fb_drv"> <pci class="VGA"/> </policy>
<policy label="audio_drv"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>}
<policy label_prefix="ps2_drv"> <device name="PS2"/> </policy>
<policy label_prefix="usb_drv"> <pci class="USB"/> </policy>
<policy label_prefix="fb_drv"> <pci class="VGA"/> </policy>
<policy label_prefix="audio_drv"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>}
}
append_platform_drv_build_components