From 6ad5b8ff68141976206bf0e04492247dedfd6645 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 11 Dec 2007 10:00:09 +0000
Subject: rootfs_deb.bbclass: few fixes to get it working

---
 classes/rootfs_deb.bbclass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'classes/rootfs_deb.bbclass')

diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index 935ef6e3f7..853ea225fc 100644
--- a/classes/rootfs_deb.bbclass
+++ b/classes/rootfs_deb.bbclass
@@ -10,8 +10,12 @@ fakeroot rootfs_deb_do_rootfs () {
 	mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info
 	mkdir -p ${IMAGE_ROOTFS}/var/dpkg/updates
 
+	mkdir -p ${STAGING_ETCDIR_NATIVE}/apt/
+
 	rm -f ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
 	rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences
+	> ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
+	> ${STAGING_ETCDIR_NATIVE}/apt/preferences
 	> ${IMAGE_ROOTFS}/var/dpkg/status
 	> ${IMAGE_ROOTFS}/var/dpkg/available
 	# > ${STAGING_DIR}/var/dpkg/status
@@ -36,9 +40,9 @@ fakeroot rootfs_deb_do_rootfs () {
 		priority=$(expr $priority + 5)
 	done
 
-	tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list
+	tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_DIR}/etc/apt/sources.list
 
-	cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \
+	cat "${STAGING_DIR}/etc/apt/apt.conf.sample" \
 		| sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \
 		> "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf"
 
-- 
cgit v1.2.3


From 484aec6e78dd9624f20779130565d1774d5b9e9f Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Mon, 7 Jan 2008 18:25:55 +0000
Subject: Bashism fix: echo -e is a bashism and doesn't work when /bin/sh
 points to dash     Instead of using "echo -e" we simply use printf. printf
 doesn't add a newline     by default. So some places needed an extra \n in
 their string.     Most of the change was done by hand, so please carefully
 review. This bug was     spotted when trying to compile python-pyqt on my
 ubuntu hardy system.

---
 classes/rootfs_deb.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes/rootfs_deb.bbclass')

diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index 853ea225fc..c2c4a764e4 100644
--- a/classes/rootfs_deb.bbclass
+++ b/classes/rootfs_deb.bbclass
@@ -145,7 +145,7 @@ rootfs_deb_log_check() {
 		if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1
 		then
 			echo "log_check: There were error messages in the logfile"
-			echo -e "log_check: Matched keyword: [$keyword_die]\n"
+			printf "log_check: Matched keyword: [$keyword_die]\n"
 			echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die"
 			echo ""
 			do_exit=1
-- 
cgit v1.2.3