[oe-commits] org.oe.dev merge of '358ee536bc83b766d3a66b4fa27a3fef5012ace8'

[oe commit]

merge of '358ee536bc83b766d3a66b4fa27a3fef5012ace8'
     and '769fde4a1014e93e04fd7d91a1626690100f1306'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: cf012a2576f31467c51f9bb4b329a6815e740fe1
ViewMTN: http://monotone.openembedded.org/revision/info/cf012a2576f31467c51f9bb4b329a6815e740fe1
Files:
1
packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig
classes/autotools.bbclass
classes/native.bbclass
Diffs:

#
# mt diff -r358ee536bc83b766d3a66b4fa27a3fef5012ace8 -rcf012a2576f31467c51f9bb4b329a6815e740fe1
#
#
#
# patch "packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig"
#  from [b1d251def3d0ffe97b8aa186ac96c852061db329]
#    to [513031550df4c84414c69b00aeea62dd5b61825c]
#
============================================================
--- packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig	b1d251def3d0ffe97b8aa186ac96c852061db329
+++ packages/linux/linux-2.6.24/mpc8313e-rdb/defconfig	513031550df4c84414c69b00aeea62dd5b61825c
@@ -758,7 +758,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
+CONFIG_TUN=m
 # CONFIG_VETH is not set
 # CONFIG_ARCNET is not set
 CONFIG_PHYLIB=y


#
# mt diff -r769fde4a1014e93e04fd7d91a1626690100f1306 -rcf012a2576f31467c51f9bb4b329a6815e740fe1
#
#
#
# patch "classes/autotools.bbclass"
#  from [2cc639c4f37a3df20c73fcc0b5d06ef03ad73724]
#    to [487624b60f38ddf22ed33a6650fd560273ad87c2]
# 
# patch "classes/native.bbclass"
#  from [c184594947a90b6355b13df0e90a4aedb655f19f]
#    to [f958a86c17270e1239a570fb53ed2b32bf3c3477]
#
============================================================
--- classes/autotools.bbclass	2cc639c4f37a3df20c73fcc0b5d06ef03ad73724
+++ classes/autotools.bbclass	487624b60f38ddf22ed33a6650fd560273ad87c2
@@ -1,5 +1,8 @@ inherit base
 inherit base
 
+# use autotools_stage_all for native packages
+AUTOTOOLS_NATIVE_STAGE_INSTALL = "1"
+
 def autotools_dep_prepend(d):
 	import bb;
 
============================================================
--- classes/native.bbclass	c184594947a90b6355b13df0e90a4aedb655f19f
+++ classes/native.bbclass	f958a86c17270e1239a570fb53ed2b32bf3c3477
@@ -76,7 +76,12 @@ do_stage () {
 do_stage () {
 	if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ]
 	then
-		oe_runmake install
+		if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" != "1"]
+		then
+			oe_runmake install
+		else
+			autotools_stage_all
+		fi
 	fi
 }