[PATCH 00/14 V2] fix RDEPENDS issues

[PATCH 00/14 V2] fix RDEPENDS issues

[Robert Yang]

* Changes of V2:
  - Add fix for webmin.
  - apache2: split apache2-scripts as Olof Johansson suggested. 
  - sdparm: split sdparm-scripts subpkg as Randy suggested

// Robert

The following changes since commit 28e26a9b0ad37d0c92ba42b2727215eef1edf5a2:

  tcpslice: add recipe under tcpdump (2014-09-09 10:32:51 -0400)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib rbt/rdeps
  http://cgit.openembedded.org/cgit.cgi//log/?h=rbt/rdeps

Robert Yang (14):
  aoetools: no bashism in aoe-stat
  autofs: add bash to RDEPENDS_autofs
  arptables: add bash to RDEPENDS_arptables
  ndisc6: add perl to RDEPENDS_ndisc6-misc
  stunnel: add perl to RDEPENDS_stunnel
  proftpd: add perl to RDEPENDS_proftpd
  memcached: add bash to RDEPENDS_memcached
  phpmyadmin: add bash to RDEPENDS_phpmyadmin
  apache2: split apache2-scripts subpkg
  sg3-utils: add bash to RDEPENDS_sg3-utils
  sdparm: split sdparm-scripts subpkg
  bonnie++: add perl to RDEPENDS_bonnie-scripts
  rrdtool: use rrdtool rather than PN
  webmin: fix hardcode of python2.3

 .../recipes-daemons/autofs/autofs_5.1.0.bb         |    1 +
 .../recipes-daemons/proftpd/proftpd_1.3.4b.bb      |    2 ++
 .../aoetools/aoetools/aoe-stat-no-bashism.patch    |   27 ++++++++++++++++++++
 .../recipes-support/aoetools/aoetools_36.bb        |    4 ++-
 .../recipes-support/arptables/arptables_0.0.3-4.bb |    2 +-
 .../recipes-support/memcached/memcached_1.4.17.bb  |    4 ++-
 .../recipes-support/ndisc6/ndisc6_1.0.2.bb         |    1 +
 .../recipes-support/stunnel/stunnel_4.56.bb        |    2 ++
 meta-oe/recipes-benchmark/bonnie/bonnie++_1.03e.bb |    2 ++
 meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb  |    2 +-
 meta-oe/recipes-support/sdparm/sdparm_1.08.bb      |    6 +++++
 .../recipes-support/sg3-utils/sg3-utils_1.38.bb    |    2 ++
 .../recipes-httpd/apache2/apache2_2.4.10.bb        |   10 ++++++--
 .../recipes-php/phpmyadmin/phpmyadmin_4.2.7.bb     |    1 +
 .../webmin/files/remove-python2.3.patch            |   25 ++++++++++++++++++
 .../recipes-webadmin/webmin/webmin_1.700.bb        |    4 ++-
 16 files changed, 88 insertions(+), 7 deletions(-)
 create mode 100644 meta-networking/recipes-support/aoetools/aoetools/aoe-stat-no-bashism.patch
 create mode 100644 meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch

-- 
1.7.9.5

[PATCH 01/14] aoetools: no bashism in aoe-stat

[Robert Yang]

So use /bin/sh.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../aoetools/aoetools/aoe-stat-no-bashism.patch    |   27 ++++++++++++++++++++
 .../recipes-support/aoetools/aoetools_36.bb        |    4 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 meta-networking/recipes-support/aoetools/aoetools/aoe-stat-no-bashism.patch

