summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/lcdproc
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2020-03-11 16:42:05 +0800
committerKhem Raj <raj.khem@gmail.com>2020-03-11 08:58:57 -0700
commitd178745cbf5c97b7cdcf274108a58c8e1f88d3ca (patch)
treeab1cf2f60e724eeecbfbf4a6c1973c4b5fee2c65 /meta-oe/recipes-extended/lcdproc
parentf5d2bf55a8169a9446c2f96f327b3e5d91a6e6cc (diff)
downloadmeta-openembedded-d178745cbf5c97b7cdcf274108a58c8e1f88d3ca.tar.gz
conf/layer.conf: add BBFILES_DYNAMIC and dynamic layers
some recipes under meta-oe have dependency on meta-python, and test_world of yocto-check-layer will failed with error like: ERROR: test_world (common.CommonCheckLayer) ERROR: Nothing PROVIDES 'python3-pytoml-native' (but /meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb DEPENDS on or otherwise requires it). Close matches: python3-numpy-native python3-pycairo-native python3-rpm-native ERROR: Required build target 'meta-world-pkgdata' has no buildable providers. Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'mozjs', 'python3-pytoml-native'] fix by make these recipes only active when identified layers are present Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/lcdproc')
-rw-r--r--meta-oe/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch33
-rw-r--r--meta-oe/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch41
-rw-r--r--meta-oe/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch35
-rw-r--r--meta-oe/recipes-extended/lcdproc/lcdproc_git.bb105
4 files changed, 0 insertions, 214 deletions
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch b/meta-oe/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch
deleted file mode 100644
index f6a7956db2..0000000000
--- a/meta-oe/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From a20feee4963bc38975fbaf44bbe85a31825f59db Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 6 Apr 2019 17:28:28 -0700
4Subject: [PATCH 1/3] Fix parallel build (fix port-internal make dependencies)
5 on many cores
6
7Upstream-Status: Submitted [https://github.com/lcdproc/lcdproc/pull/142]
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 server/drivers/Makefile.am | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am
14index e08f2b2d..4fd2e3f1 100644
15--- a/server/drivers/Makefile.am
16+++ b/server/drivers/Makefile.am
17@@ -47,11 +47,11 @@ CwLnx_LDADD = libLCD.a libbignum.a
18 futaba_LDADD = @LIBUSB_LIBS@ @LIBUSB_1_0_LIBS@ libLCD.a
19 g15_LDADD = @LIBG15@
20 glcd_LDADD = libLCD.a @GLCD_DRIVERS@ @FT2_LIBS@ @LIBPNG_LIBS@ @LIBSERDISP@ @LIBUSB_LIBS@ @LIBX11_LIBS@
21-glcd_DEPENDENCIES = @GLCD_DRIVERS@ glcd-glcd-render.o
22+glcd_DEPENDENCIES = @GLCD_DRIVERS@ glcd-glcd-render.o libLCD.a
23 glcdlib_LDADD = @LIBGLCD@
24 glk_LDADD = libbignum.a
25 hd44780_LDADD = libLCD.a @HD44780_DRIVERS@ @HD44780_I2C@ @LIBUSB_LIBS@ @LIBFTDI_LIBS@ @LIBUGPIO@ libbignum.a
26-hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@
27+hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@ libLCD.a libbignum.a
28 i2500vfd_LDADD = @LIBFTDI_LIBS@
29 imon_LDADD = libLCD.a libbignum.a
30 imonlcd_LDADD = libLCD.a
31--
322.24.1
33
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch b/meta-oe/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch
deleted file mode 100644
index eb866bf10a..0000000000
--- a/meta-oe/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From d447a05ee560ba5894d2ed4cd93d0475c2f3c08e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 17 Dec 2019 17:39:32 -0800
4Subject: [PATCH 2/3] Include <limits.h> for PATH_MAX definition
5
6musl libc exposes the missing include
7
8Upstream-Status: Submitted [https://github.com/lcdproc/lcdproc/pull/142]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 server/drivers/hidraw_lib.c | 1 +
12 server/drivers/linux_input.c | 1 +
13 2 files changed, 2 insertions(+)
14
15diff --git a/server/drivers/hidraw_lib.c b/server/drivers/hidraw_lib.c
16index 49b03f20..3b51f279 100644
17--- a/server/drivers/hidraw_lib.c
18+++ b/server/drivers/hidraw_lib.c
19@@ -8,6 +8,7 @@
20 #include <dirent.h>
21 #include <errno.h>
22 #include <fcntl.h>
23+#include <limits.h>
24 #include <stdlib.h>
25 #include <string.h>
26 #include <sys/ioctl.h>
27diff --git a/server/drivers/linux_input.c b/server/drivers/linux_input.c
28index 5b914d4c..6fcfc591 100644
29--- a/server/drivers/linux_input.c
30+++ b/server/drivers/linux_input.c
31@@ -5,6 +5,7 @@
32
33 #include <dirent.h>
34 #include <errno.h>
35+#include <limits.h>
36 #include <stdint.h>
37 #include <stdio.h>
38 #include <stdlib.h>
39--
402.24.1
41
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch b/meta-oe/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch
deleted file mode 100644
index e39e9bda14..0000000000
--- a/meta-oe/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 7fd144f101fa5c9316d3468ed26f55629afe1305 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 17 Dec 2019 17:55:54 -0800
4Subject: [PATCH 3/3] Fix non x86 platforms on musl
5
6Musl only specifies in/outb for x86/x86. Use the fallback path in case
7musl is used.
8
9This should fail compilation during the linking stage but for some reason
10does not. Will do if -Werror=implicit-function-declaration is specified.
11
12Original here: https://github.com/openwrt/packages/blob/master/utils/lcdproc/patches/110-in-outb.patch
13Upstream-Status: Pending
14
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 server/drivers/port.h | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/server/drivers/port.h b/server/drivers/port.h
21index c584cd4e..bde235b3 100644
22--- a/server/drivers/port.h
23+++ b/server/drivers/port.h
24@@ -94,7 +94,7 @@ static inline int port_deny_multiple(unsigned short port, unsigned short count);
25 /* ---------------------------- Linux ------------------------------------ */
26 /* Use ioperm, inb and outb in <sys/io.h> (Linux) */
27 /* And iopl for higher addresses of PCI LPT cards */
28-#if defined HAVE_IOPERM
29+#if defined(__GLIBC__) || (defined(__x86__) || defined(__x86_64__))
30
31 /* Glibc2 and Glibc1 */
32 # ifdef HAVE_SYS_IO_H
33--
342.24.1
35
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb
deleted file mode 100644
index 275b984e47..0000000000
--- a/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb
+++ /dev/null
@@ -1,105 +0,0 @@
1DESCRIPTION = "LCDproc is a client/server suite to drive all kinds of LCD (-like) devices. The client \
2shipped with this package can be used to acquire various kinds of system stats."
3SUMMARY = "Drivers for character-based LCD displays"
4HOMEPAGE = "http://lcdproc.org"
5SECTION = "utils"
6LICENSE = "GPLv2+"
7DEPENDS = "ncurses lirc"
8
9LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \
10 file://README.md;beginline=107;md5=5db392f043253a2d64b1737068ce6b58"
11
12PV = "0.5.9+git${SRCPV}"
13SRCREV = "3a3d622d9bb74c44fa67bc20573751a207514134"
14SRC_URI = "git://github.com/lcdproc/lcdproc \
15 file://0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch \
16 file://0002-Include-limits.h-for-PATH_MAX-definition.patch \
17 file://0003-Fix-non-x86-platforms-on-musl.patch \
18 "
19
20S = "${WORKDIR}/git"
21
22inherit autotools pkgconfig update-rc.d
23
24LCD_DRIVERS ?= "all,!irman,!svga${SERIALVFD}"
25SERIALVFD ?= ""
26SERIALVFD_libc-musl = ",!serialVFD"
27SERIALVFD_libc-musl_x86 = ""
28SERIALVFD_libc-musl_x86-64 = ""
29
30LCD_DEFAULT_DRIVER ?= "curses"
31
32PACKAGECONFIG ??= "usb"
33PACKAGECONFIG[usb] = "--enable-libusb,--disable-libusb,virtual/libusb0"
34PACKAGECONFIG[ftdi] = "--enable-libftdi,--disable-libftdi,libftdi"
35PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render,"
36PACKAGECONFIG[hid] = "--enable-libhid,--disable-libhid,libhid"
37PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng"
38
39LCD_DRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}"
40
41EXTRA_OECONF = "--enable-drivers='${LCD_DRIVERS}'"
42
43do_install () {
44 # binaries
45 install -D -m 0755 server/LCDd ${D}${sbindir}/LCDd
46 install -D -m 0755 clients/lcdproc/lcdproc ${D}${bindir}/lcdproc
47
48 # init scripts
49 install -d ${D}${sysconfdir}/init.d
50 # so far, not fixed :-( and now even uglier :-((
51 cat scripts/init-LCDd.debian | sed -e s'/--oknodo//' -e 's/ -s -f / -s 1 -f 1 /' -e 's/force-reload/force-restart/' -e 's/sleep 1/sleep 4/' > ${D}${sysconfdir}/init.d/lcdd
52 chmod 0755 ${D}${sysconfdir}/init.d/lcdd
53 install -m 0755 scripts/init-lcdproc.debian ${D}${sysconfdir}/init.d/lcdproc
54 sed -i s'/--oknodo//' ${D}${sysconfdir}/init.d/lcdproc
55
56 # configuration files
57 install -m 0644 ${S}/LCDd.conf ${D}${sysconfdir}/LCDd.conf
58 sed -i 's!^DriverPath=.*!DriverPath=${libdir}/lcdproc/!' ${D}${sysconfdir}/LCDd.conf
59 sed -i 's!^Driver=.*!Driver=${LCD_DEFAULT_DRIVER}!' ${D}${sysconfdir}/LCDd.conf
60 install -m 0644 ${S}/clients/lcdproc/lcdproc.conf ${D}${sysconfdir}/lcdproc.conf
61
62 # driver library files
63 install -d ${D}${libdir}/lcdproc
64 for i in server/drivers/*.so; do
65 install -m 0644 $i ${D}${libdir}/lcdproc/
66 done
67 # binaries
68 install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc
69
70 # configuration files
71 install -D -m 0644 ${S}/clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf
72}
73
74PACKAGES =+ "lcdd lcdvc"
75
76RRECOMMENDS_${PN} = "lcdd"
77
78FILES_lcdd = "${sysconfdir}/LCDd.conf \
79 ${sbindir}/LCDd \
80 ${sysconfdir}/init.d/lcdd"
81
82CONFFILES_lcdd = "${sysconfdir}/LCDd.conf"
83CONFFILES_${PN} = "${sysconfdir}/lcdproc.conf"
84CONFFILES_lcdvc = "${sysconfdir}/lcdvc.conf"
85FILES_lcdvc = "${sysconfdir}/lcdvc.conf ${sbindir}/lcdvc"
86
87# Driver packages
88
89# USB / no USB trickery
90
91RCONFLICTS_lcdd-driver-hd47780nousb = "lcdd-driver-hd44780"
92RCONFLICTS_lcdd-driver-hd47780 = "lcdd-driver-hd44780nousb"
93
94INITSCRIPT_PACKAGES = "lcdd lcdproc"
95INITSCRIPT_NAME_lcdd = "lcdd"
96INITSCRIPT_NAME_lcdproc = "lcdproc"
97INITSCRIPT_PARAMS_lcdd = "defaults 70 21"
98INITSCRIPT_PARAMS_lcdproc = "defaults 71 20"
99
100python populate_packages_prepend() {
101 plugindir = d.expand('${libdir}/lcdproc')
102 do_split_packages(d, plugindir, '(.*)\.so$', 'lcdd-driver-%s', 'LCDd driver for %s', prepend=True)
103}
104
105PACKAGES_DYNAMIC += "^lcdd-driver-.*"