[meta-oe][PATCH 1/2] lm_sensors: add ALLOW_EMPTY to lmsensors and lmsensors-config

[meta-oe][PATCH 1/2] lm_sensors: add ALLOW_EMPTY to lmsensors and lmsensors-config

[Jack Mitchell]

From: Jack Mitchell <jmitchell@cbnl.com>

When building with dev-pkgs enabled I was hitting an error lmsensors-dev
not available. Adding ALLOW_EMPTY allowed the empty package to be created
and therefore satisfy the dependancy.

Signed-off-by: Jack Mitchell <jmitchell@cbnl.com>
---
 meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb | 2 ++
 meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb b/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb
index 058ae1b..4b859cd 100644
--- a/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb
+++ b/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb
@@ -12,6 +12,8 @@ SRC_URI = "file://fancontrol \
            file://sensors.conf \
 "
 
+ALLOW_EMPTY_${PN} = "1"
+
 do_install() {
     # Install fancontrol configuration file
     install -d ${D}${sysconfdir}
diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb b/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb
index 60df0c6..b5c2921 100644
--- a/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb
+++ b/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb
@@ -16,6 +16,8 @@ SRC_URI[sha256sum] = "ecc91ba3d918e96fb7d5eb9acce978af803b130e0b33b08d5ea05b2bfc
 
 inherit update-rc.d
 
+ALLOW_EMPTY_${PN} = "1"
+
 INITSCRIPT_PACKAGES = "${PN}-fancontrol ${PN}-sensord"
 INITSCRIPT_NAME_${PN}-fancontrol = "fancontrol"
 INITSCRIPT_NAME_${PN}-sensord = "sensord"
-- 
1.8.4

[meta-oe][PATCH 2/2] lmsensors: split out cgi into seperate package

[Jack Mitchell]

From: Jack Mitchell <jmitchell@cbnl.com>

Split the CGI files out of sensord package into there own package. This
is in order to split out the lighttpd dependancy.

Signed-off-by: Jack Mitchell <jmitchell@cbnl.com>
---
 meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb | 8 +++++++-
 meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb      | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb b/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb
index 4b859cd..ffec22e 100644
--- a/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb
+++ b/meta-oe/recipes-support/lm_sensors/lmsensors-config_1.0.bb
@@ -42,11 +42,17 @@ PACKAGES =+ "${PN}-sensord"
 # fancontrol script configuration
 PACKAGES =+ "${PN}-fancontrol"
 
+# sensord web cgi support
+PACKAGES =+ "${PN}-cgi"
+RRECOMMENDS_${PN}-cgi = "lighttpd lighttpd-module-cgi"
+RDEPENDS_${PN}-cgi = "${PN}-sensord"
+FILES_${PN}-cgi = "/www/*" 
+
 # libsensors configuration file
 FILES_${PN}-libsensors = "${sysconfdir}/sensors.d/sensors.conf"
 
 # sensord logging daemon configuration files
-FILES_${PN}-sensord = "${sysconfdir}/sensord.conf /www/*"
+FILES_${PN}-sensord = "${sysconfdir}/sensord.conf"
 
 # fancontrol script configuration file
 FILES_${PN}-fancontrol = "${sysconfdir}/fancontrol"
diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb b/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb
index b5c2921..ab58e2d 100644
--- a/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb
+++ b/meta-oe/recipes-support/lm_sensors/lmsensors_3.3.3.bb
@@ -93,7 +93,7 @@ RDEPENDS_${PN}-sensors = "${PN}-libsensors"
 FILES_${PN}-sensord = "${bindir}/sensord ${sysconfdir}/init.d/sensord"
 FILES_${PN}-sensord-dbg = "${bindir}/.debug/sensord"
 FILES_${PN}-sensord-doc = "${mandir}/man8/sensord.8"
-RDEPENDS_${PN}-sensord = "${PN}-sensors rrdtool lighttpd lighttpd-module-cgi"
+RDEPENDS_${PN}-sensord = "${PN}-sensors rrdtool"
 RRECOMMENDS_${PN}-sensord = "lmsensors-config-sensord"
 
 # fancontrol script files
-- 
1.8.4

Re: [meta-oe][PATCH 1/2] lm_sensors: add ALLOW_EMPTY to lmsensors and lmsensors-config

[Burton, Ross]

On 24 September 2013 10:35, Jack Mitchell <ml@communistcode.co.uk> wrote:
> When building with dev-pkgs enabled I was hitting an error lmsensors-dev
> not available. Adding ALLOW_EMPTY allowed the empty package to be created
> and therefore satisfy the dependancy.

Your ALLOW_EMPTY statements only apply to lmsensors and
lmsensors-config, not lmsensors-dev (as you're using just ${PN}), and
surely you don't need it on the lmsensors-config recipe at all.

Ross

Re: [meta-oe][PATCH 1/2] lm_sensors: add ALLOW_EMPTY to lmsensors and lmsensors-config

[Jack Mitchell]

On 24/09/13 10:52, Burton, Ross wrote:
> On 24 September 2013 10:35, Jack Mitchell <ml@communistcode.co.uk> wrote:
>> When building with dev-pkgs enabled I was hitting an error lmsensors-dev
>> not available. Adding ALLOW_EMPTY allowed the empty package to be created
>> and therefore satisfy the dependancy.
> 
> Your ALLOW_EMPTY statements only apply to lmsensors and
> lmsensors-config, not lmsensors-dev (as you're using just ${PN}), and
> surely you don't need it on the lmsensors-config recipe at all.
> 
> Ross

If I take out the ALLOW_EMPTY statements I get the following do_rootfs
error:

| Collected errors:
|  * satisfy_dependencies_for: Cannot satisfy the following dependencies
for lmsensors-config-dev:
|  * 	lmsensors-config (= 1.0-r0) *
|  * opkg_install_cmd: Cannot install package lmsensors-config-dev.
|  * satisfy_dependencies_for: Cannot satisfy the following dependencies
for lmsensors-dev:
|  * 	lmsensors (= 3.3.3-r0) *
|  * opkg_install_cmd: Cannot install package lmsensors-dev.
| WARNING:
/home/jack/Work/oe-core.git/test-build/tmp-eglibc/work/cbnlcomexpress-oe-linux/cbnl-dev-image/1.0-r0/temp/run.do_rootfs.6333:1
exit 255 from
|   opkg-cl -f $INSTALL_CONF_IPK -o $INSTALL_ROOTFS_IPK
--force_postinstall --prefer-arch-to-version install `cat $1`
| ERROR: Function failed: do_rootfs (log file is located at
/home/jack/Work/oe-core.git/test-build/tmp-eglibc/work/cbnlcomexpress-oe-linux/cbnl-dev-image/1.0-r0/temp/log.do_rootfs.6333)

The only dependancy I have is lmsensors-sensord. Could it possibly be a
bug with the dev-pkgs image feature if it shouldn't be selecting these
packages for install?

Cheers,
Jack.

Re: [meta-oe][PATCH 1/2] lm_sensors: add ALLOW_EMPTY to lmsensors and lmsensors-config

[Jack Mitchell]

On 24/09/13 10:52, Burton, Ross wrote:
> On 24 September 2013 10:35, Jack Mitchell <ml@communistcode.co.uk> wrote:
>> When building with dev-pkgs enabled I was hitting an error lmsensors-dev
>> not available. Adding ALLOW_EMPTY allowed the empty package to be created
>> and therefore satisfy the dependancy.
> 
> Your ALLOW_EMPTY statements only apply to lmsensors and
> lmsensors-config, not lmsensors-dev (as you're using just ${PN}), and
> surely you don't need it on the lmsensors-config recipe at all.
> 
> Ross
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 

v2 on it's way with the RDEPENDS mechanism used as discussed on IRC and
a better commit message.