VA
/
virtual-appliance
1
0
Fork 0
Code Issues Pull Requests Releases 6 Wiki Activity

Introduce appliance-level make.conf

This commit is contained in:
Albert Hopkins 2012-12-23 01:47:26 +00:00
parent b9200a5214
commit f4f5393f64
16 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -158,6 +158,7 @@ ifdef PKGDIR
echo PKGDIR="/var/portage/packages" >> $(CHROOT)/etc/portage/make.conf echo PKGDIR="/var/portage/packages" >> $(CHROOT)/etc/portage/make.conf
endif endif
echo ACCEPT_KEYWORDS=$(ACCEPT_KEYWORDS) >> $(CHROOT)/etc/portage/make.conf echo ACCEPT_KEYWORDS=$(ACCEPT_KEYWORDS) >> $(CHROOT)/etc/portage/make.conf
[ -f "$(APPLIANCE)/make.conf" ] && cat "$(APPLIANCE)/make.conf" >> $(CHROOT)/etc/portage/make.conf
cp locale.gen $(CHROOT)/etc/locale.gen cp locale.gen $(CHROOT)/etc/locale.gen
$(inroot) locale-gen $(inroot) locale-gen
mkdir -p $(CHROOT)/etc/portage mkdir -p $(CHROOT)/etc/portage

5
airport/Makefile
View File

@ -5,14 +5,9 @@ PGVER := 9.2
rcdefault := /etc/runlevels/default rcdefault := /etc/runlevels/default
preinstall: preinstall:
sed -i '/^PYTHON_TARGETS=/d' $(CHROOT)/etc/portage/make.conf
echo 'PYTHON_TARGETS="python2_7"' >> $(CHROOT)/etc/portage/make.conf
$(inroot) $(EMERGE) -n $(USEPKG) python:2.7 $(inroot) $(EMERGE) -n $(USEPKG) python:2.7
$(inroot) eselect python set python2.7 $(inroot) eselect python set python2.7
$(inroot) python-updater $(inroot) python-updater
sed -i '/^APACHE2_/d' $(CHROOT)/etc/portage/make.conf
echo 'APACHE2_MPMS="prefork"' >> $(CHROOT)/etc/portage/make.conf
echo 'APACHE2_MODULES="auth_basic authz_host env include info"' >> $(CHROOT)/etc/portage/make.conf
postinstall: airport.service settings.py airport.wsgi default_vhost.include firstboot.start issue postinstall: airport.service settings.py airport.wsgi default_vhost.include firstboot.start issue

5
airport/make.conf Normal file
View File

@ -0,0 +1,5 @@
# Settings for Airport
PYTHON_TARGETS="python2_7"
APACHE2_MPMS="prefork"
APACHE2_MODULES="auth_basic authz_host env include info"

3
drupal/Makefile
View File

@ -4,8 +4,7 @@ DPVER = 7.17
inroot := chroot $(CHROOT) inroot := chroot $(CHROOT)
rcdefault := /etc/runlevels/default rcdefault := /etc/runlevels/default
preinstall: make.conf.extra preinstall:
cat make.conf.extra >> $(CHROOT)/etc/portage/make.conf
postinstall: firstboot.start postinstall: firstboot.start
$(inroot) passwd -d postgres $(inroot) passwd -d postgres

0
drupal/make.conf.extra → drupal/make.conf
View File

9
gnome/Makefile
View File

@ -5,15 +5,6 @@ preinstall:
mkdir -p "$(CHROOT)/var/lib/dbus" mkdir -p "$(CHROOT)/var/lib/dbus"
echo 1234567890abcdef1234567890abcdef > \ echo 1234567890abcdef1234567890abcdef > \
"$(CHROOT)"/var/lib/dbus/machine-id "$(CHROOT)"/var/lib/dbus/machine-id
chroot "$(CHROOT)" $(EMERGE) $(USEPKG) -1n dev-util/pkgconfig
ifeq ($(OVERLAY),YES)
chroot $(CHROOT) $(EMERGE) $(USEPKG) -1n app-portage/layman
chroot $(CHROOT) $(EMERGE) $(USEPKG) -1n dev-vcs/git
chroot $(CHROOT) /usr/bin/layman --sync ALL
chroot $(CHROOT) /usr/bin/layman --add gnome
echo "source /var/lib/layman/make.conf" >> $(CHROOT)/etc/portage/make.conf
echo USE='"$$USE clutter"' >> $(CHROOT)/etc/portage/make.conf
endif
postinstall: custom.conf gdm.start postinstall: custom.conf gdm.start
$(RM) "$(CHROOT)"/var/lib/dbus/machine-id $(RM) "$(CHROOT)"/var/lib/dbus/machine-id

3
kde/Makefile
View File

