diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-09-09 11:41:44 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-09-09 11:41:44 +0000 |
| commit | e4ef6eacfb2280a4d63cd569d691280fdf6b0e8f (patch) | |
| tree | 08350103aa1a9fad46a2858ea49b014afddd70aa /classes | |
| parent | 5fff1e40328e6ab7967b55fbcd717c29d68a1d3f (diff) | |
| parent | d6833d3ab6f6b0c4078c9d0c46cb9d5dd0faea58 (diff) | |
merge of '3025e5e7a53ca716304775ca0ca1dc45ca4b0524'
and '60271e29029910207b8512833d049fad50fb282b'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 4 | ||||
| -rw-r--r-- | classes/qmake.bbclass | 2 | ||||
| -rw-r--r-- | classes/qmake2.bbclass | 2 | ||||
| -rw-r--r-- | classes/qmake_base.bbclass (renamed from classes/qmake-base.bbclass) | 2 | ||||
| -rw-r--r-- | classes/qt3e.bbclass | 2 | ||||
| -rw-r--r-- | classes/qt3x11.bbclass | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index d4b327e266..999d409914 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -487,9 +487,9 @@ python base_do_fetch() { try: if not base_chk_file(parser, pn, pv,uri, localpath, d): if type != "file": - bb.note("%s-%s-%s has no section, not checking URI" % (pn,pv,uri)) + bb.note("%s-%s: %s has no entry in conf/checksums.ini, not checking URI" % (pn,pv,uri)) else: - bb.debug("%s-%s-%s has no section, not checking URI" % (pn,pv,uri)) + bb.debug("%s-%s: %s has no entry in conf/checksums.ini, not checking URI" % (pn,pv,uri)) except Exception: raise bb.build.FuncFailed("Checksum of '%s' failed" % uri) } diff --git a/classes/qmake.bbclass b/classes/qmake.bbclass index b45e54ca6a..34f59ef9f7 100644 --- a/classes/qmake.bbclass +++ b/classes/qmake.bbclass @@ -1,4 +1,4 @@ -inherit qmake-base +inherit qmake_base DEPENDS_prepend = "qmake-native " diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index 86f1439b30..d0f59d2cd4 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -1,7 +1,7 @@ # # QMake variables for Qt4 # -inherit qmake-base +inherit qmake_base DEPENDS_prepend = "qmake2-native uicmoc4-native " diff --git a/classes/qmake-base.bbclass b/classes/qmake_base.bbclass index 52f6d830a0..ea8903c278 100644 --- a/classes/qmake-base.bbclass +++ b/classes/qmake_base.bbclass @@ -31,7 +31,7 @@ oe_qmake_mkspecs () { done } -qmake-base_do_configure() { +qmake_base_do_configure() { case ${QMAKESPEC} in *linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++) ;; diff --git a/classes/qt3e.bbclass b/classes/qt3e.bbclass index 58a6779af6..98c47adb90 100644 --- a/classes/qt3e.bbclass +++ b/classes/qt3e.bbclass @@ -1,5 +1,5 @@ # -# override variables set by qmake-base to compile Qt/X11 apps +# override variables set by qmake_base to compile Qt/X11 apps # export QTDIR="${STAGING_DIR}/${HOST_SYS}/qte3" export QTEDIR="${STAGING_DIR}/${HOST_SYS}/qte3" diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass index 95ed4f538a..67f2cf7348 100644 --- a/classes/qt3x11.bbclass +++ b/classes/qt3x11.bbclass @@ -1,7 +1,7 @@ DEPENDS_prepend = "${@["qt3x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt-x11-free')]}" EXTRA_QMAKEVARS_POST += "CONFIG+=thread" # -# override variables set by qmake-base to compile Qt/X11 apps +# override variables set by qmake_base to compile Qt/X11 apps # export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt3" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic3" |