diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2008-03-15 16:17:31 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2008-03-15 16:17:31 +0000 |
| commit | f4b9a60d4df924a24e1e6efe938eb2ddf4692c2f (patch) | |
| tree | f40c6af7279f4f07c0800b10f3bd16ac5091f2a1 | |
| parent | 9589247ca3b9608c02196aa6cda38a91a7c1da05 (diff) | |
Reverse accidental changes in dc0f5b4ef4b836d72bf43dffa503ab86e6f7de54
| -rw-r--r-- | classes/cpan.bbclass | 13 | ||||
| -rw-r--r-- | classes/insane.bbclass | 2 | ||||
| -rw-r--r-- | packages/glib-2.0/glib-2.0_2.15.6.bb | 2 | ||||
| -rw-r--r-- | packages/gpsdrive/gpsdrive_2.10pre4.bb | 1 | ||||
| -rw-r--r-- | packages/gtk-webcore/osb-browser_svn.bb | 2 |
5 files changed, 4 insertions, 16 deletions
diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index 506d4c4c81..5a0b4a5c92 100644 --- 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 52264e44b5..5ff49cd65e 100644 --- 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 6e27ac09e2..525a9d23de 100644 --- 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 fb8b25aa6d..102a917c1f 100644 --- 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 44e5c122e5..912215cfbd 100644 --- 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" |