Author: arekm Date: Tue Nov 16 08:07:55 2010 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
More THization.
---- Files affected:
pld-builder.new:
README.bin-builder (1.5 -> 1.6) , jak-wysylac-zlecenia.txt (1.5 -> 1.6) ,
user-manual.txt (1.3 -> 1.4)
pld-builder.new/PLD_Builder:
report.py (1.35 -> 1.36)
pld-builder.new/config:
builder.conf (1.41 -> 1.42)
---- Diffs:
================================================================
Index: pld-builder.new/README.bin-builder
diff -u pld-builder.new/README.bin-builder:1.5
pld-builder.new/README.bin-builder:1.6
--- pld-builder.new/README.bin-builder:1.5 Wed Sep 1 21:43:10 2010
+++ pld-builder.new/README.bin-builder Tue Nov 16 09:07:50 2010
@@ -2,7 +2,7 @@
packages and chroot
~~~~~~~~~~~~~~~~~~~
-1. install pld-builder from ac-ready on target host
+1. install pld-builder from th repoeistory on target host
2. create chroot /srv/chroot
(you can symlink to real dest for the sake of copy-paste from here)
@@ -13,7 +13,7 @@
mv /var/lib/rpm{,-host}
ln -s /srv/chroot/var/lib/rpm /var/lib/rpm
-- install distro gpg key as default ac config packages are signed and sign
verify enabled in config:
+- install distro gpg key as default th config packages are signed and sign
verify enabled in config:
rpm -r /srv/chroot --import /etc/pki/rpm-gpg/PLD-*.asc
- setup minimal /dev
@@ -24,8 +24,8 @@
with --noignore:
poldek -r /srv/chroot -u vserver-packages -Q --noignore
-- install pld-builder-chroot from ac-ready
-poldek -r /srv/chroot -u pld-builder-chroot -Q --sn ac --sn ac-ready
+- install pld-builder-chroot from th repos
+poldek -r /srv/chroot -u pld-builder-chroot -Q --sn th --sn th-ready
- make rpmdb readable for builder user
chmod -R a+rX /srv/chroot/var/lib/rpm
@@ -41,16 +41,16 @@
~~~~~~~~
1. import src builder key to bin builder so it can download queue.gz
-src-builder$ gpg --export KEYID --armor > ac-src.asc
-bin-builder$ gpg --import < ac-src.asc
+src-builder$ gpg --export KEYID --armor > th-src.asc
+bin-builder$ gpg --import < th-src.asc
2. generate new key for bin builder and import it to src builder so it can
accept spool/notify messages
gpg --gen-key on target host
3. import that public key to src builder keyring
-bin-builder$ gpg --export KEYID --armor > ac-ppc.asc
-src-builder$ gpg --import < ac-ppc.asc
+bin-builder$ gpg --export KEYID --armor > th-i686.asc
+src-builder$ gpg --import < th-i686.asc
ssh keys
~~~~~~~~
@@ -58,8 +58,8 @@
generate key on bin builder and add it to authorized_keys of ftp account
i.e account where you push your uploads:
-[ac-ppc]
-ftp_url = scp://[email protected]:ftp/.tree/.incoming/ppc/
+[th-i686]
+ftp_url = scp://[email protected]:ftp/.tree/.incoming/i686/
buildlogs
~~~~~~~~~
@@ -68,7 +68,7 @@
sudo access
~~~~~~~~~~~
make sure builder user (who runs crons) can sudo chroot to the chroots:
-builder ALL=(ALL) NOPASSWD: /usr/sbin/chroot /home/users/builder/chroot-ac *
+builder ALL=(ALL) NOPASSWD: /usr/sbin/chroot /home/users/builder/chroot-th *
testing
~~~~~~~
================================================================
Index: pld-builder.new/jak-wysylac-zlecenia.txt
diff -u pld-builder.new/jak-wysylac-zlecenia.txt:1.5
pld-builder.new/jak-wysylac-zlecenia.txt:1.6
--- pld-builder.new/jak-wysylac-zlecenia.txt:1.5 Sat Nov 13 21:41:20 2010
+++ pld-builder.new/jak-wysylac-zlecenia.txt Tue Nov 16 09:07:50 2010
@@ -30,13 +30,13 @@
make-request.sh kernel.spec:LINUX_2_6
make-request.sh qt.spec kadu.spec
- make-request.sh -b 'ac-i* ac-athlon' nasm.spec
+ make-request.sh -b 'th-i* th-x86_64' nasm.spec
Pierwszy przyk�ad to puszczenie zlecenia na pakiet kernel z brancha LINUX_2_6.
Drugi to puszczenie w jednym zleceniu qt i kadu, przy czym je�li budowanie
qt si� wywr�ci, to automatyka nawet nie b�dzie pr�bowa�a budowa� kadu.
Ostatni przyk�ad to puszczenie nasma tylko i wy��cznie na buildery x86
-(ac-i* rozwija si� na to samo, co ac-i?86). Zwracam uwag�, �e przy
+(th-i* rozwija si� na to samo, co th-i?86). Zwracam uwag�, �e przy
listowaniu tych buidler�w trzeba je wycytowa�, �eby sz�y jako jeden
argument.
@@ -59,7 +59,7 @@
zupgrejdowany na builderach, a zamiast w ready wyl�duje w test (p�ki co
cieciwa u�ywa tego do budowania sobie w spokoju jajek 2.6).
-Zasady puszczania do Ac:
+Zasady puszczania do Th:
- Puszczamy zawsze z HEAD i bez bcond�w. Odst�pstwa od tej zasady s�
akceptowalne tylko i wy��cznie w dobrze uzasadnionych przypadkach. HEAD ma
@@ -67,17 +67,3 @@
wedle zasady "src.rpm ma si� budowa� w �rodowisku, jakie jest dost�pne na
ftpie (wyj�tek to oczywi�cie java) i nie oczekujmy wiedzy tajemnej (jakiego
bconda u�y�) od wszystkich, kt�rzy chc� dany pakiet zbudowa�".
-
-- Ja tego nie powiedzia�em: w chwili obecnej nie jest ustawiona blokada na
- puszczanie pakiet�w o tej samej rel mimo zmiany np. speca. S�u�y to
- �atwiejszemu poprawianiu pakiet�w na okoliczno�� nie budowania si� na
- niekt�rych arch (tzn. p�ki pakiet le�y w ready to spokojnie mo�na mu doda�
- jeszcze par� poprawek i pu�ci� na brakuj�ce arch nie podbijaj�c rel). W
- pierwszej kolejno�ci do g��wnego drzewka przenosz� pakiety buduj�ce si� na
- wszystkich arch, tak�e ma si� zawsze ten dzie�-dwa na powiedzenie mi, cobym
- si� wstrzyma� (lub poprawienie). Ten 'workaround' zostanie utrzymany do
- osi�gni�cia oko�o 70-80% stanu pakiet�w z Ra, czyli jeszcze troch�. W ka�dym
- razie nie nale�y si� tym p�ki co martwi�, bo jak przyjdzie pora, to b�d�
- tr�bi� co si� zmienia i jak.
-
-
================================================================
Index: pld-builder.new/user-manual.txt
diff -u pld-builder.new/user-manual.txt:1.3 pld-builder.new/user-manual.txt:1.4
--- pld-builder.new/user-manual.txt:1.3 Tue Jun 19 17:30:49 2007
+++ pld-builder.new/user-manual.txt Tue Nov 16 09:07:50 2010
@@ -49,11 +49,10 @@
poldek.conf:
source = local,pri=1 /spools/ready/
-source = main-test,noauto,pri=2 ftp://ftp.pld-linux.org/dists/ac/test/athlon/
-source = main-ready,pri=3 ftp://ftp.pld-linux.org/dists/ac/ready/athlon/
-source = main-ug,pri=4 ftp://ftp.pld-linux.org/dists/ac/updates/general/athlon/
-source = main-us,pri=5
ftp://ftp.pld-linux.org/dists/ac/updates/security/athlon/
-source = main,pri=6 ftp://ftp.pld-linux.org/dists/ac/PLD/athlon/RPMS/
+source = main-test,noauto,pri=2
ftp://ftp.pld-linux.org/dists/th/test/i686/RPMS/
+source = main-ready,pri=3 ftp://ftp.pld-linux.org/dists/th/ready/i686/RPMS/
+source = main-ug,pri=4 ftp://ftp.pld-linux.org/dists/th/updates/i686/RPMS/
+source = main,pri=5 ftp://ftp.pld-linux.org/dists/th/PLD/i686/RPMS/
particle_install = no
greedy = yes
rpmdef = _excludedocs 1
================================================================
Index: pld-builder.new/PLD_Builder/report.py
diff -u pld-builder.new/PLD_Builder/report.py:1.35
pld-builder.new/PLD_Builder/report.py:1.36
--- pld-builder.new/PLD_Builder/report.py:1.35 Tue Apr 7 16:23:26 2009
+++ pld-builder.new/PLD_Builder/report.py Tue Nov 16 09:07:50 2010
@@ -123,7 +123,6 @@
# write in iteration list and status of all processed files
for b in r.batches:
- # Instead of hardcoded Ac information use some config variable
m.write('<package name="%s" arch="%s">\n' % (b.spec, b.branch))
if b.build_failed:
m.write('<failed/>\n')
================================================================
Index: pld-builder.new/config/builder.conf
diff -u pld-builder.new/config/builder.conf:1.41
pld-builder.new/config/builder.conf:1.42
--- pld-builder.new/config/builder.conf:1.41 Sun Nov 14 00:13:25 2010
+++ pld-builder.new/config/builder.conf Tue Nov 16 09:07:50 2010
@@ -54,7 +54,7 @@
control_url = http://src.th.pld-linux.org/
# Src builder's email for sending status notifications (build ok/failed).
-#notify_email = [email protected]
+#notify_email = [email protected]
# Where to cache rpm's from binary builders locally
rpm_cache_dir = /spools/ready
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/README.bin-builder?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/jak-wysylac-zlecenia.txt?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/user-manual.txt?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/report.py?r1=1.35&r2=1.36&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/config/builder.conf?r1=1.41&r2=1.42&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
