[freeside-commits] freeside/rpm/build BOOTSTRAP, NONE, 1.1 build-freeside, 1.2, 1.3 buildsysrc, NONE, 1.1 cvs-check-and-build, 1.1, 1.2

Ivan,,, ivan at wavetail.420.am
Thu Jul 8 02:32:16 PDT 2010


Update of /home/cvs/cvsroot/freeside/rpm/build
In directory wavetail.420.am:/tmp/cvs-serv32484

Modified Files:
	build-freeside cvs-check-and-build 
Added Files:
	BOOTSTRAP buildsysrc 
Log Message:
checking in more of the rpm build system (is that it?)

--- NEW FILE: buildsysrc ---
# Define shell variables for the Freeside RPM build system
#

SRCFOLDER=ivan at 10.5.4.5:/home/ivan/redhat/SRPMS
REFFOLDER=$HOME/buildsys/ref/SRPMS
#ARCHS='i386 x86_64'
REPOFOLDER=/home/ivan/public_html
REPOBASEFOLDER=/home/ivan/public_html
KEYID=rpm

VERSIONS='1.7'
DISTROS='centos'
CENTOSVERS='5'
ARCHS='x86_64'

Index: cvs-check-and-build
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rpm/build/cvs-check-and-build,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- cvs-check-and-build	7 Jul 2010 17:51:58 -0000	1.1
+++ cvs-check-and-build	8 Jul 2010 09:32:14 -0000	1.2
@@ -36,6 +36,9 @@
         esac
 done
 
-ssh 10.5.4.5 /home/rsiddall/build-from-cvs $FORCE_FLAG
-cd /home/rsiddall/buildsys; ./build-freeside; ./refresh-repo $QUIET_FLAG
+#ssh 10.5.4.5 /home/rsiddall/build-from-cvs $FORCE_FLAG
+#cd /home/rsiddall/buildsys; ./build-freeside; ./refresh-repo $QUIET_FLAG
+
+ssh 10.5.4.5 ./build-from-cvs $FORCE_FLAG
+cd ~/buildsys; ./build-freeside; ./refresh-repo $QUIET_FLAG
 

--- NEW FILE: BOOTSTRAP ---
# its more notes than a script, so no #!/bin/sh yet

# s/ivan/username/ in buildsysrc and below


###
# host dirs
###


cd
mkdir public_html
mkdir mock
mkdir redhat
mkdir redhat/SRPMS
mkdir buildsys
mkdir buildsys/ref
mkdir buildsys/ref/SRPMS

cd buildsys
for a in build-freeside buildsysrc cvs-check-and-build enrpm expect-addsign expect-signrepo ovid2flute refresh-repo; do
ln -s ~/freeside/rpm/build/$a .
done


###
# vserver setup
###


#ftp://ftp.pld-linux.org/people/hawk/vserver-templates/Centos
#sudo vserver centos5 build -m template --context 5 --hostname centos5.freeside.biz --interface dummy0:10.5.4.5/24 -- -d centos5 -t centos5-i686.tar.bz2
sudo vserver centos5 build -m template --context 5 --hostname centos5.freeside.biz --interface dummy0:10.5.4.5/24 -- -d centos5 -t centos5-x86_64.tar.bz2

#something like this as /etc/init.d/vserver-nat:
!/bin/sh
iptables -t nat -F
iptables -t nat -A POSTROUTING -s 10.5.4.0/24 -d ! 10.5.4.0/24 -j SNAT --to-source 192.168.1.143

vserver centos5 start
vserver centos5 enter
#edit /etc/resolv.conf (easier from outside, no vi inside yet)

yum update
yum install openssh-server vim-minimal zsh screen sudo perl patch cvs diffutils rpm-build rsync

adduser ivan #username
cd ~ivan #username
mkdir .ssh
vi .ssh/authorized_keys

mkdir redhat
mkdir redhat/BUILD
mkdir redhat/RPMS
mkdir redhat/SOURCES
mkdir redhat/SPECS
mkdir redhat/SRPMS
chown -R ivan:ivan redhat

vi ~/.rpmmacros
%_topdir /home/ivan/redhat
%_signature gpg
%_gpg_path /home/ivan/.gnupg
%_gpg_name Freeside Internet Services, Inc. RPM Signing Key

vi /etc/ssh/sshd_config #ListenAddress
#also need to edit on the host so the vserver can claim its address

