|
If I'm not mistaken, I think we are referring
to two different things. My tazwok.conf includes the
following:
WOK="/home/slitaz/wok/"
SOURCES_REPOSITORY="/home/slitaz/src"
PACKAGES_REPOSITORY="/home/slitaz/packages"
(CONFIGURE_ARGS, LOCALE, and *_MIRROR are also
present.)
Those paths, though, appear to be global path
definitions. I'm interested in the $src path that tazwok dynamically
generates underneath $WOK (e.g. $WOK/$PACKAGE/$SOURCE-$VERSION
).
Perhaps the attached tazwok diff file will help
make things clearer. Changes include the following:
- Source archives are now extracted to
$WOK/$PACKAGE/source (instead of $WOK/$PACKAGE)
- $src is set to $WOK/$PACKAGE/source IF the
directory $WOK/$PACKAGE/source/$SOURCE-$PACKAGE does not exist (i.e. is not
created during the extraction of the source archive)
- Additional changes to try to address some problems
I have experienced when both WANTED and SOURCE are defined.
I have tested this on four different packages that
each a have a different combination of $WANTED and $SOURCE
- freetype1 - $SOURCE defined; $WANTED
undefined
- freetype1-dev - $SOURCE defined; $WANTED
defined
- freetype - $SOURCE undefined; $WANTED
undefined
- freetype-dev - $SOURCE undefined; $WANTED
defined
(NOTE: In the freetype1-dev receipt, I commented
out the _pkg assignment statement for testing purposes.)
The changes in the attached diff may work for these
four cases, but are there other scenarios that might need to be
addressed?
Thank you,
Matthew
Sent: Monday, February 16, 2009 12:55 PM
Subject: Re: tazwok $src directory
if I am not wrong these variables are present in
/etc/tazwok.conf
They're pretty intuitive, so u'll be able to figure it out.
I dont have access to my VM, so I'm not able to tell you for
sure.
regards
Sandeep
On Mon, Feb 16, 2009 at 7:18 PM, rcx <rcx@xxxxxxxxxxxxxxxx>
wrote:
Hello,
When tazwok extracts a source archive, it
extracts to the root of the package folder (e.g.
/home/slitaz/wok/<package> ). The $src variable then assumes that
those source archives have a root folder of
$SOURCE-$VERSION.
Am I missing a property that can be used to
change these default source directories? For example, some source
archives don't package everything inside a root folder, so when tazwok
unpackages such source archives, everything gets dumped under the wok package
folder (alongside the "receipt" file, "stuff" folder, etc.), making it a mess
to cleanup. Meanwhile, $src thinks it is a directory that really doesn't
exist (e.g. /home/slitaz/wok/<package>/$SOURCE-$VERSION).
If there isn't a configurable property, would it
be possible (without breaking too many things) to have tazwok extract the
source archive to a "src" folder inside the tazwok package directory?
For example, this directory structure might look like the
following:
/home/slitaz/wok/<package>/
- src/
- stuff/
- receipt
Then, when the $src value is assigned, tazwok
could check if /home/slitaz/wok/<package>/src/$SOURCE-$VERSION/
exists. If is does exist, $src could be assigned the path where the last
directory is $SOURCE-$VERSION (as it currently does); otherwise, $src could
simply be assigned the value /home/slitaz/wok/<package>/src.
Optionally, if the root of the source archive only contains a single folder,
$src could be assigned that folder path even if the directory name is not
$SOURCE-$VERSION.
Does this make sense, or is there some mechanism
already in place that I have missed?
Thank you,
Matthew
|