* [PATCH 1/2] Revert "pango.inc: add directory "/etc/pango""
@ 2012-01-17 10:19 Koen Kooi
2012-01-17 10:19 ` [PATCH 2/2] pango: create /etc/pango in module postinsts if it's missing Koen Kooi
2012-01-17 15:09 ` [PATCH 1/2] Revert "pango.inc: add directory "/etc/pango"" Richard Purdie
0 siblings, 2 replies; 4+ messages in thread
From: Koen Kooi @ 2012-01-17 10:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
This reverts commit 65186bd86170d8c375931a18487c2fdf3bd1b3b0.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/recipes-graphics/pango/pango.inc | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index e7262c3..bf528f4 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -46,11 +46,6 @@ fi
}
-# Command "pango-querymodules > /etc/pango/pango.modules" needs this directory.
-do_install_prepend() {
- install -d ${D}/${sysconfdir}/pango
-}
-
python populate_packages_prepend () {
prologue = d.getVar("postinst_prologue", 1)
@@ -59,5 +54,6 @@ python populate_packages_prepend () {
do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
}
+FILES_${PN} = "/etc/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] pango: create /etc/pango in module postinsts if it's missing
2012-01-17 10:19 [PATCH 1/2] Revert "pango.inc: add directory "/etc/pango"" Koen Kooi
@ 2012-01-17 10:19 ` Koen Kooi
2012-01-17 22:22 ` Khem Raj
2012-01-17 15:09 ` [PATCH 1/2] Revert "pango.inc: add directory "/etc/pango"" Richard Purdie
1 sibling, 1 reply; 4+ messages in thread
From: Koen Kooi @ 2012-01-17 10:19 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/recipes-graphics/pango/pango.inc | 3 +++
meta/recipes-graphics/pango/pango_1.28.4.bb | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index bf528f4..ce8b6ba 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -44,6 +44,9 @@ if [ "x$D" != "x" ]; then
exit 1
fi
+if ! [ -e $D${sysconfdir}/pango ] ; then
+ mkdir -p $D${sysconfdir}/pango
+fi
}
python populate_packages_prepend () {
diff --git a/meta/recipes-graphics/pango/pango_1.28.4.bb b/meta/recipes-graphics/pango/pango_1.28.4.bb
index 5778c3f..9681f9e 100644
--- a/meta/recipes-graphics/pango/pango_1.28.4.bb
+++ b/meta/recipes-graphics/pango/pango_1.28.4.bb
@@ -2,7 +2,7 @@ require pango.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-PR = "r5"
+PR = "r6"
SRC_URI += "file://no-tests.patch"
SRC_URI += "file://noconst.patch"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] Revert "pango.inc: add directory "/etc/pango""
2012-01-17 10:19 [PATCH 1/2] Revert "pango.inc: add directory "/etc/pango"" Koen Kooi
2012-01-17 10:19 ` [PATCH 2/2] pango: create /etc/pango in module postinsts if it's missing Koen Kooi
@ 2012-01-17 15:09 ` Richard Purdie
1 sibling, 0 replies; 4+ messages in thread
From: Richard Purdie @ 2012-01-17 15:09 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
On Tue, 2012-01-17 at 11:19 +0100, Koen Kooi wrote:
> This reverts commit 65186bd86170d8c375931a18487c2fdf3bd1b3b0.
>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> meta/recipes-graphics/pango/pango.inc | 6 +-----
> 1 files changed, 1 insertions(+), 5 deletions(-)
Merged to master (along with 2/2), thanks.
Richard
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] pango: create /etc/pango in module postinsts if it's missing
2012-01-17 10:19 ` [PATCH 2/2] pango: create /etc/pango in module postinsts if it's missing Koen Kooi
@ 2012-01-17 22:22 ` Khem Raj
0 siblings, 0 replies; 4+ messages in thread
From: Khem Raj @ 2012-01-17 22:22 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
On Tue, Jan 17, 2012 at 2:19 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
>
> +if ! [ -e $D${sysconfdir}/pango ] ; then
> + mkdir -p $D${sysconfdir}/pango
> +fi
> }
when you are using mkdir -p then why enclose it in if-fi
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-01-17 22:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-17 10:19 [PATCH 1/2] Revert "pango.inc: add directory "/etc/pango"" Koen Kooi
2012-01-17 10:19 ` [PATCH 2/2] pango: create /etc/pango in module postinsts if it's missing Koen Kooi
2012-01-17 22:22 ` Khem Raj
2012-01-17 15:09 ` [PATCH 1/2] Revert "pango.inc: add directory "/etc/pango"" Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.