Re: [PATCH] better handling of non-free CDs
On Tue, Jun 06, 2000 at 12:05:53PM +0100, Raphael Hertzog wrote:
>
>Le Mon, Jun 05, 2000 at 11:23:51AM +0100, Steve McIntyre écrivait:
>> I've hacked the add_package function to just ignore non-free packages
>> in the dependency lists unless we're onto the later CDs containing
>> only non-free. Contrib packages therefore will be dropped into place
>> just as normal.
>
>Yes that's the problem. :) If you build a CD set with NONFREE and
>EXTRANONFREE contrib packages will be put on the first 2 binary CDs but
>they'll depend on packages that are on CD 4. We loose the fact that a
>package in CD X has all its dependencies on CD 1..X.
That's always been a problem with contrib, to be honest. I've got no
problem with breaking the contrib section in this way - then if people
want to go and download the non-free dependencies off the web (for
example, a non-free package that forbids CD distribution) they can do
just that, and not have to download all the contrib stuff too.
>What we could probably do, is always build the 3 first CD as usual with
>NONFREE unset, but have an extra target "extranonfree-list" in the
>Makefile that would do what is required (ie include non-free package
>and contrib packages that have not been included before).
Maybe.
>I really think that we should be able to add this feature without
>modifying actual tools/{cd2src,list2cds} ...
Again, maybe. The changes I've made seemed to me to be quite clean and
a fairly obvious way of doing things. If you have a better plan, go
ahead.
>> That's the problem - I want to keep main and non-free entirely
>> separate, for logistical reasons. Then I don't have to keep so many
>> images around to cope with the different options. If you look at the
>> patch, there's a simple config change - set $extranonfree in list2cds
>> if you want it split. If you leave it set to 0 then behaviour should
>> be almost identical to before. I haven't plumbed it through yet, but
>> I'm going to add it as another variable in CONF.sh.
>
>Yes I know what you want, and i've seen the variable but the only thing i
>can tell you is that i'm not sure that you're doing the same than before
>since you changed the code even if extranonfree = 0 ...
I'm fairly certain it should work just the same. I'll test and see if
it helps...
>I want that we can generate images like you proposed but I also want to be
>able to merge everything. It may be possible that for woody we'll need 4
>binary CD and there may be enough free space on CD4 for non-free without
>requiring CD5 ...
I'd really like to keep it all entirely separate if possible - it
really makes life easier in terms of images, especially if we start
pressing CDs. I'm not convinced of the need/desire to merge non-free
onto later CDs.
--
Steve McIntyre, Allstor Software smcintyr@allstor-sw.co.uk
<a href=http://www.chiark.greenend.org.uk/~stevem/comp/>My PC page</a>
"Can't keep my eyes from the circling sky,
"Tongue-tied & twisted, Just an earth-bound misfit, I..."
Reply to: