Re: [rock-linux] RFC: using subdirs for different versions

ROCK Mailing List Archives

Attachments
Entire message
+ (text/plain)
Author: Tobias Rittweiler
Date:  
To: rock-linux
Subject: Re: [rock-linux] RFC: using subdirs for different versions
On Friday, March 21, 2003 at 11:40:41 PM,
    Chris Hamilton <> wrote:

> Well you know me, I am always full of s^Hdesign.
>
>
> package/bob/bobpackage
> |
> [...]
> |
> |
> | - current
> | |
> [...] [...]
> |
> | - stable
> | |
> [...] [...]
> |
> \ - cheese
> |
> [...]


Hey, I've had almost the same idea. Though I had 'stable', 'devel' and
'cvs' in mind, so that you can easily choose what you want; and also
to enable the package maintainer to be not that bounded on that issue.

Stable should be obvious. Devel is just a -rc, -pre, -whatever
version. And with choosing CVS, a snapshot is either retrieved via web
or automatically fetched from a CVS server. (for example many irssi user
tend to use CVS versions).


-- 
cheers,
 Tobias                                       

http://freebits.org - ``Free Life, free Opinion, free Software.''
http://rocklinux.org - ``I'm a hacker, and I'm using ROCK Linux.''

``Jesus died too soon. If he had lived to my age he would have
  repudiated his doctrine.''
  -- Friedrich Wilhelm NietzscheFrom  Sat Mar 22 13:25:27 2003
Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.177])
        by nerd.clifford.at (8.12.1/8.12.1/rock) with ESMTP id h2MCPRAN011251
        for <>; Sat, 22 Mar 2003 13:25:27 +0100
