meta-poky/conf: move default templates to conf/templates/default/

This follows the changes in oe-core, where templates are expected
to be under conf/templates.

(From meta-yocto rev: 29608bd03e1bffa124353061617b1d71370a4e5f)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 0 insertions, 33 deletions

diff --git a/meta-poky/conf/site.conf.sample b/meta-poky/conf/site.conf.sample
deleted file mode 100644
index 5164fedf63..0000000000
--- a/meta-poky/conf/site.conf.sample
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# local.conf covers user settings, site.conf covers site specific information
-# such as proxy server addresses and optionally any shared download location
-#
-# SITE_CONF_VERSION is increased each time build/conf/site.conf
-# changes incompatibly
-SCONF_VERSION = "1"
-
-# Uncomment to cause CVS to use the proxy host specified
-#CVS_PROXY_HOST = "proxy.example.com"
-#CVS_PROXY_PORT = "81"
-
-# For svn, you need to create ~/.subversion/servers containing:
-#[global]
-#http-proxy-host = proxy.example.com
-#http-proxy-port = 81
-#
-
-# To use git with a proxy, you must use an external git proxy command, such as
-# the one provided by scripts/oe-git-proxy. To use this script, copy it to
-# your PATH and uncomment the following:
-#GIT_PROXY_COMMAND ?= "oe-git-proxy"
-#ALL_PROXY ?= "socks://socks.example.com:1080"
-#or
-#ALL_PROXY ?= "https://proxy.example.com:8080"
-# If you wish to use certain hosts without the proxy, specify them in NO_PROXY.
-# See the script for details on syntax. The script oe-git-proxy uses some tools
-# that may not be included on HOSTTOOLS, thus  add them manually through
-# HOSTTOOLS += "getent"
-
-# Uncomment this to use a shared download directory
-#DL_DIR = "/some/shared/download/directory/"
-