[meta-oe][PATCH 0/3] A couple of S!=B fixes

[meta-oe][PATCH 0/3] A couple of S!=B fixes

[Paul Eggleton]

Plus one related metadata fix.


The following changes since commit c76b3b9b97fcdc5854c1d27247c4998c59c2fd2b:

  claanup: remove garbage file (2014-06-16 11:02:22 -0400)

are available in the git repository at:

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

Paul Eggleton (3):
  lcdproc: fix do_install for S!=B
  pv: upgrade to 1.5.3
  pv: fix metadata fields

 meta-oe/recipes-extended/lcdproc/lcdproc5.inc     |  4 ++--
 meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb |  2 +-
 meta-oe/recipes-support/pv/pv_1.4.6.bb            | 17 -----------------
 meta-oe/recipes-support/pv/pv_1.5.3.bb            | 11 +++++++++++
 4 files changed, 14 insertions(+), 20 deletions(-)
 delete mode 100644 meta-oe/recipes-support/pv/pv_1.4.6.bb
 create mode 100644 meta-oe/recipes-support/pv/pv_1.5.3.bb

-- 
1.9.3

[meta-oe][PATCH 1/3] lcdproc: fix do_install for S!=B

[Paul Eggleton]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-oe/recipes-extended/lcdproc/lcdproc5.inc     | 4 ++--
 meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
index d1a45ca..91329d8 100644
--- a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc
@@ -36,10 +36,10 @@ do_install () {
     sed -i s'/--oknodo//' ${D}${sysconfdir}/init.d/lcdproc
 
     # configuration files
-    install -m 0644 LCDd.conf ${D}${sysconfdir}/LCDd.conf
+    install -m 0644 ${S}/LCDd.conf ${D}${sysconfdir}/LCDd.conf
     sed -i 's!^DriverPath=.*!DriverPath=${libdir}/lcdproc/!' ${D}${sysconfdir}/LCDd.conf
     sed -i 's!^Driver=.*!Driver=${LCD_DEFAULT_DRIVER}!' ${D}${sysconfdir}/LCDd.conf
-    install -m 0644 clients/lcdproc/lcdproc.conf ${D}${sysconfdir}/lcdproc.conf
+    install -m 0644 ${S}/clients/lcdproc/lcdproc.conf ${D}${sysconfdir}/lcdproc.conf
 
     # driver library files
     install -d ${D}${libdir}/lcdproc
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
index 39e6074..1f9524d 100644
--- a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
@@ -15,7 +15,7 @@ do_install_append () {
     install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc
 
     # configuration files
-    install -D -m 0644 clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf
+    install -D -m 0644 ${S}/clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf
 }
 
 PACKAGES =+ "lcdvc"
-- 
1.9.3

[meta-oe][PATCH 2/3] pv: upgrade to 1.5.3

[Paul Eggleton]

Autotools breakage fixed upstream (which also fixes the S!=B issue).

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-oe/recipes-support/pv/{pv_1.4.6.bb => pv_1.5.3.bb} | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
 rename meta-oe/recipes-support/pv/{pv_1.4.6.bb => pv_1.5.3.bb} (55%)

diff --git a/meta-oe/recipes-support/pv/pv_1.4.6.bb b/meta-oe/recipes-support/pv/pv_1.5.3.bb
similarity index 55%
rename from meta-oe/recipes-support/pv/pv_1.4.6.bb
rename to meta-oe/recipes-support/pv/pv_1.5.3.bb
index 8aec14c..5695412 100644
--- a/meta-oe/recipes-support/pv/pv_1.4.6.bb
+++ b/meta-oe/recipes-support/pv/pv_1.5.3.bb
@@ -4,14 +4,8 @@ LICENSE = "Artistic-License-2.0"
 LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
 
 SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.bz2"
-SRC_URI[md5sum] = "d55ff76f5caa83efc23aa527dbb0b191"
-SRC_URI[sha256sum] = "edfea0033ec6222eb60b4ec6d905dd2dccdb5900beef03f67f42ca9ed67e9fe2"
+SRC_URI[md5sum] = "efe8e9e4cad5f3264a32258a63bf2c8e"
+SRC_URI[sha256sum] = "76f3999b1c3b3027163dce6ef667cdf8dafb75218ee25e54a03bfe590478f90e"
 
 inherit autotools
 
-# broken autotools
-do_configure() {
-	cp ${S}/autoconf/configure.in ${S}
-	gnu-configize --force
-	oe_runconf
-}
-- 
1.9.3

[meta-oe][PATCH 3/3] pv: fix metadata fields

[Paul Eggleton]

* Use correct LICENSE value to match up with common license file (and
  avoid corresponding warning)
* Set SUMMARY instead of DESCRIPTION

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-oe/recipes-support/pv/pv_1.5.3.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/pv/pv_1.5.3.bb b/meta-oe/recipes-support/pv/pv_1.5.3.bb
index 5695412..5e3dd67 100644
--- a/meta-oe/recipes-support/pv/pv_1.5.3.bb
+++ b/meta-oe/recipes-support/pv/pv_1.5.3.bb
@@ -1,6 +1,6 @@
-DESCRIPTION = "pv - Pipe Viewer - is a terminal-based tool for monitoring the progress of data through a pipeline."
+SUMMARY = "Terminal-based tool for monitoring the progress of data through a pipeline"
 
-LICENSE = "Artistic-License-2.0"
+LICENSE = "Artistic-2.0"
 LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
 
 SRC_URI = "http://www.ivarch.com/programs/sources/pv-${PV}.tar.bz2"
-- 
1.9.3