Received: from [212.227.126.205] (helo=mrelayng.kundenserver.de)
        by moutng.kundenserver.de with esmtp (Exim 3.35 #1)
        id 18wi8v-0003CV-00
        for ; Sat, 22 Mar 2003 13:30:33 +0100
Received: from [194.25.159.26] (helo=mobile.nfilus.dyndns.org)
        by mrelayng.kundenserver.de with asmtp (Exim 3.35 #1)
        id 18wi8v-0004Ww-00
        for ; Sat, 22 Mar 2003 13:30:33 +0100
Received: from niko by mobile.nfilus.dyndns.org with local (Exim 4.03 #1 (Debian))
        id 18wi8s-00009C-00
        for <>; Sat, 22 Mar 2003 13:30:30 +0100
Date: Sat, 22 Mar 2003 13:30:30 +0100
From: Nikolaus Filus <>
To:
Subject: Re: [rock-linux] Device Autodetection....
Message-ID: <>
References: <>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <>; from on Fri, Mar 21, 2003 at 07:55:32PM +0100

On Fri, Mar 21, 2003 at 07:55:32PM +0100, Clifford Wolf wrote:
>Hi,
>
>I just remembered a discussion about s.th. like this on the list some time
>ago and wrote this little perl script:


>Use with care! This does also load framebuffer modules, etc...
>feedback? suggestions? comments?


Nice idea! I would just replace modprobe with echo and offer this
information to the installing user as the first orientation of what devices
are known and already handled by our modules. If alternatives are possible
print them also out (8139too vs 8139cp, wlan-ng vs pcmcia-cs, ...)

I still wanted to have a closer look on kudzu and specially the
implementation in Knoppix, as it seems to do its job very well. Maybe we can
borrow something there.

NikolausFrom Sat Mar 22 13:40:52 2003
Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.177])
        by nerd.clifford.at (8.12.1/8.12.1/rock) with ESMTP id h2MCeqAN014382
        for <>; Sat, 22 Mar 2003 13:40:52 +0100
Received: from [212.227.126.161] (helo=mrelayng.kundenserver.de)
        by moutng.kundenserver.de with esmtp (Exim 3.35 #1)
        id 18wiNq-0000Yu-00
        for ; Sat, 22 Mar 2003 13:45:58 +0100
Received: from [194.25.159.26] (helo=mobile.nfilus.dyndns.org)
        by mrelayng.kundenserver.de with asmtp (Exim 3.35 #1)
        id 18wiNq-0007Oi-00
        for ; Sat, 22 Mar 2003 13:45:58 +0100
Received: from niko by mobile.nfilus.dyndns.org with local (Exim 4.03 #1 (Debian))
        id 18wiNn-0000AW-00
        for <>; Sat, 22 Mar 2003 13:45:56 +0100
Date: Sat, 22 Mar 2003 13:45:55 +0100
From: Nikolaus Filus <>
To:
Subject: Re: [rock-linux] RFC: using subdirs for different versions
Message-ID: <>
References: <> <> <> <> <> <> <>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <>; from on Sat, Mar 22, 2003 at 09:48:08AM +0100

On Sat, Mar 22, 2003 at 09:48:08AM +0100, Tobias Rittweiler wrote:
>On Friday, March 21, 2003 at 11:40:41 PM,
> Chris Hamilton <> wrote:
>
>> Well you know me, I am always full of s^Hdesign.
>>
>>
>> package/bob/bobpackage
>> |
>> [...]
>> |
>> |
>> | - current
>> | |
>> [...] [...]
>> |
>> | - stable
>> | |
>> [...] [...]
>> |
>> \ - cheese
>> |
>> [...]
>
>Hey, I've had almost the same idea. Though I had 'stable', 'devel' and
>'cvs' in mind, so that you can easily choose what you want; and also
>to enable the package maintainer to be not that bounded on that issue.


I'm not sure, how to deal with the difference between "stable" as package by
itself and "stable" as concerning the itegration in Rock (what includes also
some usage testing and not only it-compiles-well)

>Stable should be obvious. Devel is just a -rc, -pre, -whatever
>version. And with choosing CVS, a snapshot is either retrieved via web
>or automatically fetched from a CVS server. (for example many irssi user
>tend to use CVS versions).


I wouldn't make the structure such difficult and make this heavy versioning
mandatorial but optional (as everything in Rock). I'm sure there are
packages, where new versions come once a year. But on the other hand there
are heavy developed packages, with minor updates/snapshots every day. In
such case versioning would be helpfull, as Miguel[1] could send his update
patches every day (or we could really complete those auto-update tags) and
we could still say that one special version is "Rock-stable" and tested.
This would also be more flexible in packages updates on an already installed
system, where one could say "update with last stable" or "update with most
recent one".

I would also like to remove the version suffixes from the package names, as
it is real stupid to explicitly say "Build-Pkg orbit224" where orbit2 is the
package name and 24 the current used tree. Or why do I have to say mc45 and
not just mc?

<dream on>
./scripts/Update --latest gnome2
or
./scripts/Update --stable kde
<dream off>

Saying gnome2 would even be too much, as we only have gnome2 and gnome14 is
mostly compatibility stuff.

Nikolaus

[1] Miguel, please take it with humour. Your work and patches are always a
great help, but makes it neccessary to be at least as uptodate as you :)From Sat Mar 22 13:44:28 2003
Received: from email06.aon.at (WARSL401PIP3.highway.telekom.at [195.3.96.75])
        by nerd.clifford.at (8.12.1/8.12.1/rock) with SMTP id h2MCiRAN014524
        for <>; Sat, 22 Mar 2003 13:44:27 +0100
Received: (qmail 484578 invoked from network); 22 Mar 2003 12:49:28 -0000
Received: from m089p009.dipool.highway.telekom.at (HELO ?192.168.69.17?) ([62.46.1.9]) (envelope-sender <>)
          by qmail6rs.highway.telekom.at (qmail-ldap-1.03) with SMTP
          for <>; 22 Mar 2003 12:49:28 -0000
Date: Sat, 22 Mar 2003 13:50:03 +0100 (CET)
From: Clifford Wolf <>
X-X-Sender:
To:
Subject: Re: [rock-linux] Device Autodetection....
In-Reply-To: <>
Message-ID: <>
References: <>
 <>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

On Sat, 22 Mar 2003, Nikolaus Filus wrote:

> Nice idea! I would just replace modprobe with echo and offer this
> information to the installing user as the first orientation of what devices
> are known and already handled by our modules. If alternatives are possible
> print them also out (8139too vs 8139cp, wlan-ng vs pcmcia-cs, ...)


Please have a look at etc/stone.d/mod_hardware.sh and hwscan in current
cvs (both are now part of the sysfiles package).

yours,
 - clifford

-- 
| Clifford Wolf ............ www.clifford.at . . . IRC: www.freenode.net
| ROCK Linux Workgroup ..... www.rocklinux.org . . Tel: +43-699-10063494
| NTx Consulting Group ..... www.ntx.at  . . . . . Fax: +43-2235-42788-4
| Vocat.cc ................. www.vocat.cc  . . . . . . . . . . . . . . .
| EDEN Creations ........... www.edenevents.at . . . . . . . . . . . . .
+------=[ Usenet Compliant Signature (RFC 2646) ]=---> www.rocklinux.net

>>> I'm looking for a new job: http://www.clifford.at/resume.html <<<


Reality corrupted. Reboot universe? (Y/N) /"\ ASCII Ribbon
                                                       \ /  Campaign
There are only 10 types of people in the world: X Against
Those who understand binary and those who don't. / \ HTML MailFrom Sat Mar 22 13:48:19 2003
Received: from email03.aon.at (WARSL401PIP6.highway.telekom.at [195.3.96.93])
        by nerd.clifford.at (8.12.1/8.12.1/rock) with SMTP id h2MCmJAN014703
        for <>; Sat, 22 Mar 2003 13:48:19 +0100
Received: (qmail 156654 invoked from network); 22 Mar 2003 12:53:20 -0000
Received: from m089p009.dipool.highway.telekom.at (HELO ?192.168.69.17?) ([62.46.1.9]) (envelope-sender <>)
          by qmail3rs.highway.telekom.at (qmail-ldap-1.03) with SMTP
          for <>; 22 Mar 2003 12:53:20 -0000
Date: Sat, 22 Mar 2003 13:53:55 +0100 (CET)
From: Clifford Wolf <>
X-X-Sender:
To:
Subject: Re: [rock-linux] [PATCH] new patch to make ocaml compile with tcltk
 8.4
In-Reply-To: <>
Message-ID: <>
References: <>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

On Thu, 20 Mar 2003, Mathieu wrote:

> as found by Nikolaus, ocaml does not build currently due to a problem
> with tcltk 8.4 here is a patch which adds a patch in the ocaml directory
> that solve that problem i tested it and it works


applied.

-- 
| Clifford Wolf ............ www.clifford.at . . . IRC: www.freenode.net
| ROCK Linux Workgroup ..... www.rocklinux.org . . Tel: +43-699-10063494
| NTx Consulting Group ..... www.ntx.at  . . . . . Fax: +43-2235-42788-4
| Vocat.cc ................. www.vocat.cc  . . . . . . . . . . . . . . .
| EDEN Creations ........... www.edenevents.at . . . . . . . . . . . . .
+------=[ Usenet Compliant Signature (RFC 2646) ]=---> www.rocklinux.net

>>> I'm looking for a new job: http://www.clifford.at/resume.html <<<


Reality corrupted. Reboot universe? (Y/N) /"\ ASCII Ribbon
                                                       \ /  Campaign
There are only 10 types of people in the world: X Against
Those who understand binary and those who don't. / \ HTML MailFrom Sat Mar 22 13:50:30 2003
Received: from email04.aon.at (WARSL401PIP5.highway.telekom.at [195.3.96.90])
        by nerd.clifford.at (8.12.1/8.12.1/rock) with SMTP id h2MCoTAN014831
        for <>; Sat, 22 Mar 2003 13:50:29 +0100
Received: (qmail 152904 invoked from network); 22 Mar 2003 12:55:30 -0000
Received: from m089p009.dipool.highway.telekom.at (HELO ?192.168.69.17?) ([62.46.1.9]) (envelope-sender <>)
          by qmail4rs.highway.telekom.at (qmail-ldap-1.03) with SMTP
          for <>; 22 Mar 2003 12:55:30 -0000
Date: Sat, 22 Mar 2003 13:56:06 +0100 (CET)
From: Clifford Wolf <>
X-X-Sender:
To:
Subject: Re: [rock-linux] [PATCH] procps
In-Reply-To: <>
Message-ID: <>
References: <>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

On Thu, 20 Mar 2003, Miguel A. Bolanos wrote:

> This update fix keyboard handling (help screen, etc.)


applied.

-- 
| Clifford Wolf ............ www.clifford.at . . . IRC: www.freenode.net
| ROCK Linux Workgroup ..... www.rocklinux.org . . Tel: +43-699-10063494
| NTx Consulting Group ..... www.ntx.at  . . . . . Fax: +43-2235-42788-4
| Vocat.cc ................. www.vocat.cc  . . . . . . . . . . . . . . .
| EDEN Creations ........... www.edenevents.at . . . . . . . . . . . . .
+------=[ Usenet Compliant Signature (RFC 2646) ]=---> www.rocklinux.net

>>> I'm looking for a new job: http://www.clifford.at/resume.html <<<


Reality corrupted. Reboot universe? (Y/N) /"\ ASCII Ribbon
                                                       \ /  Campaign
There are only 10 types of people in the world: X Against
Those who understand binary and those who don't. / \ HTML MailFrom Wed Mar 5 04:18:36 2003
Received: from sun0.mpimf-heidelberg.mpg.de (sun0.mpimf-heidelberg.mpg.de [149.217.50.120])
        by nerd.clifford.at (8.12.1/8.12.1/rock) with ESMTP id h253IZAN026782
        for <>; Wed, 5 Mar 2003 04:18:36 +0100
Received: from volans (volans.mpimf-heidelberg.mpg.de [149.217.52.158])
        by sun0.mpimf-heidelberg.mpg.de (8.11.6+Sun/8.11.6) with ESMTP id h253Mcr14162
        for <>; Wed, 5 Mar 2003 04:22:39 +0100 (MET)
Subject: Re: [rock-linux] Re: [PATCH] mine
From: "Juergen \"George\" "Sawinski <>
To:
In-Reply-To: <>
References: <>
         <>
Content-Type: multipart/mixed; boundary="=-Bgz8gSNw04niZ/hZyPSv"
Organization: Max-Planck Institute for Medical Research
Message-Id: <1046834682.1520.13.camel@volans>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2
Date: 05 Mar 2003 04:24:43 +0100


--=-Bgz8gSNw04niZ/hZyPSv
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Still a problem: auto_str is needed but not compiled.

Concerning errno, see
http://www.winehq.com/hypermail/wine-devel/2003/01/0971.html:

[...]
the real problem is even worse. glibc has switched to using
thread-local storage for errno (i.e. it is declared as 'extern __thread
int errno') when the tool chain supports the __thread keyword.
[...]

George

On Wed, 2003-03-05 at 03:37, Rene Rebe wrote:
> Hi again.
>
> Maybe half past 3 in the nigth is not a good time for diffs ... - here
> the correct one ...
>
> On: Wed, 05 Mar 2003 03:28:35 +0100 (CET),
> Rene Rebe <> wrote:
> > HI.
> >
> > This patch fixes two problems happening in my build:
> >
> > - make somehow manages to cripple the MINE_VERSION variable,
> > therefor I created an implicit rule for our objects in the
> > Makefiel (ugly ... - maybe Cliffs had a better fix)
> >
> > - with the new glibc mine's cdb does not link due to unresolved symbol
> > "errno", fixed by including the correct header ...
> >
> > Off course this (and more) is all in my rxr tree.
> >
> > If all goes well, I have a nwe ISO tomorrow (dRock-2.0 technology
> > preview with some failed packages).
> >
> > jackson:/home/rene/develop/rock # ./test-patch.sh 2clifford-mine.patch
> > Rsyncing ROCK Linux source-tree ...
> >
> > Applying patch 2clifford-mine.patch ...
> > patching file package/base/mine/hotfix.patch
> > patching file package/base/mine/hotfix2.patch
> >
> > Have fun,
> > - Ren??
>
> - Ren??
>
> --
> Ren?? Rebe - Europe/Germany/Berlin
> e-mail: ,
> web: http://www.rocklinux.org/people/rene http://gsmp.tfh-berlin.de/rene/
>
> Anyone sending unwanted advertising e-mail to this address will be
> charged $25 for network traffic and computing time. By extracting my
> address from this message or its header, you agree to these terms.
>
> ______________________________________________________________________
>
> diff -urN --exclude CVS rock-src-1.7/package/base/mine/hotfix.patch rock-src-1.7-rxr/package/base/mine/hotfix.patch
> --- rock-src-1.7/package/base/mine/hotfix.patch 2003-03-05 03:35:14.000000000 +0100
> +++ rock-src-1.7-rxr/package/base/mine/hotfix.patch 2003-03-05 03:32:34.000000000 +0100
> @@ -1,14 +1,3 @@
> ---- ./Makefile.orig 2003-02-13 02:55:18.000000000 +0100
> -+++ ./Makefile 2003-02-13 02:55:30.000000000 +0100
> -@@ -71,7 +71,7 @@
> - mine: $(MINE_ALL_OBJS)
> -
> - gasgui: $(GAS_OBJ)
> -- gcc $(GAS_OBJ) -ldialog -lcurses -o gasgui
> -+ gcc $(GAS_OBJ) -ldialog -lcurses -lm -o gasgui
> -
> - install:
> - install mine $(prefix)/sbin/mine
> --- ./selector.c.orig 2003-02-22 12:04:25.000000000 +0100
> +++ ./selector.c 2003-02-22 12:04:29.000000000 +0100
> @@ -237,7 +237,7 @@
> diff -urN --exclude CVS rock-src-1.7/package/base/mine/hotfix2.patch rock-src-1.7-rxr/package/base/mine/hotfix2.patch
> --- rock-src-1.7/package/base/mine/hotfix2.patch 1970-01-01 01:00:00.000000000 +0100
> +++ rock-src-1.7-rxr/package/base/mine/hotfix2.patch 2003-03-05 03:31:13.000000000 +0100
> @@ -0,0 +1,53 @@
> +
> +This patch fixes two problems happening in my build:
> +
> +- make somehow manages to cripple the MINE_VERSION variable,
> + therefor I created an implicit rule for our objects in the
> + Makefiel (ugly ... - maybe Cliffs had a better fix)
> +
> +- with the new glibc mine's cdb does not link due to unresolved symbol
> + "errno", fixed by including the correct header ...
> +
> + Rene Rebe -
> +
> +--- mine-0.5/Makefile 2003-02-12 13:01:50.000000000 +0100
> ++++ mine-0.5-rxr/Makefile 2003-03-05 02:17:11.000000000 +0100
> +@@ -43,8 +43,7 @@
> +
> + # Set and configure the c-compiler
> + #
> +-CFLAGS = -I$(CDB_DIR) -I$(BZIP2_DIR) -I$(LIBTAR_DIR)/lib -I. -Wall
> +-CFLAGS += -D'MINE_VERSION="$(MINE_VER)"' -O2
> ++CFLAGS = -I$(CDB_DIR) -I$(BZIP2_DIR) -I$(LIBTAR_DIR)/lib -I. -Wall -O2
> + ifeq ($(USE_AVL), 1)
> + CFLAGS += -DUSE_AVL=1
> + MINE_OBJ += avl.o
> +@@ -66,12 +65,16 @@
> +
> + prefix = /usr
> +
> ++# implicit rule for our .c files
> ++%.o: %.c
> ++ $(BUILDCC) -c $(CFLAGS) -DMINE_VERSION=\"$(MINE_VER)\" -o $@ $<
> ++
> + all: $(targets)
> +
> + mine: $(MINE_ALL_OBJS)
> +
> + gasgui: $(GAS_OBJ)
> +- gcc $(GAS_OBJ) -ldialog -lcurses -o gasgui
> ++ gcc $(GAS_OBJ) -DMINE_VERSION=\"$(MINE_VER)\" -ldialog -lcurses -lm -o gasgui
> +
> + install:
> + install mine $(prefix)/sbin/mine
> +--- mine-0.5/cdb-0.75/error.h.orig 2003-03-05 03:16:25.000000000 +0100
> ++++ mine-0.5/cdb-0.75/error.h 2003-03-05 03:15:13.000000000 +0100
> +@@ -1,6 +1,8 @@
> + #ifndef ERROR_H
> + #define ERROR_H
> +
> ++#include <errno.h>
> ++
> + extern int errno;
> +
> + extern int error_intr;

-- 
Juergen "George" Sawinski                  |  Phone:  +49-6221-486-308
Max-Planck Institute for Medical Research  |  Fax:    +49-6221-486-325
Dept. of Biomedical Optics                 |  Mobile: +49-171-532 5302
Jahnstr. 29                                |  
D-69120 Heidelberg                         |  
Germany                                    |  

GPG Key/Fingerprint: 9A5F7A31/86F2E5D5EDF4D9983BDD3F23986F154F9A5F7A31

--=-Bgz8gSNw04niZ/hZyPSv
Content-Disposition: attachment; filename=mine-0.5.patch
Content-Type: text/x-patch; name=mine-0.5.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

diff -urN mine-0.5-orig/cdb-0.75/Makefile mine-0.5/cdb-0.75/Makefile
--- mine-0.5-orig/cdb-0.75/Makefile 2003-02-12 13:01:51.000000000 +0100
+++ mine-0.5/cdb-0.75/Makefile 2003-03-05 03:58:30.000000000 +0100
@@ -12,8 +12,16 @@
 compile alloc.c alloc.h error.h
         ./compile alloc.c

+auto-str: \
+load auto-str.o buffer.a unix.a byte.a
+ ./load auto-str buffer.a unix.a byte.a
+
+auto-str.o: \
+compile auto-str.c buffer.h readwrite.h exit.h
+ ./compile auto-str.c
+
 auto_home.c: \
-conf-home
+auto-str conf-home
         ./auto-str auto_home `head -1 conf-home` > auto_home.c

 auto_home.o: \
diff -urN mine-0.5-orig/cdb-0.75/error.h mine-0.5/cdb-0.75/error.h
--- mine-0.5-orig/cdb-0.75/error.h 2003-02-12 13:01:51.000000000 +0100
+++ mine-0.5/cdb-0.75/error.h 2003-03-05 03:54:12.000000000 +0100
@@ -1,7 +1,7 @@
 #ifndef ERROR_H
 #define ERROR_H

-extern int errno;
+#include <errno.h>

 extern int error_intr;
 extern int error_nomem;

--=-Bgz8gSNw04niZ/hZyPSv--