diff options
| author | Anne Nicolas <ennael@mageia.org> | 2015-04-20 23:04:14 +0200 |
|---|---|---|
| committer | Anne Nicolas <ennael@mageia.org> | 2015-04-20 23:04:14 +0200 |
| commit | 82fa3fd4f01f7baf2534cc87d3b36d86b9138787 (patch) | |
| tree | 684b546697dabdb9407c8387da4f1a1f55d0b6ed | |
| parent | a842c0a330aa717e59a174bd43ace037debf2590 (diff) | |
| download | bcd-82fa3fd4f01f7baf2534cc87d3b36d86b9138787.tar bcd-82fa3fd4f01f7baf2534cc87d3b36d86b9138787.tar.gz bcd-82fa3fd4f01f7baf2534cc87d3b36d86b9138787.tar.bz2 bcd-82fa3fd4f01f7baf2534cc87d3b36d86b9138787.tar.xz bcd-82fa3fd4f01f7baf2534cc87d3b36d86b9138787.zip | |
Fix non-free drivers integration in dual
| -rwxr-xr-x | create_dual.sh | 26 | ||||
| -rw-r--r-- | dual64.xml | 9 |
2 files changed, 20 insertions, 15 deletions
diff --git a/create_dual.sh b/create_dual.sh index 1147e8f..3a8fde7 100755 --- a/create_dual.sh +++ b/create_dual.sh @@ -56,19 +56,23 @@ do done # use symbolic links on noarch -cd $BUILDPATH/x86_64/$MEDIAMAIN -for i in *noarch.rpm +for i in core nonfree do - if [ -f "../../../i586/$MEDIAMAIN/$i" ];then - echo $i - echo "erase package $i" - rm -vf $i - echo "link with the i586 one" - ln -sf ../../../i586/$MEDIAMAIN/$i . - else - echo "no ../../../i586/$MEDIAMAIN/$i package" - fi + cd $BUILDPATH/x86_64/media/$i + + for j in *noarch.rpm + do + if [ -f "../../../i586/$MEDIAMAIN/$j" ];then + echo $j + echo "erase package $j" + rm -vf $j + echo "link with the i586 one" + ln -sf ../../../i586/$MEDIAMAIN/$j . + else + echo "no ../../../i586/$MEDIAMAIN/$j package" + fi + done done # build idx file, add release notes @@ -86,13 +86,13 @@ <backport>no</backport> <testing>no</testing> </list> - <list name="Nonfree" desc="Nonfree Release"> + <list name="nonfree" desc="Nonfree Release"> <!-- MANDATORY list of wanted packages on the iso --> <input name="base"> <file>lists/basesystem_mini</file> </input> <input> - <file>lists/nnonfree_mini</file> + <file>lists/nonfree_mini</file> </input> <!-- to create an array you must keep this even if it is empty --> <!-- MANDATORY list of unwanted packages on the iso --> @@ -103,14 +103,14 @@ <file>lists/exclude_free</file> </exclude> <exclude name="exclude"> - <file>lists/exclude_tofix</file> + <file>lists/exclude_dual</file> </exclude> <!-- to create an array you must keep this even if it is empty --> <exclude> </exclude> <!-- nosuggests options should be yes or no --> <nosuggests>yes</nosuggests> - <!-- will be taken in {repo}{version}{arch}/media --> + <!-- will be taken in {repo}{version}{aRCh}/media --> <mediadir>nonfree</mediadir> <destmedia>nonfree</destmedia> <!-- @@ -123,6 +123,7 @@ <testing>no</testing> </list> + <!-- keep this entry to create an array ref --> <list></list> </media> |