Reverse accidental changes in dc0f5b4ef4b836d72bf43dffa503ab86e6f7de54

diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index 506d4c4..5a0b4a5 100644 (file)
--- a/classes/cpan.bbclass
+++ b/classes/cpan.bbclass
@@ -50,16 +50,7 @@ cpan_do_compile () {
 }
 
 cpan_do_install () {
-       if [ ${@is_target(d)} == "yes" ]; then
-               oe_runmake install_vendor
-       fi
-}
-
-cpan_do_stage () {
-       if [ ${@is_target(d)} == "no" ]; then
-               oe_runmake install_vendor
-       fi
+       oe_runmake install_vendor
 }
-                                                               
 
-EXPORT_FUNCTIONS do_configure do_compile do_install do_stage
+EXPORT_FUNCTIONS do_configure do_compile do_install

diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index 52264e4..5ff49cd 100644 (file)
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -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

diff --git a/packages/glib-2.0/glib-2.0_2.15.6.bb b/packages/glib-2.0/glib-2.0_2.15.6.bb
index 6e27ac0..525a9d2 100644 (file)
--- a/packages/glib-2.0/glib-2.0_2.15.6.bb
+++ b/packages/glib-2.0/glib-2.0_2.15.6.bb
@@ -1,7 +1,5 @@
 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 \

diff --git a/packages/gpsdrive/gpsdrive_2.10pre4.bb b/packages/gpsdrive/gpsdrive_2.10pre4.bb
index fb8b25a..102a917 100644 (file)
--- a/packages/gpsdrive/gpsdrive_2.10pre4.bb
+++ b/packages/gpsdrive/gpsdrive_2.10pre4.bb
@@ -31,4 +31,3 @@ FILES_${PN}-map-icons-classic = "${datadir}/map-icons/classic.small"
 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"
-

diff --git a/packages/gtk-webcore/osb-browser_svn.bb b/packages/gtk-webcore/osb-browser_svn.bb
index 44e5c12..912215c 100644 (file)
--- a/packages/gtk-webcore/osb-browser_svn.bb
+++ b/packages/gtk-webcore/osb-browser_svn.bb
@@ -14,5 +14,5 @@ SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;modul
 
 S = "${WORKDIR}/osb-browser"
 
-DEFAULT_PREFERENCE = "5"
+DEFAULT_PREFERENCE = "-1"