gcc: Some futher .bb -> .inc changes

diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index 5a0b4a5c92116fe90763a9ec99649405b7031e5d..506d4c4c81d0c2b1076a96f8a82b489b78595db7 100644 (file)
--- a/classes/cpan.bbclass
+++ b/classes/cpan.bbclass
@@ -50,7 +50,16 @@ cpan_do_compile () {
 }
 
 cpan_do_install () {
-       oe_runmake install_vendor
+       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
 }
+                                                               
 
-EXPORT_FUNCTIONS do_configure do_compile do_install
+EXPORT_FUNCTIONS do_configure do_compile do_install do_stage

diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index 5ff49cd65e60e80f9fbe663ef1a8c7d396240535..52264e44b562f34f6b636d1257550f658319c063 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 = tmpdir
+        pkgconfigcheck = workdir
 
     # find all .la and .pc files
     # read the content

diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
index b779e99435830a617129c6c5233a87c91b4701db..62dabe48b8fe3e63e952ec773edc2b7ccdbebd20 100644 (file)
--- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -1,4 +1,4 @@
-require gcc_csl-arm-2005q3.bb
+require gcc-csl-arm-2005q3.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross

diff --git a/packages/gcc/gcc-cross_csl-arm-cvs.bb b/packages/gcc/gcc-cross_csl-arm-cvs.bb
index a9cb4787014a70d6f91911d0c7b1555d1199488f..93d00179d1cd627e27edecf09f6cd83041304716 100644 (file)
--- a/packages/gcc/gcc-cross_csl-arm-cvs.bb
+++ b/packages/gcc/gcc-cross_csl-arm-cvs.bb
@@ -1,4 +1,4 @@
-require gcc_csl-arm-cvs.bb
+require gcc-csl-arm-cvs.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross

diff --git a/packages/gcc/gcc-cross_csl-arm.bb b/packages/gcc/gcc-cross_csl-arm.bb
index 5ca4b949e094d756e20307f289f0e0fd2dc3ba44..e44e43aa25c6d7efa6282c066d7d53bd2ea027f3 100644 (file)
--- a/packages/gcc/gcc-cross_csl-arm.bb
+++ b/packages/gcc/gcc-cross_csl-arm.bb
@@ -1,4 +1,4 @@
-require gcc_csl-arm.bb
+require gcc-csl-arm.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross

diff --git a/packages/gcc/gcc-csl-arm-cvs.inc b/packages/gcc/gcc-csl-arm-cvs.inc
index d8e5fee2bb7f4d4953efbc6f0924120aad974646..334ae9c72892409f501141fbe1fa35fccf36ab12 100644 (file)
--- a/packages/gcc/gcc-csl-arm-cvs.inc
+++ b/packages/gcc/gcc-csl-arm-cvs.inc
@@ -1,4 +1,4 @@
-require gcc_csl-arm.bb
+require gcc-csl-arm.inc
 
 PV = "3.4.4+csl-arm-${SRCDATE}"
 BINV = "3.4.4"

diff --git a/packages/gcc/gcc-native_3.4.4.bb b/packages/gcc/gcc-native_3.4.4.bb
index d70a4f54648f2faae6d1cf319498e609ef875777..f20937d60c8ecb8c033b6c9f9d875766578eb922 100644 (file)
--- a/packages/gcc/gcc-native_3.4.4.bb
+++ b/packages/gcc/gcc-native_3.4.4.bb
@@ -1,3 +1,3 @@
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 require gcc-native.inc
 PROVIDES += "gcc3-native"

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 525a9d23de0a2f6cd3ce0fc56f5929afd15a4db4..6e27ac09e289b6f1a0e0da5e81285a7bd4759d88 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,5 +1,7 @@
 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 102a917c1ff95309728b4f0f2f3264634659128d..fb8b25aa6d95233f9dd27b26f1666679b6a2811a 100644 (file)
--- a/packages/gpsdrive/gpsdrive_2.10pre4.bb
+++ b/packages/gpsdrive/gpsdrive_2.10pre4.bb
@@ -31,3 +31,4 @@ 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 912215cfbd69b36bf910b948f20788d7d3b6db4a..44e5c122e53852250a33d31c6952321091a647d7 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 = "-1"
+DEFAULT_PREFERENCE = "5"