mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

Remove irda-utils and the irda feature

Browse Source 
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>
This commit is contained in:
Adrian Bunk
2019-05-14 11:45:48 +03:00
committed by Richard Purdie
parent 92cc79f4e6
commit 2537269bf5
7 changed files with 1 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/conf/distro/include/default-distrovars.inc
+1 -1
View File
@@ -10,7 +10,7 @@ LOCALE_UTF8_ONLY ?= "0"
LOCALE_UTF8_IS_DEFAULT ?= "1"
LOCALE_UTF8_IS_DEFAULT_class-nativesdk = "0"
DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 ipv4 ipv6 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11"
DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 ipv4 ipv6 largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11"
DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT}"
IMAGE_FEATURES ?= ""
meta/conf/distro/include/maintainers.inc
-1
View File
@@ -286,7 +286,6 @@ RECIPE_MAINTAINER_pn-intltool = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER_pn-iproute2 = "Changhyeok Bae <changhyeok.bae@gmail.com>"
RECIPE_MAINTAINER_pn-iptables = "Changhyeok Bae <changhyeok.bae@gmail.com>"
RECIPE_MAINTAINER_pn-iputils = "Changhyeok Bae <changhyeok.bae@gmail.com>"
RECIPE_MAINTAINER_pn-irda-utils = "Changhyeok Bae <changhyeok.bae@gmail.com>"
RECIPE_MAINTAINER_pn-iso-codes = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER_pn-iw = "Changhyeok Bae <changhyeok.bae@gmail.com>"
RECIPE_MAINTAINER_pn-libjpeg-turbo = "Anuj Mittal <anuj.mittal@intel.com>"
meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/init
-78
View File
@@ -1,78 +0,0 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: irda
# Required-Start: $network $remote_fs
# Required-Stop: $network $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Infrared port support
### END INIT INFO
NAME="irattach"
test -x "$IRDA_DAEMON" || IRDA_DAEMON=/usr/sbin/irattach
test -z "$IRATTACH_PID" && IRATTACH_PID=/var/run/irattach.pid
# Source function library.
. /etc/init.d/functions
module_id() {
awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
}
if [ ! -f /etc/sysconfig/irda ]; then
case `module_id` in
"HP iPAQ H2200" | "HP iPAQ HX4700" | "HTC Universal")
IRDA=yes
DEVICE=/dev/ttyS2
DONGLE=
DISCOVERY=
;;
*)
IRDA=yes
DEVICE=/dev/ttyS1
DONGLE=
DISCOVERY=
;;
esac
else
. /etc/sysconfig/irda
fi
# Check that irda is up.
[ ${IRDA} = "no" ] && exit 0
[ -f /usr/sbin/irattach ] || exit 0
ARGS=
if [ $DONGLE ]; then
ARGS="$ARGS -d $DONGLE"
fi
if [ "$DISCOVERY" = "yes" ];then
ARGS="$ARGS -s"
fi
case "$1" in
start)
echo -n "Starting IrDA: $NAME"
start-stop-daemon --start --quiet --exec "$IRDA_DAEMON" ${DEVICE} ${ARGS} --pidfile "$IRATTACH_PID"
sleep 1
[ -f /var/run/irattach.pid ] && echo " done" || echo " fail"
;;
stop)
echo "Stopping IrDA: $NAME"
start-stop-daemon --stop --quiet --exec "$IRDA_DAEMON" --pidfile "$IRATTACH_PID"
;;
restart|force-reload)
$0 stop
$0 start
;;
status)
status irattach
exit $?
;;
*)
N=/etc/init.d/$NAME
echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
exit 1
;;
esac
meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
-87
View File
@@ -1,87 +0,0 @@
Obey LDFLAGS
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Upstream-Status: Pending
Index: irda-utils-0.9.18/findchip/Makefile
===================================================================
--- irda-utils-0.9.18.orig/findchip/Makefile
+++ irda-utils-0.9.18/findchip/Makefile
@@ -65,5 +65,5 @@ install: findchip
gfindchip: gfindchip.c
$(prn_cc)
- $(ECMD))$(CC) $(CFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs`
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs`
Index: irda-utils-0.9.18/irattach/Makefile
===================================================================
--- irda-utils-0.9.18.orig/irattach/Makefile
+++ irda-utils-0.9.18/irattach/Makefile
@@ -49,13 +49,13 @@ all: $(TARGETS)
irattach: irattach.o util.o
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@
dongle_attach: dongle_attach.o
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@
install: $(TARGETS)
Index: irda-utils-0.9.18/irdadump/Makefile
===================================================================
--- irda-utils-0.9.18.orig/irdadump/Makefile
+++ irda-utils-0.9.18/irdadump/Makefile
@@ -40,7 +40,7 @@ lib_irdadump.a: $(LIBIRDADUMP_OBJS)
irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
.c.o:
Index: irda-utils-0.9.18/irdaping/Makefile
===================================================================
--- irda-utils-0.9.18.orig/irdaping/Makefile
+++ irda-utils-0.9.18/irdaping/Makefile
@@ -56,7 +56,7 @@ all: $(TARGETS)
irdaping: $(OBJS)
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
.c.o:
Index: irda-utils-0.9.18/irnetd/Makefile
===================================================================
--- irda-utils-0.9.18.orig/irnetd/Makefile
+++ irda-utils-0.9.18/irnetd/Makefile
@@ -50,7 +50,7 @@ all: $(TARGETS)
irnetd: $(OBJS)
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
install: irnetd
Index: irda-utils-0.9.18/psion/Makefile
===================================================================
--- irda-utils-0.9.18.orig/psion/Makefile
+++ irda-utils-0.9.18/psion/Makefile
@@ -25,4 +25,4 @@ install: $(PSION_TARGETS)
CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
irpsion5:
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@
\ No newline at end of file
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(PSION_SRC) -o $@
\ No newline at end of file
meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/musl.patch
-29
View File
@@ -1,29 +0,0 @@
Replace use of <net/if_packet.h> with <linux/if_packet.h>.
kernel headers <linux/if_packet.h> already provides the
needed definitions, moreover not all libc implementations
provide if_packet.h e.g. musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: irda-utils-0.9.18/irdaping/irdaping.c
===================================================================
--- irda-utils-0.9.18.orig/irdaping/irdaping.c
+++ irda-utils-0.9.18/irdaping/irdaping.c
@@ -33,7 +33,6 @@
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <net/if.h> /* For struct ifreq */
-#include <net/if_packet.h> /* For struct sockaddr_pkt */
#include <net/if_arp.h> /* For ARPHRD_IRDA */
#include <netinet/if_ether.h> /* For ETH_P_ALL */
#include <netinet/in.h> /* For htons */
@@ -46,6 +45,7 @@
#include <asm/byteorder.h> /* __cpu_to_le32 and co. */
#include <linux/types.h> /* For __u8 and co. */
+#include <linux/if_packet.h> /* For struct sockaddr_pkt */
#include <irda.h>
#ifndef AF_IRDA
meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
-51
View File
@@ -1,51 +0,0 @@
SUMMARY = "Common files for IrDA"
DESCRIPTION = "Provides common files needed to use IrDA. \
IrDA allows communication over Infrared with other devices \
such as phones and laptops."
HOMEPAGE = "http://irda.sourceforge.net/"
BUGTRACKER = "http://sourceforge.net/p/irda/bugs/"
SECTION = "base"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://irdadump/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://smcinit/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
file://man/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://irdadump/irdadump.c;beginline=1;endline=24;md5=d78b9dce3cd78c2220250c9c7a2be178"
SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
file://ldflags.patch \
file://musl.patch \
file://init"
SRC_URI[md5sum] = "84dc12aa4c3f61fccb8d8919bf4079bb"
SRC_URI[sha256sum] = "61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6"
inherit update-rc.d
EXTRA_OEMAKE = "\
'CC=${CC}' \
'LD=${LD}' \
'CFLAGS=${CFLAGS}' \
'LDFLAGS=${LDFLAGS}' \
'SYS_INCLUDES=' \
'V=1' \
"
INITSCRIPT_NAME = "irattach"
INITSCRIPT_PARAMS = "defaults 20"
TARGETS ??= "irattach irdaping"
do_compile () {
for t in ${TARGETS}; do
oe_runmake -C $t
done
}
do_install () {
install -d ${D}${sbindir}
for t in ${TARGETS}; do
oe_runmake -C $t ROOT="${D}" install
done
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
}
meta/recipes-core/packagegroups/packagegroup-base.bb
-19
View File
@@ -21,7 +21,6 @@ PACKAGES = ' \
${@bb.utils.contains("MACHINE_FEATURES", "apm", "packagegroup-base-apm", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "ext2", "packagegroup-base-ext2", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "vfat", "packagegroup-base-vfat", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "irda", "packagegroup-base-irda", "",d)} \
${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "packagegroup-base-keyboard", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "pci", "packagegroup-base-pci", "",d)} \
${@bb.utils.contains("MACHINE_FEATURES", "pcmcia", "packagegroup-base-pcmcia", "", d)} \
@@ -63,7 +62,6 @@ RDEPENDS_packagegroup-base = "\
${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'packagegroup-base-alsa', '',d)} \
${@bb.utils.contains('COMBINED_FEATURES', 'ext2', 'packagegroup-base-ext2', '',d)} \
${@bb.utils.contains('COMBINED_FEATURES', 'vfat', 'packagegroup-base-vfat', '',d)} \
${@bb.utils.contains('COMBINED_FEATURES', 'irda', 'packagegroup-base-irda', '',d)} \
${@bb.utils.contains('COMBINED_FEATURES', 'pci', 'packagegroup-base-pci', '',d)} \
${@bb.utils.contains('COMBINED_FEATURES', 'pcmcia', 'packagegroup-base-pcmcia', '',d)} \
${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', 'packagegroup-base-usbgadget', '',d)} \
@@ -221,23 +219,6 @@ RRECOMMENDS_packagegroup-base-bluetooth = "\
${@bb.utils.contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \
"
SUMMARY_packagegroup-base-irda = "IrDA support"
RDEPENDS_packagegroup-base-irda = "\
irda-utils"
RRECOMMENDS_packagegroup-base-irda = "\
kernel-module-pxaficp-ir \
kernel-module-irda \
kernel-module-ircomm \
kernel-module-ircomm-tty \
kernel-module-irlan \
${@bb.utils.contains('DISTRO_FEATURES', 'ppp', 'kernel-module-irnet', '',d)} \
kernel-module-irport \
kernel-module-irtty \
kernel-module-irtty-sir \
kernel-module-sir-dev \
${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} "
SUMMARY_packagegroup-base-usbgadget = "USB gadget support"
RRECOMMENDS_packagegroup-base-usbgadget = "\
kernel-module-pxa27x_udc \