diff --git a/meta-networking/recipes-support/aoetools/aoetools/aoe-stat-no-bashism.patch b/meta-networking/recipes-support/aoetools/aoetools/aoe-stat-no-bashism.patch
new file mode 100644
index 0000000..ec89b7a
--- /dev/null
+++ b/meta-networking/recipes-support/aoetools/aoetools/aoe-stat-no-bashism.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 bashism
+
+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/aoe-stat.in b/aoe-stat.in
+index 50e6ac6..0c1d6f5 100755
+--- a/aoe-stat.in
++++ b/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_36.bb b/meta-networking/recipes-support/aoetools/aoetools_36.bb
index 5bb486f..2b80ae7 100644
--- a/meta-networking/recipes-support/aoetools/aoetools_36.bb
+++ b/meta-networking/recipes-support/aoetools/aoetools_36.bb
@@ -10,7 +10,9 @@ 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-bashism.patch \
+        "
 SRC_URI[md5sum] = "bff30daa988a65f69d4448ce4726a6db"
 SRC_URI[sha256sum] = "fb5e2cd0de7644cc1ec04ee3aeb43211cf7445a0c19e13d6b3ed5a8fbdf215ff"
 
-- 
1.7.9.5

[PATCH 02/14] autofs: add bash to RDEPENDS_autofs

[Robert Yang]

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

[PATCH 03/14] arptables: add bash to RDEPENDS_arptables

[Robert Yang]

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

[PATCH 04/14] ndisc6: add perl to RDEPENDS_ndisc6-misc

[Robert Yang]

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

[PATCH 05/14] stunnel: add perl to RDEPENDS_stunnel

[Robert Yang]

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

[PATCH 06/14] proftpd: add perl to RDEPENDS_proftpd

[Robert Yang]

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

[PATCH 07/14] memcached: add bash to RDEPENDS_memcached

[Robert Yang]

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 e61bc74..4d93f04 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

[PATCH 08/14] phpmyadmin: add bash to RDEPENDS_phpmyadmin

[Robert Yang]

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

[PATCH 09/14] apache2: split apache2-scripts subpkg

[Robert Yang]

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

[PATCH 10/14] sg3-utils: add bash to RDEPENDS_sg3-utils

[Robert Yang]

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

[PATCH 11/14] sdparm: split sdparm-scripts subpkg

[Robert Yang]

Bash scripts:
packages-split/sdparm/usr/bin/sas_disk_blink:#!/bin/bash
packages-split/sdparm/usr/bin/scsi_ch_swp:#!/bin/bash

The 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, so put them in sdparm-scripts as
Randy suggested.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta-oe/recipes-support/sdparm/sdparm_1.08.bb |    6 ++++++
 1 file changed, 6 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..b603a56 100644
--- a/meta-oe/recipes-support/sdparm/sdparm_1.08.bb
+++ b/meta-oe/recipes-support/sdparm/sdparm_1.08.bb
@@ -11,7 +11,13 @@ SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \
            file://make-sysroot-work.patch \
            "
 
+PACKAGES =+ "${PN}-scripts"
+RDEPENDS_${PN}-scripts += "bash ${PN}"
+
 SRC_URI[md5sum] = "be5786f37499018ef44f409597c92d42"
 SRC_URI[sha256sum] = "376b78a414b1a9c47f3f13dbeb963e7a3ec7be126f83927d6856b5f7ac425e57"
 
 inherit autotools
+
+# Put the bash scripts to ${PN}-scripts
+FILES_${PN}-scripts = "${bindir}/sas_disk_blink ${bindir}/scsi_ch_swp"
-- 
1.7.9.5

[PATCH 12/14] bonnie++: add perl to RDEPENDS_bonnie-scripts

[Robert Yang]

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

[PATCH 13/14] rrdtool: use rrdtool rather than PN

[Robert Yang]

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

[PATCH 14/14] webmin: fix hardcode of python2.3

[Robert Yang]

Use "/usr/bin/env python" to fix it.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../webmin/files/remove-python2.3.patch            |   25 ++++++++++++++++++++
 .../recipes-webadmin/webmin/webmin_1.700.bb        |    4 +++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch

