[prev in list] [next in list] [prev in thread] [next in thread] 

List:       leaf-cvs-commits
Subject:    [Leaf-cvs-commits] src/bering-uclibc/apps/openvpn buildtool.cfg,1.1,1.2 buildtool.mk,1.2,1.3
From:       Martin Hejl <hejl () users ! sourceforge ! net>
Date:       2004-01-16 13:26:50
Message-ID: E1AhTzu-0008Ju-00 () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/leaf/src/bering-uclibc/apps/openvpn
In directory sc8-pr-cvs1:/tmp/cvs-serv30470

Modified Files:
	buildtool.cfg buildtool.mk 
Log Message:
Added definition for second package (one with lzo support and one without)


Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/openvpn/buildtool.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buildtool.cfg	15 Jan 2004 13:42:46 -0000	1.1
--- buildtool.cfg	16 Jan 2004 13:26:45 -0000	1.2
***************
*** 87,89 ****
--- 87,140 ----
  		</Contents>
  	</openvpn>
+ 	<openvpnz>
+ 		Version  = 1.6_beta1
+ 		Revision = 1
+ 
+ 		Help <<EOF
+ 			Easy-to-use, robust, and highly configurable VPN daemon with lzo online compression support
+ 			OpenVPN is an easy-to-use, robust, and highly configurable VPN 
+ 			(Virtual Private Network) daemon which can be used to securely link two or 
+ 			more private networks using an encrypted tunnel over the internet
+ 			See: http://openvpn.sf.net
+ 			Requires: libcrpto.lrp libssl.lrp liblzo.lrp
+ 			LEAF package by __PACKAGER__, __BUILDDATE__
+ 			EOF
+ 
+ 		<Permissions>
+ 			Files = 644
+ 			Directories = 755
+ 		</Permissions>
+ 
+ 		<Owner>
+ 				Files = root:root
+ 				Directories = root:root
+ 		</Owner>
+ 
+ 		<Contents>
+ 			<File>
+ 				Filename 	= etc/openvpn
+ 				Type		= list
+ 			</File>			
+ 			<File>
+ 				Filename 	= etc/openvpn/openvpn.conf
+ 				Source		= etc/openvpn/openvpn.conf
+ 				Description = openvpn config
+ 				Type		= conf
+ 				Type		= binary
+ 			</File>
+ 			<File>
+ 				Filename 	= usr/sbin/openvpn
+ 				Source		= usr/sbin/openvpn_lzo
+ 				Type		= binary
+ 				Permissions	= 755
+ 			</File>
+ 			<File>
+ 				Filename 	= etc/init.d/openvpn
+ 				Source		= etc/init.d/openvpn
+ 				Type		= binary
+ 				Permissions	= 755
+ 			</File>
+ 		</Contents>
+ 	</openvpnz>
+ 
  </Package>

Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/openvpn/buildtool.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildtool.mk	15 Jan 2004 18:03:08 -0000	1.2
--- buildtool.mk	16 Jan 2004 13:26:45 -0000	1.3
***************
*** 3,6 ****
--- 3,7 ----
  OPENVPN_DIR:=openvpn-1.6_beta1
  OPENVPN_TARGET_DIR:=$(BT_BUILD_DIR)/openvpn
+ OPENVPNLZO_TARGET_DIR:=$(BT_BUILD_DIR)/openvpnlzo
  STRIP_OPTIONS=-s --remove-section=.note --remove-section=.comment 
   
***************
*** 18,22 ****
--- 19,37 ----
  	(cd $(OPENVPN_DIR); autoheader );
  	(cd $(OPENVPN_DIR); automake);	
+ 	
+ build:
+ 	mkdir -p $(OPENVPN_TARGET_DIR)/etc/openvpn
+ 	mkdir -p $(OPENVPN_TARGET_DIR)/etc/init.d
+ 	mkdir -p $(OPENVPN_TARGET_DIR)/usr/sbin
+ 	mkdir -p $(BT_STAGING_DIR)/etc/openvpn
+ 
+ 	mkdir -p $(OPENVPNLZO_TARGET_DIR)/etc/openvpn
+ 	mkdir -p $(OPENVPNLZO_TARGET_DIR)/etc/init.d
+ 	mkdir -p $(OPENVPNLZO_TARGET_DIR)/usr/sbin
+ 	
+ 	mkdir -p $(BT_STAGING_DIR)/etc/init.d
+ 	mkdir -p $(BT_STAGING_DIR)/usr/sbin		
  
