On Sunday 31 January 2010 18:08:49 Pavel Heimlich, a.k.a. hajma wrote:
> 2010/1/31 Ben Taylor <bentaylor.solx86 at gmail.com>:
> > I think it is a really bad idea be continuing to clutter up
> > foss-depend-packages.inc
> > with os determination code.
As long as we're fiddling around with that code, yes. Once the os determination
code is stable, we return to the desire to have *fewer* include files, in
general (this makes it easier, for instance, to merge stuff to JUCR).
> > 1) include base-os-selection.inc in base-foss-headers.inc
> > 2) remove any os selection code from foss-depend-packages.inc
yes, and yes.
> > 3) in any FOSSspec, remove any foss-paths.inc if base-foss-headers.inc
> > is included,
> > otherwise, add base-foss-headers.inc and remove foss-paths.inc
Well .. base-foss-headers does the following:
- sets Distribution, Vendor, SUNW_Pkg, meta data
- adds Requires: FOSShier
- adds some BuildRequires
- defines has64 and _arch64
- includes depend-packages
- includes foss-paths
- sets BuldRoot and BaseDir
So these do not make sense for every specfile.
> > 4) add base-os-selection.inc to any KDEspec that includes
> > foss-depend-packages.inc
The KDE specs have a truly craptaculous mix of includes. I think it would work
if kde-common.inc was moved above the Requires sections and all other includes
removed, but that bears testing.
> > 5) stop using _with_{s10,nv,osol} for tests. because those are
> > propogated through
Yes, those are a holdover from when I didn't know how to programmatically
tell the difference between the different OS versions we're supporting.
[ade]
