diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-04 22:21:54 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-04 22:21:54 +0100 |
commit | 78646a0eb8f5f9d41d6bcfd261b4717e1648ab5f (patch) | |
tree | 9bb8338369591ad084a8a3a1b19a9727b0d4c2e4 | |
parent | bb9efd268326393ca769c38e6385216569e70e52 (diff) | |
parent | c0949bd08b50c985226dee3d1b3f63d1d067293e (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
123 files changed, 1026 insertions, 300 deletions
diff --git a/package/binutils/Makefile b/package/binutils/Makefile index e429001bf..c66ab6d2d 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -42,8 +42,8 @@ else CONFIGURE_ARGS+= --disable-werror endif -pre-build: - @-rm $(STAGING_TARGET_DIR)/lib/libiberty.a $(STAGING_TARGET_DIR)/usr/lib/libiberty.a +post-build: + $(CP) ${WRKBUILD}/libiberty/libiberty.a $(STAGING_TARGET_DIR)/usr/lib libbfd-install: ${INSTALL_DIR} ${IDIR_LIBBFD}/usr/lib diff --git a/package/comgt/Makefile b/package/comgt/Makefile index cc2041150..f8433814e 100644 --- a/package/comgt/Makefile +++ b/package/comgt/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= comgt PKG_VERSION:= 0.32 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= db2452680c3d953631299e331daf49ef PKG_DESCR:= 3G/GPRS datacard control tool PKG_SECTION:= utils diff --git a/package/comgt/patches/patch-comgt_c b/package/comgt/patches/patch-comgt_c new file mode 100644 index 000000000..666423ba5 --- /dev/null +++ b/package/comgt/patches/patch-comgt_c @@ -0,0 +1,47 @@ +--- comgt.0.32.orig/comgt.c 2006-10-20 16:49:46.000000000 +0200 ++++ comgt.0.32/comgt.c 2013-12-28 19:40:28.000000000 +0100 +@@ -30,7 +30,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <signal.h> +-#include <termio.h> ++#include <termios.h> + #include <fcntl.h> + #include <unistd.h> + #include <string.h> +@@ -81,7 +81,7 @@ char token[MAXTOKEN]; /* For gettoken( + char scriptfile[MAXPATH]; /* Script file name */ + char scriptfilepath[MAXPATH]; /* temp storage for full path */ + BOOL verbose=0; /* Log actions */ +-struct termio cons, stbuf, svbuf; /* termios: svbuf=before, stbuf=while */ ++struct termios cons, stbuf, svbuf; /* termios: svbuf=before, stbuf=while */ + int comfd=0; /* Communication file descriptor. Defaults to stdin. */ + char msg[STRINGL]; /* Massage messages here */ + int preturn,returns[MAXGOSUBS]; +@@ -926,7 +926,7 @@ void setcom(void) { + } + + void doset(void) { +- struct termio console; ++ struct termios console; + int a,b; + gettoken(); + if(strcmp(token,"echo")==0) { +@@ -1281,7 +1281,7 @@ void opengt(void) { + parity=stbuf.c_cflag & (PARENB | PARODD); + stbuf.c_iflag &= ~(IGNCR | ICRNL | IUCLC | INPCK | IXON | IXANY | IGNPAR ); + stbu |