[oe-commits] org.oe.dev rootfs_deb.bbclass: few fixes to get it working

[hrw commit]

rootfs_deb.bbclass: few fixes to get it working

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: a42329cb6f62bec43e8b79838373cabe85297648
ViewMTN: http://monotone.openembedded.org/revision/info/a42329cb6f62bec43e8b79838373cabe85297648
Files:
1
classes/rootfs_deb.bbclass
Diffs:

#
# mt diff -r0477df9022563b244a5800a100d17545b4e0258b -ra42329cb6f62bec43e8b79838373cabe85297648
#
# 
# 
# patch "classes/rootfs_deb.bbclass"
#  from [a0b75d9e9ae17a15ef75f4c35ae2dbe1a9b70922]
#    to [a11a09e4cbc92351c6a2152d90f32d639e23ee76]
# 
============================================================
--- classes/rootfs_deb.bbclass	a0b75d9e9ae17a15ef75f4c35ae2dbe1a9b70922
+++ classes/rootfs_deb.bbclass	a11a09e4cbc92351c6a2152d90f32d639e23ee76
@@ -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"