[oe-commits] org.oe.dev Reverse accidental changes in dc0f5b4ef4b836d72bf43dffa503ab86e6f7de54

[rpurdie commit]

Reverse accidental changes in  dc0f5b4ef4b836d72bf43dffa503ab86e6f7de54

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: a5e6f730b8b1833b4514c2239923dba9fe07f93b
ViewMTN: http://monotone.openembedded.org/revision/info/a5e6f730b8b1833b4514c2239923dba9fe07f93b
Files:
1
classes/cpan.bbclass
classes/insane.bbclass
packages/glib-2.0/glib-2.0_2.15.6.bb
packages/gpsdrive/gpsdrive_2.10pre4.bb
packages/gtk-webcore/osb-browser_svn.bb
Diffs:

#
# mt diff -rbba5da2f1dd60bbf772531393fbfff2f6a79bfc5 -ra5e6f730b8b1833b4514c2239923dba9fe07f93b
#
#
#
# patch "classes/cpan.bbclass"
#  from [7a1ee7c60006de5f1fdeedf6a41459c55b0a894e]
#    to [3d10b2c778e3f89f5026df7ac1fcd54bc43fd360]
# 
# patch "classes/insane.bbclass"
#  from [8fbdc5bf22c0812dedcb14402f923bcf4159d81e]
#    to [0712df99743c442ed311e6b4d4be0d28f29d525f]
# 
# patch "packages/glib-2.0/glib-2.0_2.15.6.bb"
#  from [0bfa6b7b4259a557f92ce561a63620ba08f02ae3]
#    to [c13c859de167ff242477ffe86356620ae601725f]
# 
# patch "packages/gpsdrive/gpsdrive_2.10pre4.bb"
#  from [6d446a64d62ee79fc63d43aebc56508d08316dbb]
#    to [9e4cea32b63aa093d54c9b1039cfa8dd87790322]
# 
# patch "packages/gtk-webcore/osb-browser_svn.bb"
#  from [a596b9f9099c52a956389aa76f1254c29e0465ba]
#    to [a4aaa87e84fa4a445154cd52d8091f3f8bb46963]
#
============================================================
--- classes/cpan.bbclass	7a1ee7c60006de5f1fdeedf6a41459c55b0a894e
+++ classes/cpan.bbclass	3d10b2c778e3f89f5026df7ac1fcd54bc43fd360
@@ -50,16 +50,7 @@ cpan_do_install () {
 }
 
 cpan_do_install () {
-	if [ ${@is_target(d)} == "yes" ]; then
-		oe_runmake install_vendor
-	fi
+	oe_runmake install_vendor
 }
 
+EXPORT_FUNCTIONS do_configure do_compile do_install
-cpan_do_stage () {
-	if [ ${@is_target(d)} == "no" ]; then
-		oe_runmake install_vendor
-	fi
-}
-								
-
-EXPORT_FUNCTIONS do_configure do_compile do_install do_stage
============================================================
--- classes/insane.bbclass	8fbdc5bf22c0812dedcb14402f923bcf4159d81e
+++ classes/insane.bbclass	0712df99743c442ed311e6b4d4be0d28f29d525f
@@ -341,7 +341,7 @@ def package_qa_check_staged(path,d):
         pkgconfigcheck = workdir
     else:
         installed = "installed=yes"
-        pkgconfigcheck = workdir
+        pkgconfigcheck = tmpdir
 
     # find all .la and .pc files
     # read the content
============================================================
--- packages/glib-2.0/glib-2.0_2.15.6.bb	0bfa6b7b4259a557f92ce561a63620ba08f02ae3
+++ packages/glib-2.0/glib-2.0_2.15.6.bb	c13c859de167ff242477ffe86356620ae601725f
@@ -1,7 +1,5 @@ require glib.inc
 require glib.inc
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.15/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1 \
============================================================
--- packages/gpsdrive/gpsdrive_2.10pre4.bb	6d446a64d62ee79fc63d43aebc56508d08316dbb
+++ packages/gpsdrive/gpsdrive_2.10pre4.bb	9e4cea32b63aa093d54c9b1039cfa8dd87790322
@@ -31,4 +31,3 @@ FILES_${PN}-doc = "${datadir}/man ${data
 FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg"
 FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt"
 FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation"
-
============================================================
--- packages/gtk-webcore/osb-browser_svn.bb	a596b9f9099c52a956389aa76f1254c29e0465ba
+++ packages/gtk-webcore/osb-browser_svn.bb	a4aaa87e84fa4a445154cd52d8091f3f8bb46963
@@ -14,5 +14,5 @@ S = "${WORKDIR}/osb-browser"
 
 S = "${WORKDIR}/osb-browser"
 
-DEFAULT_PREFERENCE = "5"
+DEFAULT_PREFERENCE = "-1"