diff --git a/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch b/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch
new file mode 100644
index 0000000..75e5bd1
--- /dev/null
+++ b/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch
@@ -0,0 +1,25 @@
+From 6f04699d5d417122b67e8118fd1955c769f17e76 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Tue, 2 Sep 2014 00:11:05 -0700
+Subject: [PATCH] ajaxterm/ajaxterm/qweb.py: fix hardcode of python2.3
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ ajaxterm/ajaxterm/qweb.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ajaxterm/ajaxterm/qweb.py b/ajaxterm/ajaxterm/qweb.py
+index 20c5092..c658a6b 100644
+--- a/ajaxterm/ajaxterm/qweb.py
++++ b/ajaxterm/ajaxterm/qweb.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.3
++#!/usr/bin/env python
+ #
+ # vim:set et ts=4 fdc=0 fdn=2 fdl=0:
+ #
+-- 
+1.7.9.5
+
diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb
index 45d635e..2a363cb 100644
--- a/meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb
+++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb
@@ -15,7 +15,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
            file://samba-config-fix.patch \
            file://proftpd-config-fix.patch \
            file://net-lib.pl.patch \
-           file://media-tomb.patch"
+           file://media-tomb.patch \
+           file://remove-python2.3.patch \
+            "
 
 SRC_URI[md5sum] = "e5261114a6a6ed10caf570d3239ed5b7"
 SRC_URI[sha256sum] = "1a6a8aa62c32c04932b902d17fc1864ee8f3fba03012bd25f709aa65e7e9b0f2"
-- 
1.7.9.5

Re: [PATCH 02/14] autofs: add bash to RDEPENDS_autofs

[Mike Looijmans]

Wouldn't it be a LOT more constructive to fix the bashism. I fail to see 
the virtue in adding 2MB of "bash" to an embedded system just for a text 
echo statement that no-one will actually read unless they hook up a 
serial console to their TV set or so.


On 9-9-2014 18:27, Robert Yang wrote:
> 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
>
>


-- 
Mike Looijmans

Re: [PATCH 02/14] autofs: add bash to RDEPENDS_autofs

[Robert Yang]

On 09/11/2014 01:08 AM, Mike Looijmans wrote:
> Wouldn't it be a LOT more constructive to fix the bashism. I fail to see the
> virtue in adding 2MB of "bash" to an embedded system just for a text echo
> statement that no-one will actually read unless they hook up a serial console to
> their TV set or so.

The problem is that there are more bashism, here is the full list:

