[leaf-commits] src/bering-uclibc4/source/accel-pptp buildtool.cfg, 1.9, 1.10 buildtool.mk, 1.4, 1.5
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-serv20640/accel-pptp Modified Files: buildtool.cfg buildtool.mk Log Message: First try to make multi-kernel distro Index: buildtool.cfg =================================================================== RCS file: /cvsroot/leaf/src/bering-uclibc4/source/accel-pptp/buildtool.cfg,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** buildtool.cfg 21 Oct 2010 15:39:00 -0000 1.9 --- buildtool.cfg 31 Oct 2010 23:11:39 -0000 1.10 *************** *** 33,37 **** <accel> Version = 0.8.5 ! Revision = 3 Help <<EOF --- 33,37 ---- <accel> Version = 0.8.5 ! Revision = 4 Help <<EOF *************** *** 73,95 **** Permissions = 755 </File> ! <File> ! Source = usr/lib/pppd/pptp.so ! Filename = usr/lib/pppd/pptp.so ! Type = binary ! Permissions = 755 ! </File> ! <File> ! Source = lib/modules/__KVER__/net/pptp.ko ! Filename = lib/modules/pptp.ko ! Type = binary ! Type = module ! </File> ! <File> ! Source = etc/modules.d/accel-pptp ! Filename = etc/modules.d/accel-pptp ! Type = binary ! Type = conf ! Type = local ! </File> </Contents> --- 73,89 ---- Permissions = 755 </File> ! # <File> ! # Source = usr/lib/pppd/pptp.so ! # Filename = usr/lib/pppd/pptp.so ! # Type = binary ! # Permissions = 755 ! # </File> ! # <File> ! # Source = etc/modules.d/accel-pptp ! # Filename = etc/modules.d/accel-pptp ! # Type = binary ! # Type = conf ! # Type = local ! # </File> </Contents> *************** *** 98,102 **** <accelsrv> Version = 0.8.5 ! Revision = 3 Help <<EOF --- 92,96 ---- <accelsrv> Version = 0.8.5 ! Revision = 4 Help <<EOF Index: buildtool.mk =================================================================== RCS file: /cvsroot/leaf/src/bering-uclibc4/source/accel-pptp/buildtool.mk,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** buildtool.mk 19 Oct 2010 17:06:51 -0000 1.4 --- buildtool.mk 31 Oct 2010 23:11:39 -0000 1.5 *************** *** 19,23 **** mkdir -p $(PPTP_TARGET_DIR)/etc/init.d 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 --- 19,22 ---- *************** *** 32,45 **** 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) ! cp -a $(PPTP_DIR)/kernel/driver/pptp.ko $(PPTP_TARGET_DIR)/lib/modules/$(BT_KERNEL_RELEASE)/net cp -a $(PPTP_DIR)/pptpd-1.3.3/pptpd $(PPTP_TARGET_DIR)/usr/sbin cp -a $(PPTP_DIR)/pptpd-1.3.3/pptpctrl $(PPTP_TARGET_DIR)/usr/sbin --- 31,51 ---- 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; KDIR=$(BT_LINUX_DIR)$(FIRSTKARCH) \ ! sh ./configure.3 --prefix=/usr --enable-bcrelay --with-libwrap) ! (cd $(PPTP_DIR)/pppd_plugin; KDIR=$(BT_LINUX_DIR)$(FIRSTKARCH) \ ! sh ./configure.3 --prefix=/usr) ! ! (for i in $(KARCHS); do export LOCALVERSION="-$$i" ; \ ! mkdir -p $(PPTP_TARGET_DIR)/lib/modules/$(BT_KERNEL_RELEASE)-$$i/net ; \ ! cd $(PPTP_DIR)/kernel/driver && $(MAKE) $(EXTRA_VARS) KDIR=$(BT_LINUX_DIR)-$$i CC=$(HOSTCC) && \ ! cp -a pptp.ko $(PPTP_TARGET_DIR)/lib/modules/$(BT_KERNEL_RELEASE)-$$i/net ||\ ! exit 1 ; done) ! 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)$(FIRSTKARCH) CC=$(HOSTCC) ! $(MAKE) -C $(PPTP_DIR)/pppd_plugin $(EXTRA_VARS) KDIR=$(BT_LINUX_DIR)$(FIRSTKARCH) CC=$(HOSTCC) cp -a $(PPTP_DIR)/pptpd-1.3.3/pptpd $(PPTP_TARGET_DIR)/usr/sbin cp -a $(PPTP_DIR)/pptpd-1.3.3/pptpctrl $(PPTP_TARGET_DIR)/usr/sbin ------------------------------------------------------------------------------ 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