* [PATCH 01/13] aoetools: no bashism in aoe-stat
2014-09-01 15:18 [PATCH 00/13] fix RDEPENDS issues Robert Yang
@ 2014-09-01 15:18 ` Robert Yang
2014-09-01 15:18 ` [PATCH 02/13] autofs: add bash to RDEPENDS_autofs Robert Yang
` (11 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Robert Yang @ 2014-09-01 15:18 UTC (permalink / raw)
To: Openembedded-devel
So use /bin/sh.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../aoetools/aoe-stat-no-checkbashism.patch | 27 ++++++++++++++++++++
.../recipes-support/aoetools/aoetools_34.bb | 6 ++++-
2 files changed, 32 insertions(+), 1 deletion(-)
create mode 100644 meta-networking/recipes-support/aoetools/aoetools/aoe-stat-no-checkbashism.patch
diff --git a/meta-networking/recipes-support/aoetools/aoetools/aoe-stat-no-checkbashism.patch b/meta-networking/recipes-support/aoetools/aoetools/aoe-stat-no-checkbashism.patch
new file mode 100644
index 0000000..67632ca
--- /dev/null
+++ b/meta-networking/recipes-support/aoetools/aoetools/aoe-stat-no-checkbashism.patch
@@ -0,0 +1,27 @@
+From 38c97e590fde19213f6ba31e72d1c227db869427 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Sun, 31 Aug 2014 22:28:38 -0700
+Subject: [PATCH] aoe-stat.in: no checkbashism
+
+The checkbashisms shows there is no bashism, so use /bin/sh.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ aoe-stat.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meta-networking/aoe-stat.in b/meta-networking/aoe-stat.in
+index 50e6ac6..0c1d6f5 100755
+--- a/meta-networking/aoe-stat.in
++++ b/meta-networking/aoe-stat.in
+@@ -1,4 +1,4 @@
+-#! /bin/bash
++#! /bin/sh
+ # aoe-stat - collate and present information about AoE storage
+ # Copyright 2012, CORAID, Inc., and licensed under GPL v.2.
+
+--
+1.7.9.5
+
diff --git a/meta-networking/recipes-support/aoetools/aoetools_34.bb b/meta-networking/recipes-support/aoetools/aoetools_34.bb
index eb1e0fe..09f61e9 100644
--- a/meta-networking/recipes-support/aoetools/aoetools_34.bb
+++ b/meta-networking/recipes-support/aoetools/aoetools_34.bb
@@ -10,7 +10,11 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
RRECOMMENDS_${PN} = "kernel-module-aoe"
-SRC_URI = "http://sourceforge.net/projects/${BPN}/files/${BPN}/${BPN}-${PV}.tar.gz"
+SRC_URI = "http://sourceforge.net/projects/${BPN}/files/${BPN}/${BPN}-${PV}.tar.gz \
+ file://aoe-stat-no-checkbashism.patch \
+ "
+
+
SRC_URI[md5sum] = "cde7f7cedc7cd9938a5ebfd009dd3ec0"
SRC_URI[sha256sum] = "fd6c57244e9458d7cbe7a0171295ddee4d8cdcae291e40d6acbc641df7296d85"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 02/13] autofs: add bash to RDEPENDS_autofs
2014-09-01 15:18 [PATCH 00/13] fix RDEPENDS issues Robert Yang
2014-09-01 15:18 ` [PATCH 01/13] aoetools: no bashism in aoe-stat Robert Yang
@ 2014-09-01 15:18 ` Robert Yang
2014-09-01 15:18 ` [PATCH 03/13] arptables: add bash to RDEPENDS_arptables Robert Yang
` (10 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Robert Yang @ 2014-09-01 15:18 UTC (permalink / raw)
To: Openembedded-devel
Bashism:
[snip]
possible bashism in autofs/etc/init.d/autofs line 116 ($"foo" should be eval_gettext "foo"):
echo $"$prog not running"
possible bashism in autofs/etc/init.d/autofs line 120 ($"foo" should be eval_gettext "foo"):
echo $"Reloading maps"
possible bashism in autofs/etc/init.d/autofs line 150 ($"foo" should be eval_gettext "foo"):
echo $"Usage: $0 {start|forcestart|stop|restart|forcerestart|reload}"
[snip]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../recipes-daemons/autofs/autofs_5.1.0.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.1.0.bb b/meta-networking/recipes-daemons/autofs/autofs_5.1.0.bb
index aab2187..06ee77b 100644
--- a/meta-networking/recipes-daemons/autofs/autofs_5.1.0.bb
+++ b/meta-networking/recipes-daemons/autofs/autofs_5.1.0.bb
@@ -4,6 +4,7 @@ LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
DEPENDS += "libtirpc flex-native bison-native"
+RDEPENDS_${PN} += "bash"
inherit autotools-brokensep systemd
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 03/13] arptables: add bash to RDEPENDS_arptables
2014-09-01 15:18 [PATCH 00/13] fix RDEPENDS issues Robert Yang
2014-09-01 15:18 ` [PATCH 01/13] aoetools: no bashism in aoe-stat Robert Yang
2014-09-01 15:18 ` [PATCH 02/13] autofs: add bash to RDEPENDS_autofs Robert Yang
@ 2014-09-01 15:18 ` Robert Yang
2014-09-18 7:42 ` Khem Raj
2014-09-01 15:18 ` [PATCH 04/13] ndisc6: add perl to RDEPENDS_ndisc6-misc Robert Yang
` (9 subsequent siblings)
12 siblings, 1 reply; 22+ messages in thread
From: Robert Yang @ 2014-09-01 15:18 UTC (permalink / raw)
To: Openembedded-devel
Bashism:
possible bashism in arptables/etc/init.d/arptables line 14 (should be '.', not 'source'):
source /etc/init.d/functions
possible bashism in arptables/etc/init.d/arptables line 96 ($"foo" should be eval_gettext "foo"):
echo $"Usage $0 {start|stop|restart|condrestart|save|status}"
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../recipes-support/arptables/arptables_0.0.3-4.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb b/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb
index 74f81b5..94920f9 100644
--- a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb
+++ b/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
PR = "r2"
-RDEPENDS_${PN} += "perl"
+RDEPENDS_${PN} += "perl bash"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
SRC_URI = " \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH 03/13] arptables: add bash to RDEPENDS_arptables
2014-09-01 15:18 ` [PATCH 03/13] arptables: add bash to RDEPENDS_arptables Robert Yang
@ 2014-09-18 7:42 ` Khem Raj
2014-09-19 3:03 ` Robert Yang
0 siblings, 1 reply; 22+ messages in thread
From: Khem Raj @ 2014-09-18 7:42 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 9/1/14 8:18 AM, Robert Yang wrote:
> Bashism:
> possible bashism in arptables/etc/init.d/arptables line 14 (should be '.', not 'source'):
> source /etc/init.d/functions
> possible bashism in arptables/etc/init.d/arptables line 96 ($"foo" should be eval_gettext "foo"):
> echo $"Usage $0 {start|stop|restart|condrestart|save|status}"
could these be patched instead of rdepending on bash
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
> .../recipes-support/arptables/arptables_0.0.3-4.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb b/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb
> index 74f81b5..94920f9 100644
> --- a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb
> +++ b/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb
> @@ -5,7 +5,7 @@ SECTION = "console/network"
>
> PR = "r2"
>
> -RDEPENDS_${PN} += "perl"
> +RDEPENDS_${PN} += "perl bash"
>
> LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
> SRC_URI = " \
>
- --
- -Khem
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
Comment: GPGTools - https://gpgtools.org
iEYEARECAAYFAlQajN0ACgkQuwUzVZGdMxSHuACdFnp3LZpRjZsN3IVLm2tCCb8L
y2kAnRFWsf2R9HDvvAp1xUoSnQB9bZfQ
=ZfQX
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 03/13] arptables: add bash to RDEPENDS_arptables
2014-09-18 7:42 ` Khem Raj
@ 2014-09-19 3:03 ` Robert Yang
0 siblings, 0 replies; 22+ messages in thread
From: Robert Yang @ 2014-09-19 3:03 UTC (permalink / raw)
To: openembedded-devel
On 09/18/2014 03:42 PM, Khem Raj wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
>
>
> On 9/1/14 8:18 AM, Robert Yang wrote:
>> Bashism:
>> possible bashism in arptables/etc/init.d/arptables line 14 (should be '.', not 'source'):
>> source /etc/init.d/functions
>> possible bashism in arptables/etc/init.d/arptables line 96 ($"foo" should be eval_gettext "foo"):
>> echo $"Usage $0 {start|stop|restart|condrestart|save|status}"
>
> could these be patched instead of rdepending on bash
Thanks, I updated in the repo (V2, but V1 and V2 uses the same repo):
git://git.openembedded.org/meta-openembedded-contrib rbt/rdeps
And here is the patch:
commit e8848953ff6815c2335dc23d18ee40277e04103f
Author: Robert Yang <liezhi.yang@windriver.com>
Date: Sun Aug 31 23:22:11 2014 -0700
arptables: remove bashism
Bashism:
possible bashism in arptables/etc/init.d/arptables line 14 (should be '.',
not 'source'):
source /etc/init.d/functions
possible bashism in arptables/etc/init.d/arptables line 96 ($"foo" should
be eval_gettext "foo"):
echo $"Usage $0 {start|stop|restart|condrestart|save|status}"
Use "." to replace of "source", and change /bin/bash to /bin/sh, the
echo $"foo" works well in our busybox.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
diff --git
a/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch
b/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.
new file mode 100644
index 0000000..f332658
--- /dev/null
+++
b/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables-remove-bashism.patch
@@ -0,0 +1,37 @@
+From cd312bc0e3686404428878d23b8888cba09a20e1 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Thu, 18 Sep 2014 19:46:58 -0700
+Subject: [PATCH] arptables.sysv: remove bashism
+
+Use "." to replace of "source", and change /bin/bash to /bin/sh, the
+echo $"foo" works well in busybox.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ arptables.sysv | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arptables.sysv b/arptables.sysv
+index 7a90bd2..7710376 100644
+--- a/arptables.sysv
++++ b/arptables.sysv
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # init script for arptables
+ #
+@@ -11,7 +11,7 @@
+ #
+ # config: __SYSCONFIG__/arptables
+
+-source /etc/init.d/functions
++. /etc/init.d/functions
+ # source /etc/sysconfig/network
+
+ # Check that networking is up.
+--
+1.7.9.5
+
// Robert
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>> .../recipes-support/arptables/arptables_0.0.3-4.bb | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb b/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb
>> index 74f81b5..94920f9 100644
>> --- a/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb
>> +++ b/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb
>> @@ -5,7 +5,7 @@ SECTION = "console/network"
>>
>> PR = "r2"
>>
>> -RDEPENDS_${PN} += "perl"
>> +RDEPENDS_${PN} += "perl bash"
>>
>> LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
>> SRC_URI = " \
>>
>
> - --
> - -Khem
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
> Comment: GPGTools - https://gpgtools.org
>
> iEYEARECAAYFAlQajN0ACgkQuwUzVZGdMxSHuACdFnp3LZpRjZsN3IVLm2tCCb8L
> y2kAnRFWsf2R9HDvvAp1xUoSnQB9bZfQ
> =ZfQX
> -----END PGP SIGNATURE-----
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 04/13] ndisc6: add perl to RDEPENDS_ndisc6-misc
2014-09-01 15:18 [PATCH 00/13] fix RDEPENDS issues Robert Yang
` (2 preceding siblings ...)
2014-09-01 15:18 ` [PATCH 03/13] arptables: add bash to RDEPENDS_arptables Robert Yang
@ 2014-09-01 15:18 ` Robert Yang
2014-09-01 15:18 ` [PATCH 05/13] stunnel: add perl to RDEPENDS_stunnel Robert Yang
` (8 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Robert Yang @ 2014-09-01 15:18 UTC (permalink / raw)
To: Openembedded-devel
Perl:
ndisc6-misc/usr/bin/dnssort:#! /usr/bin/perl
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../recipes-support/ndisc6/ndisc6_1.0.2.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.2.bb b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.2.bb
index 066aac2..a0e37e1 100644
--- a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.2.bb
+++ b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.2.bb
@@ -9,6 +9,7 @@ LICENSE = "GPL-2.0"
# perform the actual trace operation.
RDEPENDS_${PN}-tcptraceroute6 = "${PN}-rltraceroute6"
RDEPENDS_${PN}-tracert6 = "${PN}-rltraceroute6"
+RDEPENDS_${PN}-misc += "perl"
SRC_URI = "http://www.remlab.net/files/ndisc6/ndisc6-${PV}.tar.bz2 \
"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 05/13] stunnel: add perl to RDEPENDS_stunnel
2014-09-01 15:18 [PATCH 00/13] fix RDEPENDS issues Robert Yang
` (3 preceding siblings ...)
2014-09-01 15:18 ` [PATCH 04/13] ndisc6: add perl to RDEPENDS_ndisc6-misc Robert Yang
@ 2014-09-01 15:18 ` Robert Yang
2014-09-01 15:18 ` [PATCH 06/13] proftpd: add perl to RDEPENDS_proftpd Robert Yang
` (7 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Robert Yang @ 2014-09-01 15:18 UTC (permalink / raw)
To: Openembedded-devel
Perl:
stunnel/usr/bin/stunnel3:#!/usr/bin/perl
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../recipes-support/stunnel/stunnel_4.56.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-networking/recipes-support/stunnel/stunnel_4.56.bb b/meta-networking/recipes-support/stunnel/stunnel_4.56.bb
index 8671193..74f2234 100644
--- a/meta-networking/recipes-support/stunnel/stunnel_4.56.bb
+++ b/meta-networking/recipes-support/stunnel/stunnel_4.56.bb
@@ -5,6 +5,8 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=f41ebed8571077706fee0b860c4d6666"
DEPENDS = "openssl zlib tcp-wrappers"
+RDEPENDS_${PN} += "perl"
+
SRC_URI = "https://www.stunnel.org/downloads/archive/4.x/${BP}.tar.gz"
SRC_URI[md5sum] = "ac4c4a30bd7a55b6687cbd62d864054c"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 06/13] proftpd: add perl to RDEPENDS_proftpd
2014-09-01 15:18 [PATCH 00/13] fix RDEPENDS issues Robert Yang
` (4 preceding siblings ...)
2014-09-01 15:18 ` [PATCH 05/13] stunnel: add perl to RDEPENDS_stunnel Robert Yang
@ 2014-09-01 15:18 ` Robert Yang
2014-09-01 15:18 ` [PATCH 07/13] memcached: add bash to RDEPENDS_memcached Robert Yang
` (6 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Robert Yang @ 2014-09-01 15:18 UTC (permalink / raw)
To: Openembedded-devel
Perl:
proftpd/usr/bin/ftpasswd:#!/usr/bin/perl
proftpd/usr/bin/ftpquota:#!/usr/bin/perl
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../recipes-daemons/proftpd/proftpd_1.3.4b.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
index c154c6d..4d2fcd7 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
@@ -68,3 +68,5 @@ USERADD_PARAM_${PN} = "--system -g ${FTPGROUP} --home-dir /var/lib/${FTPUSER} --
--shell /bin/false ${FTPUSER}"
FILES_${PN} += "/home/${FTPUSER}"
+
+RDEPENDS_${PN} += "perl"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 07/13] memcached: add bash to RDEPENDS_memcached
2014-09-01 15:18 [PATCH 00/13] fix RDEPENDS issues Robert Yang
` (5 preceding siblings ...)
2014-09-01 15:18 ` [PATCH 06/13] proftpd: add perl to RDEPENDS_proftpd Robert Yang
@ 2014-09-01 15:18 ` Robert Yang
2014-09-01 15:18 ` [PATCH 08/13] phpmyadmin: add bash to RDEPENDS_phpmyadmin Robert Yang
` (5 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Robert Yang @ 2014-09-01 15:18 UTC (permalink / raw)
To: Openembedded-devel
Bashism:
possible bashism in memcached/etc/init.d/memcached line 40 (bash arrays, ${name[0|*|@]}):
if [ -r "${FILES[0]}" ]; then
possible bashism in memcached/etc/init.d/memcached line 42 (bash arrays, ${name[0|*|@]}):
for FILE in "${FILES[@]}";
possible bashism in memcached/etc/init.d/memcached line 53 (should be VAR="${VAR}foo"):
CONFIGS+=($NAME)
possible bashism in memcached/etc/init.d/memcached line 54 (should be 'b = a'):
elif [ "memcached_$2" == "$NAME" ];
possible bashism in memcached/etc/init.d/memcached line 62 (bash arrays, ${name[0|*|@]}):
if [ ${#CONFIGS[@]} == 0 ];
possible bashism in memcached/etc/init.d/memcached line 71 (bash arrays, ${name[0|*|@]}):
CONFIG_NUM=${#CONFIGS[@]}
possible bashism in memcached/etc/init.d/memcached line 72 ('((' should be '$(('):
for ((i=0; i < $CONFIG_NUM; i++)); do
possible bashism in memcached/etc/init.d/memcached line 73 (bash arrays, ${name[0|*|@]}):
NAME=${CONFIGS[${i}]}
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../recipes-support/memcached/memcached_1.4.17.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta-networking/recipes-support/memcached/memcached_1.4.17.bb b/meta-networking/recipes-support/memcached/memcached_1.4.17.bb
index 5d37df0..2c7b9fb 100644
--- a/meta-networking/recipes-support/memcached/memcached_1.4.17.bb
+++ b/meta-networking/recipes-support/memcached/memcached_1.4.17.bb
@@ -15,7 +15,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7e5ded7363d335e1bb18013ca08046ff"
inherit autotools
DEPENDS += "libevent"
-RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader perl-module-tie-hash"
+RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader \
+ perl-module-tie-hash bash \
+ "
SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \
file://configure.patch"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 08/13] phpmyadmin: add bash to RDEPENDS_phpmyadmin
2014-09-01 15:18 [PATCH 00/13] fix RDEPENDS issues Robert Yang
` (6 preceding siblings ...)
2014-09-01 15:18 ` [PATCH 07/13] memcached: add bash to RDEPENDS_memcached Robert Yang
@ 2014-09-01 15:18 ` Robert Yang
2014-09-01 15:18 ` [PATCH 09/13] apache2: add perl to RDEPENDS_apache2 Robert Yang
` (4 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Robert Yang @ 2014-09-01 15:18 UTC (permalink / raw)
To: Openembedded-devel
Bashism:
possible bashism in plugins/transformations/generator_plugin.sh line 16 (echo -e):
echo -e "Usage: ./generator_plugin.sh MIMEType MIMESubtype TransformationName [Description]\n"
possible bashism in plugins/transformations/generator_plugin.sh line 28 (${parm,[,][pat]} or ${parm^[^][pat]}):
MT="${MT^}"
possible bashism in plugins/transformations/generator_plugin.sh line 29 (${parm,[,][pat]} or ${parm^[^][pat]}):
MS="${MS^}"
possible bashism in plugins/transformations/generator_plugin.sh line 30 (${parm,[,][pat]} or ${parm^[^][pat]}):
TN="${TN^}"
possible bashism in plugins/transformations/generator_plugin.sh line 51 (should be 'b = a'):
if [ "$4" == "--generate_only_main_class" ]; then
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../recipes-php/phpmyadmin/phpmyadmin_4.2.7.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.2.7.bb b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.2.7.bb
index 8054c35..0de3f6d 100644
--- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.2.7.bb
+++ b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.2.7.bb
@@ -29,3 +29,4 @@ do_install() {
FILES_${PN} = "${datadir}/${BPN} \
${sysconfdir}/apache2/conf.d"
+RDEPENDS_${PN} += "bash"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 09/13] apache2: add perl to RDEPENDS_apache2
2014-09-01 15:18 [PATCH 00/13] fix RDEPENDS issues Robert Yang
` (7 preceding siblings ...)
2014-09-01 15:18 ` [PATCH 08/13] phpmyadmin: add bash to RDEPENDS_phpmyadmin Robert Yang
@ 2014-09-01 15:18 ` Robert Yang
2014-09-02 8:31 ` Olof Johansson
2014-09-01 15:18 ` [PATCH 10/13] sg3-utils: add bash to RDEPENDS_sg3-utils Robert Yang
` (3 subsequent siblings)
12 siblings, 1 reply; 22+ messages in thread
From: Robert Yang @ 2014-09-01 15:18 UTC (permalink / raw)
To: Openembedded-devel
Perl:
apache2/usr/bin/dbmmanage:#!/usr/bin/perl
apache2/usr/bin/apxs:#!/usr/bin/perl -w
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../recipes-httpd/apache2/apache2_2.4.10.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
index 0356029..5989a05 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
@@ -149,4 +149,4 @@ FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*"
FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
-RDEPENDS_${PN} += "openssl libgcc"
+RDEPENDS_${PN} += "openssl libgcc perl"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH 09/13] apache2: add perl to RDEPENDS_apache2
2014-09-01 15:18 ` [PATCH 09/13] apache2: add perl to RDEPENDS_apache2 Robert Yang
@ 2014-09-02 8:31 ` Olof Johansson
2014-09-02 8:45 ` Robert Yang
2014-09-02 12:54 ` [PATCH 09/13] apache2: split apache2-scripts subpkg Robert Yang
0 siblings, 2 replies; 22+ messages in thread
From: Olof Johansson @ 2014-09-02 8:31 UTC (permalink / raw)
To: openembedded-devel@lists.openembedded.org
On 14-09-01 17:18 +0200, Robert Yang wrote:
> Perl:
> apache2/usr/bin/dbmmanage:#!/usr/bin/perl
> apache2/usr/bin/apxs:#!/usr/bin/perl -w
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
> .../recipes-httpd/apache2/apache2_2.4.10.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
> index 0356029..5989a05 100644
> --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
> +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
> @@ -149,4 +149,4 @@ FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*"
>
> FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
>
> -RDEPENDS_${PN} += "openssl libgcc"
> +RDEPENDS_${PN} += "openssl libgcc perl"
This would probably be nice to separate to a -scripts package if
those two scripts are the only reason they would rdepend on perl.
I think apxs could be included in the -dev package.
Regards,
--
olofjn
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 09/13] apache2: add perl to RDEPENDS_apache2
2014-09-02 8:31 ` Olof Johansson
@ 2014-09-02 8:45 ` Robert Yang
2014-09-02 8:52 ` Olof Johansson
2014-09-02 12:54 ` [PATCH 09/13] apache2: split apache2-scripts subpkg Robert Yang
1 sibling, 1 reply; 22+ messages in thread
From: Robert Yang @ 2014-09-02 8:45 UTC (permalink / raw)
To: openembedded-devel
On 09/02/2014 04:31 PM, Olof Johansson wrote:
> On 14-09-01 17:18 +0200, Robert Yang wrote:
>> Perl:
>> apache2/usr/bin/dbmmanage:#!/usr/bin/perl
>> apache2/usr/bin/apxs:#!/usr/bin/perl -w
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>> .../recipes-httpd/apache2/apache2_2.4.10.bb | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
>> index 0356029..5989a05 100644
>> --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
>> +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
>> @@ -149,4 +149,4 @@ FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*"
>>
>> FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
>>
>> -RDEPENDS_${PN} += "openssl libgcc"
>> +RDEPENDS_${PN} += "openssl libgcc perl"
>
> This would probably be nice to separate to a -scripts package if
> those two scripts are the only reason they would rdepend on perl.
> I think apxs could be included in the -dev package.
Yes, these are the only two AFAIK, I will create a apache2-scripts
which only includes /usr/bin/dbmmanage, and put apxs to -dev.
// Robert
>
> Regards,
>
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 09/13] apache2: split apache2-scripts subpkg
2014-09-02 8:31 ` Olof Johansson
2014-09-02 8:45 ` Robert Yang
@ 2014-09-02 12:54 ` Robert Yang
1 sibling, 0 replies; 22+ messages in thread
From: Robert Yang @ 2014-09-02 12:54 UTC (permalink / raw)
To: openembedded-devel
Hello,
I updated this commit in the original repo:
git://git.openembedded.org/meta-openembedded-contrib rbt/rdeps
// Robert
And the patch is:
Subject: [PATCH] apache2: split apache2-scripts subpkg
Split apache2-scripts subpkg to put the perl script dbmmanage, so that
apache2 doesn't have to RDEPEND on perl.
Add another perl script apxs to apache2-dev pkg as Olof Johansson
suggested.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../recipes-httpd/apache2/apache2_2.4.10.bb | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
index 0356029..573cd6f 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
@@ -112,7 +112,7 @@ INITSCRIPT_NAME = "apache2"
INITSCRIPT_PARAMS = "defaults 91 20"
LEAD_SONAME = "libapr-1.so.0"
-PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}"
+PACKAGES = "${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}"
CONFFILES_${PN} = "${sysconfdir}/${BPN}/httpd.conf \
${sysconfdir}/${BPN}/magic \
@@ -129,11 +129,16 @@ FILES_${PN}-dev = "${datadir}/${BPN}/build \
${libdir}/apr*.exp \
${includedir}/${BPN} \
${libdir}/*.la \
- ${libdir}/*.a"
+ ${libdir}/*.a \
+ ${bindir}/apxs \
+ "
+
# manual to manual
FILES_${PN}-doc += " ${datadir}/${BPN}/manual"
+FILES_${PN}-scripts += "${bindir}/dbmmanage"
+
#
# override this too - here is the default, less datadir
#
@@ -150,3 +155,4 @@ FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*"
FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
RDEPENDS_${PN} += "openssl libgcc"
+RDEPENDS_${PN}-scripts += "perl ${PN}"
--
1.7.9.5
On 09/02/2014 04:31 PM, Olof Johansson wrote:
> On 14-09-01 17:18 +0200, Robert Yang wrote:
>> Perl:
>> apache2/usr/bin/dbmmanage:#!/usr/bin/perl
>> apache2/usr/bin/apxs:#!/usr/bin/perl -w
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>> .../recipes-httpd/apache2/apache2_2.4.10.bb | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
>> index 0356029..5989a05 100644
>> --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
>> +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.10.bb
>> @@ -149,4 +149,4 @@ FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*"
>>
>> FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug"
>>
>> -RDEPENDS_${PN} += "openssl libgcc"
>> +RDEPENDS_${PN} += "openssl libgcc perl"
>
> This would probably be nice to separate to a -scripts package if
> those two scripts are the only reason they would rdepend on perl.
> I think apxs could be included in the -dev package.
>
> Regards,
>
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 10/13] sg3-utils: add bash to RDEPENDS_sg3-utils
2014-09-01 15:18 [PATCH 00/13] fix RDEPENDS issues Robert Yang
` (8 preceding siblings ...)
2014-09-01 15:18 ` [PATCH 09/13] apache2: add perl to RDEPENDS_apache2 Robert Yang
@ 2014-09-01 15:18 ` Robert Yang
2014-09-01 15:18 ` [PATCH 11/13] sdparm: add bash to RDEPENDS_sdparm Robert Yang
` (2 subsequent siblings)
12 siblings, 0 replies; 22+ messages in thread
From: Robert Yang @ 2014-09-01 15:18 UTC (permalink / raw)
To: Openembedded-devel
Bash scripts:
sg3-utils/usr/bin/scsi_stop:#!/bin/bash
sg3-utils/usr/bin/scsi_mandat:#!/bin/bash
sg3-utils/usr/bin/scsi_logging_level:#! /bin/bash
sg3-utils/usr/bin/scsi_temperature:#!/bin/bash
sg3-utils/usr/bin/scsi_start:#!/bin/bash
sg3-utils/usr/bin/scsi_satl:#!/bin/bash
sg3-utils/usr/bin/scsi_readcap:#!/bin/bash
sg3-utils/usr/bin/scsi_ready:#!/bin/bash
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../recipes-support/sg3-utils/sg3-utils_1.38.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.38.bb b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.38.bb
index 36c13a4..5ce11b6 100644
--- a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.38.bb
+++ b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.38.bb
@@ -15,3 +15,5 @@ SRC_URI[sha256sum] = "d7d3a8b4b698e2c17c8f16bb876946720260d4d659d471c5d7c12ce652
inherit autotools-brokensep
S = "${WORKDIR}/sg3_utils-${PV}"
+
+RDEPENDS_${PN} += "bash"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 11/13] sdparm: add bash to RDEPENDS_sdparm
2014-09-01 15:18 [PATCH 00/13] fix RDEPENDS issues Robert Yang
` (9 preceding siblings ...)
2014-09-01 15:18 ` [PATCH 10/13] sg3-utils: add bash to RDEPENDS_sg3-utils Robert Yang
@ 2014-09-01 15:18 ` Robert Yang
2014-09-04 21:10 ` Randy MacLeod
2014-09-01 15:18 ` [PATCH 12/13] bonnie: add perl to RDEPENDS_bonnie-scripts Robert Yang
2014-09-01 15:18 ` [PATCH 13/13] rrdtool: use rrdtool rather than PN Robert Yang
12 siblings, 1 reply; 22+ messages in thread
From: Robert Yang @ 2014-09-01 15:18 UTC (permalink / raw)
To: Openembedded-devel
Bash scripts:
packages-split/sdparm/usr/bin/sas_disk_blink:#!/bin/bash
packages-split/sdparm/usr/bin/scsi_ch_swp:#!/bin/bash
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta-oe/recipes-support/sdparm/sdparm_1.08.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.08.bb b/meta-oe/recipes-support/sdparm/sdparm_1.08.bb
index 713e451..be46b96 100644
--- a/meta-oe/recipes-support/sdparm/sdparm_1.08.bb
+++ b/meta-oe/recipes-support/sdparm/sdparm_1.08.bb
@@ -15,3 +15,5 @@ SRC_URI[md5sum] = "be5786f37499018ef44f409597c92d42"
SRC_URI[sha256sum] = "376b78a414b1a9c47f3f13dbeb963e7a3ec7be126f83927d6856b5f7ac425e57"
inherit autotools
+
+RDEPENDS_${PN} += "bash"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PATCH 11/13] sdparm: add bash to RDEPENDS_sdparm
2014-09-01 15:18 ` [PATCH 11/13] sdparm: add bash to RDEPENDS_sdparm Robert Yang
@ 2014-09-04 21:10 ` Randy MacLeod
2014-09-05 1:58 ` Robert Yang
0 siblings, 1 reply; 22+ messages in thread
From: Randy MacLeod @ 2014-09-04 21:10 UTC (permalink / raw)
To: openembedded-devel, Robert Yang
On 14-09-01 11:18 AM, Robert Yang wrote:
> Bash scripts:
> packages-split/sdparm/usr/bin/sas_disk_blink:#!/bin/bash
> packages-split/sdparm/usr/bin/scsi_ch_swp:#!/bin/bash
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
> meta-oe/recipes-support/sdparm/sdparm_1.08.bb | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.08.bb b/meta-oe/recipes-support/sdparm/sdparm_1.08.bb
> index 713e451..be46b96 100644
> --- a/meta-oe/recipes-support/sdparm/sdparm_1.08.bb
> +++ b/meta-oe/recipes-support/sdparm/sdparm_1.08.bb
> @@ -15,3 +15,5 @@ SRC_URI[md5sum] = "be5786f37499018ef44f409597c92d42"
> SRC_URI[sha256sum] = "376b78a414b1a9c47f3f13dbeb963e7a3ec7be126f83927d6856b5f7ac425e57"
>
> inherit autotools
> +
> +RDEPENDS_${PN} += "bash"
>
We should move these scripts to a sdparm-scripts sub-pkg.
sdparm is a ~150K executable so making it pull in bash
at >1000K isn't good for embedded systems.
Neither script appears to be essential:
sas_disk_blink - blink the LED on a SAS disk
scsi_ch_swp:
"Usage: scsi_ch_swp [-h] [-s 0|1] [-v] [-w] <blk_device>"
...
"Access the Software Write Protect (SWP) bit in the SCSI control"
"mode page and if changed adjust the Linux block device (e.g."
"/dev/sdc) settings accordingly. If supported, when the SWP bit"
"is set (1) the device is read-only; when clear (0) the device"
"is read-write (i.e. its contents can be read and changed)."
"When no options given it reads SWP and gets blockdev's RO flag."
Comments or concerns?
--
# Randy MacLeod. SMTS, Linux, Wind River
Direct: 613.963.1350
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: [PATCH 11/13] sdparm: add bash to RDEPENDS_sdparm
2014-09-04 21:10 ` Randy MacLeod
@ 2014-09-05 1:58 ` Robert Yang
0 siblings, 0 replies; 22+ messages in thread
From: Robert Yang @ 2014-09-05 1:58 UTC (permalink / raw)
To: Randy MacLeod, openembedded-devel
On 09/05/2014 05:10 AM, Randy MacLeod wrote:
> On 14-09-01 11:18 AM, Robert Yang wrote:
>> Bash scripts:
>> packages-split/sdparm/usr/bin/sas_disk_blink:#!/bin/bash
>> packages-split/sdparm/usr/bin/scsi_ch_swp:#!/bin/bash
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>> meta-oe/recipes-support/sdparm/sdparm_1.08.bb | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.08.bb
>> b/meta-oe/recipes-support/sdparm/sdparm_1.08.bb
>> index 713e451..be46b96 100644
>> --- a/meta-oe/recipes-support/sdparm/sdparm_1.08.bb
>> +++ b/meta-oe/recipes-support/sdparm/sdparm_1.08.bb
>> @@ -15,3 +15,5 @@ SRC_URI[md5sum] = "be5786f37499018ef44f409597c92d42"
>> SRC_URI[sha256sum] =
>> "376b78a414b1a9c47f3f13dbeb963e7a3ec7be126f83927d6856b5f7ac425e57"
>>
>> inherit autotools
>> +
>> +RDEPENDS_${PN} += "bash"
>>
>
> We should move these scripts to a sdparm-scripts sub-pkg.
Good idea, I will do it.
// Robert
>
> sdparm is a ~150K executable so making it pull in bash
> at >1000K isn't good for embedded systems.
>
>
> Neither script appears to be essential:
>
> sas_disk_blink - blink the LED on a SAS disk
>
> scsi_ch_swp:
> "Usage: scsi_ch_swp [-h] [-s 0|1] [-v] [-w] <blk_device>"
> ...
> "Access the Software Write Protect (SWP) bit in the SCSI control"
> "mode page and if changed adjust the Linux block device (e.g."
> "/dev/sdc) settings accordingly. If supported, when the SWP bit"
> "is set (1) the device is read-only; when clear (0) the device"
> "is read-write (i.e. its contents can be read and changed)."
> "When no options given it reads SWP and gets blockdev's RO flag."
>
>
> Comments or concerns?
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 12/13] bonnie: add perl to RDEPENDS_bonnie-scripts
2014-09-01 15:18 [PATCH 00/13] fix RDEPENDS issues Robert Yang
` (10 preceding siblings ...)
2014-09-01 15:18 ` [PATCH 11/13] sdparm: add bash to RDEPENDS_sdparm Robert Yang
@ 2014-09-01 15:18 ` Robert Yang
2014-09-01 15:18 ` [PATCH 13/13] rrdtool: use rrdtool rather than PN Robert Yang
12 siblings, 0 replies; 22+ messages in thread
From: Robert Yang @ 2014-09-01 15:18 UTC (permalink / raw)
To: Openembedded-devel
Perl:
bonnie-scripts/usr/bin/bon_csv2html:#!/usr/bin/perl
bonnie-scripts/usr/bin/bon_csv2txt:#!/usr/bin/perl
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta-oe/recipes-benchmark/bonnie/bonnie++_1.03e.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-benchmark/bonnie/bonnie++_1.03e.bb b/meta-oe/recipes-benchmark/bonnie/bonnie++_1.03e.bb
index f8a23d7..2c1217e 100644
--- a/meta-oe/recipes-benchmark/bonnie/bonnie++_1.03e.bb
+++ b/meta-oe/recipes-benchmark/bonnie/bonnie++_1.03e.bb
@@ -28,3 +28,5 @@ PACKAGES =+ "bonnie-scripts"
FILES_${PN} = "${sbindir}"
FILES_bonnie-scripts = "${bindir}"
+
+RDEPENDS_bonnie-scripts += "perl"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 13/13] rrdtool: use rrdtool rather than PN
2014-09-01 15:18 [PATCH 00/13] fix RDEPENDS issues Robert Yang
` (11 preceding siblings ...)
2014-09-01 15:18 ` [PATCH 12/13] bonnie: add perl to RDEPENDS_bonnie-scripts Robert Yang
@ 2014-09-01 15:18 ` Robert Yang
12 siblings, 0 replies; 22+ messages in thread
From: Robert Yang @ 2014-09-01 15:18 UTC (permalink / raw)
To: Openembedded-devel
The "${datadir}/${PN}" will be changed to "${datadir}/lib32-rrdtool"
when multilib which isn't what need, use rrdtool to fix the problem.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb
index c3d3b7c..449a923 100644
--- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb
@@ -108,7 +108,7 @@ FILES_${PN}-doc += "${datadir}/examples"
DESCRIPTION_${PN}-perl = \
"The ${PN}-perl package includes RRDtool bindings for perl."
-FILES_${PN}-perl = "${libdir}/perl/vendor_perl/*/*.pm ${datadir}/${PN}/examples \
+FILES_${PN}-perl = "${libdir}/perl/vendor_perl/*/*.pm ${datadir}/rrdtool/examples \
${libdir}/perl/vendor_perl/*/auto/RRDs/RRDs.*"
RDEPENDS_${PN}-perl = "perl perl-module-lib perl-module-getopt-long perl-module-time-hires \
perl-module-io-file perl-module-ipc-open2 perl-module-io-socket"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 22+ messages in thread