+ 	# Build a version without lzo support
  	(cd $(OPENVPN_DIR); \
  		rm -rf config.cache; \
***************
*** 28,47 ****
  			--with-ssl-lib=$(BT_STAGING_DIR)/lib \
  			--disable-dependency-tracking \
- 			--disable-lzo \
  			--enable-ssl \
  			--enable-iproute2 \
  			--with-iproute-path=/sbin/ip \
  			--includedir=$(BT_STAGING_DIR)/include \
  			--disable-pthread \
  			--prefix=/usr \
  			--libdir=$(BT_STAGING_DIR)/lib );
  	
- build:
- 		mkdir -p $(OPENVPN_TARGET_DIR)/etc/openvpn
- 		mkdir -p $(OPENVPN_TARGET_DIR)/etc/init.d
- 		mkdir -p $(OPENVPN_TARGET_DIR)/usr/sbin
- 		mkdir -p $(BT_STAGING_DIR)/etc/openvpn
- 		mkdir -p $(BT_STAGING_DIR)/etc/init.d
- 		mkdir -p $(BT_STAGING_DIR)/usr/sbin		
  		make CC=$(TARGET_CC) -C $(OPENVPN_DIR)
  		$(BT_STRIP) $(STRIP_OPTIONS) $(OPENVPN_DIR)/openvpn
--- 43,55 ----
  			--with-ssl-lib=$(BT_STAGING_DIR)/lib \
  			--disable-dependency-tracking \
  			--enable-ssl \
  			--enable-iproute2 \
  			--with-iproute-path=/sbin/ip \
  			--includedir=$(BT_STAGING_DIR)/include \
+ 			--disable-lzo \
  			--disable-pthread \
  			--prefix=/usr \
  			--libdir=$(BT_STAGING_DIR)/lib );
  	
  		make CC=$(TARGET_CC) -C $(OPENVPN_DIR)
  		$(BT_STRIP) $(STRIP_OPTIONS) $(OPENVPN_DIR)/openvpn
***************
*** 52,55 ****
--- 60,92 ----
  		cp openvpn $(BT_STAGING_DIR)/etc/init.d/		
  		cp $(OPENVPN_TARGET_DIR)/usr/sbin/openvpn $(BT_STAGING_DIR)/usr/sbin/openvpn
+ 		
+ 		make CC=$(TARGET_CC) -C $(OPENVPN_DIR) clean
+ 
+ 		# Build a version with lzo support
+ 		(cd $(OPENVPN_DIR); \
+ 			CFLAGS="-O2 -march=i486" \
+ 			CC=$(TARGET_CC) \
+ 			LD=$(TARGET_LD) \
+ 			./configure \
+ 				--with-ssl-headers=$(BT_STAGING_DIR)/include/openssl \
+ 				--with-ssl-lib=$(BT_STAGING_DIR)/lib \
+ 				--disable-dependency-tracking \
+ 				--enable-ssl \
+ 				--enable-iproute2 \
+ 				--with-iproute-path=/sbin/ip \
+ 				--with-lzo-headers=$(BT_STAGING_DIR)/usr/include \
+ 				--with-lzo-lib=$(BT_STAGING_DIR)/usr/lib \
+ 				--includedir=$(BT_STAGING_DIR)/include \
+ 				--disable-pthread \
+ 				--prefix=/usr \
+ 				--libdir=$(BT_STAGING_DIR)/lib );
+ 	
+ 		make CC=$(TARGET_CC) -C $(OPENVPN_DIR)
+ 		$(BT_STRIP) $(STRIP_OPTIONS) $(OPENVPN_DIR)/openvpn
+ 		make DESTDIR=$(OPENVPNLZO_TARGET_DIR) -C $(OPENVPN_DIR) install 
+ 		cp openvpn.conf $(OPENVPNLZO_TARGET_DIR)/etc/openvpn/ 
+ 		cp openvpn $(OPENVPNLZO_TARGET_DIR)/etc/init.d 
+ 		cp $(OPENVPNLZO_TARGET_DIR)/usr/sbin/openvpn $(BT_STAGING_DIR)/usr/sbin/openvpn_lzo
+ 
  
  clean:
***************
*** 63,65 ****
--- 100,103 ----
  	rm -f  $(BT_STAGING_DIR)/etc/init.d/openvpn
  	rm -f $(BT_STAGING_DIR)/usr/sbin/openvpn
+ 	rm -f $(BT_STAGING_DIR)/usr/sbin/openvpn_lzo
  




-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Leaf-cvs-commits mailing list
Leaf-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic