How to commit on the mainrepository

From Paldo

(Difference between revisions)
Jump to: navigation, search
Revision as of 06:51, 28 August 2008 (edit)
Amnon82 (Talk | contribs)
(New page: ==About the tutorial== This tutorial is for our developers. I explain you how you can commit your packages to our main-repository. Read this tutorial exactly and keep our rules in mind! ...)
← Previous diff
Revision as of 09:35, 28 August 2008 (edit) (undo)
Amnon82 (Talk | contribs)

Next diff →
Line 4: Line 4:
I explain you how you can commit your packages to our main-repository. I explain you how you can commit your packages to our main-repository.
Read this tutorial exactly and keep our rules in mind! Read this tutorial exactly and keep our rules in mind!
- 
==Rules== ==Rules==
Line 38: Line 37:
They have to be in '''tar.bz2'''-archives, so repack them if needed. They have to be in '''tar.bz2'''-archives, so repack them if needed.
To upload them us followed cmd: To upload them us followed cmd:
- scp yourownlocalrepo/sources/packagename/tarballname.tar.bz2 youruseraccount@paldo.org:/srv/paldo/sources/paketname+ scp yourownlocalrepo/sources/packagename/tarballname.tar.bz2 youruseraccount@paldo.org:/srv/paldo/sources/packagename
Example: Example:
- scp ~/repo/sources/foo/foo-1.0.tar.bz2 deinBenutzername@paldo.org:/srv/paldo/sources/foo+ scp ~/repo/sources/foo/foo-1.0.tar.bz2 youruseraccount@paldo.org:/srv/paldo/sources/foo
===Specs=== ===Specs===
-Specs werden '''NUR LOKAL''' bearbeitet und in die SVN geschrieben!+We edit the specs '''only locally'''! Later we add the new specs to the svn.
-Hierzu öffnet eine Terminal und holt Euch die aktuelle svn der Specs mit folgendem Befehl:+First you've to get the latest specs using this cmd:
svn co svn://paldo.org/paldo/trunk/specs specs-svn svn co svn://paldo.org/paldo/trunk/specs specs-svn
-Nun könnt Ihr Eure veränderten Specs in den Ordner "'''specs-svn'''" kopieren.+Next copy your modified specs into the '''specs-svn''' folder.
-Wechselt in der Terminal in den Ordner "specs-svn" mit "'''cd specs-svn'''"+In the terminal change into the folder '''specs-svn''' with "'''cd specs-svn'''".
-Mit dem Befehl "'''svn st'''" werden Euch die geänderten Specs angezeigt.+Before every change you have to get your local svn with '''svn up''' to the latest stand.
-"'''svn diff'''" zeigt die Veränderungen im Detail an.+With "'''svn st'''" all of your modified specs got displayed.
 +"'''svn diff'''" shows you the changes in detail.