@ -1,13 +1,12 @@
preinstall: preinstall:
echo 'USE="$$USE qt3support xcomposite opengl"' >> "$(CHROOT)"/etc/portage/make.conf
postinstall: kdmrc kdm.start Xaccess knotifyrc postinstall: kdmrc kdm.start Xaccess knotifyrc
cp kdmrc Xaccess "$(CHROOT)"/usr/share/config/kdm cp kdmrc Xaccess "$(CHROOT)"/usr/share/config/kdm
mkdir -p "$(CHROOT)"/etc/skel/.kde4/share/config mkdir -p "$(CHROOT)"/etc/skel/.kde4/share/config
cp knotifyrc "$(CHROOT)"/etc/skel/.kde4/share/config/knotifyrc cp knotifyrc "$(CHROOT)"/etc/skel/.kde4/share/config/knotifyrc
cp kdm.start "$(CHROOT)"/etc/local.d/kdm.start cp kdm.start "$(CHROOT)"/etc/local.d/kdm.start
chroot "$(CHROOT)" ln -nsf /etc/init.d/dbus /etc/runlevels/default/dbus $(inroot) ln -nsf /etc/init.d/dbus /etc/runlevels/default/dbus
clean: clean:

3
kde/make.conf Normal file
View File

@ -0,0 +1,3 @@
# Settings for KDE
USE="$USE qt3support xcomposite opengl"

5
lodgeit/Makefile
View File

@ -1,10 +1,7 @@
# set up apache modules in make.conf
POST_FILES = lodgeit.sh 10_lodgeit.conf apache2.conf genkey.py lodgeit.wsgi POST_FILES = lodgeit.sh 10_lodgeit.conf apache2.conf genkey.py lodgeit.wsgi
POST_FILES += issue POST_FILES += issue
preinstall: make.conf.extra preinstall:
cat make.conf.extra >> $(CHROOT)/etc/portage/make.conf
chroot $(CHROOT) $(EMERGE) --select -n $(USEPKG) dev-lang/python:2.7 chroot $(CHROOT) $(EMERGE) --select -n $(USEPKG) dev-lang/python:2.7
chroot $(CHROOT) eselect python set python2.7 chroot $(CHROOT) eselect python set python2.7

0
lodgeit/make.conf.extra → lodgeit/make.conf
View File

2
owncloud/Makefile
View File

@ -1,6 +1,4 @@
preinstall: preinstall:
$(inroot) sed -i '/^APACHE2_MODULES=/d' /etc/portage/make.conf
echo 'APACHE2_MODULES="mime alias auth_basic authz_host dir env include info"' >> $(CHROOT)/etc/portage/make.conf
postinstall: postinstall:
sed -i 's/^APACHE2_OPTS=.*/APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D PHP5 -D SSL -D SSL_DEFAULT_VHOST"/' $(CHROOT)/etc/conf.d/apache2 sed -i 's/^APACHE2_OPTS=.*/APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D PHP5 -D SSL -D SSL_DEFAULT_VHOST"/' $(CHROOT)/etc/conf.d/apache2

3
owncloud/make.conf Normal file
View File

@ -0,0 +1,3 @@
# Settings for owncloud
APACHE2_MODULES="mime alias auth_basic authz_host dir env include info"

2
teamplayer/Makefile
View File

@ -16,8 +16,6 @@ post_files = bash_profile settings_local.py start-teamplayer stop-teamplayer
post_files += local.start local.stop issue lighttpd.conf teamplayer.service post_files += local.start local.stop issue lighttpd.conf teamplayer.service
preinstall: preinstall:
sed -i '/^PYTHON_TARGETS=/d' $(CHROOT)/etc/portage/make.conf
echo 'PYTHON_TARGETS="python2_7"' >> $(CHROOT)/etc/portage/make.conf
$(inroot) $(EMERGE) --select -n $(USEPKG) dev-lang/python:2.7 $(inroot) $(EMERGE) --select -n $(USEPKG) dev-lang/python:2.7
$(inroot) eselect python set python2.7 $(inroot) eselect python set python2.7
$(inroot) python-updater $(inroot) python-updater

3
teamplayer/make.conf Normal file
View File

@ -0,0 +1,3 @@
# Settings for TeamPlayer
PYTHON_TARGETS="python2_7"

1
xfce/make.conf Normal file
View File

@ -0,0 +1 @@
USE="$USE gtk3"

2
xfce/world
View File

@ -5,6 +5,7 @@ x11-apps/xdm
x11-apps/xrandr x11-apps/xrandr
x11-terms/terminal x11-terms/terminal
x11-themes/tango-icon-theme x11-themes/tango-icon-theme
x11-themes/gtk-engines-xfce
x11-themes/xfwm4-themes x11-themes/xfwm4-themes
xfce-base/thunar xfce-base/thunar
xfce-base/xfce4-meta xfce-base/xfce4-meta
@ -12,3 +13,4 @@ xfce-extra/xfce4-cpugraph-plugin
xfce-extra/xfce4-screenshooter xfce-extra/xfce4-screenshooter
xfce-extra/xfce4-systemload-plugin xfce-extra/xfce4-systemload-plugin
xfce-extra/xfce4-taskmanager xfce-extra/xfce4-taskmanager
xfce-extra/xfce4-notifyd