diff options
24 files changed, 45 insertions, 25 deletions
diff --git a/recipes/shr/e-wm-menu-shr_git.bb b/recipes/shr/e-wm-menu-shr_git.bb index 9487720b37..bdd2a0c36a 100644 --- a/recipes/shr/e-wm-menu-shr_git.bb +++ b/recipes/shr/e-wm-menu-shr_git.bb @@ -3,7 +3,8 @@ SECTION = "e/utils" LICENSE = "MIT BSD" SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" PV = "1.2+gitr${SRCPV}" -PR = "r1" +PR = "r2" +PACKAGE_ARCH = "all" RCONFLICTS_${PN} = "e-wm-menu" diff --git a/recipes/shr/e-wm-sysactions-shr_git.bb b/recipes/shr/e-wm-sysactions-shr_git.bb index 78ba5f7fb8..68d5b30402 100644 --- a/recipes/shr/e-wm-sysactions-shr_git.bb +++ b/recipes/shr/e-wm-sysactions-shr_git.bb @@ -3,7 +3,8 @@ SECTION = "e/utils" LICENSE = "MIT BSD" SRCREV = "bbcec18f0ebd47e4f6eea88b9b774edf7400e752" PV = "1.2+gitr${SRCPV}" -PR = "r4" +PR = "r5" +PACKAGE_ARCH = "all" RPROVIDES_${PN} = "e-wm-sysactions" RCONFLICTS_${PN} = "e-wm-sysactions" diff --git a/recipes/shr/elementary-theme-gry_git.bb b/recipes/shr/elementary-theme-gry_git.bb index 740817d3cc..7f9b3b7954 100644 --- a/recipes/shr/elementary-theme-gry_git.bb +++ b/recipes/shr/elementary-theme-gry_git.bb @@ -8,7 +8,8 @@ LICENSE = "unknown" SRCREV = "8ca0e9347a7a7fe10dbd5e7d6a4c8d3d12482035" PV = "0.9+gitr${SRCPV}" -PR = "r3" +PR = "r4" +PACKAGE_ARCH = "all" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \ " diff --git a/recipes/shr/elementary-theme-neo_git.bb b/recipes/shr/elementary-theme-neo_git.bb index 1016a2a8a6..c4599bf96b 100644 --- a/recipes/shr/elementary-theme-neo_git.bb +++ b/recipes/shr/elementary-theme-neo_git.bb @@ -8,7 +8,8 @@ LICENSE = "unknown" SRCREV = "c2443c4052997045f8862462a06a5b07dce42cb5" PV = "0.6+gitr${SRCPV}" -PR = "r2" +PR = "r3" +PACKAGE_ARCH = "all" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \ " diff --git a/recipes/shr/elementary-theme-niebiee_git.bb b/recipes/shr/elementary-theme-niebiee_git.bb index 67f527132e..161f3e0d94 100644 --- a/recipes/shr/elementary-theme-niebiee_git.bb +++ b/recipes/shr/elementary-theme-niebiee_git.bb @@ -4,7 +4,8 @@ DEPENDS = "edje-native" LICENSE = "MIT BSD" SRCREV = "4b89eb1d477fb1e5256e2e35bf214af2c59843eb" PV = "0.2+gitr${SRCPV}" -PR = "r0" +PR = "r1" +PACKAGE_ARCH = "all" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/elementary-theme-o2_git.bb b/recipes/shr/elementary-theme-o2_git.bb index 2042d01d86..599b60c453 100644 --- a/recipes/shr/elementary-theme-o2_git.bb +++ b/recipes/shr/elementary-theme-o2_git.bb @@ -8,7 +8,8 @@ LICENSE = "unknown" SRCREV = "b5eb3134850c277ad8ae1a960b03ff4a509278a8" PV = "0.2+gitr${SRCPV}" -PR = "r1" +PR = "r2" +PACKAGE_ARCH = "all" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \ " diff --git a/recipes/shr/elementary-theme-sixteen_git.bb b/recipes/shr/elementary-theme-sixteen_git.bb index 58418f1c7c..4357e925d6 100644 --- a/recipes/shr/elementary-theme-sixteen_git.bb +++ b/recipes/shr/elementary-theme-sixteen_git.bb @@ -4,7 +4,8 @@ DEPENDS = "edje-native" LICENSE = "MIT BSD" SRCREV = "2ac643cc273d144bb731a8cbb8ec6b3615de43a0" PV = "0.2+gitr${SRCPV}" -PR = "r2" +PR = "r3" +PACKAGE_ARCH = "all" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/phoneui-shr-theme-neo_git.bb b/recipes/shr/phoneui-shr-theme-neo_git.bb index 97986272d6..46eb8277fc 100644 --- a/recipes/shr/phoneui-shr-theme-neo_git.bb +++ b/recipes/shr/phoneui-shr-theme-neo_git.bb @@ -8,7 +8,8 @@ RDEPENDS_${PN} = "libphone-ui-shr" RSUGGESTS_${PN} = "e-wm-theme-illume-neo gtk-theme-neo icon-theme-neo elementary-theme-neo" SRCREV = "20e5e82819a7612aa31c753a6898ccc9e940c7c6" PV = "0.1+gitr${SRCPV}" -PR = "r1" +PR = "r2" +PACKAGE_ARCH = "all" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/phoneui-shr-theme-niebiee_git.bb b/recipes/shr/phoneui-shr-theme-niebiee_git.bb index 16dd01f666..db4a010c28 100644 --- a/recipes/shr/phoneui-shr-theme-niebiee_git.bb +++ b/recipes/shr/phoneui-shr-theme-niebiee_git.bb @@ -7,7 +7,8 @@ RDEPENDS_${PN} = "libphone-ui-shr" RSUGGESTS_${PN} = "elementary-theme-niebiee" SRCREV = "8bf704525807f8a29fa1f3ad653d3fea81cd5aa3" PV = "0.1+gitr${SRCPV}" -PR = "r0" +PR = "r1" +PACKAGE_ARCH = "all" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/phoneui-shr-theme-o2_git.bb b/recipes/shr/phoneui-shr-theme-o2_git.bb index 3768815d2e..92fc7185c1 100644 --- a/recipes/shr/phoneui-shr-theme-o2_git.bb +++ b/recipes/shr/phoneui-shr-theme-o2_git.bb @@ -8,7 +8,8 @@ RDEPENDS_${PN} = "libphone-ui-shr" RSUGGESTS_${PN} = "elementary-theme-o2" SRCREV = "20e5e82819a7612aa31c753a6898ccc9e940c7c6" PV = "0.1+gitr${SRCPV}" -PR = "r1" +PR = "r2" +PACKAGE_ARCH = "all" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash-theme-dontpanic_git.bb b/recipes/shr/shr-splash-theme-dontpanic_git.bb index ee26fb2cd4..c9741f52fb 100644 --- a/recipes/shr/shr-splash-theme-dontpanic_git.bb +++ b/recipes/shr/shr-splash-theme-dontpanic_git.bb @@ -3,7 +3,7 @@ SECTION = "x11/data" LICENSE = "MIT BSD" SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" PV = "1.2+gitr${SRCPV}" -PR = "r6" +PR = "${INC_PR}.0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" S = "${WORKDIR}/git/shr-splash/${PN}" diff --git a/recipes/shr/shr-splash-theme-handy_git.bb b/recipes/shr/shr-splash-theme-handy_git.bb index 170a2bdaed..ac0ec7a964 100644 --- a/recipes/shr/shr-splash-theme-handy_git.bb +++ b/recipes/shr/shr-splash-theme-handy_git.bb @@ -3,7 +3,7 @@ SECTION = "x11/data" LICENSE = "MIT BSD" SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" PV = "1.2+gitr${SRCPV}" -PR = "r3" +PR = "${INC_PR}.0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" S = "${WORKDIR}/git/shr-splash/${PN}" diff --git a/recipes/shr/shr-splash-theme-logo_git.bb b/recipes/shr/shr-splash-theme-logo_git.bb index 08848510ae..450a4a71b6 100644 --- a/recipes/shr/shr-splash-theme-logo_git.bb +++ b/recipes/shr/shr-splash-theme-logo_git.bb @@ -3,7 +3,7 @@ SECTION = "x11/data" LICENSE = "MIT BSD" SRCREV = "baad098dc8c8058a712a6d98a69b5558ccc54973" PV = "0.1+gitr${SRCPV}" -PR = "r3" +PR = "${INC_PR}.0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" S = "${WORKDIR}/git/shr-splash/${PN}" @@ -18,4 +18,5 @@ SS_append_palmpre = "/palmpre" ALTERNATIVE_PRIORITY = 3 require shr-splash-theme.inc - +# only this recipe is MACHINE specific +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes/shr/shr-splash-theme-niebiee_git.bb b/recipes/shr/shr-splash-theme-niebiee_git.bb index 0a4f266665..93021fcd1a 100644 --- a/recipes/shr/shr-splash-theme-niebiee_git.bb +++ b/recipes/shr/shr-splash-theme-niebiee_git.bb @@ -3,7 +3,7 @@ SECTION = "x11/data" LICENSE = "MIT BSD" SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" PV = "1.2+gitr${SRCPV}" -PR = "r0" +PR = "${INC_PR}.0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" S = "${WORKDIR}/git/shr-splash/${PN}" diff --git a/recipes/shr/shr-splash-theme-openmoko_git.bb b/recipes/shr/shr-splash-theme-openmoko_git.bb index ed94ed66b0..bf2dfccc60 100644 --- a/recipes/shr/shr-splash-theme-openmoko_git.bb +++ b/recipes/shr/shr-splash-theme-openmoko_git.bb @@ -3,7 +3,7 @@ SECTION = "x11/data" LICENSE = "MIT BSD" SRCREV = "ebf38849a2328ed4dab1ad143214c6b8c90bed35" PV = "1.0+gitr${SRCPV}" -PR = "r0" +PR = "${INC_PR}.0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" S = "${WORKDIR}/git/shr-splash/${PN}" diff --git a/recipes/shr/shr-splash-theme-simple_git.bb b/recipes/shr/shr-splash-theme-simple_git.bb index f873a30b6a..e4ee06c192 100644 --- a/recipes/shr/shr-splash-theme-simple_git.bb +++ b/recipes/shr/shr-splash-theme-simple_git.bb @@ -3,7 +3,7 @@ SECTION = "x11/data" LICENSE = "MIT BSD" SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" PV = "1.2+gitr${SRCPV}" -PR = "r6" +PR = "${INC_PR}.0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" S = "${WORKDIR}/git/shr-splash/${PN}" diff --git a/recipes/shr/shr-splash-theme-tux_git.bb b/recipes/shr/shr-splash-theme-tux_git.bb index b7c513d763..34ecdf2370 100644 --- a/recipes/shr/shr-splash-theme-tux_git.bb +++ b/recipes/shr/shr-splash-theme-tux_git.bb @@ -3,7 +3,7 @@ SECTION = "x11/data" LICENSE = "MIT BSD" SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" PV = "0.1+gitr${SRCPV}" -PR = "r0" +PR = "${INC_PR}.0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" S = "${WORKDIR}/git/shr-splash/${PN}" diff --git a/recipes/shr/shr-splash-theme.inc b/recipes/shr/shr-splash-theme.inc index f51899155c..a5f972166f 100644 --- a/recipes/shr/shr-splash-theme.inc +++ b/recipes/shr/shr-splash-theme.inc @@ -4,7 +4,10 @@ inherit update-alternatives FILES_${PN} = "${datadir}/shr-splash/themes/${PN}" -PACKAGE_ARCH = "${MACHINE_ARCH}" +INC_PR = "r7" + +# only shr-splash-theme-logo recipe is MACHINE specific +PACKAGE_ARCH = "all" ALTERNATIVE_NAME = "shr-splash-theme" ALTERNATIVE_LINK = "${datadir}/shr-splash/theme" diff --git a/recipes/shr/shr-theme-gry.bb b/recipes/shr/shr-theme-gry.bb index 9cb5e35c39..721b0fbb3d 100644 --- a/recipes/shr/shr-theme-gry.bb +++ b/recipes/shr/shr-theme-gry.bb @@ -2,6 +2,7 @@ DESCRIPTION = "gry* - a fast, shiny theme" SECTION = "x11/data" RDEPENDS_${PN} += "e-wm-theme-illume-gry elementary-theme-gry" PV = "0.1" -PR = "r2" +PR = "r3" +PACKAGE_ARCH = "all" ALLOW_EMPTY = "1" diff --git a/recipes/shr/shr-theme-gtk-e17lookalike_git.bb b/recipes/shr/shr-theme-gtk-e17lookalike_git.bb index 7004262998..388e2c267f 100644 --- a/recipes/shr/shr-theme-gtk-e17lookalike_git.bb +++ b/recipes/shr/shr-theme-gtk-e17lookalike_git.bb @@ -2,7 +2,8 @@ DESCRIPTION = "A gtk theme that looks like e17" LICENSE = "MIT BSD" SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" PV = "0.1.1+gitr${SRCPV}" -PR = "r5" +PR = "r6" +PACKAGE_ARCH = "all" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-theme-neo.bb b/recipes/shr/shr-theme-neo.bb index 44f7f07675..6f7f62e785 100644 --- a/recipes/shr/shr-theme-neo.bb +++ b/recipes/shr/shr-theme-neo.bb @@ -6,6 +6,7 @@ RDEPENDS_${PN} = "phoneui-shr-theme-neo elementary-theme-neo e-wm-theme-illume-n LICENSE = "unknown" PV = "0.2" -PR = "r4" +PR = "r5" +PACKAGE_ARCH = "all" ALLOW_EMPTY = "1" diff --git a/recipes/shr/shr-theme-niebiee.bb b/recipes/shr/shr-theme-niebiee.bb index 7567c7c757..9360e7e5c2 100644 --- a/recipes/shr/shr-theme-niebiee.bb +++ b/recipes/shr/shr-theme-niebiee.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Niebiee - extremely blue theme for SHR (metapackage)" SECTION = "x11/data" RDEPENDS_${PN} += "e-wm-theme-illume-niebiee elementary-theme-niebiee shr-splash-theme-niebiee phoneui-shr-theme-niebiee" PV = "0.1" -PR = "r3" +PR = "r4" +PACKAGE_ARCH = "all" ALLOW_EMPTY = "1" diff --git a/recipes/shr/shr-theme-o2.bb b/recipes/shr/shr-theme-o2.bb index 06112089c6..2f9bc70559 100644 --- a/recipes/shr/shr-theme-o2.bb +++ b/recipes/shr/shr-theme-o2.bb @@ -4,7 +4,8 @@ HOMEPAGE = "http://jmccloud.jm.funpic.de" AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" RDEPENDS_${PN} = "phoneui-shr-theme-o2 elementary-theme-o2" LICENSE = "unknown" -PR = "r1" +PR = "r2" +PACKAGE_ARCH = "all" PV = "0.1" diff --git a/recipes/shr/shr-theme-sixteen.bb b/recipes/shr/shr-theme-sixteen.bb index bf1580a55c..8e319ce812 100644 --- a/recipes/shr/shr-theme-sixteen.bb +++ b/recipes/shr/shr-theme-sixteen.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Sixteen SHR theme" SECTION = "x11/data" RDEPENDS_${PN} += "e-wm-theme-illume-sixteen elementary-theme-sixteen" PV = "0.1" -PR = "r2" +PR = "r3" +PACKAGE_ARCH = "all" ALLOW_EMPTY = "1" |