[leaf-commits] src/bering-uclibc4/source/accel-pptp buildtool.cfg, 1.4, 1.5 buildtool.mk, 1.1, 1.2

Andrew <[email protected]>
Newsgroups gmane.linux.leaf.cvs
Message-ID <[email protected]> 
Update of /cvsroot/leaf/src/bering-uclibc4/source/accel-pptp
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv10446

Modified Files:
	buildtool.cfg buildtool.mk 
Log Message:
Fixed trouble with pppd version detection (detected system pppd instead of 
one in staging dir)


Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/accel-pptp/buildtool.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** buildtool.cfg	11 Jun 2010 17:11:31 -0000	1.4
--- buildtool.cfg	8 Jul 2010 21:24:23 -0000	1.5
***************
*** 27,31 ****
  	<accel>
  		Version = 0.8.4
! 		Revision = 1
  
  		Help <<EOF
--- 27,31 ----
  	<accel>
  		Version = 0.8.4
! 		Revision = 3
  
  		Help <<EOF
***************
*** 58,62 ****
  				Filename        = etc/ppp/options.pptp
  				Type            = binary
! 				Type		= config
  				Type		= local
  			</File>	
--- 58,62 ----
  				Filename        = etc/ppp/options.pptp
  				Type            = binary
! 				Type		= conf
  				Type		= local
  			</File>	
***************
*** 83,87 ****
  				Filename        = etc/modules.d/accel-pptp
  				Type            = binary
! 				Type		= config
  				Type		= local
  			</File>	
--- 83,87 ----
  				Filename        = etc/modules.d/accel-pptp
  				Type            = binary
! 				Type		= conf
  				Type		= local
  			</File>	
***************
*** 92,96 ****
  	<accelsrv>
  		Version = 0.8.4
! 		Revision = 1
  
  		Help <<EOF
--- 92,96 ----
  	<accelsrv>
  		Version = 0.8.4
! 		Revision = 3
  
  		Help <<EOF
***************
*** 123,127 ****
  				Filename        = etc/pptpd.conf
  				Type            = binary
! 				Type		= config
  				Type		= local
  			</File>	
--- 123,127 ----
  				Filename        = etc/pptpd.conf
  				Type            = binary
! 				Type		= conf
  				Type		= local
  			</File>	
***************
*** 130,134 ****
  				Filename        = etc/ppp/options.pptpd
  				Type            = binary
! 				Type		= config
  				Type		= local
  			</File>	
--- 130,134 ----
  				Filename        = etc/ppp/options.pptpd
  				Type            = binary
! 				Type		= conf
  				Type		= local
  			</File>	
***************
*** 161,165 ****
  				Filename        = etc/init.d/pptpd
  				Type            = binary
! 				Type		= config
  				Type		= local
  				Permissions = 755
--- 161,165 ----
  				Filename        = etc/init.d/pptpd
  				Type            = binary
! 				Type		= conf
  				Type		= local
  				Permissions = 755

Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/accel-pptp/buildtool.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buildtool.mk	25 May 2010 15:39:34 -0000	1.1
--- buildtool.mk	8 Jul 2010 21:24:23 -0000	1.2
***************
*** 4,7 ****
--- 4,8 ----
  PPTP_DIR:=accel-pptp
  PPTP_TARGET_DIR:=$(BT_BUILD_DIR)/accel-pptp
+ BT_KERNEL_SOURCE:=$(BT_SOURCE_DIR)/linux/linux
  
  $(PPTP_DIR)/.source:
***************
*** 19,25 ****
  	mkdir -p $(PPTP_TARGET_DIR)/etc/modules.d
  	mkdir -p $(PPTP_TARGET_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/net
! 	(cd $(PPTP_DIR)/pptpd-1.3.3; ./configure --prefix=/usr --enable-bcrelay --with-libwrap)
! 	(cd $(PPTP_DIR)/pppd_plugin; ./configure --prefix=/usr)
  	(cd $(PPTP_DIR)/kernel/driver; $(MAKE) $(EXTRA_VARS) KDIR=$(BT_LINUX_DIR) CC=$(HOSTCC))
  	$(MAKE) -C $(PPTP_DIR)/pptpd-1.3.3 $(EXTRA_VARS) KDIR=$(BT_LINUX_DIR) CC=$(HOSTCC)
  	$(MAKE) -C $(PPTP_DIR)/pppd_plugin $(EXTRA_VARS) KDIR=$(BT_LINUX_DIR) CC=$(HOSTCC)
--- 20,42 ----
  	mkdir -p $(PPTP_TARGET_DIR)/etc/modules.d
  	mkdir -p $(PPTP_TARGET_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/net
! 	sed 's:\([="'\'' ]\+\)\(/usr\|/usr/local\)/\(s\)\?bin:\1$(BT_STAGING_DIR)\2/\3bin:g;' \
! 	$(PPTP_DIR)/pptpd-1.3.3/configure >$(PPTP_DIR)/pptpd-1.3.3/configure.1
! 	sed 's:\([="'\'' ]\+\)\(/usr\|/usr/local\)/\(s\)\?bin:\1$(BT_STAGING_DIR)\2/\3bin:g;' \
! 	$(PPTP_DIR)/pppd_plugin/configure >$(PPTP_DIR)/pppd_plugin/configure.1
! 	sed 's:/usr/src/linux:$(BT_KERNEL_SOURCE):g;' \
! 	$(PPTP_DIR)/pptpd-1.3.3/configure.1 >$(PPTP_DIR)/pptpd-1.3.3/configure.2
! 	sed 's:/usr/src/linux:$(BT_KERNEL_SOURCE):g;' \
! 	$(PPTP_DIR)/pppd_plugin/configure.1 >$(PPTP_DIR)/pppd_plugin/configure.2
! 	sed 's:which pppd:echo $(BT_STAGING_DIR)/usr/sbin/pppd:g;' \
! 	$(PPTP_DIR)/pppd_plugin/configure.2 >$(PPTP_DIR)/pppd_plugin/configure.3
! 	sed 's:which pppd:echo $(BT_STAGING_DIR)/usr/sbin/pppd:g;' \
! 	$(PPTP_DIR)/pptpd-1.3.3/configure.2 >$(PPTP_DIR)/pptpd-1.3.3/configure.3
! 	(cd $(PPTP_DIR)/pptpd-1.3.3; sh ./configure.3 --prefix=/usr --enable-bcrelay --with-libwrap)
! 	(cd $(PPTP_DIR)/pppd_plugin; sh ./configure.3 --prefix=/usr)
  	(cd $(PPTP_DIR)/kernel/driver; $(MAKE) $(EXTRA_VARS) KDIR=$(BT_LINUX_DIR) CC=$(HOSTCC))
+ 	sed 's:$(BT_STAGING_DIR)::g;' \
+ 	$(PPTP_DIR)/pptpd-1.3.3/config.h >$(PPTP_DIR)/pptpd-1.3.3/config.h.1
+ 	rm $(PPTP_DIR)/pptpd-1.3.3/config.h && \
+ 	mv $(PPTP_DIR)/pptpd-1.3.3/config.h.1 $(PPTP_DIR)/pptpd-1.3.3/config.h
  	$(MAKE) -C $(PPTP_DIR)/pptpd-1.3.3 $(EXTRA_VARS) KDIR=$(BT_LINUX_DIR) CC=$(HOSTCC)
  	$(MAKE) -C $(PPTP_DIR)/pppd_plugin $(EXTRA_VARS) KDIR=$(BT_LINUX_DIR) CC=$(HOSTCC)


------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.