e89d24ccfe
So, basically I re-architeched things a bit: The appliance/Makefile.inc fiels are now appliance/Makefile (again). The main Makefile will call "make -C appliance preinstall" and "postinstall" (and in future "clean"). So I got rid of the ugly make variables/include thing. Some of the main Makefile's variables are exported to the sub-makes. Appliances don't really need $(APPLIANCE) anymore as the appliance directory is their CWD. Added some new targets and smarter targets. I can do more with this, but it's a big improvment from last time. Still learning a lot of Makefile magic (been reading other people's Makefiles). Verified that "make -j3" works (at least on the base appliance) but will kill your hard drive :D Introduced "profiles" Which are files with variables you want to override. The file will be "include"ed by the main Makefile. For example, I have a file, "local.cfg" that looks like this: --- 8< ----------------------------- CHROOT = /var/scratch/marduk/vabuild HEADLESS = YES PRUNE_CRITICAL = NO VIRTIO = YES TIMEZONE = EST5EDT DISK_SIZE = 60.0G SWAP_SIZE = 48 PKGDIR = /var/scratch/packages NBD_DEV = /dev/nbd8 all: qcow --- 8< ------------------------------ Then, e.g. i can run "make PROFILE=local APPLIANCE=kde". If you don't specify a PROFILE variable, then it will default to the empty string, which means the main Makefile will attempt to include .cfg So, for example i have: $ ln -s local.cfg .cfg $ make APPLIANCE=kde Don't set PROFILE inside your .cfg file (why would you?). Also, if the [pro]file does not exist, the include fails silently. I will put this info in the wiki eventually...
30 lines
675 B
Plaintext
30 lines
675 B
Plaintext
app-editors/nano ncurses
|
|
dev-lang/python ssl sqlite threads xml
|
|
sys-kernel/gentoo-sources symlink
|
|
|
|
# for gnome
|
|
app-text/enchant hunspell
|
|
app-text/poppler cairo
|
|
dev-libs/libxml2 python
|
|
gnome-base/gnome-menus python
|
|
gnome-base/gvfs gdu
|
|
media-libs/libcanberra gtk
|
|
media-libs/swfdec gtk
|
|
net-libs/libsoup gnome
|
|
net-misc/curl ssl
|
|
sys-apps/dbus X
|
|
sys-apps/parted device-mapper
|
|
sys-block/parted device-mapper
|
|
sys-auth/consolekit policykit
|
|
sys-fs/udev extras
|
|
x11-libs/cairo svg X
|
|
x11-libs/gtk+ jpeg
|
|
x11-libs/pango X
|
|
mail-client/evolution ssl
|
|
gnome-extra/evolution-data-server ssl
|
|
|
|
#net-libs/xulrunner cups
|
|
#net-print/cups gnutls
|
|
#app-text/poppler utils
|
|
#app-text/ghostscript-gpl cups
|