possible bashism in autofs/etc/init.d/autofs line 39 ('function' is useless):
function start() {
possible bashism in autofs/etc/init.d/autofs line 52 ([^] should be [!]):
         elif ([ -f /proc/modules ] && lsmod) | grep -q autofs[^4]
possible bashism in autofs/etc/init.d/autofs line 88 ('function' is useless):
function stop() {
possible bashism in autofs/etc/init.d/autofs line 89 ($"foo" should be 
eval_gettext "foo"):
         echo -n $"Stopping $prog: "
possible bashism in autofs/etc/init.d/autofs line 92 (should be >word 2>&1):
                 killall -TERM $prog >& /dev/null
possible bashism in autofs/etc/init.d/autofs line 105 ('function' is useless):
function restart() {
possible bashism in autofs/etc/init.d/autofs line 113 ('function' is useless):
function reload() {
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}"

// Robert

>
>
> On 9-9-2014 18:27, Robert Yang wrote:
>> 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
>>
>>
>
>

Re: [PATCH 02/14] autofs: add bash to RDEPENDS_autofs

[Enrico Scholz]

Robert Yang <liezhi.yang@windriver.com> writes:

> possible bashism in autofs/etc/init.d/autofs line 116 ($"foo" should be eval_gettext "foo"):
>
> +RDEPENDS_${PN} += "bash"

Is this bashism only in the initscript, or somewhere else too?  If it is
only in the initscript, the RDEPENDS should be a RRECOMMENDS because
package seems to contain also a systemd service.


Enrico

Re: [PATCH 02/14] autofs: add bash to RDEPENDS_autofs

[Mike Looijmans]

On 09/11/2014 05:28 PM, Robert Yang wrote:
>
>
> On 09/11/2014 01:08 AM, Mike Looijmans wrote:
>> Wouldn't it be a LOT more constructive to fix the bashism. I fail to
>> see the
>> virtue in adding 2MB of "bash" to an embedded system just for a text echo
>> statement that no-one will actually read unless they hook up a serial
>> console to
>> their TV set or so.
>
> The problem is that there are more bashism, here is the full list:
>
> possible bashism in autofs/etc/init.d/autofs line 39 ('function' is
> useless):
> function start() {
> possible bashism in autofs/etc/init.d/autofs line 52 ([^] should be [!]):
>          elif ([ -f /proc/modules ] && lsmod) | grep -q autofs[^4]
> possible bashism in autofs/etc/init.d/autofs line 88 ('function' is
> useless):
> function stop() {
> possible bashism in autofs/etc/init.d/autofs line 89 ($"foo" should be
> eval_gettext "foo"):
>          echo -n $"Stopping $prog: "
> possible bashism in autofs/etc/init.d/autofs line 92 (should be >word
> 2>&1):
>                  killall -TERM $prog >& /dev/null
> possible bashism in autofs/etc/init.d/autofs line 105 ('function' is
> useless):
> function restart() {
> possible bashism in autofs/etc/init.d/autofs line 113 ('function' is
> useless):
> function reload() {
> 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}"
>
> // Robert
>

I put the following in a bbappend to work around the bashism, this was 
enough to make the scripts work just fine with busybox's shell:


# Remove bash scripting from init script (meaning, remove "function"
# from each shell function)
do_configure_prepend () {
	for bashfile in redhat/autofs.init.in samples/rc.autofs.in
	do
		sed -i 's.#!/bin/bash.#!/bin/sh.' $bashfile
		sed -i 's/^function //g' $bashfile
	done
}


I wanted to point to the commit on sourceforge, but the site is 
unresponsive at the moment.

>>
>>
>> On 9-9-2014 18:27, Robert Yang wrote:
>>> 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
>>>
>>>
>>
>>


-- 
Mike Looijmans

Re: [PATCH 02/14] autofs: add bash to RDEPENDS_autofs

[Robert Yang]

On 09/12/2014 08:57 PM, Mike  wrote:
> On 09/11/2014 05:28 PM, Robert Yang wrote:
>>
>>
>> On 09/11/2014 01:08 AM, Mike Looijmans wrote:
>>> Wouldn't it be a LOT more constructive to fix the bashism. I fail to
>>> see the
>>> virtue in adding 2MB of "bash" to an embedded system just for a text echo
>>> statement that no-one will actually read unless they hook up a serial
>>> console to
>>> their TV set or so.
>>
>> The problem is that there are more bashism, here is the full list:
>>
>> possible bashism in autofs/etc/init.d/autofs line 39 ('function' is
>> useless):
>> function start() {
>> possible bashism in autofs/etc/init.d/autofs line 52 ([^] should be [!]):
>>          elif ([ -f /proc/modules ] && lsmod) | grep -q autofs[^4]
>> possible bashism in autofs/etc/init.d/autofs line 88 ('function' is
>> useless):
>> function stop() {
>> possible bashism in autofs/etc/init.d/autofs line 89 ($"foo" should be
>> eval_gettext "foo"):
>>          echo -n $"Stopping $prog: "
>> possible bashism in autofs/etc/init.d/autofs line 92 (should be >word
>> 2>&1):
>>                  killall -TERM $prog >& /dev/null
>> possible bashism in autofs/etc/init.d/autofs line 105 ('function' is
>> useless):
>> function restart() {
>> possible bashism in autofs/etc/init.d/autofs line 113 ('function' is
>> useless):
>> function reload() {
>> 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}"
>>
>> // Robert
>>
>
> I put the following in a bbappend to work around the bashism, this was enough to
> make the scripts work just fine with busybox's shell:

Good, thanks, I will update it with your signed-off.

// Robert

>
>
> # Remove bash scripting from init script (meaning, remove "function"
> # from each shell function)
> do_configure_prepend () {
>      for bashfile in redhat/autofs.init.in samples/rc.autofs.in
>      do
>          sed -i 's.#!/bin/bash.#!/bin/sh.' $bashfile
>          sed -i 's/^function //g' $bashfile
>      done
> }
>
>
> I wanted to point to the commit on sourceforge, but the site is unresponsive at
> the moment.
>
>>>
>>>
>>> On 9-9-2014 18:27, Robert Yang wrote:
>>>> 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
>>>>
>>>>
>>>
>>>
>
>

Re: [PATCH 02/14] autofs: add bash to RDEPENDS_autofs

[Robert Yang]

Hi Mike,

I've updated the patch in the repo:

git://git.openembedded.org/meta-openembedded-contrib rbt/rdeps

And used a patch rather than sed command since patch is preferred, here
is the patch with your signed off:

diff --git 
a/meta-networking/recipes-daemons/autofs/autofs-5.1.0/remove-bashism.patch 
b/meta-networking/recipes-daemons/autofs/autofs-5.1.0/remove-bashism.patch
new file mode 100644
index 0000000..282d6f0
--- /dev/null
+++ b/meta-networking/recipes-daemons/autofs/autofs-5.1.0/remove-bashism.patch
@@ -0,0 +1,120 @@
+From 79034f969bbd12215d65b4337dfd38a13d02d4ef Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Sat, 13 Sep 2014 20:19:28 -0700
+Subject: [PATCH] autofs.init.in: remove bashism
+
+It can work without the bashism.
+
+Upstream-Status: Pending
+
+Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ redhat/autofs.init.in |   12 ++++++------
+ samples/rc.autofs.in  |   10 +++++-----
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/redhat/autofs.init.in b/redhat/autofs.init.in
+index 9d008ff..4f1c0d8 100644
+--- a/redhat/autofs.init.in
++++ b/redhat/autofs.init.in
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # rc file for automount using a Sun-style "master map".
+ #
+@@ -42,7 +42,7 @@ if [ -r $confdir/autofs ]; then
+       . $confdir/autofs
+ fi
+
+-function start() {
++start() {
+       # Make sure autofs4 module is loaded
+       if ! grep -q autofs /proc/filesystems

+       then
+@@ -102,7 +102,7 @@ function start() {
+       return $RETVAL
+ }
+
+-function stop() {
++stop() {
+       echo -n $"Stopping $prog: "
+       count=0
+       while [ -n "`pidof $prog`" -a $count -lt 15 ] ; do
+@@ -125,7 +125,7 @@ function stop() {
+       return $RETVAL
+ }
+
+-function restart() {
++restart() {
+       status autofs > /dev/null 2>&1
+       if [ $? -eq 0 ]; then
+               stop
+@@ -143,7 +143,7 @@ function restart() {
+       start
+ }
+
+-function reload() {
++reload() {
+       if [ ! -f /var/lock/subsys/autofs ]; then
+               echo $"$prog not running"
+               RETVAL=1
+@@ -161,7 +161,7 @@ function reload() {
+       return $RETVAL
+ }
+
+-function usage_message() {
++usage_message() {
+       echo $"Usage: $0 
{start|forcestart|stop|status|restart|force-reload|forcerestart|reload|condrestart|try-restart|usage}"
+ }
+
+diff --git a/samples/rc.autofs.in b/samples/rc.autofs.in
+index 487669f..e96cde1 100644
+--- a/samples/rc.autofs.in
++++ b/samples/rc.autofs.in
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # rc file for automount using a Sun-style "master map".
+ #
+@@ -36,7 +36,7 @@ if [ -r $confdir/autofs ]; then
+       . $confdir/autofs
+ fi
+
+-function start() {
++start() {
+       echo -n "Starting $prog: "
+
+       # Make sure autofs4 module is loaded
+@@ -85,7 +85,7 @@ function start() {
+       return $RETVAL
+ }
+
+-function stop() {
++stop() {
+       echo -n $"Stopping $prog: "
+       count=0
+       while [ -n "`pidof $prog`" -a $count -lt 15 ] ; do
+@@ -102,7 +102,7 @@ function stop() {
+       return $RETVAL
+ }
+
+-function restart() {
++restart() {
+       stop
+       while [ -n "`pidof $prog`" ] ; do
+               sleep 5
+@@ -110,7 +110,7 @@ function restart() {
+       start
+ }
+
+-function reload() {
++reload() {
+       pid=`pidof $prog`
+       if [ -z $pid ]; then
+               echo $"$prog not running"
+--
+1.7.9.5
+
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..13af2fe 100644
--- a/meta-networking/recipes-daemons/autofs/autofs_5.1.0.bb
+++ b/meta-networking/recipes-daemons/autofs/autofs_5.1.0.bb
@@ -19,6 +19,7 @@ SRC_URI = 
"${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \
             file://add-the-needed-stdarg.h.patch \
             file://using-pkg-config-to-detect-libxml-2.0-and-krb5.patch \
             file://force-STRIP-to-emtpy.patch \
+           file://remove-bashism.patch \
  "

  SRC_URI[md5sum] = "b7724a9a55923f3c06933a8dfd1e79d3"



// Robert

On 09/12/2014 08:57 PM, Mike Looijmans wrote:
> On 09/11/2014 05:28 PM, Robert Yang wrote:
>>
>>
>> On 09/11/2014 01:08 AM, Mike Looijmans wrote:
>>> Wouldn't it be a LOT more constructive to fix the bashism. I fail to
>>> see the
>>> virtue in adding 2MB of "bash" to an embedded system just for a text echo
>>> statement that no-one will actually read unless they hook up a serial
>>> console to
>>> their TV set or so.
>>
>> The problem is that there are more bashism, here is the full list:
>>
>> possible bashism in autofs/etc/init.d/autofs line 39 ('function' is
>> useless):
>> function start() {
>> possible bashism in autofs/etc/init.d/autofs line 52 ([^] should be [!]):
>>          elif ([ -f /proc/modules ] && lsmod) | grep -q autofs[^4]
>> possible bashism in autofs/etc/init.d/autofs line 88 ('function' is
>> useless):
>> function stop() {
>> possible bashism in autofs/etc/init.d/autofs line 89 ($"foo" should be
>> eval_gettext "foo"):
>>          echo -n $"Stopping $prog: "
>> possible bashism in autofs/etc/init.d/autofs line 92 (should be >word
>> 2>&1):
>>                  killall -TERM $prog >& /dev/null
>> possible bashism in autofs/etc/init.d/autofs line 105 ('function' is
>> useless):
>> function restart() {
>> possible bashism in autofs/etc/init.d/autofs line 113 ('function' is
>> useless):
>> function reload() {
>> 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}"
>>
>> // Robert
>>
>
> I put the following in a bbappend to work around the bashism, this was enough to
> make the scripts work just fine with busybox's shell:
>
>
> # Remove bash scripting from init script (meaning, remove "function"
> # from each shell function)
> do_configure_prepend () {
>      for bashfile in redhat/autofs.init.in samples/rc.autofs.in
>      do
>          sed -i 's.#!/bin/bash.#!/bin/sh.' $bashfile
>          sed -i 's/^function //g' $bashfile
>      done
> }
>
>
> I wanted to point to the commit on sourceforge, but the site is unresponsive at
> the moment.
>
>>>
>>>
>>> On 9-9-2014 18:27, Robert Yang wrote:
>>>> 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
>>>>
>>>>
>>>
>>>
>
>

Re: [PATCH 02/14] autofs: add bash to RDEPENDS_autofs

[Mike Looijmans]

Okay on that.

Mike.

On 09/14/2014 06:13 AM, Robert Yang wrote:
>
> Hi Mike,
>
> I've updated the patch in the repo:
>
> git://git.openembedded.org/meta-openembedded-contrib rbt/rdeps
>
> And used a patch rather than sed command since patch is preferred, here
> is the patch with your signed off:
>
> diff --git
> a/meta-networking/recipes-daemons/autofs/autofs-5.1.0/remove-bashism.patch
> b/meta-networking/recipes-daemons/autofs/autofs-5.1.0/remove-bashism.patch
> new file mode 100644
> index 0000000..282d6f0
> --- /dev/null
> +++ b/meta-networking/recipes-daemons/autofs/autofs-5.1.0/remove-bashism.patch
> @@ -0,0 +1,120 @@
> +From 79034f969bbd12215d65b4337dfd38a13d02d4ef Mon Sep 17 00:00:00 2001
> +From: Robert Yang <liezhi.yang@windriver.com>
> +Date: Sat, 13 Sep 2014 20:19:28 -0700
> +Subject: [PATCH] autofs.init.in: remove bashism
> +
> +It can work without the bashism.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> +---
> + redhat/autofs.init.in |   12 ++++++------
> + samples/rc.autofs.in  |   10 +++++-----
> + 2 files changed, 11 insertions(+), 11 deletions(-)
> +
> +diff --git a/redhat/autofs.init.in b/redhat/autofs.init.in
> +index 9d008ff..4f1c0d8 100644
> +--- a/redhat/autofs.init.in
> ++++ b/redhat/autofs.init.in
> +@@ -1,4 +1,4 @@
> +-#!/bin/bash
> ++#!/bin/sh
> + #
> + # rc file for automount using a Sun-style "master map".
> + #
> +@@ -42,7 +42,7 @@ if [ -r $confdir/autofs ]; then
> +       . $confdir/autofs
> + fi
> +
> +-function start() {
> ++start() {
> +       # Make sure autofs4 module is loaded
> +       if ! grep -q autofs /proc/filesystems
>
> +       then
> +@@ -102,7 +102,7 @@ function start() {
> +       return $RETVAL
> + }
> +
> +-function stop() {
> ++stop() {
> +       echo -n $"Stopping $prog: "
> +       count=0
> +       while [ -n "`pidof $prog`" -a $count -lt 15 ] ; do
> +@@ -125,7 +125,7 @@ function stop() {
> +       return $RETVAL
> + }
> +
> +-function restart() {
> ++restart() {
> +       status autofs > /dev/null 2>&1
> +       if [ $? -eq 0 ]; then
> +               stop
> +@@ -143,7 +143,7 @@ function restart() {
> +       start
> + }
> +
> +-function reload() {
> ++reload() {
> +       if [ ! -f /var/lock/subsys/autofs ]; then
> +               echo $"$prog not running"
> +               RETVAL=1
> +@@ -161,7 +161,7 @@ function reload() {
> +       return $RETVAL
> + }
> +
> +-function usage_message() {
> ++usage_message() {
> +       echo $"Usage: $0
> {start|forcestart|stop|status|restart|force-reload|forcerestart|reload|condrestart|try-restart|usage}"
>
> + }
> +
> +diff --git a/samples/rc.autofs.in b/samples/rc.autofs.in
> +index 487669f..e96cde1 100644
> +--- a/samples/rc.autofs.in
> ++++ b/samples/rc.autofs.in
> +@@ -1,4 +1,4 @@
> +-#!/bin/bash
> ++#!/bin/sh
> + #
> + # rc file for automount using a Sun-style "master map".
> + #
> +@@ -36,7 +36,7 @@ if [ -r $confdir/autofs ]; then
> +       . $confdir/autofs
> + fi
> +
> +-function start() {
> ++start() {
> +       echo -n "Starting $prog: "
> +
> +       # Make sure autofs4 module is loaded
> +@@ -85,7 +85,7 @@ function start() {
> +       return $RETVAL
> + }
> +
> +-function stop() {
> ++stop() {
> +       echo -n $"Stopping $prog: "
> +       count=0
> +       while [ -n "`pidof $prog`" -a $count -lt 15 ] ; do
> +@@ -102,7 +102,7 @@ function stop() {
> +       return $RETVAL
> + }
> +
> +-function restart() {
> ++restart() {
> +       stop
> +       while [ -n "`pidof $prog`" ] ; do
> +               sleep 5
> +@@ -110,7 +110,7 @@ function restart() {
> +       start
> + }
> +
> +-function reload() {
> ++reload() {
> +       pid=`pidof $prog`
> +       if [ -z $pid ]; then
> +               echo $"$prog not running"
> +--
> +1.7.9.5
> +
> 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..13af2fe 100644
> --- a/meta-networking/recipes-daemons/autofs/autofs_5.1.0.bb
> +++ b/meta-networking/recipes-daemons/autofs/autofs_5.1.0.bb
> @@ -19,6 +19,7 @@ SRC_URI =
> "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \
>              file://add-the-needed-stdarg.h.patch \
>              file://using-pkg-config-to-detect-libxml-2.0-and-krb5.patch \
>              file://force-STRIP-to-emtpy.patch \
> +           file://remove-bashism.patch \
>   "
>
>   SRC_URI[md5sum] = "b7724a9a55923f3c06933a8dfd1e79d3"
>
>
>
> // Robert
>
> On 09/12/2014 08:57 PM, Mike Looijmans wrote:
>> On 09/11/2014 05:28 PM, Robert Yang wrote:
>>>
>>>
>>> On 09/11/2014 01:08 AM, Mike Looijmans wrote:
>>>> Wouldn't it be a LOT more constructive to fix the bashism. I fail to
>>>> see the
>>>> virtue in adding 2MB of "bash" to an embedded system just for a text echo
>>>> statement that no-one will actually read unless they hook up a serial
>>>> console to
>>>> their TV set or so.
>>>
>>> The problem is that there are more bashism, here is the full list:
>>>
>>> possible bashism in autofs/etc/init.d/autofs line 39 ('function' is
>>> useless):
>>> function start() {
>>> possible bashism in autofs/etc/init.d/autofs line 52 ([^] should be [!]):
>>>          elif ([ -f /proc/modules ] && lsmod) | grep -q autofs[^4]
>>> possible bashism in autofs/etc/init.d/autofs line 88 ('function' is
>>> useless):
>>> function stop() {
>>> possible bashism in autofs/etc/init.d/autofs line 89 ($"foo" should be
>>> eval_gettext "foo"):
>>>          echo -n $"Stopping $prog: "
>>> possible bashism in autofs/etc/init.d/autofs line 92 (should be >word
>>> 2>&1):
>>>                  killall -TERM $prog >& /dev/null
>>> possible bashism in autofs/etc/init.d/autofs line 105 ('function' is
>>> useless):
>>> function restart() {
>>> possible bashism in autofs/etc/init.d/autofs line 113 ('function' is
>>> useless):
>>> function reload() {
>>> 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}"
>>>
>>> // Robert
>>>
>>
>> I put the following in a bbappend to work around the bashism, this was
>> enough to
>> make the scripts work just fine with busybox's shell:
>>
>>
>> # Remove bash scripting from init script (meaning, remove "function"
>> # from each shell function)
>> do_configure_prepend () {
>>      for bashfile in redhat/autofs.init.in samples/rc.autofs.in
>>      do
>>          sed -i 's.#!/bin/bash.#!/bin/sh.' $bashfile
>>          sed -i 's/^function //g' $bashfile
>>      done
>> }
>>
>>
>> I wanted to point to the commit on sourceforge, but the site is unresponsive at
>> the moment.
>>
>>>>
>>>>
>>>> On 9-9-2014 18:27, Robert Yang wrote:
>>>>> 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
>>>>>
>>>>>
>>>>
>>>>
>>
>>



Met vriendelijke groet / kind regards,

Mike Looijmans

TOPIC Embedded Systems
Eindhovenseweg 32-C, NL-5683 KH Best
Postbus 440, NL-5680 AK Best
Telefoon: (+31) (0) 499 33 69 79
Telefax:  (+31) (0) 499 33 69 70
E-mail: mike.looijmans@topic.nl
Website: www.topic.nl

Please consider the environment before printing this e-mail

Topic zoekt gedreven (embedded) software specialisten!
http://topic.nl/vacatures/topic-zoekt-software-engineers/