Refactoring:

REQUIRED_DEPENDENCIES -> REQUIRED_INSTALLED_PACKAGES
REQUIRED_PACKAGES -> REQUIRED_CONTENT_PACKAGES

29 files changed, 47 insertions, 47 deletions

diff --git a/helper/fileutil.inc b/helper/fileutil.inc
index 24b50a5f..de4bd409 100644
--- a/helper/fileutil.inc
+++ b/helper/fileutil.inc
@@ -45,9 +45,9 @@ tarcopy () {
 
 # get all files of required packages by a module
 list_packet_files() {
-	[ -z "$REQUIRED_PACKAGES" ] && pinfo "No required packages for $TOOL"  && return 1
+	[ -z "$REQUIRED_CONTENT_PACKAGES" ] && pinfo "No required packages for $TOOL"  && return 1
 	local PACKAGE=""
-	for PACKAGE in $REQUIRED_PACKAGES; do
+	for PACKAGE in $REQUIRED_CONTENT_PACKAGES; do
 		local OPTIONAL="$(echo "$PACKAGE" | cut -c 1)"
 		[ "x$OPTIONAL" = "x@" ] && PACKAGE="$(echo "$PACKAGE" | cut -c 2-)"
 		local FILES=""
@@ -72,15 +72,15 @@ list_packet_files() {
 }
 #
 # install all dependencies of a module
-# goes through all package as given in the variable REQUIRED_DEPENDENCIES
+# goes through all package as given in the variable REQUIRED_INSTALLED_PACKAGES
 install_dependencies() {
-	[ -z "$REQUIRED_DEPENDENCIES" ] && return 
+	[ -z "$REQUIRED_INSTALLED_PACKAGES" ] && return 
 	if [ "$PACKET_MANAGER" = "apt" ]; then
 		# install package, only if not already installed, TODO fix me
-		#dpkg -l $(echo $(echo "$REQUIRED_DEPENDENCIES")) &> /dev/null && return
-		apt-get install -y $REQUIRED_DEPENDENCIES || perror "Could not apt-get install $REQUIRED_DEPENDENCIES"
+		#dpkg -l $(echo $(echo "$REQUIRED_INSTALLED_PACKAGES")) &> /dev/null && return
+		apt-get install -y $REQUIRED_INSTALLED_PACKAGES || perror "Could not apt-get install $REQUIRED_INSTALLED_PACKAGES"
 	elif [ "$PACKET_MANAGER" = "zypper" ]; then
-		zypper --no-refresh install -y -n $REQUIRED_DEPENDENCIES || perror "Could not zypper install $REQUIRED_DEPENDENCIES"
+		zypper --no-refresh install -y -n $REQUIRED_INSTALLED_PACKAGES || perror "Could not zypper install $REQUIRED_INSTALLED_PACKAGES"
 	fi
 }
 #
diff --git a/remote/modules/consolekit/consolekit.conf b/remote/modules/consolekit/consolekit.conf
index 38f1718f..afb573ce 100644
--- a/remote/modules/consolekit/consolekit.conf
+++ b/remote/modules/consolekit/consolekit.conf
@@ -1,4 +1,4 @@
-REQUIRED_PACKAGES="consolekit"
+REQUIRED_CONTENT_PACKAGES="consolekit"
 REQUIRED_BINARIES="	ck-history
 			ck-launch-session
 			ck-list-sessions
diff --git a/remote/modules/consolekit/consolekit.conf.zypper b/remote/modules/consolekit/consolekit.conf.zypper
index c528ddc0..394ee0da 100644
--- a/remote/modules/consolekit/consolekit.conf.zypper
+++ b/remote/modules/consolekit/consolekit.conf.zypper
@@ -1,4 +1,4 @@
-REQUIRED_PACKAGES="ConsoleKit"
+REQUIRED_CONTENT_PACKAGES="ConsoleKit"
 REQUIRED_BINARIES="	ck-history
 			ck-launch-session
 			ck-list-sessions
diff --git a/remote/modules/dbus/dbus.conf b/remote/modules/dbus/dbus.conf
index 4a1bc6a5..c8fa050d 100644
--- a/remote/modules/dbus/dbus.conf
+++ b/remote/modules/dbus/dbus.conf
@@ -1,4 +1,4 @@
-REQUIRED_PACKAGES="dbus"
+REQUIRED_CONTENT_PACKAGES="dbus"
 REQUIRED_BINARIES="	dbus-cleanup-sockets
 			dbus-daemon
 			dbus-uuidgen
diff --git a/remote/modules/dbus/dbus.conf.zypper b/remote/modules/dbus/dbus.conf.zypper
index 97c58411..ce3d5d08 100644
--- a/remote/modules/dbus/dbus.conf.zypper
+++ b/remote/modules/dbus/dbus.conf.zypper
@@ -1,4 +1,4 @@
-REQUIRED_PACKAGES="dbus-1"
+REQUIRED_CONTENT_PACKAGES="dbus-1"
 REQUIRED_BINARIES="	dbus-cleanup-sockets
 			dbus-daemon
 			dbus-uuidgen
diff --git a/remote/modules/hwinfo/hwinfo.conf b/remote/modules/hwinfo/hwinfo.conf
index 2d3db99d..c254fc71 100644
--- a/remote/modules/hwinfo/hwinfo.conf
+++ b/remote/modules/hwinfo/hwinfo.conf
@@ -1,3 +1,3 @@
 REQUIRED_BINARIES="	hwinfo"
-REQUIRED_DEPENDENCIES=" flex
+REQUIRED_INSTALLED_PACKAGES=" flex
 			hwinfo"
diff --git a/remote/modules/kdm/kdm.conf b/remote/modules/kdm/kdm.conf
index a6f0161e..d59f0009 100644
--- a/remote/modules/kdm/kdm.conf
+++ b/remote/modules/kdm/kdm.conf
@@ -1,6 +1,6 @@
-REQUIRED_DEPENDENCIES="	kdm
+REQUIRED_INSTALLED_PACKAGES="	kdm
 			kde-workspace-kgreet-plugins"
-REQUIRED_PACKAGES="	kdm
+REQUIRED_CONTENT_PACKAGES="	kdm
 			kde-workspace-kgreet-plugins
 			libicu48
 			libxcursor1
diff --git a/remote/modules/kdm/kdm.conf.zypper b/remote/modules/kdm/kdm.conf.zypper
index 23034356..a2266c52 100644
--- a/remote/modules/kdm/kdm.conf.zypper
+++ b/remote/modules/kdm/kdm.conf.zypper
@@ -1,5 +1,5 @@
-REQUIRED_DEPENDENCIES="kdm"
-REQUIRED_PACKAGES="kdm kde4-kgreeter-plugins"
+REQUIRED_INSTALLED_PACKAGES="kdm"
+REQUIRED_CONTENT_PACKAGES="kdm kde4-kgreeter-plugins"
 REQUIRED_BINARIES=""
 REQUIRED_DIRECTORIES="	/etc/dbus-1
 			/usr/lib/kde4
diff --git a/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.conf b/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.conf
index 58d189b7..e9349002 100644
--- a/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.conf
+++ b/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.conf
@@ -1,7 +1,7 @@
 VERSION=lightdm-gtk-greeter-1.3.1
 URL=https://launchpad.net/lightdm-gtk-greeter/1.4/1.3.1/+download/lightdm-gtk-greeter-1.3.1.tar.gz
-REQUIRED_DEPENDENCIES="gtk+-3.0 liblightdm-gobject-1-dev libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common shared-mime-info gnome-themes-standard"
-REQUIRED_PACKAGES="libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common shared-mime-info gnome-themes-standard"
+REQUIRED_INSTALLED_PACKAGES="gtk+-3.0 liblightdm-gobject-1-dev libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common shared-mime-info gnome-themes-standard"
+REQUIRED_CONTENT_PACKAGES="libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common shared-mime-info gnome-themes-standard"
 REQUIRED_BINARIES="lightdm-gtk-greeter"
 REQUIRED_DIRECTORIES="/usr/lib /usr/share/lightdm-gtk-greeter /usr/share/mime /usr/share/xgreeters /usr/share/icons /usr/share/themes /etc /usr/bin"
 REQUIRED_FILES="/etc/lightdm/lightdm-gtk-greeter.conf"
diff --git a/remote/modules/ldm/ldm.conf b/remote/modules/ldm/ldm.conf
index d40aab7f..74ab9450 100644
--- a/remote/modules/ldm/ldm.conf
+++ b/remote/modules/ldm/ldm.conf
@@ -1,7 +1,7 @@
 VERSION=lightdm-1.4.0
 URL=https://launchpad.net/lightdm/1.4/1.4.0/+download/lightdm-1.4.0.tar.gz
-REQUIRED_DEPENDENCIES="libpam-dev itstool liblightdm-gobject-1-dev"
-REQUIRED_PACKAGES=""
+REQUIRED_INSTALLED_PACKAGES="libpam-dev itstool liblightdm-gobject-1-dev"
+REQUIRED_CONTENT_PACKAGES=""
 REQUIRED_BINARIES="dm-tool lightdm lightdm-set-defaults gdmflexiserver lightdm-guest-session-wrapper lightdm-set-defaults"
 REQUIRED_DIRECTORIES="/etc /lib"
 REQUIRED_FILES=""
diff --git a/remote/modules/openbox/openbox.conf b/remote/modules/openbox/openbox.conf
index 67c63c4c..f7d09947 100644
--- a/remote/modules/openbox/openbox.conf
+++ b/remote/modules/openbox/openbox.conf
@@ -1,6 +1,6 @@
-REQUIRED_DEPENDENCIES=" openbox
+REQUIRED_INSTALLED_PACKAGES=" openbox
 			libpango1.0-0"
-REQUIRED_PACKAGES="	openbox
+REQUIRED_CONTENT_PACKAGES="	openbox
 			libpango1.0-0"
 REQUIRED_BINARIES="	openbox
 			openbox-session"
diff --git a/remote/modules/pam/pam.conf b/remote/modules/pam/pam.conf
index 0afd3ec3..2d334b52 100644
--- a/remote/modules/pam/pam.conf
+++ b/remote/modules/pam/pam.conf
@@ -1,7 +1,7 @@
-REQUIRED_DEPENDENCIES=" libpam-ldap
+REQUIRED_INSTALLED_PACKAGES=" libpam-ldap
 			libnss-ldap
 			libpam-script"
-REQUIRED_PACKAGES="	libpam0g
+REQUIRED_CONTENT_PACKAGES="	libpam0g
 			libpam-modules
 			libpam-ck-connector
 			libpam-cap
diff --git a/remote/modules/pam/pam.conf.zypper b/remote/modules/pam/pam.conf.zypper
index ab0039ff..bdabe4a4 100644
--- a/remote/modules/pam/pam.conf.zypper
+++ b/remote/modules/pam/pam.conf.zypper
@@ -1,5 +1,5 @@
-REQUIRED_DEPENDENCIES=" pam_ldap pam pam-devel nss_ldap pam-modules"
-REQUIRED_PACKAGES="	pam_ldap pam pam-devel nss_ldap pam-modules"
+REQUIRED_INSTALLED_PACKAGES=" pam_ldap pam pam-devel nss_ldap pam-modules"
+REQUIRED_CONTENT_PACKAGES="	pam_ldap pam pam-devel nss_ldap pam-modules"
 REQUIRED_DIRECTORIES="	/lib
 			/usr/lib
 			/etc/security"
diff --git a/remote/modules/plymouth/plymouth.conf b/remote/modules/plymouth/plymouth.conf
index 026aff9c..0e3e6eda 100644
--- a/remote/modules/plymouth/plymouth.conf
+++ b/remote/modules/plymouth/plymouth.conf
@@ -1,6 +1,6 @@
 VERSION=plymouth-0.8.6.1
 URL=http://www.freedesktop.org/software/plymouth/releases/${VERSION}.tar.bz2
-REQUIRED_DEPENDENCIES="	libpng-dev
+REQUIRED_INSTALLED_PACKAGES="	libpng-dev
 			libpango1.0-dev
 			libcairo-dev
 			libgtk2.0-dev
diff --git a/remote/modules/plymouth/plymouth.conf.zypper b/remote/modules/plymouth/plymouth.conf.zypper
index 9166c137..ad9052e5 100644
--- a/remote/modules/plymouth/plymouth.conf.zypper
+++ b/remote/modules/plymouth/plymouth.conf.zypper
@@ -1,6 +1,6 @@
 VERSION=plymouth-0.8.6.1
 URL=http://www.freedesktop.org/software/plymouth/releases/${VERSION}.tar.bz2
-REQUIRED_DEPENDENCIES="	libpng12-devel
+REQUIRED_INSTALLED_PACKAGES="	libpng12-devel
 			pango-devel
 			cairo-devel
 			gtk2-devel
diff --git a/remote/modules/policykit-src/policykit.conf b/remote/modules/policykit-src/policykit.conf
index 73b04015..3e74c383 100644
--- a/remote/modules/policykit-src/policykit.conf
+++ b/remote/modules/policykit-src/policykit.conf
@@ -1,7 +1,7 @@
 VERSION=polkit-0.110
 URL=http://www.freedesktop.org/software/polkit/releases/polkit-0.110.tar.gz
-REQUIRED_DEPENDENCIES="libmozjs185-1.0"
-REQUIRED_PACKAGES="libmozjs185-1.0"
+REQUIRED_INSTALLED_PACKAGES="libmozjs185-1.0"
+REQUIRED_CONTENT_PACKAGES="libmozjs185-1.0"
 REQUIRED_BINARIES=""
 REQUIRED_DIRECTORIES="/bin /etc /lib /usr/share/dbus-1 /usr/share/polkit-1"
 REQUIRED_FILES=""
diff --git a/remote/modules/policykit/policykit.conf b/remote/modules/policykit/policykit.conf
index cf04281d..f13fe2c0 100644
--- a/remote/modules/policykit/policykit.conf
+++ b/remote/modules/policykit/policykit.conf
@@ -1,5 +1,5 @@
-REQUIRED_DEPENDENCIES="libmozjs185-1.0"
-REQUIRED_PACKAGES="libmozjs185-1.0 policykit-1"
+REQUIRED_INSTALLED_PACKAGES="libmozjs185-1.0"
+REQUIRED_CONTENT_PACKAGES="libmozjs185-1.0 policykit-1"
 REQUIRED_BINARIES=""
 REQUIRED_DIRECTORIES="	/etc/pam.d /etc/dbus-1 /etc/polkit-1
 			/usr/bin 
diff --git a/remote/modules/policykit/policykit.conf.zypper b/remote/modules/policykit/policykit.conf.zypper
index 5d334b1e..87c0014e 100644
--- a/remote/modules/policykit/policykit.conf.zypper
+++ b/remote/modules/policykit/policykit.conf.zypper
@@ -1,5 +1,5 @@
-REQUIRED_DEPENDENCIES="libmozjs185-1_0"
-REQUIRED_PACKAGES="libmozjs185-1_0 polkit"
+REQUIRED_INSTALLED_PACKAGES="libmozjs185-1_0"
+REQUIRED_CONTENT_PACKAGES="libmozjs185-1_0 polkit"
 REQUIRED_BINARIES=""
 REQUIRED_DIRECTORIES="	/etc/pam.d /etc/dbus-1 /etc/polkit-1
 			/usr/bin 
diff --git a/remote/modules/rsyslogd/rsyslogd.conf b/remote/modules/rsyslogd/rsyslogd.conf
index 602a6050..d0d46e77 100644
--- a/remote/modules/rsyslogd/rsyslogd.conf
+++ b/remote/modules/rsyslogd/rsyslogd.conf
@@ -1,4 +1,4 @@
-REQUIRED_PACKAGES="	rsyslog"
+REQUIRED_CONTENT_PACKAGES="	rsyslog"
 REQUIRED_BINARIES="	rsyslogd"
 REQUIRED_FILES="	/etc/rsyslog.conf"
 REQUIRED_DIRECTORIES="	/usr/lib/rsyslog"
diff --git a/remote/modules/rsyslogd/rsyslogd.conf.zypper b/remote/modules/rsyslogd/rsyslogd.conf.zypper
index 782503e2..0a61d61b 100644
--- a/remote/modules/rsyslogd/rsyslogd.conf.zypper
+++ b/remote/modules/rsyslogd/rsyslogd.conf.zypper
@@ -1,3 +1,3 @@
 REQUIRED_BINARIES="	rsyslogd
 			rsyslog-service-prepare"
-REQUIRED_PACKAGES="	rsyslog"
+REQUIRED_CONTENT_PACKAGES="	rsyslog"
diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/systemd.conf
index 2b116784..b5e8370d 100644
--- a/remote/modules/systemd/systemd.conf
+++ b/remote/modules/systemd/systemd.conf
@@ -2,7 +2,7 @@ VERSION=systemd-197
 URL=http://www.freedesktop.org/software/systemd/${VERSION}.tar.xz
 LIBKMOD_VERSION="kmod-12"
 LIBKMOD_URL="http://www.kernel.org/pub/linux/utils/kernel/kmod/${LIBKMOD_VERSION}.tar.gz"
-REQUIRED_DEPENDENCIES="	intltool
+REQUIRED_INSTALLED_PACKAGES="	intltool
 			gperf
 			dbus
 			pkg-config
diff --git a/remote/modules/systemd/systemd.conf.zypper b/remote/modules/systemd/systemd.conf.zypper
index 4f415ded..de89399e 100644
--- a/remote/modules/systemd/systemd.conf.zypper
+++ b/remote/modules/systemd/systemd.conf.zypper
@@ -1,6 +1,6 @@
 VERSION=systemd-201
 URL=http://www.freedesktop.org/software/systemd/${VERSION}.tar.xz
-REQUIRED_DEPENDENCIES="	intltool
+REQUIRED_INSTALLED_PACKAGES="	intltool
 			gperf
 			pkg-config
 			libcap-devel
diff --git a/remote/modules/vmchooser/vmchooser.conf b/remote/modules/vmchooser/vmchooser.conf
index 976384aa..7f03ea83 100644
--- a/remote/modules/vmchooser/vmchooser.conf
+++ b/remote/modules/vmchooser/vmchooser.conf
@@ -1,5 +1,5 @@
 GIT=git://git.openslx.org/openslx/tools/vmchooser.git
-REQUIRED_DEPENDENCIES="	cmake
+REQUIRED_INSTALLED_PACKAGES="	cmake
 			libqt4-dev"
 PREFIX="/opt/openslx/bin"
 REQUIRED_BINARIES="vmchooser"
diff --git a/remote/modules/vmplayer/vmplayer.conf b/remote/modules/vmplayer/vmplayer.conf
index df88968e..2797303e 100644
--- a/remote/modules/vmplayer/vmplayer.conf
+++ b/remote/modules/vmplayer/vmplayer.conf
@@ -1,5 +1,5 @@
-#REQUIRED_DEPENDENCIES="libgconf-2-4 fontconfig-config"
-#REQUIRED_PACKAGES="libgconf-2-4 fontconfig-config"
+#REQUIRED_INSTALLED_PACKAGES="libgconf-2-4 fontconfig-config"
+#REQUIRED_CONTENT_PACKAGES="libgconf-2-4 fontconfig-config"
 REQUIRED_BINARIES=""
 REQUIRED_SYSTEM_FILES=""
 REQUIRED_DIRECTORIES="/etc /usr"
diff --git a/remote/modules/xorg/xorg.conf b/remote/modules/xorg/xorg.conf
index a63ef508..81b5530b 100644
--- a/remote/modules/xorg/xorg.conf
+++ b/remote/modules/xorg/xorg.conf
@@ -1,4 +1,4 @@
-REQUIRED_PACKAGES="	xserver-xorg
+REQUIRED_CONTENT_PACKAGES="	xserver-xorg
 			xserver-xorg-core
 			libgl1-mesa-dri
 			xkb-data
diff --git a/remote/modules/xorg/xorg.conf.zypper b/remote/modules/xorg/xorg.conf.zypper
index 22a6bdd8..e0636dd7 100644
--- a/remote/modules/xorg/xorg.conf.zypper
+++ b/remote/modules/xorg/xorg.conf.zypper
@@ -1,4 +1,4 @@
-REQUIRED_PACKAGES="	xorg-x11
+REQUIRED_CONTENT_PACKAGES="	xorg-x11
 			xorg-x11-server
 			xorg-x11-driver-input
 			xorg-x11-driver-video
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
index 0ca8d64c..713c0a3d 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
@@ -4,7 +4,7 @@ fetch_source() {
 }
 
 build() {
-	if [ ! -z "$REQUIRED_PACKAGES" ]; then
+	if [ ! -z "$REQUIRED_CONTENT_PACKAGES" ]; then
 		COPYLIST="list_dpkg_output"
 		[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
 		list_packet_files >> "${COPYLIST}"
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index a8bbf386..f5452f53 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -1,5 +1,5 @@
 REQUIRED_MODULES="	kernel"
-REQUIRED_DEPENDENCIES="nfs-common aufs-tools squashfs-tools whois xfsprogs"
+REQUIRED_INSTALLED_PACKAGES="nfs-common aufs-tools squashfs-tools whois xfsprogs"
 REQUIRED_BINARIES="	bash
 			more
 			less
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
index 8543a284..dbbd4697 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
@@ -1,7 +1,7 @@
 pinfo "If aufs install fails, run zypper addrepo http://jftp.inai.de/openSUSE_12.3/ j.eng-i586"
 REQUIRED_MODULES="	kernel"
-REQUIRED_DEPENDENCIES="nfs-client aufs squashfs"
-REQUIRED_PACKAGES="timezone"
+REQUIRED_INSTALLED_PACKAGES="nfs-client aufs squashfs"
+REQUIRED_CONTENT_PACKAGES="timezone"
 REQUIRED_BINARIES="	bash
 			agetty
 			cat