diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-01-14 07:36:28 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-01-14 07:36:28 +0000 |
| commit | f1bf29d18be92745af49b2bfc1f3e78222d99202 (patch) | |
| tree | ec0b2ae1fce92ad1f1eb43c25323c3fd2d5fa766 /classes | |
| parent | a07fc78ab8cf29941d64b5a863ff5784c0433b55 (diff) | |
| parent | e04e540f70e47af0019789b691e63914db5d8d11 (diff) | |
merge of '2e4f188aff9f2db155896f2fc0669c515d2d86c3'
and 'ba76f4856806d81e983ec7db3a011d59a30abf15'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/insane.bbclass | 5 | ||||
| -rw-r--r-- | classes/sanity.bbclass | 3 | ||||
| -rw-r--r-- | classes/sdl.bbclass | 36 |
3 files changed, 20 insertions, 24 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 840ebf6eff..97cf036dd9 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -464,7 +464,6 @@ python do_qa_configure() { os.path.join(root,"config.log") if "config.log" in files: if os.system(statement) == 0: - bb.fatal("This autoconf log indicates errors, it looked at \ - host includes. Rerun configure task after fixing this. \ - Path was '%s'" % root) + bb.fatal("""This autoconf log indicates errors, it looked at host includes. +Rerun configure task after fixing this. The path was '%s'""" % root) } diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index bbc06d9697..9994febf0d 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -83,9 +83,6 @@ def check_sanity(e): if not check_app_exists('${BUILD_PREFIX}g++', e.data): missing = missing + "C++ Compiler (${BUILD_PREFIX}g++)," - if not check_app_exists('${BUILD_PREFIX}gfortran', e.data): - missing = missing + "GNU Fortran Compiler" - required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum" for util in required_utilities.split(): diff --git a/classes/sdl.bbclass b/classes/sdl.bbclass index d478d97f18..23cbf10919 100644 --- a/classes/sdl.bbclass +++ b/classes/sdl.bbclass @@ -4,41 +4,41 @@ DEPENDS += "virtual/libsdl libsdl-mixer libsdl-image" -APPDESKTOP ?= "${PN}.desktop" +APPDESKTOP ?= "${WORKDIR}/${PN}.desktop" APPNAME ?= "${PN}" -APPIMAGE ?= "${PN}.png" +APPIMAGE ?= "${WORKDIR}/${PN}.png" sdl_do_sdl_install() { - install -d ${D}${palmtopdir}/bin - install -d ${D}${palmtopdir}/pics - install -d ${D}${palmtopdir}/apps/Games - ln -sf ${bindir}/${APPNAME} ${D}${palmtopdir}/bin/${APPNAME} - install -m 0644 ${APPIMAGE} ${D}${palmtopdir}/pics/${PN}.png + install -d ${D}${datadir}/applications + install -d ${D}${datadir}/pixmaps + + install -m 0644 ${APPIMAGE} ${D}${datadir}/pixmaps/${PN}.png if [ -e "${APPDESKTOP}" ] then - echo ${APPDESKTOP} present, installing to palmtopdir... - install -m 0644 ${APPDESKTOP} ${D}${palmtopdir}/apps/Games/${PN}.desktop + echo ${APPDESKTOP} present, using it... + install -m 0644 ${APPDESKTOP} ${D}${datadir}/applications/ else echo ${APPDESKTOP} not present, creating one on-the-fly... - cat >${D}${palmtopdir}/apps/Games/${PN}.desktop <<EOF + cat >${D}${datadir}/applications/${PN}.desktop <<EOF [Desktop Entry] -Note=Auto Generated... this may be not what you want +Name=${PN} Comment=${DESCRIPTION} +Note=Auto Generated by OE SDL bbclass Exec=${APPNAME} Icon=${PN}.png Type=Application -Name=${PN} +Categories=Games EOF fi } EXPORT_FUNCTIONS do_sdl_install -addtask sdl_install after do_compile before do_populate_staging +addtask sdl_install after do_install before do_package -SECTION = "x11/games" -SECTION_${PN}-opie = "opie/games" +#SECTION = "x11/games" +#SECTION_${PN}-opie = "opie/games" -PACKAGES += "${PN}-opie" -RDEPENDS_${PN}-opie += "${PN}" -FILES_${PN}-opie = "${palmtopdir}" +#PACKAGES += "${PN}-opie" +#RDEPENDS_${PN}-opie += "${PN}" +#FILES_${PN}-opie = "${palmtopdir}" |