* [Buildroot] [PATCH] irda-utils: new package for IrDA devices
@ 2010-11-20 8:05 Mike Frysinger
2010-12-08 5:07 ` [Buildroot] [PATCH v2] " Mike Frysinger
0 siblings, 1 reply; 3+ messages in thread
From: Mike Frysinger @ 2010-11-20 8:05 UTC (permalink / raw)
To: buildroot
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
package/Config.in | 1 +
package/irda-utils/Config.in | 19 ++++++++
package/irda-utils/irda-utils-0.9.18-daemon.patch | 26 +++++++++++
package/irda-utils/irda-utils-0.9.18-nommu.patch | 14 ++++++
package/irda-utils/irda-utils-0.9.18-subdir.patch | 16 +++++++
package/irda-utils/irda-utils.mk | 47 +++++++++++++++++++++
6 files changed, 123 insertions(+), 0 deletions(-)
create mode 100644 package/irda-utils/Config.in
create mode 100644 package/irda-utils/irda-utils-0.9.18-daemon.patch
create mode 100644 package/irda-utils/irda-utils-0.9.18-nommu.patch
create mode 100644 package/irda-utils/irda-utils-0.9.18-subdir.patch
create mode 100644 package/irda-utils/irda-utils.mk
diff --git a/package/Config.in b/package/Config.in
index bd348a4..f445f69 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -175,6 +175,7 @@ source "package/hwdata/Config.in"
source "package/i2c-tools/Config.in"
source "package/input-tools/Config.in"
source "package/iostat/Config.in"
+source "package/irda-utils/Config.in"
source "package/kbd/Config.in"
source "package/lm-sensors/Config.in"
source "package/lsuio/Config.in"
diff --git a/package/irda-utils/Config.in b/package/irda-utils/Config.in
new file mode 100644
index 0000000..418ab61
--- /dev/null
+++ b/package/irda-utils/Config.in
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_IRDA_UTILS
+ bool "irda-utils"
+ help
+ user space utilities which control the IrDA stack
+
+ http://irda.sourceforge.net/
+
+if BR2_PACKAGE_IRDA_UTILS
+
+config BR2_PACKAGE_IRDA_UTILS_IRATTACH
+ bool "irattach"
+
+config BR2_PACKAGE_IRDA_UTILS_IRDAPING
+ bool "irdaping"
+
+config BR2_PACKAGE_IRDA_UTILS_IRNETD
+ bool "irnetd"
+
+endif
diff --git a/package/irda-utils/irda-utils-0.9.18-daemon.patch b/package/irda-utils/irda-utils-0.9.18-daemon.patch
new file mode 100644
index 0000000..5ff9f38
--- /dev/null
+++ b/package/irda-utils/irda-utils-0.9.18-daemon.patch
@@ -0,0 +1,26 @@
+--- a/irattach/util.c
++++ b/irattach/util.c
+@@ -156,21 +156,10 @@
+
+ void fork_now(int ttyfd)
+ {
+- int ret;
+ int i;
+
+- if ((ret = fork()) > 0)
+- exit(0);
+-
+- if (ret == -1)
+- syslog(LOG_INFO, "forking: %m");
+- if (setsid() < 0)
+- syslog(LOG_INFO, "detaching from tty: %m");
+-
+- if ((ret = fork()) > 0) {
+- /* cleanup_files = 0; */
+- exit(0);
+- }
++ if (daemon(1, 1))
++ syslog(LOG_INFO, "daemon: %m");
+
+ /* Close all open inherited files! Except for ttyfd! */
+ for (i = 0; i < 64; i++)
diff --git a/package/irda-utils/irda-utils-0.9.18-nommu.patch b/package/irda-utils/irda-utils-0.9.18-nommu.patch
new file mode 100644
index 0000000..f06347b
--- /dev/null
+++ b/package/irda-utils/irda-utils-0.9.18-nommu.patch
@@ -0,0 +1,14 @@
+--- a/irattach/irattach.c
++++ b/irattach/irattach.c
+@@ -397,7 +397,11 @@
+ after_names[i]);
+ /* Create a new instance for this other
+ * interface */
++#ifdef NO_FORK
++ pid = -1;
++#else
+ pid = fork();
++#endif
+ /* If in the child */
+ if(!pid) {
+ /* Get the interface name */
diff --git a/package/irda-utils/irda-utils-0.9.18-subdir.patch b/package/irda-utils/irda-utils-0.9.18-subdir.patch
new file mode 100644
index 0000000..9aa8f70
--- /dev/null
+++ b/package/irda-utils/irda-utils-0.9.18-subdir.patch
@@ -0,0 +1,16 @@
+--- a/Makefile
++++ b/Makefile
+@@ -31,11 +31,11 @@
+ CFLAGS= -O2 -W -Wall
+
+ all:
+- @-(set -e ; for d in $(DIRS) ; do $(MAKE) $(MAKE_OUTPUT) -C $$d $@ ; done)
++ @(set -e ; for d in $(DIRS) ; do $(MAKE) $(MAKE_OUTPUT) -C $$d $@ ; done)
+
+
+ install:
+- @-(set -e ; for d in $(DIRS) ; do $(MAKE) $(MAKE_OUTPUT) -C $$d $@ ; done)
++ @(set -e ; for d in $(DIRS) ; do $(MAKE) $(MAKE_OUTPUT) -C $$d $@ ; done)
+
+
+ clean:
diff --git a/package/irda-utils/irda-utils.mk b/package/irda-utils/irda-utils.mk
new file mode 100644
index 0000000..fb36d85
--- /dev/null
+++ b/package/irda-utils/irda-utils.mk
@@ -0,0 +1,47 @@
+#############################################################
+#
+# irda-utils
+#
+#############################################################
+
+IRDA_UTILS_VERSION = 0.9.18
+IRDA_UTILS_SOURCE = irda-utils-$(IRDA_UTILS_VERSION).tar.gz
+IRDA_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/irda
+
+IRDA_UTILS_CFLAGS = $(TARGET_CFLAGS) -I.
+ifeq ($(BR2_USE_MMU),)
+IRDA_UTILS_CFLAGS += -DNO_FORK=1
+endif
+
+define IRDA_UTILS_BUILD_CMDS
+ $(MAKE) \
+ CC="$(TARGET_CC)" \
+ CFLAGS="$(IRDA_UTILS_CFLAGS)" \
+ SYS_INCLUDES= \
+ DIRS="irattach irdaping irnetd" \
+ V=1 -C $(@D)
+endef
+
+define IRDA_UTILS_CLEAN_CMDS
+ $(MAKE) -C $(@D) clean
+endef
+
+IRDA_UTILS_SBINS- =
+IRDA_UTILS_SBINS-y =
+IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRATTACH) += irattach
+IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRDAPING) += irdaping
+IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRNETD) += irnetd
+IRDA_UTILS_SBINS- += $(IRDA_UTILS_SBINS-y)
+
+define IRDA_UTILS_INSTALL_TARGET_CMDS
+ set -e; \
+ for sbin in $(IRDA_UTILS_SBINS-y); do \
+ $(INSTALL) -D $(@D)/*/$$sbin $(TARGET_DIR)/usr/sbin/$$sbin; \
+ done
+endef
+
+define IRDA_UTILS_UNINSTALL_TARGET_CMDS
+ rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,$(IRDA_UTILS_SBINS-))
+endef
+
+$(eval $(call GENTARGETS,package,irda-utils))
--
1.7.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v2] irda-utils: new package for IrDA devices
2010-11-20 8:05 [Buildroot] [PATCH] irda-utils: new package for IrDA devices Mike Frysinger
@ 2010-12-08 5:07 ` Mike Frysinger
2011-01-14 12:26 ` Peter Korsgaard
0 siblings, 1 reply; 3+ messages in thread
From: Mike Frysinger @ 2010-12-08 5:07 UTC (permalink / raw)
To: buildroot
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
v2
- add author info to patches
package/Config.in | 1 +
package/irda-utils/Config.in | 19 ++++++++
package/irda-utils/irda-utils-0.9.18-daemon.patch | 30 +++++++++++++
package/irda-utils/irda-utils-0.9.18-nommu.patch | 18 ++++++++
package/irda-utils/irda-utils-0.9.18-subdir.patch | 20 +++++++++
package/irda-utils/irda-utils.mk | 47 +++++++++++++++++++++
6 files changed, 135 insertions(+), 0 deletions(-)
create mode 100644 package/irda-utils/Config.in
create mode 100644 package/irda-utils/irda-utils-0.9.18-daemon.patch
create mode 100644 package/irda-utils/irda-utils-0.9.18-nommu.patch
create mode 100644 package/irda-utils/irda-utils-0.9.18-subdir.patch
create mode 100644 package/irda-utils/irda-utils.mk
diff --git a/package/Config.in b/package/Config.in
index 88984c7..d6ffa16 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -176,6 +176,7 @@ source "package/hwdata/Config.in"
source "package/i2c-tools/Config.in"
source "package/input-tools/Config.in"
source "package/iostat/Config.in"
+source "package/irda-utils/Config.in"
source "package/kbd/Config.in"
source "package/lm-sensors/Config.in"
source "package/lsuio/Config.in"
diff --git a/package/irda-utils/Config.in b/package/irda-utils/Config.in
new file mode 100644
index 0000000..418ab61
--- /dev/null
+++ b/package/irda-utils/Config.in
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_IRDA_UTILS
+ bool "irda-utils"
+ help
+ user space utilities which control the IrDA stack
+
+ http://irda.sourceforge.net/
+
+if BR2_PACKAGE_IRDA_UTILS
+
+config BR2_PACKAGE_IRDA_UTILS_IRATTACH
+ bool "irattach"
+
+config BR2_PACKAGE_IRDA_UTILS_IRDAPING
+ bool "irdaping"
+
+config BR2_PACKAGE_IRDA_UTILS_IRNETD
+ bool "irnetd"
+
+endif
diff --git a/package/irda-utils/irda-utils-0.9.18-daemon.patch b/package/irda-utils/irda-utils-0.9.18-daemon.patch
new file mode 100644
index 0000000..be1d282
--- /dev/null
+++ b/package/irda-utils/irda-utils-0.9.18-daemon.patch
@@ -0,0 +1,30 @@
+written by Mike Frysinger
+
+https://sourceforge.net/tracker/?func=detail&aid=3132053&group_id=5616&atid=305616
+
+--- a/irattach/util.c
++++ b/irattach/util.c
+@@ -156,21 +156,10 @@
+
+ void fork_now(int ttyfd)
+ {
+- int ret;
+ int i;
+
+- if ((ret = fork()) > 0)
+- exit(0);
+-
+- if (ret == -1)
+- syslog(LOG_INFO, "forking: %m");
+- if (setsid() < 0)
+- syslog(LOG_INFO, "detaching from tty: %m");
+-
+- if ((ret = fork()) > 0) {
+- /* cleanup_files = 0; */
+- exit(0);
+- }
++ if (daemon(1, 1))
++ syslog(LOG_INFO, "daemon: %m");
+
+ /* Close all open inherited files! Except for ttyfd! */
+ for (i = 0; i < 64; i++)
diff --git a/package/irda-utils/irda-utils-0.9.18-nommu.patch b/package/irda-utils/irda-utils-0.9.18-nommu.patch
new file mode 100644
index 0000000..ce1eb5c
--- /dev/null
+++ b/package/irda-utils/irda-utils-0.9.18-nommu.patch
@@ -0,0 +1,18 @@
+written by Mike Frysinger
+
+https://sourceforge.net/tracker/?func=detail&aid=3132056&group_id=5616&atid=305616
+
+--- a/irattach/irattach.c
++++ b/irattach/irattach.c
+@@ -397,7 +397,11 @@
+ after_names[i]);
+ /* Create a new instance for this other
+ * interface */
++#ifdef NO_FORK
++ pid = -1;
++#else
+ pid = fork();
++#endif
+ /* If in the child */
+ if(!pid) {
+ /* Get the interface name */
diff --git a/package/irda-utils/irda-utils-0.9.18-subdir.patch b/package/irda-utils/irda-utils-0.9.18-subdir.patch
new file mode 100644
index 0000000..04b1b21
--- /dev/null
+++ b/package/irda-utils/irda-utils-0.9.18-subdir.patch
@@ -0,0 +1,20 @@
+written by Mike Frysinger
+
+https://sourceforge.net/tracker/?func=detail&aid=3132051&group_id=5616&atid=305616
+
+--- a/Makefile
++++ b/Makefile
+@@ -31,11 +31,11 @@
+ CFLAGS= -O2 -W -Wall
+
+ all:
+- @-(set -e ; for d in $(DIRS) ; do $(MAKE) $(MAKE_OUTPUT) -C $$d $@ ; done)
++ @(set -e ; for d in $(DIRS) ; do $(MAKE) $(MAKE_OUTPUT) -C $$d $@ ; done)
+
+
+ install:
+- @-(set -e ; for d in $(DIRS) ; do $(MAKE) $(MAKE_OUTPUT) -C $$d $@ ; done)
++ @(set -e ; for d in $(DIRS) ; do $(MAKE) $(MAKE_OUTPUT) -C $$d $@ ; done)
+
+
+ clean:
diff --git a/package/irda-utils/irda-utils.mk b/package/irda-utils/irda-utils.mk
new file mode 100644
index 0000000..fb36d85
--- /dev/null
+++ b/package/irda-utils/irda-utils.mk
@@ -0,0 +1,47 @@
+#############################################################
+#
+# irda-utils
+#
+#############################################################
+
+IRDA_UTILS_VERSION = 0.9.18
+IRDA_UTILS_SOURCE = irda-utils-$(IRDA_UTILS_VERSION).tar.gz
+IRDA_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/irda
+
+IRDA_UTILS_CFLAGS = $(TARGET_CFLAGS) -I.
+ifeq ($(BR2_USE_MMU),)
+IRDA_UTILS_CFLAGS += -DNO_FORK=1
+endif
+
+define IRDA_UTILS_BUILD_CMDS
+ $(MAKE) \
+ CC="$(TARGET_CC)" \
+ CFLAGS="$(IRDA_UTILS_CFLAGS)" \
+ SYS_INCLUDES= \
+ DIRS="irattach irdaping irnetd" \
+ V=1 -C $(@D)
+endef
+
+define IRDA_UTILS_CLEAN_CMDS
+ $(MAKE) -C $(@D) clean
+endef
+
+IRDA_UTILS_SBINS- =
+IRDA_UTILS_SBINS-y =
+IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRATTACH) += irattach
+IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRDAPING) += irdaping
+IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRNETD) += irnetd
+IRDA_UTILS_SBINS- += $(IRDA_UTILS_SBINS-y)
+
+define IRDA_UTILS_INSTALL_TARGET_CMDS
+ set -e; \
+ for sbin in $(IRDA_UTILS_SBINS-y); do \
+ $(INSTALL) -D $(@D)/*/$$sbin $(TARGET_DIR)/usr/sbin/$$sbin; \
+ done
+endef
+
+define IRDA_UTILS_UNINSTALL_TARGET_CMDS
+ rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,$(IRDA_UTILS_SBINS-))
+endef
+
+$(eval $(call GENTARGETS,package,irda-utils))
--
1.7.3.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v2] irda-utils: new package for IrDA devices
2010-12-08 5:07 ` [Buildroot] [PATCH v2] " Mike Frysinger
@ 2011-01-14 12:26 ` Peter Korsgaard
0 siblings, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2011-01-14 12:26 UTC (permalink / raw)
To: buildroot
>>>>> "Mike" == Mike Frysinger <vapier@gentoo.org> writes:
Mike> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Mike> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Mike> ---
Mike> v2
Mike> - add author info to patches
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-01-14 12:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-20 8:05 [Buildroot] [PATCH] irda-utils: new package for IrDA devices Mike Frysinger
2010-12-08 5:07 ` [Buildroot] [PATCH v2] " Mike Frysinger
2011-01-14 12:26 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox