Waldemar Brodkorb 3 недель назад
Родитель
Сommit
f6840af9af

+ 0 - 36
package/digitemp/Makefile

@@ -1,36 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${ADK_TOPDIR}/rules.mk
-
-PKG_NAME:=		digitemp
-PKG_VERSION:=		3.6.0
-PKG_RELEASE:=		1
-PKG_HASH:=		14cfc584cd3714fe8c9a2cdc8388be49e08b5e395d95e6bcd11d4410e2505ca2
-PKG_DESCR:=		program for reading values from 1-wire devices
-PKG_SECTION:=		sys/hw
-PKG_DEPENDS:=		libusb
-PKG_BUILDDEP:=		libusb libusb-compat
-PKG_URL:=		http://www.digitemp.com/software/linux/
-PKG_SITES:=		http://www.digitemp.com/software/linux/
-
-PKG_LIBC_DEPENDS:=	uclibc-ng glibc
-
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-
-include ${ADK_TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,DIGITEMP,digitemp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-TARGET_CPPFLAGS+=	-I./src -I./userial
-ALL_TARGET=		ds2490
-
-do-install:
-	${INSTALL_DIR} ${IDIR_DIGITEMP}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/digitemp_DS2490 \
-		${IDIR_DIGITEMP}/usr/sbin/digitemp_DS2490
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 0 - 49
package/digitemp/patches/patch-Makefile

@@ -1,49 +0,0 @@
-do not use static linking on Cygwin
---- digitemp-3.6.0.orig/Makefile	2008-08-28 23:37:00.000000000 +0200
-+++ digitemp-3.6.0/Makefile	2011-01-14 21:37:33.000000000 +0100
-@@ -11,8 +11,9 @@
- 
- VERSION = 3.6.0
- 
--CC	= gcc
--CFLAGS	= -I./src -I./userial -O2 -Wall # -g
-+CC	?= gcc
-+CFLAGS	?= -I./src -I./userial 
-+LDFLAGS ?=
- 
- OBJS		=	src/digitemp.o src/device_name.o src/ds2438.o
- HDRS		= 	src/digitemp.h src/device_name.h
-@@ -45,7 +46,7 @@ DS2490OBJS	=	userial/ds2490/ownet.o user
- # If you add a new OSTYPE here please email it to me so that I can add
- # it to the distribution in the next release
- # -----------------------------------------------------------------------
--SYSTYPE := $(shell uname -s)
-+SYSTYPE := Linux
- 
- ifeq ($(SYSTYPE), Linux)
-   CFLAGS += -DLINUX
-@@ -57,7 +58,6 @@ endif
- 
- ifneq (, $(findstring CYGWIN,$(SYSTYPE)))
-   CFLAGS += -DCYGWIN
--  LIBS   += -static -static-libgcc
- endif
- 
- ifeq ($(SYSTYPE), SunOS)
-@@ -116,13 +116,13 @@ all:		help
- 
- # Build the Linux executable
- ds9097:		$(OBJS) $(HDRS) $(ONEWIREOBJS) $(ONEWIREHDRS) $(DS9097OBJS)
--		$(CC) $(OBJS) $(ONEWIREOBJS) $(DS9097OBJS) -o digitemp_DS9097 $(LIBS)
-+		$(CC) $(LDFLAGS) $(OBJS) $(ONEWIREOBJS) $(DS9097OBJS) -o digitemp_DS9097 $(LIBS)
- 
- ds9097u:	$(OBJS) $(HDRS) $(ONEWIREOBJS) $(ONEWIREHDRS) $(DS9097UOBJS)
--		$(CC) $(OBJS) $(ONEWIREOBJS) $(DS9097UOBJS) -o digitemp_DS9097U $(LIBS)
-+		$(CC) $(LDFLAGS) $(OBJS) $(ONEWIREOBJS) $(DS9097UOBJS) -o digitemp_DS9097U $(LIBS)
- 
- ds2490:		$(OBJS) $(HDRS) $(ONEWIREOBJS) $(ONEWIREHDRS) $(DS2490OBJS)
--		$(CC) $(OBJS) $(ONEWIREOBJS) $(DS2490OBJS) -o digitemp_DS2490 $(LIBS)
-+		$(CC) $(LDFLAGS) $(OBJS) $(ONEWIREOBJS) $(DS2490OBJS) -o digitemp_DS2490 $(LIBS)
- 
- 
- # Clean up the object files and the sub-directory for distributions

+ 0 - 118
package/digitemp/patches/patch-src_digitemp_c

@@ -1,118 +0,0 @@
---- digitemp-3.6.0.orig/src/digitemp.c	2008-08-28 06:42:48.000000000 +0200
-+++ digitemp-3.6.0/src/digitemp.c	2009-06-12 21:29:17.000000000 +0200
-@@ -62,9 +62,7 @@
- #include <stdlib.h>
- #include <ctype.h>
- #include <unistd.h>
--#if !defined(AIX) && !defined(SOLARIS) && !defined(FREEBSD) && !defined(DARWIN)
- #include <getopt.h>
--#endif /* !AIX and !SOLARIS and !FREEBSD and !DARWIN */
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/time.h>
-@@ -75,24 +73,11 @@
- #include <stdint.h>
- #include "ad26.h"
- 
--// Include endian.h
--#if DARWIN
--#include <machine/endian.h>
--#endif
--#if FREEBSD
--#include <sys/endian.h>
--#endif
--#if !defined(DARWIN) && !defined(FREEBSD)
--#include <endian.h>
--#endif
--
--#ifdef LINUX
- #ifndef OWUSB
- #ifdef LOCKDEV
- #include <lockdev.h>
- #endif
- #endif
--#endif
- 
- #include "digitemp.h"
- #include "device_name.h"
-@@ -101,51 +86,8 @@
- 
- 
- /* Setup the correct getopt starting point */
--#ifdef LINUX
- #define GETOPTEOF -1
- #define OPTINDSTART 0
--#endif
--
--#ifdef CYGWIN
--#define GETOPTEOF -1
--#define OPTINDSTART 0
--#endif
--
--#ifdef AIX
--#define OPTINDSTART 0
--#define GETOPTEOF 255
--#endif
-- 
--#ifdef SOLARIS
--#define GETOPTEOF EOF
--#define OPTINDSTART 1
--#endif
--
--#ifdef FREEBSD
--#define GETOPTEOF EOF
--#define OPTINDSTART 1
--#endif
--
--#ifdef OPENBSD
--#define GETOPTEOF EOF
--#define OPTINDSTART 1
--#endif
--
--#ifdef NETBSD
--#define GETOPTEOF EOF
--#define OPTINDSTART 1
--#endif
--
--#ifdef DARWIN
--#define GETOPTEOF EOF
--#define OPTINDSTART 1
--#endif
-- 
--#ifdef OTHER
--#define GETOPTEOF EOF
--#define OPTINDSTART 1
--#endif 
--
- 
- /* For tracking down strange errors */
- #undef BCL_DEBUG
-@@ -153,10 +95,6 @@
- extern char 	*optarg;              
- extern int	optind, opterr, optopt;
- 
--#if defined(FREEBSD) || defined(DARWIN)
--extern int optreset;
--#endif /* FREEBSD or DARWIN */
--
- extern const char dtlib[];			/* Library Used            */
-  
- char serial_port[40],                        /* Path to the serial port */
-@@ -1928,7 +1866,7 @@ int Walk1Wire()
-   struct _roms  coupler_list;           /* Attached Roms                */
-   int   x;
- 
--  bzero( &coupler_list, sizeof( struct _roms ) );
-+  memset( &coupler_list, 0, sizeof( struct _roms ) );
-     
-   /* Find any DS2409 Couplers and turn them all off.
-      This WILL NOT WORK if there is a coupler attached to the
-@@ -2427,7 +2365,7 @@ int main( int argc, char *argv[] )
- 
- 
-   /* Make sure the structure is erased */
--  bzero( &sensor_list, sizeof( struct _roms ) );
-+  memset( &sensor_list, 0, sizeof( struct _roms ) );
-  
- 
-   if( argc <= 1 )