From 82fa3fd4f01f7baf2534cc87d3b36d86b9138787 Mon Sep 17 00:00:00 2001
From: Anne Nicolas <ennael@mageia.org>
Date: Mon, 20 Apr 2015 23:04:14 +0200
Subject: Fix non-free drivers integration in dual

---
 create_dual.sh | 26 +++++++++++++++-----------
 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 
diff --git a/dual64.xml b/dual64.xml
index d02e622..4290ea4 100644
--- a/dual64.xml
+++ b/dual64.xml
@@ -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>
-- 
cgit v1.2.1