Commit Graph

33 Commits

Author SHA1 Message Date
Albert Hopkins c08d85dace Minor changes to make kde/unstable build again 2010-11-27 16:43:40 -05:00
Albert Hopkins 3bb8e3fd37 Makefile: change filesystem label 2010-11-26 07:33:45 -05:00
Albert Hopkins abe5e4d98f Makefile tweaks 2010-11-20 19:51:27 -05:00
Albert Hopkins e89d24ccfe I learned a lot about Makefiles :D
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...
2010-11-13 18:22:18 -05:00
Albert Hopkins 63b8411f17 Should be compatible with 32bit guests 2010-11-06 18:46:07 -04:00
Albert Hopkins 26dac946ac * Pre-emerge xz-utils as some packages need this to unpack
* Clean up Makefile a little
2010-11-06 17:49:19 -04:00
Albert Hopkins 63cae4a119 Various fixes 2010-11-06 04:41:15 -04:00
Albert Hopkins 62801481e7 Make stage3 tarball always have the same filename 2010-11-05 10:52:04 -04:00
Albert Hopkins 295b1d9a96 Switch from ext4 to ext2 as an experiment 2010-11-05 08:59:18 -04:00
Albert Hopkins a5af02ae14 Move umounting in it's own target and don't ||true it 2010-11-05 08:06:13 -04:00
Albert Hopkins 7a21aed5fe * Use rsync --exclude-from instead of copying and removing
* Made a change so that "make -j2" works
2010-11-05 01:53:07 -04:00
Albert Hopkins 4f2bcd184e Merged changes 2010-11-04 23:25:47 -04:00
Albert Hopkins 543619d871 Various tweaks 2010-11-04 23:17:00 -04:00
Albert Hopkins 795211626e Make (hopefully) work with non-gentoo hosts 2010-11-04 23:10:54 -04:00
Albert Hopkins 717589eb4b Makefile(clean): umount each mount point individually 2010-10-26 20:00:50 -04:00
Albert Hopkins 7cf0f4ecf2 Changed from preinstall/postintall scripts to Makefile include files 2010-10-06 07:37:32 -04:00
Albert Hopkins 9b19fd1590 Makefile: introduce NBD_DEV variable to specify which nbd device to use 2010-10-03 11:29:27 -04:00
Albert Hopkins b95132a264 * Add ACCEPT_KEYWORDS Makefile option
* kde: Works now in ~amd64 also
* gnome: (Hopefully) works now in ~amd64 also
* Add xfce virtual appliance
* Add HEADLESS Makefile option that configures grub.conf and /etc/inittab
  to use serial console
2010-09-18 02:43:14 -04:00
Albert Hopkins 86182d95ed Actually copy $(TIMEZONE) to /etc/localtime 2010-09-07 07:42:18 -04:00
Albert Hopkins eaf9c7cf82 Don't match hostname to localhost in /etc/hosts 2010-08-15 15:22:24 -04:00
Albert Hopkins f0fb08c7ce Add power management to kernel config. Add acpid to VM installation. 2010-07-31 20:16:35 -04:00
Albert Hopkins abaf13ae2b Instad of masking python3, change default python to python2.6 to work around the stage3 problem.
This bug has been reported upstream:
http://bugs.gentoo.org/show_bug.cgi?id=330655
2010-07-31 16:12:35 -04:00
Albert Hopkins ea8ef5b795 Various cleanups. Maked python3. Added -pipe back go CFLAGS. 2010-07-31 06:53:21 -04:00
Albert Hopkins ac0dd5fe39 Fix so that the latest stage3 is unpacked if there are multiple tarballs
in the current directory.
2010-07-30 01:56:56 +00:00
Albert Hopkins 466d286685 Make so bind mount variables point to gentoo defaults.
Ensure that images can be built by a virtual machine

Removed "-pipe" from CFLAGS in make.conf for machines with low memory (such
as virtual machines)
2010-07-29 22:49:39 +00:00
Albert Hopkins c317172525 New teamplayer vm and kernel config update. 2010-07-21 23:08:35 -04:00
Albert Hopkins af260872d8 Enable a serial console in /etc/inittab 2010-07-10 19:32:08 -04:00
Albert Hopkins 22f53efe34 Make script is now modular, create a directory for your appliance, drop
some files in it and "make APPLIANCE=..."
2010-07-10 16:43:22 -04:00
Albert Hopkins a2cd06b30f Update system before world, lock passwords last. 2010-07-10 16:03:39 -04:00
Albert Hopkins 8a7b5f1700 Cleaned up Makefile and hopefully made it more modular. Added preinstall
and postinstall scripts for additional software
2010-07-10 14:04:04 -04:00
Albert Hopkins d500b91164 Makefile: don't attempt to fetch the stage3 if stage3 was already run 2010-07-09 20:49:58 -04:00
Albert Hopkins 0e2fb5bda6 Made Makefile a little bit smarter. 2010-07-09 20:22:55 -04:00
Albert Hopkins fe5646804c Initial commit 2010-07-08 23:22:37 -04:00