From 1f2f03c6c269ab336a6b8c908bcca8bc88194703 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sun, 8 Jan 2012 19:05:05 +0000 Subject: classes: add palmtop-defs.bbclass The Opie-related definitions are about to be removed from bitbake.conf in OE-Core, so create a palmtop-defs.bbclass which can be used to hold these and make every recipe that refers to any of these definitions inherit it. Signed-off-by: Paul Eggleton --- recipes-opie/opie-help-en/opie-help-en.inc | 2 ++ recipes-opie/opie-i18n/opie-i18n.inc | 3 ++- recipes-opie/opie-icon-reload/opie-icon-reload.inc | 2 ++ recipes-opie/opie-keytabs/opie-keytabs.inc | 2 ++ recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin.inc | 2 ++ recipes-opie/opie-pics/opie-pics.inc | 2 ++ recipes-opie/opie-sh-snes/opie-sh-snes_0.2.bb | 3 ++- recipes-opie/opie-sounds/opie-sounds.inc | 2 ++ recipes-opie/opie-ttf-support/opie-ttf-support_1.1.bb | 2 ++ 9 files changed, 18 insertions(+), 2 deletions(-) (limited to 'recipes-opie') diff --git a/recipes-opie/opie-help-en/opie-help-en.inc b/recipes-opie/opie-help-en/opie-help-en.inc index 78ad55a..1ad39b1 100644 --- a/recipes-opie/opie-help-en/opie-help-en.inc +++ b/recipes-opie/opie-help-en/opie-help-en.inc @@ -11,6 +11,8 @@ RDEPENDS_${PN} = "opie-helpbrowser" S = "${WORKDIR}/html" +inherit palmtop-defs + do_install() { install -d ${D}${palmtopdir}/help/en/html/ install -m 0644 ${WORKDIR}/html/*.html ${D}${palmtopdir}/help/en/html/ diff --git a/recipes-opie/opie-i18n/opie-i18n.inc b/recipes-opie/opie-i18n/opie-i18n.inc index f2be6f9..6caf876 100644 --- a/recipes-opie/opie-i18n/opie-i18n.inc +++ b/recipes-opie/opie-i18n/opie-i18n.inc @@ -5,9 +5,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" DEPENDS = "opie-lrelease-native" - S = "${WORKDIR}/i18n" +inherit palmtop-defs + do_compile() { for f in ?? ??_?? do diff --git a/recipes-opie/opie-icon-reload/opie-icon-reload.inc b/recipes-opie/opie-icon-reload/opie-icon-reload.inc index fe897c8..6eb628c 100644 --- a/recipes-opie/opie-icon-reload/opie-icon-reload.inc +++ b/recipes-opie/opie-icon-reload/opie-icon-reload.inc @@ -10,6 +10,8 @@ SRC_URI = "file://icon-reload.desktop \ file://icon-reload.sh \ file://reload.png" +inherit palmtop-defs + FILES_${PN} += "${palmtopdir}" do_install() { diff --git a/recipes-opie/opie-keytabs/opie-keytabs.inc b/recipes-opie/opie-keytabs/opie-keytabs.inc index 4f51c05..05962a2 100644 --- a/recipes-opie/opie-keytabs/opie-keytabs.inc +++ b/recipes-opie/opie-keytabs/opie-keytabs.inc @@ -4,6 +4,8 @@ LICENSE = "GPLv2" # FIXME stopgap until split archives have license files included LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +inherit palmtop-defs + do_install() { install -d ${D}${palmtopdir}/etc/keytabs/ install -m 0644 ${WORKDIR}/etc/keytabs/*.* ${D}${palmtopdir}/etc/keytabs/ diff --git a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin.inc b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin.inc index 1df6032..1227415 100644 --- a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin.inc +++ b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin.inc @@ -5,6 +5,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" RPROVIDES_${PN} = "opie-mediaplayer2-skin" +inherit palmtop-defs + do_install() { install -d ${D}${palmtopdir}/pics/opieplayer2/skins/${SKINNAME}/ install -m 0644 ${WORKDIR}/pics/opieplayer2/skins/${SKINNAME}/*.png ${D}${palmtopdir}/pics/opieplayer2/skins/${SKINNAME}/ diff --git a/recipes-opie/opie-pics/opie-pics.inc b/recipes-opie/opie-pics/opie-pics.inc index a4adad2..82e761a 100644 --- a/recipes-opie/opie-pics/opie-pics.inc +++ b/recipes-opie/opie-pics/opie-pics.inc @@ -7,6 +7,8 @@ PR = "r2" S = "${WORKDIR}" +inherit palmtop-defs + SHIP_INLINE_PICS = "yes" INLINE_PICS = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "pics-hires/inline", "pics/inline", d)}' diff --git a/recipes-opie/opie-sh-snes/opie-sh-snes_0.2.bb b/recipes-opie/opie-sh-snes/opie-sh-snes_0.2.bb index 97ec480..2b75b5c 100644 --- a/recipes-opie/opie-sh-snes/opie-sh-snes_0.2.bb +++ b/recipes-opie/opie-sh-snes/opie-sh-snes_0.2.bb @@ -6,9 +6,10 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 RDEPENDS_${PN} = "opie-sh" - PR = "r3" +inherit palmtop-defs + FILES_${PN} = "/opt/QtPalmtop" SRC_URI = "file://snes.desktop \ diff --git a/recipes-opie/opie-sounds/opie-sounds.inc b/recipes-opie/opie-sounds/opie-sounds.inc index 8a8b2ea..8ae96b7 100644 --- a/recipes-opie/opie-sounds/opie-sounds.inc +++ b/recipes-opie/opie-sounds/opie-sounds.inc @@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 S = "${WORKDIR}/sounds" +inherit palmtop-defs + SOUNDS = "alarm touchsound keysound" do_install() { diff --git a/recipes-opie/opie-ttf-support/opie-ttf-support_1.1.bb b/recipes-opie/opie-ttf-support/opie-ttf-support_1.1.bb index 50cec6e..524057a 100644 --- a/recipes-opie/opie-ttf-support/opie-ttf-support_1.1.bb +++ b/recipes-opie/opie-ttf-support/opie-ttf-support_1.1.bb @@ -10,6 +10,8 @@ S = "${WORKDIR}" LIC_FILES_CHKSUM = "file://update-qtttffontdir.c;beginline=4;endline=7;md5=84d4335f8f9e85774e2a15b2dff91401" +inherit palmtop-defs + # Seems to break linking ASNEEDED = "" -- cgit 1.2.3-korg