On Wed, 22 Apr 2009 15:53:18 +0200 Simon Josefsson <[email protected]> wrote:
> Karl Goetz <[email protected]> writes: > > >> correct... So how about using $DISTRONAME_L instead of gnewsense in > >> more places? And using the same URL to the ubuntu repository as is > >> suggested on the wiki page. Something like this: > > > > Its setup that way currently because gNS is what builder was made > > for. Since theres never been any reason to change the defaults from > > ours, its not been a priority of any sort. As an example, almost > > all the strings you point out below we dont use anymore - we > > override them in config.local. > > > > Now you've reminded me, I've gone and poked the file. do another > > checkout and tell me what you think. > > > > A lot are still gNS specific, but I dont see the point in having > > lots of "CHANGEME" lines. Also, config.local can do almost > > everything config can, and after i've mangled a bit more magic, > > should be able to support all the same options. > > Looks good in general, thanks! > > It's difficult to use config.local cleanly, though. If you for > example override BASEDIR or DISTRONAME, you'll have to pull in code > from config. Maybe config.local should be read earlier in config? > I'm not sure a config.local is useful. > > >> # Where the buildscripts and livecd pull sources from > >> -REPOAPT=http://127.0.0.1/~bbrazil/srv/gnewsense/gnewsense > >> +REPOAPT=http://127.0.0.1/$DISTRONAME_L/$DISTRONAME_L > > > > Changed to REPOAPT=http://127.0.0.1/$DISTRONAME_L > > Does that work? gen-livecd appear to needed Works for me with the following symlinks: r...@rommel:~# ls -lh /var/www/ total 0 lrwxrwxrwx 1 root root 20 2009-03-15 01:26 debian -> /srv/mirrors/Debian/ lrwxrwxrwx 1 root root 25 2009-02-11 10:15 gnewsense -> /srv/gnewsense/gnewsense/ lrwxrwxrwx 1 root root 23 2009-03-15 23:05 gnewsense-main -> /srv/mirrors/gNewSense/ lrwxrwxrwx 1 root root 20 2009-03-15 01:26 ubuntu -> /srv/mirrors/Ubuntu/ > http://127.0.0.1/$DISTRONAME_L/$DISTRONAME_L at least if you follow > the hint in the wiki to symlink $REPODST to /var/www/$DISTRONAME_L. > Maybe the wiki should say symlink $REPODST/$DISTRONAME_L instead? It probably should (yet another 'was like that' issue). > Yes, looking at what's served directly under $REPODST now, it looks > like things that shouldn't be exposed even to a local web server. Yup. > > >> I guess some of the images under packages/ are gnewsense-specific, > >> but at least the above means I get a CD image. Branding can > >> always be improved later... > >> > >> Hm. Maybe the above is too complex, and the simplest solution is > >> to revert the change to config that used $DISTRONAME_L in the > >> package > > > > This is what I'm leaning towards. > > I think that would be good. It will allow people to build their own > CD images with a distribution called something else (always good to I'll put this patch in another time: r...@rommel:~/builder-working# svn diff config Index: config =================================================================== --- config (revision 243) +++ config (working copy) @@ -72,7 +72,7 @@ # Changes to be made to the ubuntu-minimal etc. and packages META_minimal_ADD="" META_standard_ADD="emacs nethack bsdgames build-essential" -META_desktop_ADD="${DISTRONAME_L}-artwork ${DISTRONAME_L}-gdm-themes epiphany-browser usplash-theme-${DISTRONAME_L}" +META_desktop_ADD="gnewsense-artwork gnewsense-gdm-themes epiphany-browser usplash-theme-gnewsense" META_minimal_REMOVE="" META_standard_REMOVE="popularity-contest friendly-recovery" META_desktop_REMOVE="ubuntu-docs ubuntu-artwork apport-gtk hwtest-gtk usplash-theme-ubuntu ubuntu-gdm-themes" Its not big enough to deserve a commit of its own. > avoid confusion) but if they want to modify artwork, they need to do > more work -- but it can be limited to replacing just one PNG file > under packages/, not duplicate an entire package hierarchy. I think > it is cool that it is so easy to build your own distribution. Hopefully it keeps getting easier :) kk > > /Simon > -- Karl Goetz, (Kamping_Kaiser / VK5FOSS) Debian user / gNewSense contributor http://www.kgoetz.id.au No, I won't join your social networking group
signature.asc
Description: PGP signature
_______________________________________________ gNewSense-dev mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/gnewsense-dev
