Changeset 1631 in MondoRescue for branches

Timestamp:

Sep 12, 2007, 2:12:50 AM (18 years ago)

Author:

Bruno Cornec

Message:

Fix a bug for pb build (omission of PB-SUF declaration)

Location:

branches/2.2.5

Files:

• pbconf/mindi/pbfilter/rpm.pbf (modified) (1 diff)
• pbconf/mondo/pbfilter/rpm.pbf (modified) (1 diff)
• tools/qemu-vm.txt (modified) (5 diffs)

branches/2.2.5/pbconf/mindi/pbfilter/rpm.pbf

@@ -31 +31 @@
 filter PBPKG = $pbpkg
 
+# PBSUF is replaced by the package name ($pbpkg in code)
+filter PBSUF = $pbsuf
+
 # PBOBS is replaced by the Obsolete line
 filter PBOBS = 

branches/2.2.5/pbconf/mondo/pbfilter/rpm.pbf

@@ -31 +31 @@
 filter PBPKG = $pbpkg
 
+# PBSUF is replaced by the package name ($pbpkg in code)
+filter PBSUF = $pbsuf
+
 # PBOBS is replaced by the Obsolete line
 filter PBOBS = 

branches/2.2.5/tools/qemu-vm.txt

@@ -7 +7 @@
 # RPM based : urpmi, yum install, yast2
 # Mandriva
-urpmi neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo mkisofs cdrecord
+urpmi neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo mkisofs cdrecord pb
 
 #Fedora
-yum install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget vim gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs
+yum install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget vim gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs pb
 
 
 # gentoo
 #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 cdrecord mkisofs
+emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue cdrecord mkisofs pb
 
 # Slackware
@@ -21 +21 @@
 #
 # Ubuntu
-apt-get install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev debian-builder dh-make fakeroot libnewt-dev libncurses5-dev
+apt-get install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev debian-builder dh-make fakeroot libnewt-dev libncurses5-dev pb
+
+# Apply AppConfig path
+patch -p0 < pb-doc/App*
 
 #Changing CD during install:
@@ -32 +35 @@
 
 #Clé SSH:
-#   Ajout clé ssh pour root:
-mkdir /root/.ssh
-chmod 700 /root/.ssh
 scp bruno@10.0.2.2:.ssh/id_dsa.pub /root/.ssh/authorized_keys
 chmod 600 /root/.ssh/authorized_keys
 
-#Créer compte bruno avec répertoires nécéssaires + env necessaire
-mkdir /users
-useradd bruno -d /users/bruno
-passwd bruno
+#Créer compte pb
+useradd pb
 
-su - bruno
-mkdir -p mondo/tmp build
-cat > ~bruno/.rpmmacros << EOF
-%_topdir    /users/bruno/build
-%_tmppath   %{_topdir}/tmp
-%packager   Bruno Cornec <bruno@mondorescue.org>
-EOF
-cat > ~bruno/.rpmrc << EOF
-buildarchtranslate: i386: i386
-buildarchtranslate: i486: i386
-buildarchtranslate: i586: i386
-buildarchtranslate: i686: i386
-EOF
+# No passwd for pb
+perl -pi -e 's/^pb:\!\!:/pb:*:/' /etc/shadow
+# Adapt sudoers
+echo "pb   ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+# poweroff only
+
+su - pb
 mkdir ~/.ssh
 chmod 700 ~/.ssh
-scp -p victoria2.home.musique-ancienne.org:.ssh/id'*' ~/.ssh
+scp -p victoria2.home.musique-ancienne.org:.ssh/id_dsa.pub ~/.ssh/authorized_keys
 # Passwd asked above
-cp ~/.ssh/id_dsa.pub ~/.ssh/authorized_keys
 chmod 600 ~/.ssh/authorized_keys
