[or-cvs] r19010: {torvm} Remove ccache until it can fail gracefully; fix geoip data f (torvm/trunk/build/kamikaze/patches)

[coderman@xxxxxxxx]

Author: coderman
Date: 2009-03-15 05:14:00 -0400 (Sun, 15 Mar 2009)
New Revision: 19010

Modified:
   torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch
   torvm/trunk/build/kamikaze/patches/005-kamikaze-build-config.patch
Log:
Remove ccache until it can fail gracefully; fix geoip data file installation into staging dir.

Modified: torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch	2009-03-15 08:50:28 UTC (rev 19009)
+++ torvm/trunk/build/kamikaze/patches/001-kamikaze-tor-package.patch	2009-03-15 09:14:00 UTC (rev 19010)
@@ -1,6 +1,6 @@
 diff -Naur a/package/tor/Makefile b/package/tor/Makefile
 --- a/package/tor/Makefile	1970-01-01 00:00:00.000000000 +0000
-+++ b/package/tor/Makefile	2009-03-15 04:21:36.085671648 +0000
++++ b/package/tor/Makefile	2009-03-15 09:11:17.875237984 +0000
 @@ -0,0 +1,113 @@
 +#
 +# Copyright (C) 2008 OpenWrt.org
@@ -105,10 +105,10 @@
 +define Package/tor/install
 +	$(INSTALL_DIR) $(1)/usr/sbin
 +	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/or/tor $(1)/usr/sbin/
-+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/config/geoip $(1)/etc/tor/geoip
 +	$(INSTALL_DIR) $(1)/etc/init.d
 +	$(INSTALL_BIN) ./files/tor.init $(1)/etc/init.d/tor
 +	$(INSTALL_DIR) $(1)/etc/tor
++	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/config/geoip $(1)/etc/tor/geoip
 +	$(INSTALL_DATA) ./files/torrc $(1)/etc/tor/torrc
 +	$(INSTALL_DIR) $(1)/var/log/tor
 +	$(INSTALL_DIR) $(1)/var/run/tor

Modified: torvm/trunk/build/kamikaze/patches/005-kamikaze-build-config.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/005-kamikaze-build-config.patch	2009-03-15 08:50:28 UTC (rev 19009)
+++ torvm/trunk/build/kamikaze/patches/005-kamikaze-build-config.patch	2009-03-15 09:14:00 UTC (rev 19010)
@@ -1,6 +1,6 @@
 diff -Naur a/.config b/.config
 --- a/.config	1970-01-01 00:00:00.000000000 +0000
-+++ b/.config	2009-03-14 19:50:51.158408720 +0000
++++ b/.config	2009-03-15 08:41:53.424475272 +0000
 @@ -0,0 +1,1291 @@
 +#
 +# Automatically generated make config: don't edit
@@ -223,7 +223,7 @@
 +CONFIG_LOCALMIRROR=""
 +CONFIG_AUTOREBUILD=y
 +CONFIG_BUILD_SUFFIX=""
-+CONFIG_CCACHE=y
++# CONFIG_CCACHE is not set
 +CONFIG_EXTERNAL_KERNEL_TREE=""
 +CONFIG_KERNEL_GIT_CLONE_URI=""
 +CONFIG_KERNEL_GIT_LOCAL_REPOSITORY=""