diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/heyu/patches | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/heyu/patches')
| -rw-r--r-- | package/heyu/patches/patch-tty_c | 8 | ||||
| -rw-r--r-- | package/heyu/patches/patch-x10state_c | 12 |
2 files changed, 16 insertions, 4 deletions
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"); |