From 2ba82fb92bf313d686e69f63bd0f621a734e441a Mon Sep 17 00:00:00 2001 From: Albert Hopkins Date: Wed, 16 Nov 2011 11:44:32 +0000 Subject: [PATCH] Add EXTRA_WORLD Makefile variable to add extra packages to world --- Makefile | 3 ++- base/package.use | 4 +++- drupal/package.use | 1 + gnome/package.use | 1 + hemp-node/package.use | 1 + kde/package.use | 1 + lodgeit/package.use | 1 + teamplayer/package.use | 1 + x/package.use | 1 + xfce/package.use | 1 + 10 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e21fa91..09f0e78 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,7 @@ RSYNC_MIRROR = rsync://rsync.gtlib.gatech.edu/gentoo/ KERNEL = gentoo-sources PACKAGE_FILES = $(wildcard $(APPLIANCE)/package.*) WORLD = $(APPLIANCE)/world +EXTRA_WORLD = CRITICAL = $(APPLIANCE)/critical # Allow appliance to override variables @@ -228,7 +229,7 @@ build-software: systools issue etc-update.conf $(CRITICAL) $(WORLD) # the stage3 so may not be installed yet $(inroot) $(EMERGE) -1n $(USEPKG) app-arch/xz-utils - $(inroot) $(EMERGE) $(USEPKG) --update --newuse --deep `cat $(WORLD)` + $(inroot) $(EMERGE) $(USEPKG) --update --newuse --deep `cat $(WORLD)` $(EXTRA_WORLD) $(gcc_config) # Need gentoolkit to run revdep-rebuild diff --git a/base/package.use b/base/package.use index 156bb70..e78efb0 100644 --- a/base/package.use +++ b/base/package.use @@ -1,5 +1,7 @@ app-editors/nano ncurses dev-lang/python ssl threads xml +net-misc/dhcp client +sys-devel/gcc cxx +sys-devel/gcc cxx sys-kernel/gentoo-sources symlink sys-libs/ncurses minimal -net-misc/dhcp client diff --git a/drupal/package.use b/drupal/package.use index 8dc0be8..5315c14 100644 --- a/drupal/package.use +++ b/drupal/package.use @@ -4,6 +4,7 @@ dev-lang/python ssl threads xml dev-php5/pecl-uploadprogress php_targets_php5-3 mail-mta/ssmtp mta ssl net-misc/dhcp client +sys-devel/gcc cxx sys-kernel/gentoo-sources symlink sys-libs/ncurses minimal www-apps/drupal postgres diff --git a/gnome/package.use b/gnome/package.use index 94e18b2..b904227 100644 --- a/gnome/package.use +++ b/gnome/package.use @@ -1,5 +1,6 @@ app-editors/nano ncurses dev-lang/python ssl sqlite threads xml +sys-devel/gcc sys-kernel/gentoo-sources symlink sys-libs/ncurses minimal diff --git a/hemp-node/package.use b/hemp-node/package.use index 56d8651..e91e662 100644 --- a/hemp-node/package.use +++ b/hemp-node/package.use @@ -1,4 +1,5 @@ app-editors/nano ncurses dev-lang/python ssl threads xml +sys-devel/gcc cxx sys-kernel/gentoo-sources symlink sys-libs/ncurses minimal diff --git a/kde/package.use b/kde/package.use index 7175fe5..95f7d8b 100644 --- a/kde/package.use +++ b/kde/package.use @@ -2,6 +2,7 @@ app-editors/nano ncurses dev-lang/python ssl threads xml mail-mta/ssmtp mta net-misc/dhcp client +sys-devel/gcc cxx sys-kernel/gentoo-sources symlink sys-libs/ncurses minimal diff --git a/lodgeit/package.use b/lodgeit/package.use index d4f64ad..04d3e8a 100644 --- a/lodgeit/package.use +++ b/lodgeit/package.use @@ -1,5 +1,6 @@ app-editors/nano ncurses dev-db/sqlite extensions dev-lang/python sqlite ssl threads xml +sys-devel/gcc cxx sys-kernel/gentoo-sources symlink sys-libs/ncurses minimal diff --git a/teamplayer/package.use b/teamplayer/package.use index fefef2e..b4e6f62 100644 --- a/teamplayer/package.use +++ b/teamplayer/package.use @@ -5,6 +5,7 @@ dev-python/django postgres media-libs/flac ogg media-sound/mpd audiofile ffmpeg flac id3tag lame network ogg vorbis mad sqlite media-video/ffmpeg mmx mxext mp3 network x264 +sys-devel/gcc cxx sys-kernel/gentoo-sources symlink sys-libs/ncurses minimal virtual/ffmpeg x264 mp3 diff --git a/x/package.use b/x/package.use index 223dd91..6e26ff4 100644 --- a/x/package.use +++ b/x/package.use @@ -1,3 +1,4 @@ +sys-devel/gcc cxx dev-lang/python xml dev-libs/libxml2 python sys-libs/ncurses minimal diff --git a/xfce/package.use b/xfce/package.use index 75c03e9..d8be7f0 100644 --- a/xfce/package.use +++ b/xfce/package.use @@ -2,6 +2,7 @@ app-editors/nano ncurses dev-lang/python ssl threads xml media-libs/libpng apng net-misc/dhcp client +sys-devel/gcc cxx sys-kernel/gentoo-sources symlink sys-libs/ncurses minimal www-client/firefox bindist