summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/irda-utils
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-05-14 11:45:48 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-15 17:53:29 +0100
commit2537269bf53b99827191390ce9f9205cc821ec54 (patch)
tree99044198feaa3dff917dcff7d93f66c1ef90a22f /meta/recipes-connectivity/irda-utils
parent92cc79f4e645b0d4bc59c1b2f12562acbae08fbe (diff)
downloadpoky-2537269bf53b99827191390ce9f9205cc821ec54.tar.gz
Remove irda-utils and the irda feature
IrDA support was removed in kernel 4.17. (From OE-Core rev: 9609256bfcfbb3860f68f1d8e553e9dd051ad218) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/irda-utils')
-rwxr-xr-xmeta/recipes-connectivity/irda-utils/irda-utils-0.9.18/init78
-rw-r--r--meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch87
-rw-r--r--meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/musl.patch29
-rw-r--r--meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb51
4 files changed, 0 insertions, 245 deletions
diff --git a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/init b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/init
deleted file mode 100755
index 6f29e9c6ed..0000000000
--- a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/init
+++ /dev/null
@@ -1,78 +0,0 @@
1#! /bin/sh
2### BEGIN INIT INFO
3# Provides: irda
4# Required-Start: $network $remote_fs
5# Required-Stop: $network $remote_fs
6# Default-Start: 2 3 4 5
7# Default-Stop: 0 1 6
8# Short-Description: Infrared port support
9### END INIT INFO
10
11NAME="irattach"
12test -x "$IRDA_DAEMON" || IRDA_DAEMON=/usr/sbin/irattach
13test -z "$IRATTACH_PID" && IRATTACH_PID=/var/run/irattach.pid
14
15# Source function library.
16. /etc/init.d/functions
17
18module_id() {
19 awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
20}
21
22if [ ! -f /etc/sysconfig/irda ]; then
23 case `module_id` in
24 "HP iPAQ H2200" | "HP iPAQ HX4700" | "HTC Universal")
25 IRDA=yes
26 DEVICE=/dev/ttyS2
27 DONGLE=
28 DISCOVERY=
29 ;;
30 *)
31 IRDA=yes
32 DEVICE=/dev/ttyS1
33 DONGLE=
34 DISCOVERY=
35 ;;
36 esac
37else
38 . /etc/sysconfig/irda
39fi
40
41# Check that irda is up.
42[ ${IRDA} = "no" ] && exit 0
43
44[ -f /usr/sbin/irattach ] || exit 0
45
46ARGS=
47if [ $DONGLE ]; then
48 ARGS="$ARGS -d $DONGLE"
49fi
50if [ "$DISCOVERY" = "yes" ];then
51 ARGS="$ARGS -s"
52fi
53
54case "$1" in
55 start)
56 echo -n "Starting IrDA: $NAME"
57 start-stop-daemon --start --quiet --exec "$IRDA_DAEMON" ${DEVICE} ${ARGS} --pidfile "$IRATTACH_PID"
58 sleep 1
59 [ -f /var/run/irattach.pid ] && echo " done" || echo " fail"
60 ;;
61 stop)
62 echo "Stopping IrDA: $NAME"
63 start-stop-daemon --stop --quiet --exec "$IRDA_DAEMON" --pidfile "$IRATTACH_PID"
64 ;;
65 restart|force-reload)
66 $0 stop
67 $0 start
68 ;;
69 status)
70 status irattach
71 exit $?
72 ;;
73 *)
74 N=/etc/init.d/$NAME
75 echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
76 exit 1
77 ;;
78esac
diff --git a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
deleted file mode 100644
index b246de8f5f..0000000000
--- a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
+++ /dev/null
@@ -1,87 +0,0 @@
1Obey LDFLAGS
2
3Signed-off-by: Christopher Larson <chris_larson@mentor.com>
4Upstream-Status: Pending
5
6Index: irda-utils-0.9.18/findchip/Makefile
7===================================================================
8--- irda-utils-0.9.18.orig/findchip/Makefile
9+++ irda-utils-0.9.18/findchip/Makefile
10@@ -65,5 +65,5 @@ install: findchip
11
12 gfindchip: gfindchip.c
13 $(prn_cc)
14- $(ECMD))$(CC) $(CFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs`
15+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs`
16
17Index: irda-utils-0.9.18/irattach/Makefile
18===================================================================
19--- irda-utils-0.9.18.orig/irattach/Makefile
20+++ irda-utils-0.9.18/irattach/Makefile
21@@ -49,13 +49,13 @@ all: $(TARGETS)
22
23 irattach: irattach.o util.o
24 $(prn_cc_o)
25- $(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@
26+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@
27
28
29
30 dongle_attach: dongle_attach.o
31 $(prn_cc_o)
32- $(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@
33+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@
34
35
36 install: $(TARGETS)
37Index: irda-utils-0.9.18/irdadump/Makefile
38===================================================================
39--- irda-utils-0.9.18.orig/irdadump/Makefile
40+++ irda-utils-0.9.18/irdadump/Makefile
41@@ -40,7 +40,7 @@ lib_irdadump.a: $(LIBIRDADUMP_OBJS)
42
43 irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
44 $(prn_cc_o)
45- $(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
46+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
47
48
49 .c.o:
50Index: irda-utils-0.9.18/irdaping/Makefile
51===================================================================
52--- irda-utils-0.9.18.orig/irdaping/Makefile
53+++ irda-utils-0.9.18/irdaping/Makefile
54@@ -56,7 +56,7 @@ all: $(TARGETS)
55
56 irdaping: $(OBJS)
57 $(prn_cc_o)
58- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
59+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
60
61
62 .c.o:
63Index: irda-utils-0.9.18/irnetd/Makefile
64===================================================================
65--- irda-utils-0.9.18.orig/irnetd/Makefile
66+++ irda-utils-0.9.18/irnetd/Makefile
67@@ -50,7 +50,7 @@ all: $(TARGETS)
68
69 irnetd: $(OBJS)
70 $(prn_cc_o)
71- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
72+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
73
74
75 install: irnetd
76Index: irda-utils-0.9.18/psion/Makefile
77===================================================================
78--- irda-utils-0.9.18.orig/psion/Makefile
79+++ irda-utils-0.9.18/psion/Makefile
80@@ -25,4 +25,4 @@ install: $(PSION_TARGETS)
81 CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
82 irpsion5:
83 $(prn_cc_o)
84- $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@
85\ No newline at end of file
86+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(PSION_SRC) -o $@
87\ No newline at end of file
diff --git a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/musl.patch b/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/musl.patch
deleted file mode 100644
index 97eb975023..0000000000
--- a/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/musl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Replace use of <net/if_packet.h> with <linux/if_packet.h>.
2
3kernel headers <linux/if_packet.h> already provides the
4needed definitions, moreover not all libc implementations
5provide if_packet.h e.g. musl
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8Upstream-Status: Pending
9
10Index: irda-utils-0.9.18/irdaping/irdaping.c
11===================================================================
12--- irda-utils-0.9.18.orig/irdaping/irdaping.c
13+++ irda-utils-0.9.18/irdaping/irdaping.c
14@@ -33,7 +33,6 @@
15 #include <sys/socket.h>
16 #include <sys/ioctl.h>
17 #include <net/if.h> /* For struct ifreq */
18-#include <net/if_packet.h> /* For struct sockaddr_pkt */
19 #include <net/if_arp.h> /* For ARPHRD_IRDA */
20 #include <netinet/if_ether.h> /* For ETH_P_ALL */
21 #include <netinet/in.h> /* For htons */
22@@ -46,6 +45,7 @@
23 #include <asm/byteorder.h> /* __cpu_to_le32 and co. */
24
25 #include <linux/types.h> /* For __u8 and co. */
26+#include <linux/if_packet.h> /* For struct sockaddr_pkt */
27 #include <irda.h>
28
29 #ifndef AF_IRDA
diff --git a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb b/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
deleted file mode 100644
index 11b2ee9117..0000000000
--- a/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
+++ /dev/null
@@ -1,51 +0,0 @@
1SUMMARY = "Common files for IrDA"
2DESCRIPTION = "Provides common files needed to use IrDA. \
3IrDA allows communication over Infrared with other devices \
4such as phones and laptops."
5HOMEPAGE = "http://irda.sourceforge.net/"
6BUGTRACKER = "http://sourceforge.net/p/irda/bugs/"
7SECTION = "base"
8LICENSE = "GPLv2+"
9LIC_FILES_CHKSUM = "file://irdadump/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
10 file://smcinit/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
11 file://man/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
12 file://irdadump/irdadump.c;beginline=1;endline=24;md5=d78b9dce3cd78c2220250c9c7a2be178"
13
14SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
15 file://ldflags.patch \
16 file://musl.patch \
17 file://init"
18
19SRC_URI[md5sum] = "84dc12aa4c3f61fccb8d8919bf4079bb"
20SRC_URI[sha256sum] = "61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6"
21
22inherit update-rc.d
23
24EXTRA_OEMAKE = "\
25 'CC=${CC}' \
26 'LD=${LD}' \
27 'CFLAGS=${CFLAGS}' \
28 'LDFLAGS=${LDFLAGS}' \
29 'SYS_INCLUDES=' \
30 'V=1' \
31"
32
33INITSCRIPT_NAME = "irattach"
34INITSCRIPT_PARAMS = "defaults 20"
35
36TARGETS ??= "irattach irdaping"
37do_compile () {
38 for t in ${TARGETS}; do
39 oe_runmake -C $t
40 done
41}
42
43do_install () {
44 install -d ${D}${sbindir}
45 for t in ${TARGETS}; do
46 oe_runmake -C $t ROOT="${D}" install
47 done
48
49 install -d ${D}${sysconfdir}/init.d
50 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
51}