[oe-commits] org.oe.packaged-staging packaged-staging.bbclass: Remove merge artifact, reindent functions for clarity

[rpurdie commit]

packaged-staging.bbclass: Remove merge artifact, reindent functions for clarity

Author: rpurdie at openembedded.org
Branch: org.openembedded.packaged-staging
Revision: ae09a62d71925516d3f39482bad6822f91c61fdc
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ae09a62d71925516d3f39482bad6822f91c61fdc
Files:
1
classes/packaged-staging.bbclass
Diffs:

#
# mt diff -r7882ba5a909f18de72c09032581c30bea6877b98 -rae09a62d71925516d3f39482bad6822f91c61fdc
#
# 
# 
# patch "classes/packaged-staging.bbclass"
#  from [63352bb380fda435c062935b31b384ceeb57e0d4]
#    to [41cb6fa74d30c4478f834cc32a3b6b5507d9f5a3]
# 
============================================================
--- classes/packaged-staging.bbclass	63352bb380fda435c062935b31b384ceeb57e0d4
+++ classes/packaged-staging.bbclass	41cb6fa74d30c4478f834cc32a3b6b5507d9f5a3
@@ -88,40 +88,40 @@ do_stage_prepend() {
 
 do_stage_prepend() {
 
-stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/staging-stamp-cache -u
+	stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/staging-stamp-cache -u
 
-stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/cross-stamp-cache -u
+	stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/cross-stamp-cache -u
 
-if [ ! -e ${STAGING_BASEDIR} ]; then
-	mkdir -p ${STAGING_BASEDIR}
-fi
+	if [ ! -e ${STAGING_BASEDIR} ]; then
+		mkdir -p ${STAGING_BASEDIR}
+	fi
 
-if [ ! -e ${DEPLOY_DIR_PSTAGE} ]; then
-	mkdir -p ${DEPLOY_DIR_PSTAGE}
-fi
+	if [ ! -e ${DEPLOY_DIR_PSTAGE} ]; then
+		mkdir -p ${DEPLOY_DIR_PSTAGE}
+	fi
 
-if [ -e ${STAGING_BASEDIR}/usr ]; then
-        oenote "${STAGING_BASEDIR}/usr already present, leaving it alone"
-else
-	oenote "${STAGING_BASEDIR}/usr not present, symlinking it"
-	ln -s ${STAGING_BASEDIR}/ ${STAGING_BASEDIR}/usr
-fi
+	if [ -e ${STAGING_BASEDIR}/usr ]; then
+	        oenote "${STAGING_BASEDIR}/usr already present, leaving it alone"
+	else
+		oenote "${STAGING_BASEDIR}/usr not present, symlinking it"
+		ln -s ${STAGING_BASEDIR}/ ${STAGING_BASEDIR}/usr
+	fi
 
-#assemble appropriate ipkg.conf
-if [ -e ${DEPLOY_DIR_PSTAGE}/ipkg.conf ]; then
-        rm ${DEPLOY_DIR_PSTAGE}/ipkg.conf
-fi
+	#assemble appropriate ipkg.conf
+	if [ -e ${DEPLOY_DIR_PSTAGE}/ipkg.conf ]; then
+	        rm ${DEPLOY_DIR_PSTAGE}/ipkg.conf
+	fi
 
-ipkgarchs="${BUILD_ARCH} all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${IPKG_EXTRA_ARCHS} ${MACHINE}"
-    priority=1
-    for arch in $ipkgarchs; do
-      echo "arch $arch $priority" >> ${DEPLOY_DIR_PSTAGE}/ipkg.conf
-      priority=$(expr $priority + 5)
-    done
-echo "src oe file:${DEPLOY_DIR_IPK}" >> ${DEPLOY_DIR_PSTAGE}/ipkg.conf 
-export OLD_PWD=`pwd`
-cd ${DEPLOY_DIR_IPK} && rm *${BUILD_ARCH}.ipk -f ; ipkg-make-index -p Packages . ; cd ${OLD_PWD}
-${PSTAGE_UPDATE_CMD} ${STAGING_BASEDIR}
+	ipkgarchs="${BUILD_ARCH} all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${IPKG_EXTRA_ARCHS} ${MACHINE}"
+	priority=1
+	for arch in $ipkgarchs; do
+		echo "arch $arch $priority" >> ${DEPLOY_DIR_PSTAGE}/ipkg.conf
+		priority=$(expr $priority + 5)
+	done
+	echo "src oe file:${DEPLOY_DIR_IPK}" >> ${DEPLOY_DIR_PSTAGE}/ipkg.conf 
+	export OLD_PWD=`pwd`
+	cd ${DEPLOY_DIR_IPK} && rm *${BUILD_ARCH}.ipk -f ; ipkg-make-index -p Packages . ; cd ${OLD_PWD}
+	${PSTAGE_UPDATE_CMD} ${STAGING_BASEDIR}
 
 	#check for generated packages
 	if [ -e ${SPAWNFILE} ]; then
@@ -168,8 +168,6 @@ do_stage_append() {
 	${PSTAGE_LIST_CMD} ${STAGING_BASEDIR} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-staging_list         
 	${PSTAGE_LIST_CMD} ${CROSS_DIR} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-cross_list
 
-if [ ${PN} != "glibc-intermediate" ] ; then
-
 	set +e
 	rm -rf ${PSTAGE_TMPDIR_STAGE}
 	stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/staging-stamp-cache -u -d ${PSTAGE_TMPDIR_STAGE}