Add EXTRA_WORLD Makefile variable to add extra packages to world
This commit is contained in:
parent
871941c88c
commit
2ba82fb92b
3
Makefile
3
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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
sys-devel/gcc cxx
|
||||
dev-lang/python xml
|
||||
dev-libs/libxml2 python
|
||||
sys-libs/ncurses minimal
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue