Skip to contentSkip to conversation

lcdproc: add recipe from OE-Classic and update/clean up

PATCH In review Paul Eggleton 2 participants 3 messages Oct 7, 2012 – Oct 9, 2012

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

PATCH 1/1 lcdproc: add recipe from OE-Classic and update/clean up

* Update to latest upstream version 0.5.5
* Add an Ubuntu patch to fix incompatibility with current automake
* Use automatic package splitting for drivers
* Allow specifying drivers to build via LCD_DRIVERS
* Allow specifying default enabled driver via LCD_DEFAULT_DRIVER
* Disable g15 driver by default (but allow it to be re-enabled using PACKAGECONFIG, assuming the required recipes are also provided).
* Fix conf files not going into lcdvc and lcdd packages due to override expansion not happening at the expected time (for CONFFILES_*)
* Remove some unnecessary cruft
* Move packaging parts of recipe below do_install
* Add LIC_FILES_CHKSUM
* Make LICENSE more accurate
* Add SUMMARY

Signed-off-by Paul Eggleton <[email protected]>
---
 .../lcdproc/lcdproc/automake-111-fix.patch         |   21 ++++++
 meta-oe/recipes-extended/lcdproc/lcdproc5.inc      |   77 ++++++++++++++++++++
 meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb  |   24 ++++++
 3 files changed, 122 insertions(+)
 create mode 100644 meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch
 create mode 100644 meta-oe/recipes-extended/lcdproc/lcdproc5.inc
 create mode 100644 meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch new file +21 -0
new file mode 100644
index 0000000..061cc22
@@ -0,0 +1,21 @@
+Description: With automake 1.11.3, pkglib_PROGRAMS is not valid anymore, 
+ so work around this by using my_execbin_PROGRAMS.
+Author: Andreas Moog <[email protected]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/934265
+
+Upstream-Status: Backport 
+
+Index: lcdproc-0.5.5/server/drivers/Makefile.am
+===================================================================
+--- lcdproc-0.5.5.orig/server/drivers/Makefile.am	2012-02-26 14:04:37.000000000 +0100
++++ lcdproc-0.5.5/server/drivers/Makefile.am	2012-02-26 14:13:17.764467350 +0100
+@@ -20,7 +20,8 @@
+ 
+ ## Keep the lists sorted!
+ 
+-pkglib_PROGRAMS = @DRIVERS@
++my_execbindir = $(pkglibdir)
++my_execbin_PROGRAMS = @DRIVERS@
+ EXTRA_PROGRAMS = bayrad CFontz CFontz633 CFontzPacket curses debug CwLnx ea65 EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon imonlcd IOWarrior irman joy lb216 lcdm001 lcterm lirc lis MD8800 mdm166a ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD picolcd pyramid sed1330 sed1520 serialPOS serialVFD shuttleVFD stv5730 SureElec svga t6963 text tyan sli ula200 xosd i2500vfd irtrans
+ noinst_LIBRARIES = libLCD.a libbignum.a
+
meta-oe/recipes-extended/lcdproc/lcdproc5.inc new file +77 -0

77 lines not on this page · raw message

meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb new file +24 -0
new file mode 100644
index 0000000..0276c55
@@ -0,0 +1,24 @@
+require lcdproc5.inc
+
+SRC_URI += "file://automake-111-fix.patch"
+
+SRC_URI[md5sum] = "c92d4529d36eeec6d9d6fd0a4aa3ec82"
+SRC_URI[sha256sum] = "b136b47d7bf585a003334f432d8730a36ef5ed1cd520084b919667d825e48d42"
+
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render,"
+
+LCD_DRIVERS_append = "${@base_contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}"
+
+do_install_append () {
+	# binaries
+	install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc
+
+	# configuration files
+	install -D -m 0644 clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf
+}
+
+PACKAGES =+ "lcdvc"
+CONFFILES_lcdvc = "${sysconfdir}/lcdvc.conf"
+FILES_lcdvc = "${sysconfdir}/lcdvc.conf ${sbindir}/lcdvc"
+
Signature · 1 line
1.7.9.5
#1 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 07-10-12 12:47, Paul Eggleton schreef:

