Skip to contentSkip to conversation

Remove irda-utils and the irda feature

PATCH New Adrian Bunk 1 participant 1 message May 14, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Remove irda-utils and the irda feature

IrDA support was removed in kernel 4.17.

---
irda-utils will be submitted for inclusion in meta-openembedded.
v2: Changes to documentation and a comment in meta-poky
will be sent separately.

---
 .../distro/include/default-distrovars.inc     |  2 +-
 meta/conf/distro/include/maintainers.inc      |  1 -
 .../irda-utils/irda-utils-0.9.18/init         | 78 -----------------
 .../irda-utils-0.9.18/ldflags.patch           | 87 -------------------
 .../irda-utils/irda-utils-0.9.18/musl.patch   | 29 -------
 .../irda-utils/irda-utils_0.9.18.bb           | 51 -----------
 .../packagegroups/packagegroup-base.bb        | 19 ----
 7 files changed, 1 insertion(+), 266 deletions(-)
 delete mode 100755 meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/init
 delete mode 100644 meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
 delete mode 100644 meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/musl.patch
 delete mode 100644 meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
meta/conf/distro/include/default-distrovars.inc +1 -1
index 7a0baf3260..10d86cf7b1 100644
@@ -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 +0 -1
index 2f1976a00f..67a51cdecc 100644
@@ -286,7 +286,6 @@ RECIPE_MAINTAINER_pn-intltool = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-iproute2 = "Changhyeok Bae <[email protected]>"
 RECIPE_MAINTAINER_pn-iptables = "Changhyeok Bae <[email protected]>"
 RECIPE_MAINTAINER_pn-iputils = "Changhyeok Bae <[email protected]>"
-RECIPE_MAINTAINER_pn-irda-utils = "Changhyeok Bae <[email protected]>"
 RECIPE_MAINTAINER_pn-iso-codes = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-iw = "Changhyeok Bae <[email protected]>"
 RECIPE_MAINTAINER_pn-libjpeg-turbo = "Anuj Mittal <[email protected]>"
meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/init deleted +0 -78

78 lines not on this page · raw message

meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch deleted +0 -87

87 lines not on this page · raw message

meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/musl.patch deleted +0 -29
deleted file mode 100644
index 97eb975023..0000000000
@@ -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 <[email protected]>
-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 deleted +0 -51

51 lines not on this page · raw message

meta/recipes-core/packagegroups/packagegroup-base.bb +0 -19
index 442201c9ef..cae704aa24 100644
@@ -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 \
Signature · 1 line
2.17.1