[oe-commits] Martin Jansa : Themes: make changing themes with update-alternatives non-interactive.
git version control
git at git.openembedded.org
Wed Sep 23 05:32:34 UTC 2009
Module: openembedded.git
Branch: shr/import
Commit: 547e4484e642143139d53f7f6050106a8e6fcb4f
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=547e4484e642143139d53f7f6050106a8e6fcb4f
Author: Martin Jansa <martin.jansa at gmail.com>
Date: Tue Sep 22 18:20:29 2009 +0000
Themes: make changing themes with update-alternatives non-interactive.
Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>
---
recipes/gpe-icons/gpe-icons.inc | 12 +++++++-----
recipes/gpe-icons/gpe-icons_0.25.bb | 2 +-
recipes/gpe-icons/gpe-theme-neo_git.bb | 2 +-
recipes/shr/etk-theme-neo_git.bb | 2 +-
recipes/shr/etk-theme-shr_git.bb | 2 +-
recipes/shr/etk-theme.inc | 12 +++++++-----
.../libframeworkd-phonegui-efl-theme-neo_git.bb | 2 +-
recipes/shr/libframeworkd-phonegui-efl-theme.inc | 12 +++++++-----
recipes/shr/libframeworkd-phonegui-efl_git.bb | 2 +-
9 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/recipes/gpe-icons/gpe-icons.inc b/recipes/gpe-icons/gpe-icons.inc
index d99801b..5e52894 100644
--- a/recipes/gpe-icons/gpe-icons.inc
+++ b/recipes/gpe-icons/gpe-icons.inc
@@ -9,10 +9,12 @@ ALTERNATIVE_PATH = "${datadir}/gpe/pixmaps.${PN}"
ALTERNATIVE_PRIORITY ?= 1
pkg_postinst() {
- if [[ -e /usr/share/gpe/pixmaps && ! -h /usr/share/gpe/pixmaps ]] ; then
- echo "Removing old /usr/share/gpe/pixmaps directory. Will be replaced with link managed by update-alternatives"
- echo "Press enter to continue"
- read
- rm -rf /usr/share/gpe/pixmaps
+ if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then
+ echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!"
+ echo "warn: It will be replaced with link managed by update-alternatives"
+ echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old."
+ echo "warn: It should be empty but probably isn't!"
+ echo "warn: Check what's left there and remove it manually."
+ mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old
fi
}
diff --git a/recipes/gpe-icons/gpe-icons_0.25.bb b/recipes/gpe-icons/gpe-icons_0.25.bb
index 530a2b8..11d1403 100644
--- a/recipes/gpe-icons/gpe-icons_0.25.bb
+++ b/recipes/gpe-icons/gpe-icons_0.25.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
inherit gpe
-PR = "r2"
+PR = "r3"
#only icons present in the package
PACKAGE_ARCH = "all"
diff --git a/recipes/gpe-icons/gpe-theme-neo_git.bb b/recipes/gpe-icons/gpe-theme-neo_git.bb
index 0299581..9cb085b 100644
--- a/recipes/gpe-icons/gpe-theme-neo_git.bb
+++ b/recipes/gpe-icons/gpe-theme-neo_git.bb
@@ -7,7 +7,7 @@ RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframe
LICENSE = "unknown"
PV = "0.2-${EFL_SRCREV}-gitr${SRCPV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
diff --git a/recipes/shr/etk-theme-neo_git.bb b/recipes/shr/etk-theme-neo_git.bb
index 0f0766a..e9a1dd0 100644
--- a/recipes/shr/etk-theme-neo_git.bb
+++ b/recipes/shr/etk-theme-neo_git.bb
@@ -5,7 +5,7 @@ RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframe
LICENSE = "unknown"
PV = "0.2-${EFL_SRCREV}-gitr${SRCPV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
diff --git a/recipes/shr/etk-theme-shr_git.bb b/recipes/shr/etk-theme-shr_git.bb
index c1c3f34..fea9a40 100644
--- a/recipes/shr/etk-theme-shr_git.bb
+++ b/recipes/shr/etk-theme-shr_git.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "etk SHR theme"
LICENSE = "MIT BSD"
PV = "1.1.1-${EFL_SRCREV}-gitr${SRCPV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
diff --git a/recipes/shr/etk-theme.inc b/recipes/shr/etk-theme.inc
index e102844..6e8b33d 100644
--- a/recipes/shr/etk-theme.inc
+++ b/recipes/shr/etk-theme.inc
@@ -23,10 +23,12 @@ ALTERNATIVE_PATH = "${datadir}/etk/themes.${PN}"
ALTERNATIVE_PRIORITY ?= 1
pkg_postinst() {
- if [[ -e /usr/share/etk/themes && ! -h /usr/share/etk/themes ]] ; then
- echo "Removing old /usr/share/etk/themes directory. Will be replaced with link managed by update-alternatives"
- echo "Press enter to continue"
- read
- rm -rf /usr/share/etk/themes
+ if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then
+ echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!"
+ echo "warn: It will be replaced with link managed by update-alternatives"
+ echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old."
+ echo "warn: It should be empty but probably isn't!"
+ echo "warn: Check what's left there and remove it manually."
+ mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old
fi
}
diff --git a/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb b/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb
index ad83167..bb6217d 100644
--- a/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb
+++ b/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb
@@ -6,7 +6,7 @@ RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo etk-them
LICENSE = "unknown"
PV = "0.2-${EFL_SRCREV}-gitr${SRCPV}"
-PR = "r1"
+PR = "r2"
require libframeworkd-phonegui-efl-theme.inc
diff --git a/recipes/shr/libframeworkd-phonegui-efl-theme.inc b/recipes/shr/libframeworkd-phonegui-efl-theme.inc
index ce7d3dc..eab118f 100644
--- a/recipes/shr/libframeworkd-phonegui-efl-theme.inc
+++ b/recipes/shr/libframeworkd-phonegui-efl-theme.inc
@@ -11,10 +11,12 @@ ALTERNATIVE_PATH = "${datadir}/libframeworkd-phonegui-efl.${PN}"
ALTERNATIVE_PRIORITY ?= 1
pkg_postinst() {
- if [[ -e /usr/share/libframeworkd-phonegui-efl && ! -h /usr/share/libframeworkd-phonegui-efl ]] ; then
- echo "Removing old /usr/share/libframeworkd-phonegui-efl directory. Will be replaced with link managed by update-alternatives"
- echo "Press enter to continue"
- read
- rm -rf /usr/share/libframeworkd-phonegui-efl
+ if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then
+ echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!"
+ echo "warn: It will be replaced with link managed by update-alternatives"
+ echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old."
+ echo "warn: It should be empty but probably isn't!"
+ echo "warn: Check what's left there and remove it manually."
+ mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old
fi
}
diff --git a/recipes/shr/libframeworkd-phonegui-efl_git.bb b/recipes/shr/libframeworkd-phonegui-efl_git.bb
index 7e3c6ee..c4181cf 100644
--- a/recipes/shr/libframeworkd-phonegui-efl_git.bb
+++ b/recipes/shr/libframeworkd-phonegui-efl_git.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
SECTION = "e/apps"
DEPENDS += " dbus-glib libframeworkd-glib libframeworkd-phonegui etk evas ecore edje edje-native elementary"
PV = "0.0.3+gitr${SRCPV}"
-PR = "r34"
+PR = "r35"
require libframeworkd-phonegui-efl-theme.inc
More information about the Openembedded-commits
mailing list