Quoted 12 lines

* Update to latest upstream version 0.5.5 * Add an Ubuntu patch to fix incompatibility with current automake * Use automatic package splitting for drivers * Allow specifying drivers to build via LCD_DRIVERS * Allow specifying default enabled driver via LCD_DEFAULT_DRIVER * Disable g15 driver by default (but allow it to be re-enabled using PACKAGECONFIG, assuming the required recipes are also provided). * Fix conf files not going into lcdvc and lcdd packages due to override expansion not happening at the expected time (for CONFFILES_*) * Remove some unnecessary cruft * Move packaging parts of recipe below do_install * Add LIC_FILES_CHKSUM * Make LICENSE more accurate * Add SUMMARY

Signed-off-by Paul Eggleton <[email protected]>

[..]

Quoted 6 lines
(quoted diff) +5 -0
+# Driver packages + +# USB / no USB trickery + 
+RCONFLICTS_lcdd-driver-hd47780nousb = "lcdd-driver-hd44780" 
+RCONFLICTS_lcdd-driver-hd47780 = "lcdd-driver-hd44780nousb" + 
+INITSCRIPT_PACKAGES = "lcdd lcdproc" +INITSCRIPT_NAME_lcdd = "lcdd" 
+INITSCRIPT_NAME_lcdproc = "lcdproc" +INITSCRIPT_PARAMS_lcdd = "defaults

70 21" +INITSCRIPT_PARAMS_lcdproc = "defaults 71 20"

Those the stock initscript have LSB headers? They help a lot when using systemd to work out dependencies in sysv-compat mode. -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFQc+fHMkyGM64RGpERAozFAKCwqWsRCkx/3z15MXQsX732u3lBzACgqofA wRA86yRkVOrVPS3i7ZQwDsk=
=3r5B
-----END PGP SIGNATURE-----

author
#2 lore raw
Quoted 19 lines · On Tuesday 09 October 2012 11:00:55 Koen Kooi wrote:

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 07-10-12 12:47, Paul Eggleton schreef:

Quoted 12 lines

* Update to latest upstream version 0.5.5 * Add an Ubuntu patch to fix incompatibility with current automake * Use automatic package splitting for drivers * Allow specifying drivers to build via LCD_DRIVERS * Allow specifying default enabled driver via LCD_DEFAULT_DRIVER * Disable g15 driver by default (but allow it to be re-enabled using PACKAGECONFIG, assuming the required recipes are also provided). * Fix conf files not going into lcdvc and lcdd packages due to override expansion not happening at the expected time (for CONFFILES_*) * Remove some unnecessary cruft * Move packaging parts of recipe below do_install * Add LIC_FILES_CHKSUM * Make LICENSE more accurate * Add SUMMARY

Signed-off-by Paul Eggleton <[email protected]>

[..]

Quoted 9 lines
Quoted 6 lines
(quoted diff) +5 -0
+# Driver packages + +# USB / no USB trickery +
+RCONFLICTS_lcdd-driver-hd47780nousb = "lcdd-driver-hd44780"
+RCONFLICTS_lcdd-driver-hd47780 = "lcdd-driver-hd44780nousb" +
+INITSCRIPT_PACKAGES = "lcdd lcdproc" +INITSCRIPT_NAME_lcdd = "lcdd"
+INITSCRIPT_NAME_lcdproc = "lcdproc" +INITSCRIPT_PARAMS_lcdd = "defaults

70 21" +INITSCRIPT_PARAMS_lcdproc = "defaults 71 20"

Those the stock initscript have LSB headers? They help a lot when using systemd to work out dependencies in sysv-compat mode.

Yes they do. I haven't tested them in conjunction with systemd, but they are present.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre