From da0084106fbd7a11fb0156bc673947a4f482b2d2 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 19 Mar 2013 15:02:52 +0100
Subject: copy_static_files function now called on each module

---
 remote/modules/hwinfo/hwinfo.build                   | 2 +-
 remote/modules/kdm/kdm.build                         | 2 --
 remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build | 6 +-----
 remote/modules/ldm/ldm.build                         | 3 ---
 remote/modules/plymouth/plymouth.build               | 5 +----
 remote/modules/policykit/policykit.build             | 3 ---
 remote/modules/sshd/sshd.build                       | 1 -
 remote/modules/systemd/systemd.build                 | 3 ---
 remote/setup_target                                  | 8 +++++---
 9 files changed, 8 insertions(+), 25 deletions(-)

(limited to 'remote')

diff --git a/remote/modules/hwinfo/hwinfo.build b/remote/modules/hwinfo/hwinfo.build
index 383b8c2a..b2012a22 100644
--- a/remote/modules/hwinfo/hwinfo.build
+++ b/remote/modules/hwinfo/hwinfo.build
@@ -9,7 +9,7 @@ fetch_source() {
 build() {
 	pdebug "Installing libx86emu in ${MODULE_DIR}/build..."
 	cd "${MODULE_DIR}/src/libx86emu"
-	make || perror "libx86emu: make failed."
+	EXTRA_FLAGS="-I${MODULE_DIR}/src/libx86emu/include" make || perror "libx86emu: make failed."
 	DESTDIR="${MODULE_DIR}"/build make install || perror "libx86emu: make install failed."
 	cd - &> /dev/null	
 
diff --git a/remote/modules/kdm/kdm.build b/remote/modules/kdm/kdm.build
index 88c47f6b..3a924380 100644
--- a/remote/modules/kdm/kdm.build
+++ b/remote/modules/kdm/kdm.build
@@ -14,8 +14,6 @@ build () {
 }
 
 post_copy() {
-        # copy static kdm files to stage3.2
-        cp -r ${MODULE_DIR}/data/* ${TARGET_BUILD_DIR}
 	#create static kdm folders in stage3.2
 	mkdir -p ${TARGET_BUILD_DIR}/var/lib/kdm
 	mkdir -p ${TARGET_BUILD_DIR}/var/run/kdm 
diff --git a/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build b/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build
index 19adf66a..7f02e281 100644
--- a/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build
+++ b/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build
@@ -28,11 +28,7 @@ build () {
 }
 
 post_copy() {
-	#copy static data files
-	cp -r "${MODULE_DIR}/data/"* "${TARGET_BUILD_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 > "${TARGET_BUILD_DIR}/usr/lib/${TRIPLET}/gdk-pixbuf-2.0/2.10.0/loaders.cache" || perror "pixbuf-query-loaders failed."
+	gdk-pixbuf-query-loaders > "${TARGET_BUILD_DIR}/usr/lib/${ARCH_TRIPLET}/gdk-pixbuf-2.0/2.10.0/loaders.cache" || perror "pixbuf-query-loaders failed."
 	mkdir -p "${TARGET_BUILD_DIR}/etc/pango" || perror "Making etc/pango failed."
 	pango-querymodules > "${TARGET_BUILD_DIR}/etc/pango/pango.modules" || perror "pango-querymodules failed."
 	gtk-update-icon-cache-3.0 "${TARGET_BUILD_DIR}/usr/share/icons/hicolor/" || perror "update-icon-cache-3.0 failed."
diff --git a/remote/modules/ldm/ldm.build b/remote/modules/ldm/ldm.build
index 88429cff..0e73148c 100644
--- a/remote/modules/ldm/ldm.build
+++ b/remote/modules/ldm/ldm.build
@@ -34,8 +34,5 @@ post_copy() {
 	local LDMGID=$(add_group "lightdm")
 	pinfo "lightdm user and group is $LDMUID $LDMGID"
 	chown -R "${LDMUID}:${LDMGID}" "${TARGET_BUILD_DIR}/var/lib/lightdm/" || perror "chowning '${TARGET_BUILD_DIR}/var/lib/lightdm/' failed."
-	#copyi static data files
-	cp -r "${MODULE_DIR}/data/"* "${TARGET_BUILD_DIR}" || perror "Copying data/ failed."
-
 }
 
diff --git a/remote/modules/plymouth/plymouth.build b/remote/modules/plymouth/plymouth.build
index 4363e809..fbaa428a 100644
--- a/remote/modules/plymouth/plymouth.build
+++ b/remote/modules/plymouth/plymouth.build
@@ -20,8 +20,5 @@ build() {
 }
 
 post_copy() {
-        # copy static dbus systemd unit files to stage3.2
-        SYSTEMDDIR=${TARGET_BUILD_DIR}/etc/systemd/system
-        [ ! -d ${SYSTEMDDIR} ] && mkdir -p ${SYSTEMDDIR}
-        cp -r ${MODULE_DIR}/data/* ${TARGET_BUILD_DIR}
+	:
 }
diff --git a/remote/modules/policykit/policykit.build b/remote/modules/policykit/policykit.build
index 6a03b81c..b6b70b7f 100644
--- a/remote/modules/policykit/policykit.build
+++ b/remote/modules/policykit/policykit.build
@@ -15,9 +15,6 @@ build () {
 
 post_copy() {
 
-	# copy static policykit files to stage3.2
-        cp -r ${MODULE_BUILD_DIR}/data/* ${TARGET_BUILD_DIR}
-	
 	#Add Polkit User/Group/Shadow to Stage3.2
 	pinfo "Adding polkitd user to target system..."
 	add_user "polkitd"
diff --git a/remote/modules/sshd/sshd.build b/remote/modules/sshd/sshd.build
index 57a9e35d..aa4241e6 100644
--- a/remote/modules/sshd/sshd.build
+++ b/remote/modules/sshd/sshd.build
@@ -15,5 +15,4 @@ build() {
 
 post_copy() {	
 	mkdir -p "${TARGET_BUILD_DIR}/var/run/sshd"
-	cp -r "${MODULE_DIR}"/data/* "${TARGET_BUILD_DIR}"
 }
diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index 450e743b..bb58fc1c 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -32,9 +32,6 @@ build () {
 }
 
 post_copy() {
-	# copy static data files
-	cp -r "${MODULE_DIR}"/data/* "${TARGET_BUILD_DIR}" || perror "copying data files failed."
-		
 	# dont clear systemd log at startup
 	sed -i.bak "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service"
 
diff --git a/remote/setup_target b/remote/setup_target
index c1a45787..e3273f4d 100755
--- a/remote/setup_target
+++ b/remote/setup_target
@@ -51,7 +51,8 @@ read_build () {
 	. "${BUILD_SCRIPT}" || perror "Sourcing '${BUILD_SCRIPT}' failed."
 }
 
-copyfileswithdependencies () {
+
+copy_files_with_deps () {
 
 	[ ! -d $MODULE_BUILD_DIR ] && pinfo "No build directory found, skipping dependency copying" && return 0
 	cd $MODULE_BUILD_DIR
@@ -188,7 +189,6 @@ process_module() {
 		if [ ! -z "$REQUIRED_MODULES" ]; then
 			pinfo "$MODULE 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
@@ -207,7 +207,9 @@ process_module() {
 		# remove *.la files as they might confuse libtool/linker of other tool packages
 		find "${MODULE_DIR}/build" -name '*.la' -exec rm -f {} \;
 		pinfo "## Copying files with dependencies"
-		copyfileswithdependencies
+		copy_files_with_deps
+		pinfo "## Copying static module files"
+		copy_static_data
 		pinfo "## Post copy"
 		post_copy
 
-- 
cgit v1.2.3-55-g7522