[oe-commits] org.oe.dev merge of '67a0d6fb746dc6576bd8ae2410c1144c785b13d0'

[ifaistos commit]

merge of '67a0d6fb746dc6576bd8ae2410c1144c785b13d0'
     and '6a2d2b93d5aaaeac208513989dea7830e85864d2'

Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: dc5583344df78c193ab407bb9b2231ebf422c55f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=dc5583344df78c193ab407bb9b2231ebf422c55f
Files:
1
classes/package_ipk.bbclass
conf/machine/include/tune-pentium.conf
conf/machine/include/tune-pentium.inc
conf/machine/include/tune-pentiumpro.conf
conf/machine/include/tune-pentiumpro.inc
conf/machine/i586-generic.conf
conf/machine/i686-generic.conf
Diffs:

#
# mt diff -r67a0d6fb746dc6576bd8ae2410c1144c785b13d0 -rdc5583344df78c193ab407bb9b2231ebf422c55f
#
# 
# 
# patch "classes/package_ipk.bbclass"
#  from [89bc8829d8e01336d5c7388a5fa756a042940a40]
#    to [55ae1d1bc1b49ed1ae4a1a93746b0063fda0d25b]
# 
============================================================
--- classes/package_ipk.bbclass	89bc8829d8e01336d5c7388a5fa756a042940a40
+++ classes/package_ipk.bbclass	55ae1d1bc1b49ed1ae4a1a93746b0063fda0d25b
@@ -82,6 +82,10 @@ package_update_index_ipk () {
 			touch ${DEPLOY_DIR_IPK}/$arch/Packages
 			ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/
 		fi
+		if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/ ] ; then 
+			touch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages
+			ipkg-make-index -r ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages -p ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages -l ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages.filelist -m ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/
+		fi
 	done
 }
 
@@ -102,8 +106,10 @@ package_generate_ipkg_conf () {
 		priority=$(expr $priority + 5)
 		if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
 		        echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET}
-		        echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_SDK}
 		fi
+		if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages ] ; then
+		        echo "src oe-${BUILD_ARCH}-$arch-sdk file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk" >> ${IPKGCONF_SDK}
+		fi
 	done
 }
 


#
# mt diff -r6a2d2b93d5aaaeac208513989dea7830e85864d2 -rdc5583344df78c193ab407bb9b2231ebf422c55f
#
# 
# 
# rename "conf/machine/include/tune-pentium.conf"
#     to "conf/machine/include/tune-pentium.inc"
# 
# rename "conf/machine/include/tune-pentiumpro.conf"
#     to "conf/machine/include/tune-pentiumpro.inc"
# 
# patch "conf/machine/i586-generic.conf"
#  from [7f2abcd86ad5dde6d2411133e92d2c7e426af0ab]
#    to [006a74a863afd1f923bb67cedef39bf4391cffd0]
# 
# patch "conf/machine/i686-generic.conf"
#  from [147c4ce5a52c09889cbd316c311ec4030e0797ef]
#    to [ee687be060f3975c6581a344e0fcff555311c4c0]
# 
============================================================
--- conf/machine/i586-generic.conf	7f2abcd86ad5dde6d2411133e92d2c7e426af0ab
+++ conf/machine/i586-generic.conf	006a74a863afd1f923bb67cedef39bf4391cffd0
@@ -25,5 +25,5 @@ MACHINE_TASK_PROVIDER = "task-base"
 
 
 #tune for pentium cpu
-require conf/machine/include/tune-pentium.conf
+require conf/machine/include/tune-pentium.inc
 
============================================================
--- conf/machine/i686-generic.conf	147c4ce5a52c09889cbd316c311ec4030e0797ef
+++ conf/machine/i686-generic.conf	ee687be060f3975c6581a344e0fcff555311c4c0
@@ -23,5 +23,5 @@ MACHINE_TASK_PROVIDER = "task-base"
 MACHINE_TASK_PROVIDER = "task-base"
 
 #tune for pentium pro cpu
-require conf/machine/include/tune-pentiumpro.conf
+require conf/machine/include/tune-pentiumpro.inc