From b5679c5f88c2fe0a2db749ca6ad65291a31087e3 Mon Sep 17 00:00:00 2001
From: Anne Nicolas <ennael@mageia.org>
Date: Tue, 6 Mar 2012 21:41:08 +0000
Subject: Mageia 2 Beta 1 release

---
 create_dual.sh | 91 ++++------------------------------------------------------
 1 file changed, 6 insertions(+), 85 deletions(-)

(limited to 'create_dual.sh')

diff --git a/create_dual.sh b/create_dual.sh
index cd7167e..69848c4 100755
--- a/create_dual.sh
+++ b/create_dual.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 DISTRIB=mageia-dual
-TAG=autumn
-VERSION=2-alpha1
+TAG=manon
+VERSION=2-beta1
 VV=1
 MEDIAMAIN=media/core
 PIECES="$HOME/build_bcd/pieces"
@@ -10,7 +10,7 @@ BUILDPATH="$HOME/build_bcd/build/$DISTRIB-$VERSION"
 BUILDISOPATH="$HOME/build_bcd/iso/$DISTRIB-$VERSION"
 
 # genisoimage options
-AGENISO="$DISTRIB - 2 alpha1"
+AGENISO="$DISTRIB - 2 beta1"
 PUBLISHER="Mageia.Org"
 SYSID="$PUBLISHER"
 TOOL="$SYSID BCD"
@@ -18,94 +18,15 @@ VOLSET="$SYSID $DISTRIB - $VERSION"
 VOLUME="$DISTRIB-$VERSION"
 
 
-./bcd.pl dual.xml all copy noiso nodoble
-./bcd.pl dual64.xml all copy noiso nodoble
-
-rm -vf $BUILDPATH-i586/i586/install/images/boot.iso
-rm -rvf $BUILDPATH-i586/i586/install/images/alternatives
-rm -vf $BUILDPATH-x86_64/x86_64/install/images/boot.iso
-rm -vrf $BUILDPATH-x86_64/x86_64/install/images/alternatives
-
-sync
-
-du -sh $BUILDPATH-i586/i586
-du -sh $BUILDPATH-x86_64/x86_64
-
-rm -rf $BUILDPATH
-rm -rvf $BUILDISOPATH
-mkdir -p $BUILDPATH
-mkdir -p $BUILDISOPATH
-
-cp -af $BUILDPATH-i586/i586 $BUILDPATH
-cp -af $BUILDPATH-x86_64/x86_64 $BUILDPATH
-
-cp -af $PIECES/$VV/i586/dosutils $BUILDPATH
-cp -af $PIECES/$VV/i586/autorun.inf $BUILDPATH
-
-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
-
-cat >> $BUILDPATH/i586/isolinux/isolinux.cfg <<EOF
-label harddisk64
-  localboot 0x80
-label linux64
-  kernel /x86_64/isolinux/alt0/vmlinuz
-  append initrd=/x86_64/isolinux/alt0/all.rdz automatic=method:cdrom vga=788 splash=silent
-label vgalo64
-  kernel /x86_64/isolinux/alt0/vmlinuz
-  append initrd=/x86_64/isolinux/alt0/all.rdz automatic=method:cdrom vga=785
-label vgahi64
-  kernel /x86_64/isolinux/alt0/vmlinuz
-  append initrd=/x86_64/isolinux/alt0/all.rdz automatic=method:cdrom vga=791
-label text64
-  kernel /x86_64/isolinux/alt0/vmlinuz
-  append initrd=/x86_64/isolinux/alt0/all.rdz automatic=method:cdrom text
-label rescue64
-  kernel /x86_64/isolinux/alt0/vmlinuz
-  append initrd=/x86_64/isolinux/alt0/all.rdz automatic=method:cdrom rescue
-label noacpi64
-  kernel /x86_64/isolinux/alt0/vmlinuz
-  append initrd=/x86_64/isolinux/alt0/all.rdz automatic=method:cdrom vga=788 splash=silent acpi=off
-label hdt64
-  kernel /x86_64/isolinux/hdt.c32
-  append modules=modules.pci
-label alt064
-  kernel /x86_64/isolinux/alt0/vmlinuz
-  append initrd=/x86_64/isolinux/alt0/all.rdz vga=788 splash=silent
-label alt164
-  kernel /x86_64/isolinux/alt1/vmlinuz
-  append initrd=/x86_64/isolinux/alt1/all.rdz vga=788 splash=silent
-label memtest64
-  kernel memtest
-EOF
-
-#cp -avf $HOME/bcd/compssUsers.pl $HOME/build_bcd/build/mandriva-linux-free-dual-$TAG-$VERSION/i586/media/media_info/compssUsers.pl
-#cp -avf $HOME/bcd/compssUsers.pl $HOME/build_bcd/build/mandriva-linux-free-dual-$TAG-$VERSION/x86_64/media/media_info/compssUsers.pl
-cat $BUILDPATH-i586/i586/pkg-$VERSION-$TAG.idx >> $BUILDPATH/$DISTRIB-$VERSION.idx
-cat $BUILDPATH-x86_64/x86_64/pkg-$VERSION-$TAG.idx >> $BUILDPATH/$DISTRIB-$VERSION.idx
-
 genisoimage -f -r -J -hide-rr-moved -nobak -cache-inodes -no-emul-boot -boot-load-size 4  \
-	-A "$AGENISO"
+	-A "$AGENISO" \
 	-publisher "$PUBLISHER" \
 	-sysid "$SYSID" \
 	-p "$TOOL" \
 	-volset "$VOLSET" \
 	-V "$VOLUME" \
-	-o "$BUILDISOPATH/$DISTRIB.iso" \
-	-b i586/isolinux/isolinux.bin \
+	-o "$BUILDISOPATH/$DISTRIB-$VERSION.iso" \
+	-b isolinux/isolinux.bin \
 	-boot-info-table \
 	-quiet \
 	$BUILDPATH/
-- 
cgit v1.2.1