#
# old_revision [4c108250ef95743112aee6c23a4f206124025bbb]
#
# patch "classes/rootfs_deb.bbclass"
#  from [707eb78db91916253acef44e2f1a8ff049193cff]
#    to [d0372287799208e18d906202acd2c6e49a0190bf]
#
============================================================
--- classes/rootfs_deb.bbclass	707eb78db91916253acef44e2f1a8ff049193cff
+++ classes/rootfs_deb.bbclass	d0372287799208e18d906202acd2c6e49a0190bf
@@ -1,12 +1,14 @@ do_rootfs[depends] += "dpkg-native:do_po
 #
 # Copyright 2006-2007 Openedhand Ltd.
 #
 
 do_rootfs[depends] += "dpkg-native:do_populate_staging apt-native:do_populate_staging"
+do_rootfs[recrdeptask] += "do_package_write_deb"
 
 fakeroot rootfs_deb_do_rootfs () {
 	set +e
-	mkdir -p ${IMAGE_ROOTFS}/var/dpkg/{info,updates}
+	mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info
+	mkdir -p ${IMAGE_ROOTFS}/var/dpkg/updates
 
 	rm -f ${STAGING_DIR}/etc/apt/sources.list.rev
 	rm -f ${STAGING_DIR}/etc/apt/preferences
@@ -58,21 +60,21 @@ fakeroot rootfs_deb_do_rootfs () {
 	  if [ ! -z "${LINGUAS_INSTALL}" ]; then
 		  apt-get install glibc-localedata-i18n --force-yes --allow-unauthenticated
 		  if [ $? -ne 0 ]; then
-			  exit $?
+			  exit 1
 		  fi
 		  for i in ${LINGUAS_INSTALL}; do
 			  apt-get install $i --force-yes --allow-unauthenticated
 			  if [ $? -ne 0 ]; then
-				  exit $?
+				  exit 1
 			  fi
 		  done
 	  fi
         fi
 
-	if [ ! -z "${PACKAGE_INSTALL}" ]; then
-		for i in ${PACKAGE_INSTALL}; do
+	if [ ! -z "${IMAGE_INSTALL}" ]; then
+		for i in ${IMAGE_INSTALL}; do
 			apt-get install $i --force-yes --allow-unauthenticated
-			if [ $? -eq 1 ]; then
+			if [ $? -ne 0 ]; then
 				exit 1
 			fi
 			find ${IMAGE_ROOTFS} -name \*.dpkg-new | for i in `cat`; do
@@ -110,10 +112,19 @@ fakeroot rootfs_deb_do_rootfs () {
 	if [ -e ${IMAGE_ROOTFS}/usr/dpkg/alternatives ]; then
 		rmdir ${IMAGE_ROOTFS}/usr/dpkg/alternatives
 	fi
-	ln -s /usr/lib/ipkg/alternatives ${IMAGE_ROOTFS}/usr/dpkg/alternatives
-	ln -s /usr/dpkg/info ${IMAGE_ROOTFS}/usr/lib/ipkg/info
-	ln -s /usr/dpkg/status ${IMAGE_ROOTFS}/usr/lib/ipkg/status
 
+        if [ ! -e ${IMAGE_ROOTFS}/usr/lib/ipkg ] ; then
+                mkdir -p ${IMAGE_ROOTFS}/usr/lib/ipkg
+        fi
+
+        if [ ! -e ${IMAGE_ROOTFS}/etc/ipkg ] ; then
+                mkdir -p ${IMAGE_ROOTFS}/etc/ipkg
+        fi
+ 
+	ln -sf /usr/lib/ipkg/alternatives ${IMAGE_ROOTFS}/usr/dpkg/alternatives
+	ln -sf /usr/dpkg/info ${IMAGE_ROOTFS}/usr/lib/ipkg/info
+	ln -sf /usr/dpkg/status ${IMAGE_ROOTFS}/usr/lib/ipkg/status
+
 	${ROOTFS_POSTPROCESS_COMMAND}
 
 	log_check rootfs 
@@ -132,7 +143,7 @@ rootfs_deb_log_check() {
 			echo -e "log_check: Matched keyword: [$keyword_die]\n"
 			echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die"
 			echo ""
-			do_exit=1				
+			do_exit=1
 		fi
 	done
 	test "$do_exit" = 1 && exit 1