[leaf-commits] src/bering-uclibc4/source/dhcpcd buildtool.cfg, 1.2, 1.3 buildtool.mk, 1.2, 1.3 dhcpcd.conf, 1.1, 1.2

Update of /cvsroot/leaf/src/bering-uclibc4/source/dhcpcd
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4414

Modified Files:
	buildtool.cfg buildtool.mk dhcpcd.conf 
Log Message:
Patched dhcpcd-hooks/20-resolv.conf to create /etc/dhcpc/resolv.conf

Index: dhcpcd.conf
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/dhcpcd/dhcpcd.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dhcpcd.conf	1 Jul 2010 15:13:38 -0000	1.1
--- dhcpcd.conf	29 Oct 2010 19:46:19 -0000	1.2
***************
*** 6,10 ****
  
  # A list of options we should request from the DHCP server.
! #option domain_name_servers, domain_name, domain_search, host_name
  # Most distros have ntp support.
  #option ntp_servers
--- 6,10 ----
  
  # A list of options we should request from the DHCP server.
! option domain_name_servers, domain_name, domain_search, host_name
  # Most distros have ntp support.
  #option ntp_servers
***************
*** 19,22 ****
  nohook 30-hostname
  
- # do not change resolv.conf
- nohook 20-resolv.conf
\ No newline at end of file
--- 19,20 ----

Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/dhcpcd/buildtool.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildtool.mk	1 Jul 2010 15:13:38 -0000	1.2
--- buildtool.mk	29 Oct 2010 19:46:19 -0000	1.3
***************
*** 1,19 ****
! # makefile for dhcpcd
  include $(MASTERMAKEFILE)
  
! DHCPCD_DIR:=dhcpcd-4.0.15
  DHCPCD_TARGET_DIR:=$(BT_BUILD_DIR)/dhcpcd
  
  $(DHCPCD_DIR)/.source:
  	bzcat $(DHCPCD_SOURCE) | tar -xvf -
  	touch $(DHCPCD_DIR)/.source
  
  source: $(DHCPCD_DIR)/.source
                          
! $(DHCPCD_DIR)/.configured:
! 	#(cd $(DHCPD_DIR) ; LD=$(TARGET_LD) ./configure )
! 	touch $(DHCPCD_DIR)/.configured
!                                                                  
! $(DHCPCD_DIR)/.build: $(DHCPCD_DIR)/.configured
  	mkdir -p $(DHCPCD_TARGET_DIR)
  	mkdir -p $(BT_STAGING_DIR)/sbin
--- 1,25 ----
! #############################################################
! #
! # dhcpcd
! #
! #############################################################
! 
  include $(MASTERMAKEFILE)
  
! DHCPCD_DIR:=$(shell $(BT_TGZ_GETDIRNAME) $(DHCPCD_SOURCE) 2>/dev/null )
! ifeq ($(DHCPCD_DIR),)
! DHCPCD_DIR:=$(shell cat DIRNAME)
! endif
  DHCPCD_TARGET_DIR:=$(BT_BUILD_DIR)/dhcpcd
  
  $(DHCPCD_DIR)/.source:
  	bzcat $(DHCPCD_SOURCE) | tar -xvf -
+ 	echo $(DHCPCD_DIR) > DIRNAME
+ 	cat $(DHCPCD_PATCH1) | patch -d $(DHCPCD_DIR) -p1
  	touch $(DHCPCD_DIR)/.source
  
  source: $(DHCPCD_DIR)/.source
                          
! $(DHCPCD_DIR)/.build: $(DHCPCD_DIR)/.source
  	mkdir -p $(DHCPCD_TARGET_DIR)
  	mkdir -p $(BT_STAGING_DIR)/sbin
***************
*** 22,26 ****
  	make -C $(DHCPCD_DIR) CC=$(TARGET_CC)
  	make -C $(DHCPCD_DIR) CC=$(TARGET_CC) DESTDIR=$(DHCPCD_TARGET_DIR) install
- 
  	-$(BT_STRIP) $(BT_STRIP_BINOPTS) $(DHCPCD_TARGET_DIR)/sbin/*
  	
--- 28,31 ----
***************
*** 41,43 ****
  srcclean: clean
  	rm -rf $(DHCPCD_DIR) 
! 	
\ No newline at end of file
--- 46,49 ----
  srcclean: clean
  	rm -rf $(DHCPCD_DIR) 
! 	rm DIRNAME
! 	

Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/dhcpcd/buildtool.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildtool.cfg	1 Jul 2010 15:13:38 -0000	1.2
--- buildtool.cfg	29 Oct 2010 19:46:19 -0000	1.3
***************
*** 12,15 ****
--- 12,22 ----
  </File>
  
+ <File upstream_resolv_conf_dir.patch>
+   Server = cvs4-sourceforge
+   Revision = HEAD
+   envname = DHCPCD_PATCH1
+   Directory = dhcpcd
+ </File>
+ 
  <File dhcpcd.conf>
    Server = cvs4-sourceforge
***************
*** 23,27 ****
  	<dhcpcd>
  		Version = 4.0.15
! 		Revision = 1
  
  		Help <<EOF
--- 30,34 ----
  	<dhcpcd>
  		Version = 4.0.15
! 		Revision = 2
  
  		Help <<EOF


------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in  U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store 
http://p.sf.net/sfu/nokia-dev2dev