diff options
| author | Changqing Li <changqing.li@windriver.com> | 2020-03-11 16:42:05 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2020-03-11 08:58:57 -0700 |
| commit | d178745cbf5c97b7cdcf274108a58c8e1f88d3ca (patch) | |
| tree | ab1cf2f60e724eeecbfbf4a6c1973c4b5fee2c65 /meta-oe/recipes-connectivity | |
| parent | f5d2bf55a8169a9446c2f96f327b3e5d91a6e6cc (diff) | |
| download | meta-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-connectivity')
9 files changed, 0 insertions, 664 deletions
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch deleted file mode 100644 index 0e38f7d8ec..0000000000 --- a/meta-oe/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | From 50a48a7bd8d65a165ce2aac4ba0c1e02bded04aa Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 30 Nov 2019 12:21:31 -0800 | ||
| 4 | Subject: [PATCH] Fix build on 32bit arches with 64bit time_t | ||
| 5 | |||
| 6 | time element is deprecated on new input_event structure in kernel's | ||
| 7 | input.h [1] | ||
| 8 | |||
| 9 | [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | plugins/devinput.c | 7 ++++++- | ||
| 14 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/plugins/devinput.c b/plugins/devinput.c | ||
| 17 | index d4d733a..feb4a61 100644 | ||
| 18 | --- a/plugins/devinput.c | ||
| 19 | +++ b/plugins/devinput.c | ||
| 20 | @@ -34,6 +34,11 @@ | ||
| 21 | #include <linux/uinput.h> | ||
| 22 | #include <sys/stat.h> | ||
| 23 | |||
| 24 | +#ifndef input_event_sec | ||
| 25 | +#define input_event_sec time.tv_sec | ||
| 26 | +#define input_event_usec time.tv_usec | ||
| 27 | +#endif | ||
| 28 | + | ||
| 29 | #ifndef EV_SYN | ||
| 30 | /* previous name */ | ||
| 31 | #define EV_SYN EV_RST | ||
| 32 | @@ -459,7 +464,7 @@ char* devinput_rec(struct ir_remote* remotes) | ||
| 33 | return 0; | ||
| 34 | } | ||
| 35 | |||
| 36 | - log_trace("time %ld.%06ld type %d code %d value %d", event.time.tv_sec, event.time.tv_usec, event.type, | ||
| 37 | + log_trace("time %ld.%06ld type %d code %d value %d", event.input_event_sec, event.input_event_usec, event.type, | ||
| 38 | event.code, event.value); | ||
| 39 | |||
| 40 | value = (unsigned)event.value; | ||
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lirc.tmpfiles b/meta-oe/recipes-connectivity/lirc/lirc/lirc.tmpfiles deleted file mode 100644 index 0b80e2e479..0000000000 --- a/meta-oe/recipes-connectivity/lirc/lirc/lirc.tmpfiles +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | d /run/lirc 0755 root root - | ||
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lirc_options.conf b/meta-oe/recipes-connectivity/lirc/lirc/lirc_options.conf deleted file mode 100644 index d8ddedd8fa..0000000000 --- a/meta-oe/recipes-connectivity/lirc/lirc/lirc_options.conf +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | # These are the default options to lircd, if installed as | ||
| 2 | # /etc/lirc/lirc_options.conf. See the lircd(8) and lircmd(8) | ||
| 3 | # manpages for info on the different options. | ||
| 4 | |||
| 5 | [lircd] | ||
| 6 | nodaemon = False | ||
| 7 | permission = 666 | ||
| 8 | driver = default | ||
| 9 | device = /dev/lirc0 | ||
| 10 | output = /var/run/lirc/lircd | ||
| 11 | pidfile = /var/run/lirc/lircd.pid | ||
| 12 | plugindir = /usr/lib/lirc/plugins | ||
| 13 | allow-simulate = No | ||
| 14 | repeat-max = 600 | ||
| 15 | #listen = [address:]port | ||
| 16 | #connect = host[:port] | ||
| 17 | #debug = 5 | ||
| 18 | #uinput = ... | ||
| 19 | #release = ... | ||
| 20 | #logfile = ... | ||
| 21 | |||
| 22 | [lircmd] | ||
| 23 | uinput = False | ||
| 24 | nodeamon = False | ||
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lircd.conf b/meta-oe/recipes-connectivity/lirc/lirc/lircd.conf deleted file mode 100644 index 29b03c72a0..0000000000 --- a/meta-oe/recipes-connectivity/lirc/lirc/lircd.conf +++ /dev/null | |||
| @@ -1,315 +0,0 @@ | |||
| 1 | # contributed by angelo castello | ||
| 2 | # | ||
| 3 | # note: this config file has been deduced starting from the | ||
| 4 | # raw codes provided to run mode2 utility. | ||
| 5 | # | ||
| 6 | # brand: futarque | ||
| 7 | |||
| 8 | begin remote | ||
| 9 | name futarque | ||
| 10 | bits 8 | ||
| 11 | flags SPACE_ENC|CONST_LENGTH | ||
| 12 | eps 30 | ||
| 13 | aeps 100 | ||
| 14 | |||
| 15 | header 8048 3898 | ||
| 16 | one 555 1436 | ||
| 17 | zero 555 439 | ||
| 18 | gap 113123 | ||
| 19 | ptrail 555 | ||
| 20 | pre_data_bits 8 | ||
| 21 | pre_data 0x54 | ||
| 22 | pre 570 3890 | ||
| 23 | |||
| 24 | begin codes | ||
| 25 | MUTE 0x70 | ||
| 26 | EXIT 0xA8 | ||
| 27 | POWER 0xF0 | ||
| 28 | CHANNEL_UP 0x50 | ||
| 29 | CHANNEL_DOWN 0xD0 | ||
| 30 | VOLUME_UP 0x30 | ||
| 31 | VOLUME_DOWN 0xB0 | ||
| 32 | OK 0x98 | ||
| 33 | FAVORITES 0x04 | ||
| 34 | TEXT 0x68 | ||
| 35 | EPG 0xC8 | ||
| 36 | BACK 0x48 | ||
| 37 | MENU 0x88 | ||
| 38 | 1 0x00 | ||
| 39 | 2 0x80 | ||
| 40 | 3 0x40 | ||
| 41 | 4 0xC0 | ||
| 42 | 5 0x20 | ||
| 43 | 6 0xA0 | ||
| 44 | 7 0x60 | ||
| 45 | 8 0xE0 | ||
| 46 | 9 0x10 | ||
| 47 | 0 0x90 | ||
| 48 | PAUSE 0x84 | ||
| 49 | INFO 0x38 | ||
| 50 | RED 0xE8 | ||
| 51 | GREEN 0x08 | ||
| 52 | YELLOW 0x28 | ||
| 53 | BLUE 0x78 | ||
| 54 | UP 0xD8 | ||
| 55 | DOWN 0xB8 | ||
| 56 | REWIND 0x44 | ||
| 57 | FASTFORWARD 0x24 | ||
| 58 | PLAYPAUSE 0xC4 | ||
| 59 | STOP 0x64 | ||
| 60 | RECORD 0xA4 | ||
| 61 | AUDIO 0xE4 | ||
| 62 | TAPE 0x14 | ||
| 63 | DVD 0x94 | ||
| 64 | CAPITAL_A 0xF8 | ||
| 65 | CAPITAL_B 0x54 | ||
| 66 | end codes | ||
| 67 | |||
| 68 | end remote | ||
| 69 | |||
| 70 | # brand: STM PVR-1 | ||
| 71 | |||
| 72 | begin remote | ||
| 73 | name stm_pvr_1 | ||
| 74 | bits 16 | ||
| 75 | flags SPACE_ENC|CONST_LENGTH | ||
| 76 | eps 30 | ||
| 77 | aeps 150 | ||
| 78 | |||
| 79 | header 9000 4500 | ||
| 80 | one 572 1700 | ||
| 81 | zero 572 572 | ||
| 82 | ptrail 572 | ||
| 83 | repeat 9000 2200 | ||
| 84 | pre_data_bits 16 | ||
| 85 | pre_data 0xFE | ||
| 86 | gap 100000 | ||
| 87 | |||
| 88 | begin codes | ||
| 89 | POWER 0x00ff | ||
| 90 | FAVORITES 0x7887 | ||
| 91 | MUTE 0x28d7 | ||
| 92 | 0 0x708F | ||
| 93 | 1 0xc03f | ||
| 94 | 2 0x40bf | ||
| 95 | 3 0x807f | ||
| 96 | 4 0xe01f | ||
| 97 | 5 0x609f | ||
| 98 | 6 0xa05f | ||
| 99 | 7 0xd02f | ||
| 100 | 8 0x50af | ||
| 101 | 9 0x906f | ||
| 102 | INFO 0x38c7 | ||
| 103 | SUBTITLE 0xe817 | ||
| 104 | MENU 0x9867 | ||
| 105 | EXIT 0x20df | ||
| 106 | EPG 0xa857 | ||
| 107 | BACK 0x48b7 | ||
| 108 | CURSOR_UP 0x58a7 | ||
| 109 | CURSOR_DOWN 0xd827 | ||
| 110 | CURSOR_LEFT 0x8877 | ||
| 111 | CURSOR_RIGHT 0xb04f | ||
| 112 | OK 0x10ef | ||
| 113 | VOLUME_UP 0x22dd | ||
| 114 | VOLUME_DOWN 0x8a75 | ||
| 115 | CHANNEL_UP 0x12ed | ||
| 116 | CHANNEL_DOWN 0x4ab5 | ||
| 117 | TEXT 0xf00f | ||
| 118 | RADIO 0x926d | ||
| 119 | ZOOM 0x6897 | ||
| 120 | AUDIO 0x08f7 | ||
| 121 | RED 0x42bd | ||
| 122 | GREEN 0xa25d | ||
| 123 | YELLOW 0x827d | ||
| 124 | BLUE 0x02fd | ||
| 125 | CUSTOM0 0x52ad | ||
| 126 | CUSTOM1 0x30cf | ||
| 127 | PLAY 0x629d | ||
| 128 | PAUSE 0xb24d | ||
| 129 | PREVIOUS 0xc837 | ||
| 130 | NEXT 0xf807 | ||
| 131 | REWIND 0x32cd | ||
| 132 | FASTFORWARD 0x0af5 | ||
| 133 | AUX 0x7a85 | ||
| 134 | CUSTOM3 0xb847 | ||
| 135 | PIP 0x3ac5 | ||
| 136 | SWAP 0xba45 | ||
| 137 | end codes | ||
| 138 | |||
| 139 | end remote | ||
| 140 | |||
| 141 | # brand: STM DTV-2 | ||
| 142 | |||
| 143 | begin remote | ||
| 144 | |||
| 145 | name stm_dtv_2 | ||
| 146 | flags SHIFT_ENC|CONST_LENGTH | ||
| 147 | bits 13 | ||
| 148 | aeps 150 | ||
| 149 | |||
| 150 | one 850 850 | ||
| 151 | zero 850 850 | ||
| 152 | plead 850 | ||
| 153 | gap 67800 | ||
| 154 | toggle_bit 2 | ||
| 155 | |||
| 156 | begin codes | ||
| 157 | POWER 0x100C | ||
| 158 | FAVORITES 0x1015 | ||
| 159 | AUX 0x1038 | ||
| 160 | 1 0x1001 | ||
| 161 | 2 0x1002 | ||
| 162 | 3 0x1003 | ||
| 163 | 4 0x1004 | ||
| 164 | 5 0x1005 | ||
| 165 | 6 0x1006 | ||
| 166 | 7 0x1007 | ||
| 167 | 8 0x1008 | ||
| 168 | 9 0x1009 | ||
| 169 | PERIOD 0x1024 | ||
| 170 | 0 0x103E | ||
| 171 | BACK 0x1023 | ||
| 172 | MENU 0x1016 | ||
| 173 | INFO 0x100F | ||
| 174 | EPG 0x101E | ||
| 175 | EXIT 0x1018 | ||
| 176 | CURSOR_UP 0x1017 | ||
| 177 | CURSOR_DOWN 0x101D | ||
| 178 | CURSOR_LEFT 0x1019 | ||
| 179 | CURSOR_RIGHT 0x101B | ||
| 180 | OK 0x101A | ||
| 181 | VOLUME_UP 0x1010 | ||
| 182 | VOLUME_DOWN 0x1011 | ||
| 183 | CHANNEL_UP 0x1020 | ||
| 184 | CHANNEL_DOWN 0x1021 | ||
| 185 | TEXT 0x102E | ||
| 186 | SUBTITLE 0x103C | ||
| 187 | FREEZE 0x1014 | ||
| 188 | ZOOM 0x102B | ||
| 189 | RED 0x1028 | ||
| 190 | GREEN 0x102A | ||
| 191 | YELLOW 0x102F | ||
| 192 | BLUE 0x1030 | ||
| 193 | CUSTOM10 0x1022 | ||
| 194 | INTERNET 0x1027 | ||
| 195 | CUSTOM11 0x102C | ||
| 196 | AUDIO 0x1025 | ||
| 197 | RECORD 0x102D | ||
| 198 | PLAYPAUSE 0x1029 | ||
| 199 | STOP 0x1026 | ||
| 200 | CUSTOM1 0x101C | ||
| 201 | MUTE 0x100d | ||
| 202 | CUSTOM12 0x101F | ||
| 203 | PIP 0x100B | ||
| 204 | SWAP 0x100E | ||
| 205 | end codes | ||
| 206 | |||
| 207 | end remote | ||
| 208 | |||
| 209 | # brand: Comcast | ||
| 210 | # model no. of remote control: XR2 | ||
| 211 | # 32 bits for the pre-date (should be value 0x170F443E) | ||
| 212 | # width between pre_bits and data: 12900 microseconds | ||
| 213 | # | ||
| 214 | # 24 bits for the data (key code) | ||
| 215 | # To get key REPEAT, XOR 0x088 with KEY value | ||
| 216 | # There are 8 post bits (both should be zero) | ||
| 217 | # | ||
| 218 | # Gap between keys: 8100 microseconds | ||
| 219 | begin remote | ||
| 220 | |||
| 221 | name Xfinity-XR2 | ||
| 222 | bits 24 | ||
| 223 | flags XMP | ||
| 224 | eps 20 | ||
| 225 | aeps 300 | ||
| 226 | |||
| 227 | one 0 137 | ||
| 228 | zero 250 710 | ||
| 229 | ptrail 250 | ||
| 230 | pre_data_bits 32 | ||
| 231 | pre_data 0x170F443E | ||
| 232 | post_data_bits 8 | ||
| 233 | post_data 0x0 | ||
| 234 | pre 250 12921 | ||
| 235 | gap 81698 | ||
| 236 | toggle_bit_mask 0x0 | ||
| 237 | |||
| 238 | begin codes | ||
| 239 | 1 0x1E0001 | ||
| 240 | 1_repeat 0x168001 | ||
| 241 | 2 0x1D0002 | ||
| 242 | 2_repeat 0x158002 | ||
| 243 | 3 0x1C0003 | ||
| 244 | 3_repeat 0x148003 | ||
| 245 | 4 0x1B0004 | ||
| 246 | 4_repeat 0x138004 | ||
| 247 | 5 0x1A0005 | ||
| 248 | 5_repeat 0x128005 | ||
| 249 | 6 0x190006 | ||
| 250 | 6_repeat 0x118006 | ||
| 251 | 7 0x180007 | ||
| 252 | 7_repeat 0x108007 | ||
| 253 | 8 0x170008 | ||
| 254 | 8_repeat 0x1F8008 | ||
| 255 | 9 0x160009 | ||
| 256 | 9_repeat 0x1E8009 | ||
| 257 | 0 0x1F0000 | ||
| 258 | 0_repeat 0x178000 | ||
| 259 | OK 0x180025 | ||
| 260 | OK_repeat 0x108025 | ||
| 261 | POWER 0x10000F | ||
| 262 | POWER_repeat 0x18800F | ||
| 263 | UP 0x1C0021 | ||
| 264 | UP_repeat 0x148021 | ||
| 265 | DOWN 0x1B0022 | ||
| 266 | DOWN_repeat 0x138022 | ||
| 267 | LEFT 0x1A0023 | ||
| 268 | LEFT_repeat 0x128023 | ||
| 269 | RIGHT 0x190024 | ||
| 270 | RIGHT_repeat 0x118024 | ||
| 271 | REWIND 0x190033 | ||
| 272 | REWIND_repeat 0x118033 | ||
| 273 | PLAY 0x1C0030 | ||
| 274 | PLAY_repeat 0x148030 | ||
| 275 | FASTFORWARD 0x180034 | ||
| 276 | FASTFORWARD_repeat 0x108034 | ||
| 277 | RECORD 0x170035 | ||
| 278 | RECORD_repeat 0x1F8035 | ||
| 279 | REPLAY 0x170053 | ||
| 280 | REPLAY_repeat 0x1F8053 | ||
| 281 | A 0x190060 | ||
| 282 | A_repeat 0x118060 | ||
| 283 | B 0x180061 | ||
| 284 | B_repeat 0x108061 | ||
| 285 | C 0x170062 | ||
| 286 | C_repeat 0x1F8062 | ||
| 287 | D 0x160063 | ||
| 288 | D_repeat 0x1E8063 | ||
| 289 | PAGE_UP 0x150028 | ||
| 290 | PAGE_UP_repeat 0x1D8028 | ||
| 291 | PAGE_DOWN 0x140029 | ||
| 292 | PAGE_DOWN_repeat 0x1C8029 | ||
| 293 | GUIDE 0x160027 | ||
| 294 | GUIDE_repeat 0x1E8027 | ||
| 295 | MENU 0x1D0020 | ||
| 296 | MENU_repeat 0x158020 | ||
| 297 | EXIT 0x13002A | ||
| 298 | EXIT_repeat 0x1B802A | ||
| 299 | INFO 0x170026 | ||
| 300 | INFO_repeat 0x1F8026 | ||
| 301 | LAST 0x190051 | ||
| 302 | LAST_repeat 0x118051 | ||
| 303 | VOLUME_UP 0x15000A | ||
| 304 | VOLUME_UP_repeat 0x1D800A | ||
| 305 | CHANNEL_UP 0x12000D | ||
| 306 | CHANNEL_UP_repeat 0x1A800D | ||
| 307 | VOLUME_DOWN 0x14000B | ||
| 308 | VOLUME_DOWN_repeat 0x1C800B | ||
| 309 | CHANNEL_DOWN 0x11000E | ||
| 310 | CHANNEL_DOWN_repeat 0x19800E | ||
| 311 | MUTE 0x13000C | ||
| 312 | MUTE_repeat 0x1B800D | ||
| 313 | end codes | ||
| 314 | |||
| 315 | end remote | ||
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lircd.init b/meta-oe/recipes-connectivity/lirc/lirc/lircd.init deleted file mode 100644 index 8b124af6f2..0000000000 --- a/meta-oe/recipes-connectivity/lirc/lirc/lircd.init +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | #! /bin/sh | ||
| 2 | # | ||
| 3 | # This is an init script for Familiar | ||
| 4 | # Copy it to /etc/init.d/lircd and type | ||
| 5 | # > update-rc.d lircd defaults 20 | ||
| 6 | # | ||
| 7 | |||
| 8 | |||
| 9 | test -f /usr/sbin/lircd || exit 0 | ||
| 10 | test -f /etc/lircd.conf || exit 0 | ||
| 11 | |||
| 12 | case "$1" in | ||
| 13 | start) | ||
| 14 | echo -n "Starting lirc daemon: lircd" | ||
| 15 | start-stop-daemon --start --quiet --exec /usr/sbin/lircd -- --device=/dev/lirc0 | ||
| 16 | echo "." | ||
| 17 | ;; | ||
| 18 | stop) | ||
| 19 | echo -n "Stopping lirc daemon: lircd" | ||
| 20 | start-stop-daemon --stop --quiet --exec /usr/sbin/lircd | ||
| 21 | echo "." | ||
| 22 | ;; | ||
| 23 | reload|force-reload) | ||
| 24 | start-stop-daemon --stop --quiet --signal 1 --exec /usr/sbin/lircd | ||
| 25 | ;; | ||
| 26 | restart) | ||
| 27 | echo -n "Stopping lirc daemon: lircd" | ||
| 28 | start-stop-daemon --stop --quiet --exec /usr/sbin/lircd | ||
| 29 | sleep 1 | ||
| 30 | echo -n "Starting lirc daemon: lircd" | ||
| 31 | start-stop-daemon --start --quiet --exec /usr/sbin/lircd -- --device=/dev/lirc0 | ||
| 32 | echo "." | ||
| 33 | ;; | ||
| 34 | *) | ||
| 35 | echo "Usage: /etc/init.d/lircd {start|stop|reload|restart|force-reload}" | ||
| 36 | exit 1 | ||
| 37 | esac | ||
| 38 | |||
| 39 | exit 0 | ||
| 40 | |||
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lircd.service b/meta-oe/recipes-connectivity/lirc/lirc/lircd.service deleted file mode 100644 index c8661368bb..0000000000 --- a/meta-oe/recipes-connectivity/lirc/lirc/lircd.service +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | [Unit] | ||
| 2 | Description=LIRC Infrared Signal Decoder | ||
| 3 | After=network.target | ||
| 4 | |||
| 5 | [Service] | ||
| 6 | Type=forking | ||
| 7 | EnvironmentFile=/etc/lirc/lircd.conf | ||
| 8 | PIDFile=/run/lirc/lircd.pid | ||
| 9 | ExecStartPre=/bin/mkdir -p /run/lirc | ||
| 10 | ExecStartPre=/bin/rm -f /dev/lircd | ||
| 11 | ExecStartPre=/bin/rm -f /run/lirc/lircd | ||
| 12 | ExecStartPre=/bin/ln -s /run/lirc/lircd /dev/lircd | ||
| 13 | |||
| 14 | ExecStart=/usr/sbin/lircd --pidfile=/run/lirc/lircd.pid --device=/dev/lirc0 | ||
| 15 | |||
| 16 | ExecStopPost=/bin/rm -f /dev/lircd | ||
| 17 | ExecStopPost=/bin/rm -fR /run/lirc | ||
| 18 | |||
| 19 | [Install] | ||
| 20 | WantedBy=multi-user.target | ||
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/lircexec.init b/meta-oe/recipes-connectivity/lirc/lirc/lircexec.init deleted file mode 100644 index 3a8c1a306e..0000000000 --- a/meta-oe/recipes-connectivity/lirc/lirc/lircexec.init +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | #! /bin/sh | ||
| 2 | # | ||
| 3 | # This is an init script for Familiar | ||
| 4 | # Copy it to /etc/init.d/lircexecd and type | ||
| 5 | # > update-rc.d lircexecd defaults 20 | ||
| 6 | # It must be started after lircd (and it does alphabetically :-) | ||
| 7 | # irexec reads /etc/lircrc by default | ||
| 8 | |||
| 9 | |||
| 10 | test -f /usr/bin/irexec || exit 0 | ||
| 11 | test -f /etc/lircrc || exit 0 | ||
| 12 | |||
| 13 | case "$1" in | ||
| 14 | start) | ||
| 15 | echo -n "Starting lircexec daemon: irexec" | ||
| 16 | start-stop-daemon --start --quiet --exec /usr/bin/irexec -- --daemon | ||
| 17 | echo "." | ||
| 18 | ;; | ||
| 19 | stop) | ||
| 20 | echo -n "Stopping lircexec daemon: irexec" | ||
| 21 | start-stop-daemon --stop --quiet --exec /usr/bin/irexec | ||
| 22 | echo "." | ||
| 23 | ;; | ||
| 24 | restart|force-restart) | ||
| 25 | echo -n "Stopping lircexec daemon: irexec" | ||
| 26 | start-stop-daemon --stop --quiet --exec /usr/bin/irexec | ||
| 27 | sleep 1 | ||
| 28 | echo -n "Starting lircexec daemon: irexec" | ||
| 29 | start-stop-daemon --start --quiet --exec /usr/bin/irexec -- --daemon | ||
| 30 | echo "." | ||
| 31 | ;; | ||
| 32 | *) | ||
| 33 | echo "Usage: /etc/init.d/lircexec {start|stop|reload|restart|force-restart}" | ||
| 34 | exit 1 | ||
| 35 | esac | ||
| 36 | |||
| 37 | exit 0 | ||
diff --git a/meta-oe/recipes-connectivity/lirc/lirc/pollfd.patch b/meta-oe/recipes-connectivity/lirc/lirc/pollfd.patch deleted file mode 100644 index 4feea80346..0000000000 --- a/meta-oe/recipes-connectivity/lirc/lirc/pollfd.patch +++ /dev/null | |||
| @@ -1,101 +0,0 @@ | |||
| 1 | Index: lirc-0.9.4d/daemons/lircrcd.cpp | ||
| 2 | =================================================================== | ||
| 3 | --- lirc-0.9.4d.orig/daemons/lircrcd.cpp | ||
| 4 | +++ lirc-0.9.4d/daemons/lircrcd.cpp | ||
| 5 | @@ -29,10 +29,12 @@ | ||
| 6 | #include <sys/un.h> | ||
| 7 | #include <sys/stat.h> | ||
| 8 | #include <sys/types.h> | ||
| 9 | +#include <poll.h> | ||
| 10 | #include <syslog.h> | ||
| 11 | |||
| 12 | #include "lirc_client.h" | ||
| 13 | #include "lirc/lirc_log.h" | ||
| 14 | +#include "lirc/curl_poll.h" | ||
| 15 | |||
| 16 | #define MAX_CLIENTS 100 | ||
| 17 | #define WHITE_SPACE " \t" | ||
| 18 | Index: lirc-0.9.4d/lib/curl_poll.c | ||
| 19 | =================================================================== | ||
| 20 | --- lirc-0.9.4d.orig/lib/curl_poll.c | ||
| 21 | +++ lirc-0.9.4d/lib/curl_poll.c | ||
| 22 | @@ -36,6 +36,7 @@ | ||
| 23 | #include <stdlib.h> | ||
| 24 | #include <sys/time.h> | ||
| 25 | #include <sys/types.h> | ||
| 26 | +#include <sys/poll.h> | ||
| 27 | |||
| 28 | #include "lirc_log.h" | ||
| 29 | #include "curl_poll.h" | ||
| 30 | @@ -67,7 +68,7 @@ static const logchannel_t logchannel = L | ||
| 31 | |||
| 32 | #ifdef HAVE_POLL_FINE | ||
| 33 | |||
| 34 | -int curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms) | ||
| 35 | +int curl_poll(struct pollfd *ufds, unsigned int nfds, int timeout_ms) | ||
| 36 | { | ||
| 37 | return poll(ufds, nfds, timeout_ms); | ||
| 38 | } | ||
| 39 | @@ -112,7 +113,7 @@ static int verify_sock(int s) | ||
| 40 | } | ||
| 41 | |||
| 42 | |||
| 43 | -int curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms) | ||
| 44 | +int curl_poll(struct pollfd *ufds, unsigned int nfds, int timeout_ms) | ||
| 45 | { | ||
| 46 | struct timeval pending_tv; | ||
| 47 | struct timeval* ptimeout; | ||
| 48 | Index: lirc-0.9.4d/lib/curl_poll.h | ||
| 49 | =================================================================== | ||
| 50 | --- lirc-0.9.4d.orig/lib/curl_poll.h | ||
| 51 | +++ lirc-0.9.4d/lib/curl_poll.h | ||
| 52 | @@ -1,5 +1,5 @@ | ||
| 53 | -#ifndef _POLL_H | ||
| 54 | -#define _POLL_H | ||
| 55 | +#ifndef _LIB_CURL_POLL_H | ||
| 56 | +#define _LIB_CURL_POLL_H | ||
| 57 | /*************************************************************************** | ||
| 58 | * _ _ ____ _ | ||
| 59 | * Project ___| | | | _ \| | | ||
| 60 | @@ -29,13 +29,9 @@ | ||
| 61 | extern "C" { | ||
| 62 | #endif | ||
| 63 | |||
| 64 | -#ifdef HAVE_SYS_POLL_H | ||
| 65 | -#include <sys/poll.h> | ||
| 66 | -#else | ||
| 67 | #include <poll.h> | ||
| 68 | -#endif | ||
| 69 | |||
| 70 | -int curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms); | ||
| 71 | +int curl_poll(struct pollfd *ufds, unsigned int nfds, int timeout_ms); | ||
| 72 | |||
| 73 | #ifdef __cplusplus | ||
| 74 | } | ||
| 75 | Index: lirc-0.9.4d/lib/lirc/curl_poll.h | ||
| 76 | =================================================================== | ||
| 77 | --- lirc-0.9.4d.orig/lib/lirc/curl_poll.h | ||
| 78 | +++ lirc-0.9.4d/lib/lirc/curl_poll.h | ||
| 79 | @@ -1,5 +1,5 @@ | ||
| 80 | -#ifndef _POLL_H | ||
| 81 | -#define _POLL_H | ||
| 82 | +#ifndef _LIRC_CURL_POLL_H | ||
| 83 | +#define _LIRC_CURL_POLL_H | ||
| 84 | /*************************************************************************** | ||
| 85 | * _ _ ____ _ | ||
| 86 | * Project ___| | | | _ \| | | ||
| 87 | @@ -29,13 +29,9 @@ | ||
| 88 | extern "C" { | ||
| 89 | #endif | ||
| 90 | |||
| 91 | -#ifdef HAVE_SYS_POLL_H | ||
| 92 | -#include <sys/poll.h> | ||
| 93 | -#else | ||
| 94 | #include <poll.h> | ||
| 95 | -#endif | ||
| 96 | |||
| 97 | -int curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms); | ||
| 98 | +int curl_poll(struct pollfd *ufds, unsigned int nfds, int timeout_ms); | ||
| 99 | |||
| 100 | #ifdef __cplusplus | ||
| 101 | } | ||
diff --git a/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb b/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb deleted file mode 100644 index f599696737..0000000000 --- a/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb +++ /dev/null | |||
| @@ -1,86 +0,0 @@ | |||
| 1 | DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls." | ||
| 2 | DESCRIPTION_append_lirc = " This package contains the lirc daemon, libraries and tools." | ||
| 3 | DESCRIPTION_append_lirc-exec = " This package contains a daemon that runs programs on IR signals." | ||
| 4 | DESCRIPTION_append_lirc-remotes = " This package contains some config files for remotes." | ||
| 5 | DESCRIPTION_append_lirc-nslu2example = " This package contains a working config for RC5 remotes and a modified NSLU2." | ||
| 6 | HOMEPAGE = "http://www.lirc.org" | ||
| 7 | SECTION = "console/network" | ||
| 8 | LICENSE = "GPLv2" | ||
| 9 | DEPENDS = "libxslt-native alsa-lib libftdi libusb1 libusb-compat jack portaudio-v19 python3-pyyaml" | ||
| 10 | |||
| 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
| 12 | |||
| 13 | SRC_URI = "http://prdownloads.sourceforge.net/lirc/lirc-${PV}.tar.bz2 \ | ||
| 14 | file://pollfd.patch \ | ||
| 15 | file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ | ||
| 16 | file://lircd.service \ | ||
| 17 | file://lircd.init \ | ||
| 18 | file://lircexec.init \ | ||
| 19 | file://lircd.conf \ | ||
| 20 | file://lirc_options.conf \ | ||
| 21 | file://lirc.tmpfiles \ | ||
| 22 | " | ||
| 23 | SRC_URI[md5sum] = "0d11679cbdd94a5a6da00a8e7231b4bf" | ||
| 24 | SRC_URI[sha256sum] = "c68f18c35b489b865c0a741d119b136e8702191538cd3551b977a7af6c4e41ab" | ||
| 25 | |||
| 26 | SYSTEMD_PACKAGES = "lirc lirc-exec" | ||
| 27 | SYSTEMD_SERVICE_${PN} = "lircd.service lircmd.service lircd-setup.service lircd-uinput.service" | ||
| 28 | SYSTEMD_SERVICE_${PN}-exec = "irexec.service" | ||
| 29 | SYSTEMD_AUTO_ENABLE_lirc = "enable" | ||
| 30 | SYSTEMD_AUTO_ENABLE_lirc-exec = "enable" | ||
| 31 | |||
| 32 | inherit autotools pkgconfig systemd python3native | ||
| 33 | |||
| 34 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd" | ||
| 35 | PACKAGECONFIG[x11] = "--with-x,--with-x=no,libx11," | ||
| 36 | |||
| 37 | PACKAGECONFIG ?= " \ | ||
| 38 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)} \ | ||
| 39 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' x11', '', d)} \ | ||
| 40 | " | ||
| 41 | CACHED_CONFIGUREVARS = "HAVE_WORKING_POLL=yes" | ||
| 42 | |||
| 43 | #EXTRA_OEMAKE = 'SUBDIRS="lib daemons tools"' | ||
| 44 | do_install_append() { | ||
| 45 | install -m 0755 -d ${D}${sysconfdir} | ||
| 46 | install -m 0755 -d ${D}${sysconfdir}/lirc | ||
| 47 | install -m 0755 -d ${D}${systemd_unitdir}/system | ||
| 48 | install -m 0755 -d ${D}${libdir}/tmpfiles.d | ||
| 49 | install -m 0644 ${WORKDIR}/lircd.conf ${D}${sysconfdir}/lirc/ | ||
| 50 | install -m 0644 ${WORKDIR}/lirc_options.conf ${D}${sysconfdir}/lirc/ | ||
| 51 | install -m 0644 ${WORKDIR}/lircd.service ${D}${systemd_unitdir}/system/ | ||
| 52 | install -m 0755 ${WORKDIR}/lircexec.init ${D}${systemd_unitdir}/system/ | ||
| 53 | install -m 0644 ${WORKDIR}/lirc.tmpfiles ${D}${libdir}/tmpfiles.d/lirc.conf | ||
| 54 | rm -rf ${D}${libdir}/lirc/plugins/*.la | ||
| 55 | rmdir ${D}/var/run/lirc ${D}/var/run | ||
| 56 | chown -R root:root ${D}${datadir}/lirc/contrib | ||
| 57 | } | ||
| 58 | |||
| 59 | PACKAGES =+ "${PN}-contrib ${PN}-exec ${PN}-plugins ${PN}-python" | ||
| 60 | |||
| 61 | RDEPENDS_${PN} = "bash" | ||
| 62 | RDEPENDS_${PN}-exec = "${PN}" | ||
| 63 | RDEPENDS_${PN}-python = "python3-shell python3-pyyaml python3-datetime python3-netclient python3-stringold" | ||
| 64 | |||
| 65 | RRECOMMENDS_${PN} = "${PN}-exec ${PN}-plugins" | ||
| 66 | |||
| 67 | FILES_${PN}-plugins = "${libdir}/lirc/plugins/*.so ${datadir}/lirc/configs" | ||
| 68 | FILES_${PN}-contrib = "${datadir}/lirc/contrib" | ||
| 69 | FILES_${PN}-exec = "${bindir}/irexec ${sysconfdir}/lircexec ${systemd_unitdir}/system/irexec.service" | ||
| 70 | FILES_${PN} += "${systemd_unitdir}/system/lircexec.init" | ||
| 71 | FILES_${PN} += "${systemd_unitdir}/system/lircd.service" | ||
| 72 | FILES_${PN} += "${systemd_unitdir}/system/lircd.socket" | ||
| 73 | FILES_${PN} += "${libdir}/tmpfiles.d/lirc.conf" | ||
| 74 | FILES_${PN}-dbg += "${libdir}/lirc/plugins/.debug" | ||
| 75 | FILES_${PN}-python += "${bindir}/irdb-get ${bindir}/irtext2udp ${bindir}/lircd-setup ${bindir}/pronto2lirc ${libdir}/python*/site-packages" | ||
| 76 | |||
| 77 | INITSCRIPT_PACKAGES = "lirc lirc-exec" | ||
| 78 | INITSCRIPT_NAME_lirc-exec = "lircexec" | ||
| 79 | INITSCRIPT_PARAMS_lirc-exec = "defaults 21" | ||
| 80 | |||
| 81 | # this is for distributions that don't use udev | ||
| 82 | pkg_postinst_${PN}_append() { | ||
| 83 | if [ ! -c $D/dev/lirc -a ! -f /sbin/udevd ]; then mknod $D/dev/lirc c 61 0; fi | ||
| 84 | } | ||
| 85 | |||
| 86 | SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" | ||