-Falls Ihr neue Pakete der Repository hinzufügen wollt müsst Ihr die Spec mit folgendem+If you have a new packages created the new spec-file must be added using followed cmd:
-Befehl der Repository hinzufügen:+
svn add foo.xml svn add foo.xml
-Mit "'''svn st'''" überprüft Ihr die Veränderung.+Re-check your changes with "'''svn st'''".
-Falls Ihr nur ein existierendes Paket updated, könnt Ihr diese zwei Schritte weglassen.+If you only update an existing spec-file you haven't to do the steps '''svn add''' and '''svn st'''.
-Um den Vorgang abzuschließen gebt Ihr den Befehl "'''svn commit'''" in die Terminal ein.+To close the progress you've to commit your changes to the repo. Do it with: '''svn commit'''.
-Das Programm "VI" öffnet sich. Nun müsst Ihr einen Kommentar abgeben, was Ihr an der SVN+The program '''VI''' opens. We have a format how we wrote our changes we did to the svn:
-verändert habt. Das Format ist folgendermaßen:+ * Packagename-Version-Revision: maybe a personal comment
- * Paketname-Version-Revision: ggf. persönlicher Kommentar+
Example: Example:
* foo-1.0-1: new test package * foo-1.0-1: new test package
 +
 +To do this first press'''i'''. Now you are in the edit mode. Write your changes to the svn in english.
 +When finished press '''ESC''' to quit the edit mode. With the cmd ''':wq''' you close '''VI'''.
-Drückt als erstes die Taste "'''i'''". Nun seit Ihr im Editier-Modus. Schreibt Eure(n) Kommentar(e)+After you entered your svn account password your files got uploaded.
-in englisch. Drückt danach die Taste "'''ESC'''" um den Editier-Modus zu verlassen.+
-Mit dem Befehl "''':wq'''" beendet Ihr VI.+
- +
-Eure Datei wird nach eingabe Eures Account-Passwortes hochgeladen.+
-Mit dem Befehl "'''svn up'''" updated Ihr eure lokale SVN-Specs auf den neusten Stand.+With "'''svn up'''" you update your local repository to the latest stand.
-Mit dem Befehl "'''svn log | less'''" könnt Ihr nachlesen, welche Veränderungen/Updates es in der SVN+"'''svn log | less'''" shows you the latest changes the main-repository-developer-team did.
-gibt.+
==="SVN diff"-Patches=== ==="SVN diff"-Patches===
-Für Specs die in den Meta-Specs "'''paldo'''" und "'''paldo-base'''" enthalten sind benötigt Ihr erst die Erlaubnis zum Committen+For specs which are dependencies of "'''paldo'''" and "'''paldo-base'''" you have to have a permission from Jürg or Raffaele.
-von Jürg oder Rasa.+
-Nachdem Ihr Eure neuen/geänderten Specs der lokalen SVN hinzugefügt habt prüft bitte Euere Veränderungen wie gehabt+After you added your modified specs as usual you do a "'''svn st'''" followed by "'''svn diff > ~/specs.changes'''". Your changes got saved in the file "'''~/specs.changes'''" in your home dir.
-mit "'''svn st'''". Durch ein "'''svn diff > ~/specs.changes'''" werden Eure Veränderung in die Datei "'''~/specs.changes'''" gespeichert.+Send this file by email to Jürg and Raffaele (info_at_paldo.org).
-Sendet diese zur Überprüfung an Jürg oder Rasa (info_at_paldo.org).+
-Bei Erlaubnis dürft Ihr diese Pakete der Haupt-Repository hinzufügen. Fügt Eurem Kommentar hinzu von wem Ihr die Erlaubnis+After you got permission to commit your changes write into your comments by whom you got it.
-bekommen hattet.+
-===Die Log des Build-Servers verfolgen===+===Follow the log of the build server===
-Es ist gut sich die Log des Build-Server anzusehen. Es könnten ja trotz Eurer Überprüfungen Eurer Pakete Fehler auftreten.+It is always good to check the log of our build server. Even with testings and checks sometimes still some packages have build problems on this server. Open Nautilus and connect to our server paldo.org. Open a new terminal by mouse-right-click and choosing '''"Open in Terminal"'''. Re-enter your personal svn account password. With the followed cmd you can follow the log of the build server:
-Hierzu öffnet Nautilus und connected Euch auf den Server. Öffnet nun eine Terminal mit Maus-Rechtsklick auf eine freie Fläche > "Im Terminal öffnen". Gebt nochmal Euer Server-Passwort ein. Mit folgendem Befehl könnt Ihr die Log des Build-Servers verfolgen:+
tail -f /paldo-x86/var/log/upkg-buildd/upkg-buildd.log /paldo-x86/var/log/upkg/upkg.log tail -f /paldo-x86/var/log/upkg-buildd/upkg-buildd.log /paldo-x86/var/log/upkg/upkg.log
-''Tutorial by Müller Philip (aka Amnon82) - 23.09.2007''+''Tutorial by Müller Philip (aka Amnon82) - 28.08.2008''

Revision as of 09:35, 28 August 2008

Contents

About the tutorial

This tutorial is for our developers. I explain you how you can commit your packages to our main-repository. Read this tutorial exactly and keep our rules in mind!

Rules

Everything has to have some order. A linux distribution has rules. Otherwise it will be caos and bad publicity. Changing the main-repository might create heavy issues with our user if it is done wrong.

Commit only in branch testing/unstable. Commit only new packages which are NOT in our meta-package paldo. To check if your package is in the meta-packages go on our homepage search for paldo and click on "Show all dependencies" to see them all.

If the package is in the meta-package paldo and you still want to commit it you have to create svn diff patches and mail them to Jürg or Raffaele using this email: info_at_paldo.org. Also Amnon82 can look into it: amnon_at_paldo.org. You might get the permission to commit it yourself.

Account

Maybe you get an account from Jürg/Raffaele to commit on our main-repository. To get one you've to prove your self first. Create some own repositories for paldo and point Jürg, Raffaele or Amnon82 to it.

Paths

  • ssh://paldo.org/srv/paldo/sources
  • svn co svn://paldo.org/paldo/trunk/specs

How to

Source-Tarballs

All tarballs get uploaded to "ssh://paldo.org/srv/paldo/sources". They have to be in tar.bz2-archives, so repack them if needed. To upload them us followed cmd:

  scp yourownlocalrepo/sources/packagename/tarballname.tar.bz2 youruseraccount@paldo.org:/srv/paldo/sources/packagename

Example:

  scp ~/repo/sources/foo/foo-1.0.tar.bz2 youruseraccount@paldo.org:/srv/paldo/sources/foo

Specs

We edit the specs only locally! Later we add the new specs to the svn. First you've to get the latest specs using this cmd:

  svn co svn://paldo.org/paldo/trunk/specs specs-svn

Next copy your modified specs into the specs-svn folder. In the terminal change into the folder specs-svn with "cd specs-svn". Before every change you have to get your local svn with svn up to the latest stand. With "svn st" all of your modified specs got displayed. "svn diff" shows you the changes in detail.

If you have a new packages created the new spec-file must be added using followed cmd:

  svn add foo.xml

Re-check your changes with "svn st".

If you only update an existing spec-file you haven't to do the steps svn add and svn st.

To close the progress you've to commit your changes to the repo. Do it with: svn commit. The program VI opens. We have a format how we wrote our changes we did to the svn:

  * Packagename-Version-Revision: maybe a personal comment

Example:

  * foo-1.0-1: new test package

To do this first pressi. Now you are in the edit mode. Write your changes to the svn in english. When finished press ESC to quit the edit mode. With the cmd :wq you close VI.

After you entered your svn account password your files got uploaded.

With "svn up" you update your local repository to the latest stand. "svn log | less" shows you the latest changes the main-repository-developer-team did.

"SVN diff"-Patches

For specs which are dependencies of "paldo" and "paldo-base" you have to have a permission from Jürg or Raffaele.

After you added your modified specs as usual you do a "svn st" followed by "svn diff > ~/specs.changes". Your changes got saved in the file "~/specs.changes" in your home dir. Send this file by email to Jürg and Raffaele (info_at_paldo.org).

After you got permission to commit your changes write into your comments by whom you got it.

Follow the log of the build server

It is always good to check the log of our build server. Even with testings and checks sometimes still some packages have build problems on this server. Open Nautilus and connect to our server paldo.org. Open a new terminal by mouse-right-click and choosing "Open in Terminal". Re-enter your personal svn account password. With the followed cmd you can follow the log of the build server:

   tail -f /paldo-x86/var/log/upkg-buildd/upkg-buildd.log /paldo-x86/var/log/upkg/upkg.log

Tutorial by Müller Philip (aka Amnon82) - 28.08.2008

Personal tools