From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 May 2009 20:39:07 +0200
Subject: optimize ipkg package management

- generate ipkg control file from PKG_* variables
- automatically install init scripts from ./files/*.init
  set #PKG pkgname to set the binary package
- rename FWINIT -> INIT
- move postinst and conffiles meta data to ./files
- update the packages to the latest upstream version
- remove some unready or unused package (strongswan,..)

more cleanups needed after allmodconfig
---
 package/heyu/Makefile                   | 13 +++++++++----
 package/heyu/files/files/heyu.conffiles |  1 +
 package/heyu/ipkg/files/heyu.conffiles  |  1 -
 package/heyu/ipkg/heyu.control          |  6 ------
 package/heyu/patches/patch-tty_c        |  8 ++++----
 package/heyu/patches/patch-x10state_c   | 12 ++++++++++++
 6 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 package/heyu/files/files/heyu.conffiles
 delete mode 100644 package/heyu/ipkg/files/heyu.conffiles
 delete mode 100644 package/heyu/ipkg/heyu.control
 create mode 100644 package/heyu/patches/patch-x10state_c

(limited to 'package/heyu')

diff --git a/package/heyu/Makefile b/package/heyu/Makefile
index a87affdfc..7e9efc5a0 100644
--- a/package/heyu/Makefile
+++ b/package/heyu/Makefile
@@ -6,15 +6,20 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		heyu
-PKG_VERSION:=		2.3.2
+PKG_VERSION:=		2.6.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		af3eeeaa8c432e5b3510f4df6dd39f4f
+PKG_MD5SUM:=		9c7624b61ea39bbfa70336dc703cd5f1
+PKG_DESCR:=		X10 home automation control using the CM11A
+PKG_SECTION:=		misc
+PKG_DEPENDS:=		setserial
+PKG_URL:=		http://heyu.tanj.com
+PKG_SITES:=		http://heyu.tanj.com/download/
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
-MASTER_SITES:=		http://heyu.tanj.com/download/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,HEYU,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,HEYU,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 do-build:
 	(cd ${WRKBUILD} && ${BASH} ./Configure);
diff --git a/package/heyu/files/files/heyu.conffiles b/package/heyu/files/files/heyu.conffiles
new file mode 100644
index 000000000..f3c36bc00
--- /dev/null
+++ b/package/heyu/files/files/heyu.conffiles
@@ -0,0 +1 @@
+/etc/heyu/x10.conf
diff --git a/package/heyu/ipkg/files/heyu.conffiles b/package/heyu/ipkg/files/heyu.conffiles
deleted file mode 100644
index f3c36bc00..000000000
--- a/package/heyu/ipkg/files/heyu.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/heyu/x10.conf
diff --git a/package/heyu/ipkg/heyu.control b/package/heyu/ipkg/heyu.control
deleted file mode 100644
index e888f236c..000000000
--- a/package/heyu/ipkg/heyu.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: heyu
-Priority: optional
-Section: misc
-Source: buildroot internal
-Description: X10 home automation control using the CM11A
-Depends: setserial
diff --git a/package/heyu/patches/patch-tty_c b/package/heyu/patches/patch-tty_c
index d5a83ff86..cb8acf6d9 100644
--- a/package/heyu/patches/patch-tty_c
+++ b/package/heyu/patches/patch-tty_c
@@ -1,8 +1,8 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- heyu-2.3.2.orig/tty.c	2008-04-14 00:40:24.000000000 +0200
-+++ heyu-2.3.2/tty.c	2008-10-09 14:57:18.000000000 +0200
-@@ -396,7 +396,7 @@ char *make_lock_name ( char *ttydev )
-     char        err_string[200];
+--- heyu-2.6.0.orig/tty.c	2009-01-19 03:57:00.000000000 +0100
++++ heyu-2.6.0/tty.c	2009-05-29 14:08:06.087764489 +0200
+@@ -395,7 +395,7 @@ char *make_lock_name ( char *ttydev )
+     struct stat stat_buf;
  
      /* strip the leading path name */
 -    ptr = rindex(ttydev, '/');
diff --git a/package/heyu/patches/patch-x10state_c b/package/heyu/patches/patch-x10state_c
new file mode 100644
index 000000000..c56f2489d
--- /dev/null
+++ b/package/heyu/patches/patch-x10state_c
@@ -0,0 +1,12 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- heyu-2.6.0.orig/x10state.c	2009-04-21 00:45:51.000000000 +0200
++++ heyu-2.6.0/x10state.c	2009-05-29 14:17:51.812378291 +0200
+@@ -5601,7 +5601,7 @@ char **create_noenv_environment ( LAUNCH
+ 
+ //   launcherp = configp->launcherp;
+ 
+-   if ( daemon == D_RELAY || (index >= 0 && launcherp && launcherp->type == L_POWERFAIL) )
++   if ( daemon == D_RELAY || (launcherp && launcherp->type == L_POWERFAIL) )
+       putenv("HEYU_PARENT=RELAY");    
+    else
+       putenv("HEYU_PARENT=ENGINE");
-- 
cgit v1.2.3