rc configuration

1 files changed, 60 insertions, 13 deletions

diff --git a/create_dual.sh b/create_dual.sh
index 69848c4..fa4b7d5 100755
--- a/create_dual.sh
+++ b/create_dual.sh
@@ -1,23 +1,70 @@
 #!/bin/sh
 
-DISTRIB=mageia-dual
+DISTRIB=Mageia
 TAG=manon
-VERSION=2-beta1
+VERSION=2-rc
+SUPPORT=dual-CD
 VV=1
 MEDIAMAIN=media/core
 PIECES="$HOME/build_bcd/pieces"
-BUILDPATH="$HOME/build_bcd/build/$DISTRIB-$VERSION"
-BUILDISOPATH="$HOME/build_bcd/iso/$DISTRIB-$VERSION"
+OLDBUILDPATH="$HOME/build_bcd/build/mageia-dual-$VERSION"
+BUILDPATH="$HOME/build_bcd/build/$DISTRIB-$VERSION-$SUPPORT"
+BUILDISOPATH="$HOME/build_bcd/iso/$DISTRIB-$VERSION-$SUPPORT"
 
 # genisoimage options
-AGENISO="$DISTRIB - 2 beta1"
+AGENISO="$DISTRIB - 2 rc"
 PUBLISHER="Mageia.Org"
 SYSID="$PUBLISHER"
 TOOL="$SYSID BCD"
 VOLSET="$SYSID $DISTRIB - $VERSION"
 VOLUME="$DISTRIB-$VERSION"
 
+echo $BUILDPATH/x86_64/$MEDIAMAIN
 
+# build both arch
+./bcd.pl dual.xml all copy noiso 
+./bcd.pl dual64.xml all copy noiso 
+
+# clean
+rm -rf $BUILDPATH
+rm -rvf $BUILDISOPATH
+mkdir -p $BUILDPATH
+mkdir -p $BUILDISOPATH
+
+# remove stuff to make size fit
+for i in i586 x86_64
+do
+	cp -af $OLDBUILDPATH-$i/$i $BUILDPATH
+	rm -vf $BUILDPATH/$i/install/images/boot.iso $BUILDPATH/$i/install/images/*nonfree* 
+	rm -rvf $BUILDPATH/$i/install/images/alternatives
+	rm -rvf $BUILDPATH/$i/isolinux
+done
+sync
+cp -r $PIECES/iso/dual/isolinux $BUILDPATH
+
+# use symbolic links on noarch
+cd $BUILDPATH/x86_64/$MEDIAMAIN
+
+for i in *noarch.rpm
+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
+done
+
+# build idx file
+for i in i586 x86_64
+do
+	cat $BUILDOLDPATH-$i/$i/pkg-$VERSION-$TAG.idx >> $BUILDPATH/$DISTRIB-$VERSION-$SUPPORT.idx
+done
+
+# build iso
 genisoimage -f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4  \
 	-A "$AGENISO" \
 	-publisher "$PUBLISHER" \
@@ -25,16 +72,16 @@ genisoimage -f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-loa
 	-p "$TOOL" \
 	-volset "$VOLSET" \
 	-V "$VOLUME" \
-	-o "$BUILDISOPATH/$DISTRIB-$VERSION.iso" \
+	-o "$BUILDISOPATH/$DISTRIB-$VERSION-$SUPPORT.iso" \
 	-b isolinux/isolinux.bin \
 	-boot-info-table \
 	-quiet \
 	$BUILDPATH/
 
-du -sh $BUILDPATH/$DISTRIB-$VERSION.iso
-echo "$BUILDPATH/$DISTRIB-$VERSION.idx"
-cd $BUILDPATH/
-isohybrid -fatfirst $BUILDPATH/$DISTRIB-$VERSION.iso
-cp $BUILDPATH/$DISTRIB-$VERSION.idx .
-md5sum $DISTRIB-$VERSION-dual.iso > $DISTRIB-$VERSION.iso.md5
-sha1sum $DISTRIB-$VERSION.iso > $DISTRIB-$VERSION.iso.sha1
+du -sh $BUILDISOPATH/$DISTRIB-$VERSION-$SUPPORT.iso
+echo "$BUILDISOPATH/$DISTRIB-$VERSION-$SUPPORT.idx"
+cd $BUILDISOPATH/
+isohybrid -o 1 $BUILDISOPATH/$DISTRIB-$VERSION-$SUPPORT.iso
+cp $BUILDISOPATH/$DISTRIB-$VERSION-$SUPPORT.idx .
+md5sum $DISTRIB-$VERSION-$SUPPORT.iso > $DISTRIB-$VERSION-$SUPPORT.iso.md5
+sha1sum $DISTRIB-$VERSION-$SUPPORT.iso > $DISTRIB-$VERSION-$SUPPORT.iso.sha1