From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by nuthatch.gentoo.org with esmtp (Exim 4.62) (envelope-from ) id 1I6Qww-0005Be-4q for garchives@archives.gentoo.org; Thu, 05 Jul 2007 13:00:46 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.14.0/8.14.0) with SMTP id l65D0hec005226; Thu, 5 Jul 2007 13:00:43 GMT Received: from mail.bawue.net (phoenix.bawue.net [193.7.176.60]) by robin.gentoo.org (8.14.0/8.14.0) with ESMTP id l65D0g16005216 for ; Thu, 5 Jul 2007 13:00:42 GMT Received: from my.bawue.net (imap.bawue.net [193.7.176.64]) by mail.bawue.net (Postfix) with ESMTP id C104C84AD1 for ; Thu, 5 Jul 2007 14:53:51 +0200 (CEST) Received: from 130.230.11.107 (SquirrelMail authenticated user stoile) by my.bawue.net with HTTP; Thu, 5 Jul 2007 15:53:51 +0300 (EEST) Message-ID: <59506.130.230.11.107.1183640031.squirrel@my.bawue.net> Date: Thu, 5 Jul 2007 15:53:51 +0300 (EEST) Subject: [gnap-dev] Some patches for gnap From: "Philipp Riegger" To: gnap-dev@lists.gentoo.org User-Agent: SquirrelMail/1.4.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo GNAP development X-BeenThere: gnap-dev@gentoo.org Reply-to: gnap-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 Importance: Normal X-Archives-Salt: 6a12d322-e3df-44a5-9ad4-fd649c16241b X-Archives-Hash: e2df190fa1403846d81afa346d81e9f9 Hi! I wanted to send the patches for gnap i made so far. I don't know what i screwed up, but somehow they do not apply cleanly. I send them anyway for review, if anybody wants i can send my current gnap_* scripts or recreate working patches. I will send the patcehs as replies to this email (since they are mostly for review). 01-split-gnap_make.patch 02-split-gnap_overlay.patch 03-split-gnap_remaster.patch Theese first 3 patches take the common stuff (functions, constants) from the gnap_* scripts and put it into gnap_shared.sh Note: 1) There are 2 gnap_shared.sh so far, one in the src and one in the toos directory of the gnap svn tree. This should maybe be changed... 2) The gnap_* scripts do 'source "gnap_shared.sh"', which is probably not good. In which directory will we put gnap_shared.sh? 04-feature-gnap_make-T.patch 05-festure-gnap_overlay-T.patch 06-feature-gnap_remaster-T.patch 07-split-make_tempdir.patch After i created the first patch (with which it is possible to specify a temp directory for gnap_make) i did the same for the other scripts and put the logic in gnap_shared.sh finally. For the moment this is to prevent using too small temp directories, later i want to create an option to prevent deleting special files that they can be used after a gnap run. I already talked about this. 08-namespace-gnap_shared.patch This cleanes up the namespace, all variables that are used as input parameters in gnap_shared.sh are prefixed with GNAP_ to get a clean usage of the namespace. More to that later. 09-cleanup-gnap_make.patch Some small fixes for gnap_make. Ok, so far, so good. What's next? 1) Configuring gnap At the moment configuring gnap_make (at which i concentrate so far) is quite a mess. We have default parameters (in gnap_shared.sh), we have catalyst.conf and commons.conf which we simply source, we have command line options. At the moment this means the following: Default options are set first, then they are overwritten by command line options, which are overwritten by common.conf, ehich are overwritten by catalyst.conf. This is not really clean. For example, we use CATALYST_TEMP_DIR in common.conf, catalyst uses store_dir in catalyst.conf. This is redundant and does not make it clean. The default common.conf also defines CATALYST_CONF (which might be broken because i renamed it, i have to check), but that means that the command line option for specifying catalyst.conf does not work if this is not commented out. So... do we want to change this? I would like something like: We can use variables from the environment. This will only be valid for GNAP_* variables, so we have a clear namespace and it enables people to set default variables. I'm not sure, how much this will be needed/used, but it sounds like an interesting feature. The catalyst.conf is only used for catalyst configuration (interaction between gnap and catalyst), therefore it does never make sense to overwrite information given there. Default options < environment < common.conf < command line options. This would be my prefered way of configuring gnap, where variables from sources more right overwrite variables from sources more left. 2) gnap_make feature: pretend I'd like a --pretend feature for gnap_make which lets it just create the configuration files for catalyst and the source files (portage tree, from tree snapsht and overlays). This might be useful for test runs, development and usage of catalyst features gnap does not support. This could be implemented by simply overwriting CATALYST_BIN with "echo $CATALYSY_BIN", if 1) from above is clear. 3) gnap_make feature: improved overlay handling The overlay handling of gnap_make is some kind of bug, i think. If you don't take care, Manifests are broken. Therefore i want to change it that packages (directories in which ebuilds are) are first deleted from the tree and metadata/cache if they exist, before new ones from overlays are added. This should be easy to understand, since people usually don't need stuff from the tree anymore if they use an overlay for a specific package. 4) some small stuff At the moment, if there is a choice (Overwrite/Append, Yes/No) only one possibility is checked and the other is assumed, if the one is not given. I'd like to change this to something like "It is asked in a loop until a valid option is given." There is a function gwarn, writes to stderr. It is used in some places where ginfo would make more sence, if it would exist. I'd like to implement and use this. That's all i wanted to say about the gnap_scripts at the moment. Philipp -- gnap-dev@gentoo.org mailing list