diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-01-07 16:25:05 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-01-08 20:53:00 +0100 |
| commit | 1f191e529ec4f2eae846ce727b71837951c762a0 (patch) | |
| tree | 152f015858a2edd6e7c0a12ebefe6eb9ab25d9dd | |
| parent | 0f5fd96b66e2551d9599726e3d26f51fe93471c2 (diff) | |
gpe-icons: use u-a and postinst merger for gpe-icons only for SHR
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes/gpe-icons/gpe-icons.inc | 8 | ||||
| -rw-r--r-- | recipes/gpe-icons/gpe-icons_0.25.bb | 11 |
2 files changed, 12 insertions, 7 deletions
diff --git a/recipes/gpe-icons/gpe-icons.inc b/recipes/gpe-icons/gpe-icons.inc index 0c23814b41..27adffa8b8 100644 --- a/recipes/gpe-icons/gpe-icons.inc +++ b/recipes/gpe-icons/gpe-icons.inc @@ -1,16 +1,18 @@ SECTION = "gpe" RDEPENDS += "gdk-pixbuf-loader-png" -inherit update-alternatives +INHERIT = "gpe" +INHERIT_shr = "update-alternatives" +inherit ${INHERIT} -INC_PR = "r3" +INC_PR = "r4" ALTERNATIVE_NAME = "gpe-pixmaps" ALTERNATIVE_LINK = "${datadir}/gpe/pixmaps" ALTERNATIVE_PATH = "${datadir}/gpe/pixmaps.${PN}" ALTERNATIVE_PRIORITY ?= 1 -pkg_postinst() { +pkg_postinst_shr() { 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" diff --git a/recipes/gpe-icons/gpe-icons_0.25.bb b/recipes/gpe-icons/gpe-icons_0.25.bb index 6276e9510b..7070e12c2b 100644 --- a/recipes/gpe-icons/gpe-icons_0.25.bb +++ b/recipes/gpe-icons/gpe-icons_0.25.bb @@ -4,12 +4,15 @@ SECTION = "gpe" RDEPENDS = "gdk-pixbuf-loader-png" - -inherit gpe - -PR = "r1" +PR = "${INC_PR}.0" #only icons present in the package PACKAGE_ARCH = "all" FILES_${PN} = "${datadir}/gpe" +#Only SHR is using u-a for gpe-icons +do_configure_prepend_shr() { + sed -i "s| \$(DESTDIR)\$(PREFIX)/share/gpe/pixmaps/| \$(DESTDIR)\$(PREFIX)/share/gpe/pixmaps.${PN}/|g" Makefile +} + +require gpe-icons.inc |