summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-04-03 11:42:52 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-04-03 11:42:52 +0000
commit2f3ca937d66ce6b9f2bdb1c09fbf066818ac92f4 (patch)
treed7dc1c98ae86b5d33f59b532ae9eb486e8be47d9
parentcdaaa55f34a3ce0b1be82513fd758410187fa202 (diff)
downloadopenembedded-core-2f3ca937d66ce6b9f2bdb1c09fbf066818ac92f4.tar.gz
openembedded-core-2f3ca937d66ce6b9f2bdb1c09fbf066818ac92f4.tar.bz2
openembedded-core-2f3ca937d66ce6b9f2bdb1c09fbf066818ac92f4.zip
matchbox-theme-sato: unify recipes
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4172 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb9
-rw-r--r--meta/packages/matchbox-theme-sato/matchbox-theme-sato.inc8
-rw-r--r--meta/packages/matchbox-theme-sato/matchbox-theme-sato_0.1.bb10
-rw-r--r--meta/packages/matchbox-theme-sato/matchbox-theme-sato_svn.bb10
4 files changed, 13 insertions, 24 deletions
diff --git a/meta/packages/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb b/meta/packages/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb
index 74bcef14ca..30b632934e 100644
--- a/meta/packages/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb
+++ b/meta/packages/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb
@@ -1,14 +1,9 @@
-DESCRIPTION = "Matchbox window manager 2 Sato themes"
-LICENSE = "CC-BY-SA3"
+require matchbox-theme-sato.inc
+
DEPENDS = "matchbox-wm-2"
-SECTION = "x11/wm"
PV = "0.1+svnr${SRCREV}"
SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=matchbox-sato;proto=http"
S = "${WORKDIR}/matchbox-sato"
-inherit autotools pkgconfig
-
EXTRA_OECONF = "--disable-matchbox-1 --enable-matchbox-2"
-
-FILES_${PN} += "${datadir}/themes"
diff --git a/meta/packages/matchbox-theme-sato/matchbox-theme-sato.inc b/meta/packages/matchbox-theme-sato/matchbox-theme-sato.inc
new file mode 100644
index 0000000000..a20596e6db
--- /dev/null
+++ b/meta/packages/matchbox-theme-sato/matchbox-theme-sato.inc
@@ -0,0 +1,8 @@
+DESCRIPTION = "Matchbox window manager Sato themes"
+LICENSE = "CC-BY-SA3"
+DEPENDS = "matchbox-wm"
+SECTION = "x11/wm"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${datadir}/themes"
diff --git a/meta/packages/matchbox-theme-sato/matchbox-theme-sato_0.1.bb b/meta/packages/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
index eb903a19c5..f2e2ffd4e4 100644
--- a/meta/packages/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
+++ b/meta/packages/matchbox-theme-sato/matchbox-theme-sato_0.1.bb
@@ -1,11 +1,3 @@
-DESCRIPTION = "Matchbox window manager Sato themes"
-LICENSE = "CC-BY-SA3"
-DEPENDS = "matchbox-wm"
-SECTION = "x11/wm"
+require matchbox-theme-sato.inc
SRC_URI = "http://pokylinux.org/releases/sato/matchbox-theme-sato-0.1.tar.gz"
-
-inherit autotools pkgconfig
-
-FILES_${PN} += "${datadir}/themes"
-
diff --git a/meta/packages/matchbox-theme-sato/matchbox-theme-sato_svn.bb b/meta/packages/matchbox-theme-sato/matchbox-theme-sato_svn.bb
index d42f6421ed..2641edca65 100644
--- a/meta/packages/matchbox-theme-sato/matchbox-theme-sato_svn.bb
+++ b/meta/packages/matchbox-theme-sato/matchbox-theme-sato_svn.bb
@@ -1,12 +1,6 @@
-DESCRIPTION = "Matchbox window manager Sato themes"
-LICENSE = "CC-BY-SA3"
-DEPENDS = "matchbox-wm"
-SECTION = "x11/wm"
+require matchbox-theme-sato.inc
+
PV = "0.1+svnr${SRCREV}"
SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=matchbox-sato;proto=http"
S = "${WORKDIR}/matchbox-sato"
-
-inherit autotools pkgconfig
-
-FILES_${PN} += "${datadir}/themes"