From 7baa8f0372b7031c2d4bfdf0508c4e7b1737754d Mon Sep 17 00:00:00 2001 From: Albert Hopkins Date: Sun, 23 Dec 2012 01:47:26 +0000 Subject: [PATCH] Introduce appliance-level make.conf --- Makefile | 1 + airport/Makefile | 5 ----- airport/make.conf | 5 +++++ drupal/Makefile | 3 +-- drupal/{make.conf.extra => make.conf} | 0 gnome/Makefile | 9 --------- kde/Makefile | 3 +-- kde/make.conf | 3 +++ lodgeit/Makefile | 5 +---- lodgeit/{make.conf.extra => make.conf} | 0 owncloud/Makefile | 2 -- owncloud/make.conf | 3 +++ teamplayer/Makefile | 2 -- teamplayer/make.conf | 3 +++ xfce/make.conf | 1 + xfce/world | 2 ++ 16 files changed, 21 insertions(+), 26 deletions(-) create mode 100644 airport/make.conf rename drupal/{make.conf.extra => make.conf} (100%) create mode 100644 kde/make.conf rename lodgeit/{make.conf.extra => make.conf} (100%) create mode 100644 owncloud/make.conf create mode 100644 teamplayer/make.conf create mode 100644 xfce/make.conf diff --git a/Makefile b/Makefile index dc2592a..a97033e 100644 --- a/Makefile +++ b/Makefile @@ -154,6 +154,7 @@ ifdef PKGDIR echo PKGDIR="/var/portage/packages" >> $(CHROOT)/etc/portage/make.conf endif 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 $(inroot) locale-gen mkdir -p $(CHROOT)/etc/portage diff --git a/airport/Makefile b/airport/Makefile index 8ecb107..15e9dc4 100644 --- a/airport/Makefile +++ b/airport/Makefile @@ -5,14 +5,9 @@ PGVER := 9.2 rcdefault := /etc/runlevels/default 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) eselect python set python2.7 $(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 diff --git a/airport/make.conf b/airport/make.conf new file mode 100644 index 0000000..d8b16f2 --- /dev/null +++ b/airport/make.conf @@ -0,0 +1,5 @@ + +# Settings for Airport +PYTHON_TARGETS="python2_7" +APACHE2_MPMS="prefork" +APACHE2_MODULES="auth_basic authz_host env include info" diff --git a/drupal/Makefile b/drupal/Makefile index f2d8ebc..4f741d6 100644 --- a/drupal/Makefile +++ b/drupal/Makefile @@ -4,8 +4,7 @@ DPVER = 7.17 inroot := chroot $(CHROOT) rcdefault := /etc/runlevels/default -preinstall: make.conf.extra - cat make.conf.extra >> $(CHROOT)/etc/portage/make.conf +preinstall: postinstall: firstboot.start $(inroot) passwd -d postgres diff --git a/drupal/make.conf.extra b/drupal/make.conf similarity index 100% rename from drupal/make.conf.extra rename to drupal/make.conf diff --git a/gnome/Makefile b/gnome/Makefile index 2e42c68..69945ac 100644 --- a/gnome/Makefile +++ b/gnome/Makefile @@ -5,15 +5,6 @@ preinstall: mkdir -p "$(CHROOT)/var/lib/dbus" echo 1234567890abcdef1234567890abcdef > \ "$(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 $(RM) "$(CHROOT)"/var/lib/dbus/machine-id diff --git a/kde/Makefile b/kde/Makefile index f6b7d26..9ef110d 100644 --- a/kde/Makefile +++ b/kde/Makefile @@ -1,13 +1,12 @@ preinstall: - echo 'USE="$$USE qt3support xcomposite opengl"' >> "$(CHROOT)"/etc/portage/make.conf postinstall: kdmrc kdm.start Xaccess knotifyrc cp kdmrc Xaccess "$(CHROOT)"/usr/share/config/kdm mkdir -p "$(CHROOT)"/etc/skel/.kde4/share/config cp knotifyrc "$(CHROOT)"/etc/skel/.kde4/share/config/knotifyrc 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: diff --git a/kde/make.conf b/kde/make.conf new file mode 100644 index 0000000..bd205fa --- /dev/null +++ b/kde/make.conf @@ -0,0 +1,3 @@ + +# Settings for KDE +USE="$USE qt3support xcomposite opengl" diff --git a/lodgeit/Makefile b/lodgeit/Makefile index 4c9689a..b56b134 100644 --- a/lodgeit/Makefile +++ b/lodgeit/Makefile @@ -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 += issue -preinstall: make.conf.extra - cat make.conf.extra >> $(CHROOT)/etc/portage/make.conf +preinstall: chroot $(CHROOT) $(EMERGE) --select -n $(USEPKG) dev-lang/python:2.7 chroot $(CHROOT) eselect python set python2.7 diff --git a/lodgeit/make.conf.extra b/lodgeit/make.conf similarity index 100% rename from lodgeit/make.conf.extra rename to lodgeit/make.conf diff --git a/owncloud/Makefile b/owncloud/Makefile index b385d71..ecf9604 100644 --- a/owncloud/Makefile +++ b/owncloud/Makefile @@ -1,6 +1,4 @@ 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: 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 diff --git a/owncloud/make.conf b/owncloud/make.conf new file mode 100644 index 0000000..ac57615 --- /dev/null +++ b/owncloud/make.conf @@ -0,0 +1,3 @@ + +# Settings for owncloud +APACHE2_MODULES="mime alias auth_basic authz_host dir env include info" diff --git a/teamplayer/Makefile b/teamplayer/Makefile index 1907eef..5f38dc1 100644 --- a/teamplayer/Makefile +++ b/teamplayer/Makefile @@ -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 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) eselect python set python2.7 $(inroot) python-updater diff --git a/teamplayer/make.conf b/teamplayer/make.conf new file mode 100644 index 0000000..f5071b2 --- /dev/null +++ b/teamplayer/make.conf @@ -0,0 +1,3 @@ + +# Settings for TeamPlayer +PYTHON_TARGETS="python2_7" diff --git a/xfce/make.conf b/xfce/make.conf new file mode 100644 index 0000000..8d3f4ab --- /dev/null +++ b/xfce/make.conf @@ -0,0 +1 @@ +USE="$USE gtk3" diff --git a/xfce/world b/xfce/world index a55080c..9f24dff 100644 --- a/xfce/world +++ b/xfce/world @@ -5,6 +5,7 @@ x11-apps/xdm x11-apps/xrandr x11-terms/terminal x11-themes/tango-icon-theme +x11-themes/gtk-engines-xfce x11-themes/xfwm4-themes xfce-base/thunar xfce-base/xfce4-meta @@ -12,3 +13,4 @@ xfce-extra/xfce4-cpugraph-plugin xfce-extra/xfce4-screenshooter xfce-extra/xfce4-systemload-plugin xfce-extra/xfce4-taskmanager +xfce-extra/xfce4-notifyd