vi /etc/pam.d/sshd
#comment out:
#session    required     pam_loginuid.so

/etc/init.d/sshd restart

vi /etc/sudoers

exit #and test ssh'ing in

###
# more...
###

#copy the stuff from rpm/build/native into /home/ivan (#username) in the vserver
cd rpm/build/native
for a in build-from-cvs freeside-cvs makesrpm ovid2flute ovid-0.12-1.x86_64.rpm Ovid.diff; do
  cp $a /var/lib/vservers/centos5/home/ivan/
done

for a in build-from-cvs freeside-cvs makesrpm ovid2flute; do
  chmod a+rx /var/lib/vservers/centos5/home/ivan/$a
done

vserver centos5 enter #or ssh 10.5.4.5 and sudo

rpm -i ovid-0.12-1.x86_64.rpm
cd /usr/lib/perl5/site_perl/5.*/Ovid
patch < ~ivan/Ovid.diff

#also checkout the necessary freeside versions...
export CVSROOT=":pserver:anonymous:anonymous at cvs.freeside.biz:/home/cvs/cvsroot"

cvs checkout -rFREESIDE_1_7_BRANCH -d freeside-1.7 freeside
#cvs checkout -rFREESIDE_1_9_BRANCH -d freeside-1.9 freeside

###
# yet more
###

cp expect-* /usr/local/bin/
#edit them and set your real passphrase for the gpg key you're using

###
# references
###

http://www.freeside.biz/mediawiki/index.php/Freeside:Documentation:CreatingRPMRepo

Index: build-freeside
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rpm/build/build-freeside,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- build-freeside	7 Jul 2010 21:00:05 -0000	1.2
+++ build-freeside	8 Jul 2010 09:32:14 -0000	1.3
@@ -17,14 +17,30 @@
 SLESVERS=10
 WHICHVERS=
 ARCHS='i386 x86_64'
-MOCKARGS='--autocache'
 
 BUILDSYSDIR=`dirname $0`
 
+#MOCKARGS='--autocache'
+MOCKARGS="--configdir=$BUILDSYSDIR/mock"
+
+
+if [ -f $BUILDSYSDIR/buildsysrc ]; then
+        #chmod a+x $BUILDSYSDIR/buildsysrc
+	#echo $BUILDSYSDIR/buildsysrc
+	. $BUILDSYSDIR/buildsysrc
+fi
+
 if [ -f $HOME/buildsysrc ]; then
+        #chmod a+x $HOME/buildsysrc
+	#echo $HOME/buildsysrc
 	. $HOME/buildsysrc
 fi
 
+EXPECT_ADDSIGN=$BUILDSYSDIR/expect-addsign
+if [ -f /usr/local/bin/expect-addsign ]; then
+   EXPECT_ADDSIGN=/usr/local/bin/expect-addsign
+fi
+
 usage() {
 	echo "build-freeside: build RPMs for all target distros and architectures using mock"
 	echo "where:"
@@ -72,7 +88,8 @@
 done
 
 if [ "${SRCFOLDER}x" = "x" ]; then
-	echo "No source folder defined!"
+        PWD=`pwd`
+	echo "No source folder defined! (BUILDSYSDIR=$BUILDSYSDIR pwd=$PWD)"
 	exit
 fi
 
@@ -120,6 +137,7 @@
 			for arch in $ARCHS
 			do
 				echo "$os - $arch: $srpm"
+				echo mock $MOCKARGS -r ${os}-${arch} $REFFOLDER/${srpm}
 				time mock $MOCKARGS -r ${os}-${arch} $REFFOLDER/${srpm}
 				if [ -f /var/lib/mock/${os}-${arch}/state/status ] && grep done /var/lib/mock/${os}-${arch}/state/status
 				then
@@ -137,7 +155,7 @@
 						then
 							for FILE in $FILES
 							do
-								$BUILDSYSDIR/expect-addsign $FILE
+								$EXPECT_ADDSIGN $FILE
 							done
 							if [ "${REPOMACHINE}x" != "x" ]
 							then
@@ -153,7 +171,7 @@
 						then
 							for FILE in $FILES
 							do
-								$BUILDSYSDIR/expect-addsign $FILE
+								$EXPECT_ADDSIGN $FILE
 							done
 							if [ "${REPOMACHINE}x" != "x" ]
 							then



More information about the freeside-commits mailing list