From dc82bf0e52b07a0767b6bf253852278c473ea248 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sun, 8 Jan 2012 18:39:29 +0000 Subject: opie-mediaplayer2-skin-*: use common inc file Move all common definitions to a single .inc file and abstract away differences using a SKINNAME variable. Signed-off-by: Paul Eggleton --- .../opie-mediaplayer2-skin-default-landscape_1.2.5.bb | 19 ++++--------------- .../opie-mediaplayer2-skin-default-landscape_git.bb | 19 ++++--------------- .../opie-mediaplayer2-skin-default_1.2.5.bb | 17 +++-------------- .../opie-mediaplayer2-skin-default_git.bb | 17 +++-------------- .../opie-mediaplayer2-skin-pod_1.2.5.bb | 18 ++++-------------- .../opie-mediaplayer2-skin-pod_git.bb | 18 ++++-------------- .../opie-mediaplayer2-skin-techno_1.2.5.bb | 18 ++++-------------- .../opie-mediaplayer2-skin-techno_git.bb | 18 ++++-------------- .../opie-mediaplayer2/opie-mediaplayer2-skin.inc | 13 +++++++++++++ 9 files changed, 43 insertions(+), 114 deletions(-) create mode 100644 recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin.inc diff --git a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.5.bb b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.5.bb index 5163ec1..7127137 100644 --- a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.5.bb +++ b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_1.2.5.bb @@ -1,20 +1,9 @@ -DESCRIPTION = "Skin for opie-mediaplayer2" -SECTION = "opie/multimedia" -LICENSE = "GPLv2" -# FIXME stopgap until split archives have license files included -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -APPNAME = "opieplayer2" -RPROVIDES_${PN} = "opie-mediaplayer2-skin" -PR = "r0" +SKINNAME = "default_landscape" +require opie-mediaplayer2-skin.inc + +PR = "r1" SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_pics.tar.bz2;name=split_pics" SRC_URI[split_pics.md5sum] = "e9b68749d67295f7080a23e39b17335e" SRC_URI[split_pics.sha256sum] = "0a7aab6d0bce04d6a9c257d768d8a1a481d38ba527d6e6e50723973789954b4a" -do_install() { - install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default_landscape/ - install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/default_landscape/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/default_landscape/ -} - -FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default_landscape/*.png" - diff --git a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_git.bb b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_git.bb index 9478766..7cf0215 100644 --- a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_git.bb +++ b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_git.bb @@ -1,19 +1,8 @@ -DESCRIPTION = "Skin for opie-mediaplayer2" -SECTION = "opie/multimedia" -LICENSE = "GPLv2" -# FIXME stopgap until split archives have license files included -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -APPNAME = "opieplayer2" -RPROVIDES_${PN} = "opie-mediaplayer2-skin" +SKINNAME = "default_landscape" +require opie-mediaplayer2-skin.inc + PV = "${OPIE_GIT_PV}" -PR = "r3" +PR = "r4" SRC_URI = "${OPIE_GIT};protocol=git;subpath=pics" -do_install() { - install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default_landscape/ - install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/default_landscape/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/default_landscape/ -} - -FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default_landscape/*.png" - diff --git a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.5.bb b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.5.bb index 92221c7..262b806 100644 --- a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.5.bb +++ b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default_1.2.5.bb @@ -1,20 +1,9 @@ -DESCRIPTION = "Skin for opie-mediaplayer2" -SECTION = "opie/multimedia" -LICENSE = "GPLv2" -# FIXME stopgap until split archives have license files included -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -APPNAME = "opieplayer2" -RPROVIDES_${PN} = "opie-mediaplayer2-skin" +SKINNAME = "default" +require opie-mediaplayer2-skin.inc -PR = "r0" +PR = "r1" SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_pics.tar.bz2;name=split_pics" SRC_URI[split_pics.md5sum] = "e9b68749d67295f7080a23e39b17335e" SRC_URI[split_pics.sha256sum] = "0a7aab6d0bce04d6a9c257d768d8a1a481d38ba527d6e6e50723973789954b4a" -do_install() { - install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default/ - install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/default/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/default/ -} - -FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default/*.png" diff --git a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default_git.bb b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default_git.bb index 7713bff..da74a51 100644 --- a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default_git.bb +++ b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-default_git.bb @@ -1,19 +1,8 @@ -DESCRIPTION = "Skin for opie-mediaplayer2" -SECTION = "opie/multimedia" -LICENSE = "GPLv2" -# FIXME stopgap until split archives have license files included -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -APPNAME = "opieplayer2" -RPROVIDES_${PN} = "opie-mediaplayer2-skin" +SKINNAME = "default" +require opie-mediaplayer2-skin.inc PV = "${OPIE_GIT_PV}" -PR = "r4" +PR = "r5" SRC_URI = "${OPIE_GIT};protocol=git;subpath=pics" -do_install() { - install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/default/ - install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/default/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/default/ -} - -FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/default/*.png" diff --git a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.5.bb b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.5.bb index 6d31993..20c8f79 100644 --- a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.5.bb +++ b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-pod_1.2.5.bb @@ -1,19 +1,9 @@ -DESCRIPTION = "Skin for opie-mediaplayer2" -SECTION = "opie/multimedia" -LICENSE = "GPLv2" -# FIXME stopgap until split archives have license files included -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -APPNAME = "opieplayer2" -RPROVIDES_${PN} = "opie-mediaplayer2-skin" -PR = "r0" +SKINNAME = "Pod" +require opie-mediaplayer2-skin.inc + +PR = "r1" SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_pics.tar.bz2;name=split_pics" SRC_URI[split_pics.md5sum] = "e9b68749d67295f7080a23e39b17335e" SRC_URI[split_pics.sha256sum] = "0a7aab6d0bce04d6a9c257d768d8a1a481d38ba527d6e6e50723973789954b4a" -do_install() { - install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/Pod/ - install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/Pod/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/Pod/ -} - -FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/Pod/*.png" diff --git a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-pod_git.bb b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-pod_git.bb index ffef8bb..ef9cd63 100644 --- a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-pod_git.bb +++ b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-pod_git.bb @@ -1,18 +1,8 @@ -DESCRIPTION = "Skin for opie-mediaplayer2" -SECTION = "opie/multimedia" -LICENSE = "GPLv2" -# FIXME stopgap until split archives have license files included -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -APPNAME = "opieplayer2" -RPROVIDES_${PN} = "opie-mediaplayer2-skin" +SKINNAME = "Pod" +require opie-mediaplayer2-skin.inc + PV = "${OPIE_GIT_PV}" -PR = "r3" +PR = "r4" SRC_URI = "${OPIE_GIT};protocol=git;subpath=pics" -do_install() { - install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/Pod/ - install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/Pod/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/Pod/ -} - -FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/Pod/*.png" diff --git a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.5.bb b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.5.bb index 29ccbf0..759c2b9 100644 --- a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.5.bb +++ b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-techno_1.2.5.bb @@ -1,19 +1,9 @@ -DESCRIPTION = "Skin for opie-mediaplayer2" -SECTION = "opie/multimedia" -LICENSE = "GPLv2" -# FIXME stopgap until split archives have license files included -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -APPNAME = "opieplayer2" -RPROVIDES_${PN} = "opie-mediaplayer2-skin" -PR = "r0" +SKINNAME = "techno" +require opie-mediaplayer2-skin.inc + +PR = "r1" SRC_URI = "http://sources.openembedded.org/opie-1.2.5-split_pics.tar.bz2;name=split_pics" SRC_URI[split_pics.md5sum] = "e9b68749d67295f7080a23e39b17335e" SRC_URI[split_pics.sha256sum] = "0a7aab6d0bce04d6a9c257d768d8a1a481d38ba527d6e6e50723973789954b4a" -do_install() { - install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/techno/ - install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/techno/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/techno/ -} - -FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/techno/*.png" diff --git a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-techno_git.bb b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-techno_git.bb index a37690b..9239dfb 100644 --- a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-techno_git.bb +++ b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin-techno_git.bb @@ -1,18 +1,8 @@ -DESCRIPTION = "Skin for opie-mediaplayer2" -SECTION = "opie/multimedia" -LICENSE = "GPLv2" -# FIXME stopgap until split archives have license files included -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -APPNAME = "opieplayer2" -RPROVIDES_${PN} = "opie-mediaplayer2-skin" +SKINNAME = "techno" +require opie-mediaplayer2-skin.inc + PV = "${OPIE_GIT_PV}" -PR = "r3" +PR = "r4" SRC_URI = "${OPIE_GIT};protocol=git;subpath=pics" -do_install() { - install -d ${D}${palmtopdir}/pics/${APPNAME}/skins/techno/ - install -m 0644 ${WORKDIR}/pics/${APPNAME}/skins/techno/*.png ${D}${palmtopdir}/pics/${APPNAME}/skins/techno/ -} - -FILES_${PN} = "${palmtopdir}/pics/${APPNAME}/skins/techno/*.png" diff --git a/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin.inc b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin.inc new file mode 100644 index 0000000..1df6032 --- /dev/null +++ b/recipes-opie/opie-mediaplayer2/opie-mediaplayer2-skin.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "${SKINNAME} skin for opie-mediaplayer2" +SECTION = "opie/multimedia" +LICENSE = "GPLv2" +# FIXME stopgap until split archives have license files included +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +RPROVIDES_${PN} = "opie-mediaplayer2-skin" + +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}/ +} + +FILES_${PN} = "${palmtopdir}/pics/opieplayer2/skins/${SKINNAME}/*.png" -- cgit 1.2.3-korg