-
-cat >> ~/.ssh/known_hosts << EOF
-shell.berlios.de,195.37.77.140 ssh-dss AAAAB3NzaC1kc3MAAACBAKawwrOuxejvOTWc6zFKEs2KKzVDXchPICt0p5A6LuIeIX+Uw9QMM5hji7txwuNt+ErPX/Z9xd1OBKAsormCMe6BZaxi0KMyFHPTnFTJpy168ztBD+782fQwlvop9nNRWkKoY1BGqQvKX50Zj+mQ39VP+RgJsyDMl+sKA3OqtGcVAAAAFQCBx79R1fUfJgOAVKxrCnvCu2vQRQAAAIBq5Li0/Fdf0yL/fSv6q8OZLCUgjMk6agnNbMxSK35Vctx0E4KXQbIJTmpwZIgYdZm+S2LYe0EgEYcWyBgcll1kK5Rti2e71sVuSoRNCo+rD8bsBcIETENtHZYuAeAWBlwrvT5LReGRpJ1YMNQpXXq4mQFbmhuhgJw9nKyt5xv6bgAAAIAro+dquEuGy32MOLcSqHtJm/FA+3FRG0RbLS8VDtxVC3ISe3SlSM0BecIHZ6aP5dL5W2b39/U2clls05X23SRK68DSqxoR/o9YshKdshDkPGEDfqyucOCn5FwUsZkd/WkZIuBZdLHLUtXUK6h85+08t5gmaL8eoXoOvHpsuCnNdA==
-svn.berlios.de,195.37.77.137 ssh-dss AAAAB3NzaC1kc3MAAACBAKouB77l1f4FgdP6DjLOgq5RKuGYm3zMJlM4WHcKzWnPuErZW4Omxk1CO0JojDNj/bjxz/95blWbdonEcAo0v71GcZbECFDsJdgVbZM+yxLHKOF4S5uHkiJ+LMawFcRoCGAochowoP9jUfLVAzyT1q3dbvmL43YO3FDvD+mCKTbZAAAAFQCWs/2nOqvitE/CyOCa81sadnzsPQAAAIBrgWRs2VN6jAtX1eUxPwtkJWX886DkiBwdEgtUwDW8RJJCFU6+zjNwFZ8VcjeA7OCFKmZqoD8ABojMMtB53VoXXRzp5PtWgJEMpCLOhHbAA6nLR+Zu9zV8rFHsrjvR17ZgmA8q1dZRqqvZSyzsoP4KdW7f9nD2SjFEVhjHfIsQmwAAAIEAoDlEoGO/lc8XkvNW7G8/rybzETG0cepONVKThYufP5Z2FdGj9a1TYc2Gaw2DygM20Ohwj1RW8aeRE/jYbEm4unM6IFYeLvCbDeeCCHCiCJmw/Pj2ityB5uPTat4Yn28FCd4eP5LyQq2EHz6bPA0LzpNJKwto4naIMsDpET1GNH0=
-EOF
 
 #rebuild paquets necessaires mondo:
@@ -73 +59 @@
 rpm -ivh afio-2.4.7-1.src.rpm buffer-1.19-1.src.rpm
 mkdir -p build/BUILD build/RPMS/i386 build/SRPMS
-rpmbuild -ba build/SPECS/afio.spec
-rpmbuild -ba build/SPECS/buffer.spec
+rpmbuild --define "_topdir $HOME/build" -ba build/SPECS/afio.spec
+rpmbuild --define "_topdir $HOME/build" -ba build/SPECS/buffer.spec
 chmod 644 build/RPMS/i386/*
 scp -p build/RPMS/i?86/afio-[0-9]* build/RPMS/i?86/buffer-[0-9]* www.mondorescue.org:/mondo/ftp/rhel/3/
@@ -84 +70 @@
 root:
 rpm -ivh ~bruno/build/RPMS/i?86/afio-[0-9]* ~bruno/build/RPMS/i?86/buffer-[0-9]*
-
-# Adapt sudoers
 
 # For RHAS 2.1 add grep-2.5.1