davidlt/fedora-comps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up whiteout/blacklist schema - add forgotten <whiteout><blacklist> elements, ignore ordering

Browse Source
This commit is contained in:
Will Woods 2008-07-22 18:49:45 +00:00
parent 59156ba236
commit c69b88aa52
1 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
comps.rng
View File

@ -22,8 +22,10 @@
<ref name="category"/> <ref name="category"/>
</zeroOrMore> </zeroOrMore>
<optional> <optional>
<ref name="whiteout"/> <interleave><!-- We don't care what order these are in -->
<ref name="blacklist"/> <ref name="whiteout"/>
<ref name="blacklist"/>
</interleave>
</optional> </optional>
</element> </element>
</define> </define>
@ -180,24 +182,26 @@
'hal.i386' causes anaconda to remove the (now-unneeded) hal.i386, 'hal.i386' causes anaconda to remove the (now-unneeded) hal.i386,
which gives us the desired outcome. which gives us the desired outcome.
</a:documentation> </a:documentation>
<zeroOrMore> <element name="blacklist">
<element name="package"> <zeroOrMore>
<attribute name="name"> <element name="package">
<ref name="string"/> <attribute name="name">
</attribute>
<optional>
<attribute name="arch">
<ref name="string"/> <ref name="string"/>
<a:documentation>
Arch to blacklist this package from. If unspecified, it will be
blocked on all arches.
<!-- Technically this should be an enum of known arches:
i386 x86_64 ppc ppc64 ia64 sparc alpha ... -->
</a:documentation>
</attribute> </attribute>
</optional> <optional>
</element> <attribute name="arch">
</zeroOrMore> <ref name="string"/>
<a:documentation>
Arch to blacklist this package from. If unspecified, it will be
blocked on all arches.
<!-- Technically this should be an enum of known arches:
i386 x86_64 ppc ppc64 ia64 sparc alpha ... -->
</a:documentation>
</attribute>
</optional>
</element>
</zeroOrMore>
</element>
</define> </define>
<define name="whiteout"> <define name="whiteout">
<a:documentation> <a:documentation>
@ -213,16 +217,18 @@
form 'package>requires', and the RPM macro '_dependency_whiteout' should be form 'package>requires', and the RPM macro '_dependency_whiteout' should be
filled with a (newline-separated) list of these items. filled with a (newline-separated) list of these items.
</a:documentation> </a:documentation>
<zeroOrMore> <element name="whiteout">
<element name="ignoredep"> <zeroOrMore>
<attribute name="package"> <element name="ignoredep">
<ref name="string"/> <attribute name="package">
</attribute> <ref name="string"/>
<attribute name="requires"> </attribute>
<ref name="string"/> <attribute name="requires">
</attribute> <ref name="string"/>
</element> </attribute>
</zeroOrMore> </element>
</zeroOrMore>
</element>
</define> </define>
<define name="boolean"> <define name="boolean">
<choice> <choice>