Changeset 753 in MondoRescue for branches/stable

Timestamp:

Aug 6, 2006, 1:43:13 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Qemu doc updated for SLES 10
• creation of tar file with -p to preserve directory modes
• mindi's version now handled correctly in svn2build

Location:

branches/stable/tools

Files:

• build2pkg (modified) (5 diffs)
• qemu-vm.txt (modified) (5 diffs)
• svn2build (modified) (1 diff)

branches/stable/tools/build2pkg

@@ -55 +55 @@
     src=${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz
     pv=`basename $src .tar.gz`
+    PVER=`echo $pv | sed "s|^$p-||" | cut -d- -f1`
 
     if [  _"$dtype" = _"rpm" ]; then
@@ -77 +78 @@
         echo "Generating $p RPMS"
         cd SPECS
-        tar xfz $src $p-${VER}/distributions/${ddir}-$dver/$p.spec
-        mv $p-${VER}/distributions/${ddir}-$dver/$p.spec .
-        rm -rf $p-${VER}
+        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p.spec
+        mv $p-${PVER}/distributions/${ddir}-$dver/$p.spec .
+        rm -rf $p-${PVER}
 
         rpmbuild -ba $p.spec 2> $log 1> $log
@@ -97 +98 @@
     elif [  _"$dtype" = _"ebuild" ]; then
         log=$TMP/$p-gentoo.log
-        tar xfz $src $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild
+        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${VER}.ebuild
         if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
             echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
@@ -104 +105 @@
 
         mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
-        mv $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$p-${VER}.ebuild
-        rm -rf $p-${VER}
+        mv $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$p-${PVER}.ebuild
+        rm -rf $p-${PVER}
 
         cd ${TOPBUILDDIR}/portage/sys-apps/$p
-        ebuild $p-${VER}.ebuild digest 2> $log 1> $log
+        ebuild $p-${PVER}.ebuild digest 2> $log 1> $log
         if [ $? != 0 ]; then 
             cat $log
             status=-1
         fi
-        ebuild $p-${VER}.ebuild install 2>> $log 1>> $log
+        ebuild $p-${PVER}.ebuild install 2>> $log 1>> $log
         if [ $? != 0 ]; then 
             cat $log
@@ -123 +124 @@
         cd $TOPBUILDDIR
         tar xfz $src
-        cd ${p}-${VER}
+        cd ${p}-${PVER}
         # point to the right debian conf
         ln -s distributions/${ddir}-$dver debian

branches/stable/tools/qemu-vm.txt

@@ -1 @@
-Booting CD
+#Booting CD
 qemu-img create -f qcow image.qemu 3G
 qemu -cdrom /dev/hdc -m 256 -boot d image.qemu
 
 # RPM based : urpmi, yum install, yast2
-    neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget vim-X11 gcc-c++ docbook-utils-pdf ImageMagick man patch
+urpmi neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gvim/vim-X11 gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo
 
 # gentoo
-Cf: http://wiki.xensource.com/xenwiki/QEMUGentoo
+#Cf: http://wiki.xensource.com/xenwiki/QEMUGentoo
 emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue
 
-Changing CD during install:
+#Changing CD during install:
 Ctrl-Alt-2
 eject cdrom
@@ -16 +16 @@
 change cdrom /dev/cdrom
 
-Boot single user pour change passwd root
-Clavier fr:
+# Slack: put loadkeys fr in /etc/rc.d/rc.keymap
 
-loadkeys fr
-perl -pi -e 's/"us"/"fr"/' /etc/sysconfig/keyboard
-perl -pi -e 's/"us"/"fr"/' /etc/X11/XF86Config
-perl -pi -e 's/"us"/"fr"/' /etc/X11/xorg.conf
-Slack: put loadkeys fr in /etc/rc.d/rc.keymap
-
-Conf IP:
-    Ajout machine dans DNS interne (/usr/local/etc/named/etc/db.mondo.*)
-    Reload named
-
-Clé SSH:
-    Ajout clé ssh pour root:
+#Clé SSH:
+#   Ajout clé ssh pour root:
 mkdir /root/.ssh
 chmod 700 /root/.ssh
@@ -36 +25 @@
 chmod 600 /root/.ssh/authorized_keys
 
-Install packages manquant pour mondo:
-    afio buffer
-
-Créer compte bruno avec répertoires nécéssaires + env necessaire
+#Créer compte bruno avec répertoires nécéssaires + env necessaire
 mkdir /users
 useradd bruno -d /users/bruno
@@ -60 +46 @@
 chmod 700 ~/.ssh
 scp -p victoria2.home.musique-ancienne.org:.ssh/id'*' ~/.ssh
+# Passwd asked above
 cp ~/.ssh/id_dsa.pub ~/.ssh/authorized_keys
 chmod 600 ~/.ssh/authorized_keys
@@ -68 +55 @@
 EOF
 
-rebuild paquets necessaires mondo:
+#rebuild paquets necessaires mondo:
 wget ftp://ftp.mondorescue.org/src/afio-2.4.7-1.src.rpm 
 wget ftp://ftp.mondorescue.org/src/buffer-1.19-1.src.rpm
 rpm -ivh afio-2.4.7-1.src.rpm buffer-1.19-1.src.rpm
-mkdir -p build/BUILD build/RPMS/i386
+mkdir -p build/BUILD build/RPMS/i386 build/SRPMS
 rpmbuild -ba build/SPECS/afio.spec
 rpmbuild -ba build/SPECS/buffer.spec
 chmod 644 build/RPMS/i386/*
-scp -p build/RPMS/i386/afio-[0-9]* build/RPMS/i386/buffer-[0-9]* ftp.mondorescue.org:/mondo/ftp/rhel/3/
+scp -p build/RPMS/i?86/afio-[0-9]* build/RPMS/i?86/buffer-[0-9]* ftp.mondorescue.org:/mondo/ftp/rhel/3/
 
 
 root:
-rpm -ivh ~bruno/RPMS/RPMS/i386/afio-[0-9]* ~bruno/RPMS/RPMS/i386/buffer-[0-9]*
+rpm -ivh ~bruno/build/RPMS/i?86/afio-[0-9]* ~bruno/build/RPMS/i?86/buffer-[0-9]*
+# In case
+scp bruno@10.0.2.2:/usr/bin/man2dvi /usr/local/bin
 
-pour gentoo
+#for gentoo
 chown bruno /etc/make.conf
 bruno in portage group

branches/stable/tools/svn2build

@@ -136 +136 @@
     # Finally creates the tar files
     echo "Creating $p tar files"
-    tar cfhz ${DEST}/$p-$v-$TAG.tar.gz $dest
+    tar cfphz ${DEST}/$p-$v-$TAG.tar.gz $dest
     #gzip -cd ${DEST}/$p-$v-$TAG.tar.gz | bzip2 -c3 > ${DEST}/$p-$v-$TAG.tar.bz2
     #tar cfhj ${DEST}/$p-$v-$TAG.tar.bz2 $dest