From 8d34cf49ad72e556b88033202f7dde130d80fa74 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 25 Feb 2013 20:13:48 +0100
Subject: Several fixes and improvements:

- return uid and gid again for add_user and add_group
- abort execution if sourcing the .build or .conf file of a module fails
- make sure lightdm user and group exists when building the ldm module
- use tarcopy in all modules if appropriate
---
 remote/tools/dbus/dbus.build                       | 16 +++----
 remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build | 49 +++++++++++-----------
 remote/tools/ldm/ldm.build                         | 44 +++++++++----------
 remote/tools/policykit/policykit.build             |  4 +-
 remote/tools/xorg/xorg.build                       | 21 +++++-----
 5 files changed, 66 insertions(+), 68 deletions(-)

(limited to 'remote/tools')

diff --git a/remote/tools/dbus/dbus.build b/remote/tools/dbus/dbus.build
index 5254497f..83cc8efa 100644
--- a/remote/tools/dbus/dbus.build
+++ b/remote/tools/dbus/dbus.build
@@ -9,25 +9,25 @@ fetch_source() {
 }
 
 build() {
-	BUILDDIR=${TOOL_DIR}/${TOOL}/build
+	BUILDDIR="${TOOL_DIR}/${TOOL}/build"
 
 	COPYLIST="list_dpkg_output"
-	[ -e ${COPYLIST} ] && rm ${COPYLIST}
+	[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
 
 	for FILE in $(dpkg -L dbus | grep -v share/doc | grep -v share/man)
 	do
-        	[ ! -d ${FILE} ] && echo ${FILE} >> ${COPYLIST}
+        	[ ! -d "${FILE}" ] && echo ${FILE} >> "${COPYLIST}"
 	done
 
 	# prepare target dir & copy there
 	[ ! -d ${BUILDDIR} ] && mkdir -p ${BUILDDIR}
-	(tar -cpv $(cat ${COPYLIST}|sort -u) | tar -xpv -C ${BUILDDIR}) &> /dev/null
+	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${BUILDDIR}"
 
 }
 post_copy() {
         # copy static dbus systemd unit files to stage3.2
-  	SYSTEMDDIR=${INIT_DIR}/etc/systemd/system
-	[ ! -d ${SYSTEMDDIR} ] && mkdir -p ${SYSTEMDDIR}
-	cp -r ${TOOL_DIR}/${TOOL}/data/* ${INIT_DIR}
-
+  	SYSTEMDDIR="${INIT_DIR}/etc/systemd/system"
+	mkdir -p "${SYSTEMDDIR}"
+	cp -r "${TOOL_DIR}/${TOOL}/data/"* "${INIT_DIR}" || perror "Copying data/* failed."
 }
+
diff --git a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build b/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build
index 734481d7..31ad6181 100644
--- a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build
+++ b/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build
@@ -1,13 +1,8 @@
 #tool/distro specific functions for fetching, building and installing dependencies
 
 fetch_source () {
-	if [ ! -e .fetched_source ]; then
- 		[ ! -d src ] && mkdir src
-		wget $URL
-		tar xfz $VERSION.tar.gz -C src/
-		rm $VERSION.tar.gz
-		touch .fetched_source
-	fi
+	[ ! -e .fetched_source ] && download_untar "$URL" "src/"
+	touch .fetched_source
 }	
 
 install_dependencies() {
@@ -15,29 +10,32 @@ install_dependencies() {
 }
 
 build () {
-	BUILDDIR=$TOOL_DIR/$TOOL/build
+	BUILDDIR="$TOOL_DIR/$TOOL/build"
 
 	if [ ! -e .built ]; then
-		cd src/$VERSION
-		./configure --prefix="/" --datarootdir="/usr/share"
-		make 
-		[ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR
-		DESTDIR=$BUILDDIR make install
+		cd "src/$VERSION"
+		pinfo "Running configure"
+		./configure --prefix="/" --datarootdir="/usr/share" || perror "failed."
+		pinfo "Running make"
+		make || perror "failed."
+		mkdir -p "$BUILDDIR"
+		pinfo "Running make install"
+		DESTDIR="$BUILDDIR" make install || perror "failed."
 		
 		COPYLIST="list_dpkg_output"
-		[ -e $COPYLIST ] && rm $COPYLIST
+		[ -e "$COPYLIST" ] && rm "$COPYLIST"
 
 		for PACKAGE in ${REQUIRED_PACKAGES} 
 		do
 			for FILE in $(dpkg -L ${PACKAGE} | grep -v share/doc | grep -v share/man)
 			do
-				 [ ! -d $FILE ] && echo $FILE >> $COPYLIST
+				 [ ! -d $FILE ] && echo $FILE >> "$COPYLIST"
 			done
 		done
 
 		# prepare target dir & copy there
-		[ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR
-		tar -cpv $(cat $COPYLIST|sort -u) | tar -xpv -C $BUILDDIR
+		mkdir -p "$BUILDDIR"
+		tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR"
 
 		cd -
 		touch .built
@@ -47,13 +45,14 @@ build () {
 
 post_copy() {
 	#copy static data files
-	cp -r ${TOOL_DIR}/${TOOL}/data/* ${INIT_DIR}
+	cp -r "${TOOL_DIR}/${TOOL}/data/"* "${INIT_DIR}" || perror "Copying data/* failed."
 	# TODO: FIX PATH TO TRIPLET...
-	TRIPLET=$(basename $(dirname $(ldd $SHELL|grep libc | awk -F " " '{print $3}')))
-	gdk-pixbuf-query-loaders > ${INIT_DIR}/usr/lib/${TRIPLET}/gdk-pixbuf-2.0/2.10.0/loaders.cache
-	mkdir -p ${INIT_DIR}/etc/pango
-	pango-querymodules > ${INIT_DIR}/etc/pango/pango.modules
-	gtk-update-icon-cache-3.0 ${INIT_DIR}/usr/share/icons/hicolor/
-	update-mime-database ${INIT_DIR}/usr/share/mime
-	cp -r /var/lib/polkit-1 ${INIT_DIR}/var/lib
+	TRIPLET="$(basename "$(dirname "$(ldd "$SHELL" | grep libc | awk -F " " '{print $3}')")")"
+	gdk-pixbuf-query-loaders > "${INIT_DIR}/usr/lib/${TRIPLET}/gdk-pixbuf-2.0/2.10.0/loaders.cache" || perror "pixbuf-query-loaders failed."
+	mkdir -p "${INIT_DIR}/etc/pango" || perror "Making etc/pango failed."
+	pango-querymodules > "${INIT_DIR}/etc/pango/pango.modules" || perror "pango-querymodules failed."
+	gtk-update-icon-cache-3.0 "${INIT_DIR}/usr/share/icons/hicolor/" || perror "update-icon-cache-3.0 failed."
+	update-mime-database "${INIT_DIR}/usr/share/mime" || perror "update-mime-database failed."
+	cp -r "/var/lib/polkit-1" "${INIT_DIR}/var/lib/" || perror "Copying -r /var/lib/polkit-1 to '${INIT_DIR}/var/lib/' failed."
 }
+
diff --git a/remote/tools/ldm/ldm.build b/remote/tools/ldm/ldm.build
index 76f53410..9f45e058 100644
--- a/remote/tools/ldm/ldm.build
+++ b/remote/tools/ldm/ldm.build
@@ -1,13 +1,8 @@
 #tool/distro specific functions for fetching, building and installing dependencies
 
 fetch_source () {
-	if [ ! -e .fetched_source ]; then
- 		[ ! -d src ] && mkdir src
-		wget $URL
-		tar xf $VERSION.tar.gz -C src/
-		rm $VERSION.tar.gz
-		touch .fetched_source
-	fi
+	[ ! -e .fetched_source ] && download_untar "$URL" "src/"
+	touch .fetched_source
 }	
 
 install_dependencies() {
@@ -15,29 +10,31 @@ install_dependencies() {
 }
 
 build () {
-	BUILDDIR=$TOOL_DIR/$TOOL/build
-
+	BUILDDIR="$TOOL_DIR/$TOOL/build"
 	if [ ! -e .built ]; then
-		cd src/$VERSION
-		./configure --prefix="/" --datarootdir="/usr/share"
-		make 
-		[ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR
-		DESTDIR=$BUILDDIR make install
+		cd "src/$VERSION"
+		pinfo "Running configure"
+		./configure --prefix="/" --datarootdir="/usr/share" || perror "failed."
+		pinfo "Running make"
+		make || perror "failed."
+		mkdir -p "$BUILDDIR"
+		pinfo "Running make install"
+		DESTDIR="$BUILDDIR" make install || perror "failed."
 
 		COPYLIST="list_dpkg_output"
-		[ -e $COPYLIST ] && rm $COPYLIST
+		[ -e "$COPYLIST" ] && rm "$COPYLIST"
 
 		for PACKAGE in ${REQUIRED_PACKAGES} 
 		do
 			for FILE in $(dpkg -L ${PACKAGE} | grep -v share/doc | grep -v share/man)
 			 do
-				[ ! -d $FILE ] && echo $FILE >> $COPYLIST
+				[ ! -d $FILE ] && echo $FILE >> "$COPYLIST"
 			 done
 		done
 		
 		#prepare target dir & copy there
-        [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR
-		tar -cpv $(cat $COPYLIST|sort -u) | tar -xpv -C $BUILDDIR
+		mkdir -p "$BUILDDIR"
+		tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR"
 
 		cd -
 		touch .built
@@ -46,11 +43,14 @@ build () {
 }
 
 post_copy() {
-	[ ! -d ${INIT_DIR}/var/lib/lightdm ] && mkdir -p ${INIT_DIR}/var/lib/lightdm
-	touch ${INIT_DIR}/var/lib/lightdm/.Xauthority
-	chown -R lightdm:lightdm ${INIT_DIR}/var/lib/lightdm/
+	mkdir -p "${INIT_DIR}/var/lib/lightdm"
+	touch "${INIT_DIR}/var/lib/lightdm/.Xauthority" || perror "Cannot touch '${INIT_DIR}/var/lib/lightdm/.Xauthority'"
+	local LDMUID=$(add_user "lightdm")
+	local LDMGID=$(add_group "lightdm")
+	pinfo "lightdm user and group is $LDMUID $LDMGID"
+	chown -R "${LDMUID}:${LDMGID}" "${INIT_DIR}/var/lib/lightdm/" || perror "chowning '${INIT_DIR}/var/lib/lightdm/' failed."
 	#copyi static data files
-	cp -r ${TOOL_DIR}/${TOOL}/data/* ${INIT_DIR}
+	cp -r "${TOOL_DIR}/${TOOL}/data/"* "${INIT_DIR}" || perror "Copying data/ failed."
 
 }
 
diff --git a/remote/tools/policykit/policykit.build b/remote/tools/policykit/policykit.build
index 871025a1..a42f48b7 100644
--- a/remote/tools/policykit/policykit.build
+++ b/remote/tools/policykit/policykit.build
@@ -45,9 +45,7 @@ build () {
 			# prepare target dir & copy there
 			if [ -s "$COPYLIST" ]; then
 				pinfo "using tar to copy all dependencies to $BUILDDIR"
-				tar -cpv $(cat $COPYLIST|sort -u) | tar -xpv -C $BUILDDIR
-				local RET=$?
-				[ $RET -ne 0 ] && perror "copy failed."
+				tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR"
 			else
 				pinfo "no dependencies found!"
 			fi
diff --git a/remote/tools/xorg/xorg.build b/remote/tools/xorg/xorg.build
index 590d0bb0..6ce5747c 100644
--- a/remote/tools/xorg/xorg.build
+++ b/remote/tools/xorg/xorg.build
@@ -1,37 +1,38 @@
 #!/bin/bash
 
 install_dependencies() {
-  echo "No dependencies."
+	:
 }
 
 fetch_source() {
-  echo "Extracting from running system..."
+	:
 }
 
 build() {
 
-  BUILDDIR=$TOOL_DIR/$TOOL/build
+  BUILDDIR="$TOOL_DIR/$TOOL/build"
 
   COPYLIST="list_dpkg_output"
-  [ -e $COPYLIST ] && rm $COPYLIST
+  [ -e "$COPYLIST" ] && rm "$COPYLIST"
 
   for PACKAGE in ${REQUIRED_PACKAGES} 
   do
 	for FILE in $(dpkg -L ${PACKAGE} | grep -v share/doc | grep -v share/man)
 	do
-		[ ! -d $FILE ] && echo $FILE >> $COPYLIST
+		[ ! -d $FILE ] && echo $FILE >> "$COPYLIST"
 	done
   done
 
   # prepare target dir & copy there
-  [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR
-  (tar -cpv $(cat $COPYLIST|sort -u) | tar -xpv -C $BUILDDIR) &>/dev/null
+  mkdir -p "$BUILDDIR"
+  tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR"
   
 }
 
 post_copy() {
-	[ ! -d $INIT_DIR/etc/X11 ] && mkdir -p $INIT_DIR/etc/X11
+	mkdir -p "$INIT_DIR/etc/X11"
 	[ ! -e ${INIT_DIR}/etc/X11/X ] && ln -s /usr/bin/Xorg ${INIT_DIR}/etc/X11/X	
-	[ ! -d $INIT_DIR/var/lib/xkb ] && mkdir -p $INIT_DIR/var/lib/xkb
-	cp /var/lib/xkb/server* $INIT_DIR/var/lib/xkb
+	mkdir -p "$INIT_DIR/var/lib/xkb"
+	cp /var/lib/xkb/server* "$INIT_DIR/var/lib/xkb/" || perror "Copying /var/lib/xkb/server* to '$INIT_DIR/var/lib/xkb/' failed."
 }
+
-- 
cgit v1.2.3-55-g7522


From 992a319a6fa06726cfd3f9b6e6ffd833a774f3a6 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 25 Feb 2013 20:38:45 +0100
Subject: fix library discovery for base (fixes dbus loop)

---
 remote/tools/base/base.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'remote/tools')

diff --git a/remote/tools/base/base.build b/remote/tools/base/base.build
index 06ff22b7..4f7e46a0 100644
--- a/remote/tools/base/base.build
+++ b/remote/tools/base/base.build
@@ -31,7 +31,7 @@ build() {
 
 	for LIB in ${REQUIRED_LIBRARIES}
 	do
-		for LIB_LOCATION in $(find /lib/ -name "${LIB}.so\*")
+		for LIB_LOCATION in $(find /lib/ -name "${LIB}*.so*")
 		do
 			echo ${LIB_LOCATION} >> "${FILELIST}"
 		done
-- 
cgit v1.2.3-55-g7522


From 6192918205e74ce1fde46817447ab6addd77df61 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 26 Feb 2013 15:50:50 +0100
Subject: Added dependency system for modules (REQUIRED_MODULES var in *.conf
 of module, for an example, see policykit.conf)

---
 remote/setup_tools                                 | 116 ++++++++++++---------
 remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build |   1 +
 remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.conf  |   2 +
 remote/tools/policykit/policykit.conf              |   2 +
 4 files changed, 73 insertions(+), 48 deletions(-)

(limited to 'remote/tools')

diff --git a/remote/setup_tools b/remote/setup_tools
index 74cc1c78..4c7d65e2 100755
--- a/remote/setup_tools
+++ b/remote/setup_tools
@@ -1,10 +1,13 @@
 #!/bin/bash
 
-MODULE_DIR=${ROOT_DIR}/remote
+MODULE_DIR="${ROOT_DIR}/remote"
 
 #Create tools directory if not exists
-TOOL_DIR=${MODULE_DIR}/tools
-INIT_DIR=${MODULE_DIR}/stage3.2
+TOOL_DIR="${MODULE_DIR}/tools"
+INIT_DIR="${MODULE_DIR}/stage3.2"
+
+# Keep track of processed modules
+PROCESSED_MODULES=""
 
 initial_checks ()
 {
@@ -18,6 +21,12 @@ initial_checks ()
 
 read_config () 
 {
+	unset REQUIRED_BINARIES
+	unset REQUIRED_LIBRARIES
+	unset REQUIRED_DIRECTORIES
+	unset REQUIRED_FILES
+	unset REQUIRED_MODULES
+
 	local TOOL_CONFIG="${TOOL_DIR}/${TOOL}/${TOOL}.conf"
 
 	[ ! -e "${TOOL_CONFIG}" ] && perror "Config for '$TOOL' not found."
@@ -153,10 +162,6 @@ copyfileswithdependencies ()
 		pinfo "Copying $CLISTCOUNT files to stage 3.2 target directory."
 		tarcopy "$(cat ${COPYFILES_LIST}|sort -u)" "${INIT_DIR}"
 	fi
-	unset REQUIRED_BINARIES
-	unset REQUIRED_LIBRARIES
-	unset REQUIRED_DIRECTORIES
-	unset REQUIRED_FILES
 }
 
 get_basic_libs () {
@@ -190,58 +195,74 @@ generate_stage32 () {
 	fi	
 
 	# now iterate over given tools and copy them
-	cd "${TOOL_DIR}"
 	while (( "$#" )); do
-		TOOL=$1	
-		TOOL_STR=""
-		pinfo ">>>>>>>>>>>>>>>>> Processing module [ $TOOL ]"
-		TOOL_STR="[${TOOL}]"
-		if [ -d ${TOOL} ];
-		then
-	
-			#[ "x$DEBUG" != "x1" ] \
-			#	&& echo "Logging to ${TOOL_DIR}/${TOOL}/stage32.log" \
-			#	&& exec 6>&1 > ${TOOL_DIR}/${TOOL}/stage32.log
-			# TODO: Make above work with the new logging system (add function to logging.inc to switch logfile)
-	 		cd "${TOOL}"
-			pinfo "## Reading config"
-			read_config
-			pinfo "## Reading build"
-			read_build
-			pinfo "## Installing dependencies"
-			install_dependencies
-			pinfo "## Fetching source"
-			fetch_source
-			pinfo "## Building"
-			build
-			# remove *.la files as they might confuse libtool/linker of other tool packages
-			find "${TOOL_DIR}/${TOOL}/build" -name '*.la' -exec rm -f {} \;
-			pinfo "## Copying files with dependencies"
-			copyfileswithdependencies
-			pinfo "## Post copy"
-			post_copy
-			cd ${TOOL_DIR}
-
-			# reset pipes
-			#[ "x$DEBUG" != "x1" ] && exec 1>&6 6>&- 
-			# TODO
-			pinfo "## ## Module completed ## ##"
-		else
-			perror "Tool directory for '$TOOL' not found."
-			# maybe make this a warning instead of error?
-		fi
+		process_module "$1"
 		shift
 	done
 	TOOL_STR=""
 }
 
+process_module() {
+	[ "$#" -ne "1" ] && perror "process_module: want 1 param."
+	local TOOL="$1"
+	[[ "$PROCESSED_MODULES" == *"!${TOOL}!"* ]] && return # Already processed this module
+	PROCESSED_MODULES="${PROCESSED_MODULES}!${TOOL}!"
+	local TOOL_STR=""
+	pinfo ">>>>>>>>>>>>>>>>> Processing module [ $TOOL ]"
+	TOOL_STR="[${TOOL}]"
+	if [ -d "${TOOL_DIR}/${TOOL}" ];
+	then
+
+		#[ "x$DEBUG" != "x1" ] \
+		#	&& echo "Logging to ${TOOL_DIR}/${TOOL}/stage32.log" \
+		#	&& exec 6>&1 > ${TOOL_DIR}/${TOOL}/stage32.log
+		# TODO: Make above work with the new logging system (add function to logging.inc to switch logfile)
+		cd "${TOOL_DIR}/${TOOL}" || perror "Tool dir '${TOOL_DIR}/${TOOL}' seems to exist, but cd to it failed."
+		pinfo "## Reading config"
+		read_config
+		# Check if this module has a dependency that wasn't built yet:
+		if [ ! -z "$REQUIRED_MODULES" ]; then
+			pinfo "$TOOL depends on ${REQUIRED_MODULES}...."
+			for DEP in $REQUIRED_MODULES; do
+				#[[ "$DESIRED_MODULES" != *"!${DEP}!"* ]] && perror "$TOOL has dependency $DEP, but $DEP is not in current profile."
+				process_module "$DEP"
+			done
+			# Read old config again, as it got overwritten by the deps
+			cd "${TOOL_DIR}/${TOOL}" || perror "Tool dir '${TOOL_DIR}/${TOOL}' seems to exist, but cd to it failed (after building deps)."
+			read_config
+			pinfo "<<<<<<<<<<<<<<<<< Dependency modules processed, back to module [ $TOOL ]"
+		fi
+		pinfo "## Reading build"
+		read_build
+		pinfo "## Installing dependencies"
+		install_dependencies
+		pinfo "## Fetching source"
+		fetch_source
+		pinfo "## Building"
+		build
+		# remove *.la files as they might confuse libtool/linker of other tool packages
+		find "${TOOL_DIR}/${TOOL}/build" -name '*.la' -exec rm -f {} \;
+		pinfo "## Copying files with dependencies"
+		copyfileswithdependencies
+		pinfo "## Post copy"
+		post_copy
+
+		# reset pipes
+		#[ "x$DEBUG" != "x1" ] && exec 1>&6 6>&- 
+		# TODO
+		pinfo "Module completed."
+	else
+		perror "Tool directory for '$TOOL' not found."
+		# maybe make this a warning instead of error?
+	fi
+}
+
 clean_tools() {
 	if [ "x$1" = "x" -o "x$1" = "xall" ]; then
 		#clean all
 		if [ -d ${INIT_DIR} ]; then
 			pinfo "Cleaning ${INIT_DIR}..."
 			rm -rf "${INIT_DIR}" || perror "Error deleting $INIT_DIR"
-			pinfo "done."
 		fi
 	        for TOOL in $(ls ${TOOL_DIR}); do
 			clean_tool $TOOL
@@ -276,7 +297,6 @@ clean_tool() {
 	if [ -e ${TOOLDIR}/list_binaries_and_files ]; then
 		rm "${TOOLDIR}/list_binaries_and_files" || perror "Could not delete list_binaries_and_files"
 	fi
-	pinfo "done."
 }
 
 #generate_stage32 $@
diff --git a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build b/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build
index 31ad6181..edd3427a 100644
--- a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build
+++ b/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build
@@ -53,6 +53,7 @@ post_copy() {
 	pango-querymodules > "${INIT_DIR}/etc/pango/pango.modules" || perror "pango-querymodules failed."
 	gtk-update-icon-cache-3.0 "${INIT_DIR}/usr/share/icons/hicolor/" || perror "update-icon-cache-3.0 failed."
 	update-mime-database "${INIT_DIR}/usr/share/mime" || perror "update-mime-database failed."
+	mkdir -p "${INIT_DIR}/var/lib"
 	cp -r "/var/lib/polkit-1" "${INIT_DIR}/var/lib/" || perror "Copying -r /var/lib/polkit-1 to '${INIT_DIR}/var/lib/' failed."
 }
 
diff --git a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.conf b/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.conf
index faf9f32c..f243fc20 100644
--- a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.conf
+++ b/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.conf
@@ -5,3 +5,5 @@ REQUIRED_PACKAGES="libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common shared-mime-
 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 /usr/share/polkit-1 /usr/share/dbus-1"
 REQUIRED_FILES="/etc/lightdm/lightdm-gtk-greeter.conf"
+REQUIRED_MODULES="ldm"
+
diff --git a/remote/tools/policykit/policykit.conf b/remote/tools/policykit/policykit.conf
index 1ccef0e6..c8c27cf3 100644
--- a/remote/tools/policykit/policykit.conf
+++ b/remote/tools/policykit/policykit.conf
@@ -5,3 +5,5 @@ REQUIRED_PACKAGES=""
 REQUIRED_BINARIES=""
 REQUIRED_DIRECTORIES="/bin /etc /lib /usr/share/dbus-1 /usr/share/polkit-1"
 REQUIRED_FILES=""
+REQUIRED_MODULES="systemd"
+
-- 
cgit v1.2.3-55-g7522