diff options
-rw-r--r-- | build/conf/local.conf.sample | 5 | ||||
-rw-r--r-- | meta-moblin/conf/distro/moblin.conf | 2 | ||||
-rw-r--r-- | meta/conf/distro/poky.conf | 2 |
3 files changed, 0 insertions, 9 deletions
diff --git a/build/conf/local.conf.sample b/build/conf/local.conf.sample index 14af548efd..e195b33b88 100644 --- a/build/conf/local.conf.sample +++ b/build/conf/local.conf.sample | |||
@@ -141,11 +141,6 @@ TMPDIR = "${OEROOT}/build/tmp" | |||
141 | # Uncomment this if you want BitBake to emit the log if a build fails. | 141 | # Uncomment this if you want BitBake to emit the log if a build fails. |
142 | BBINCLUDELOGS = "yes" | 142 | BBINCLUDELOGS = "yes" |
143 | 143 | ||
144 | # Specifies a location to search for pre-generated tarballs when fetching | ||
145 | # a cvs:// or svn:// URI. Uncomment this, if you do not want to pull directly | ||
146 | # from CVS or Subversion | ||
147 | SRC_TARBALL_STASH = "http://pokylinux.org/sources/" | ||
148 | |||
149 | # Set this if you wish to make pkgconfig libraries from your system available | 144 | # Set this if you wish to make pkgconfig libraries from your system available |
150 | # for native builds. Combined with extra ASSUME_PROVIDEDs this can allow | 145 | # for native builds. Combined with extra ASSUME_PROVIDEDs this can allow |
151 | # native builds of applications like oprofileui-native (unsupported feature). | 146 | # native builds of applications like oprofileui-native (unsupported feature). |
diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf index 5138e76a54..129b2cc305 100644 --- a/meta-moblin/conf/distro/moblin.conf +++ b/meta-moblin/conf/distro/moblin.conf | |||
@@ -89,8 +89,6 @@ require conf/distro/include/preferred-xorg-versions.inc | |||
89 | 89 | ||
90 | PCMCIA_MANAGER ?= "pcmciautils" | 90 | PCMCIA_MANAGER ?= "pcmciautils" |
91 | 91 | ||
92 | SRC_TARBALL_STASH += "http://pokylinux.org/sources/" | ||
93 | |||
94 | IMAGE_LINGUAS ?= "en-gb" | 92 | IMAGE_LINGUAS ?= "en-gb" |
95 | LIMIT_BUILT_LOCALES ?= "en_GB" | 93 | LIMIT_BUILT_LOCALES ?= "en_GB" |
96 | ENABLE_BINARY_LOCALE_GENERATION ?= "1" | 94 | ENABLE_BINARY_LOCALE_GENERATION ?= "1" |
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 2bf4be8c04..0a83defb5a 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf | |||
@@ -94,8 +94,6 @@ require conf/distro/include/preferred-xorg-versions.inc | |||
94 | 94 | ||
95 | PCMCIA_MANAGER ?= "pcmciautils" | 95 | PCMCIA_MANAGER ?= "pcmciautils" |
96 | 96 | ||
97 | SRC_TARBALL_STASH += "http://pokylinux.org/sources/" | ||
98 | |||
99 | IMAGE_LINGUAS ?= "en-gb" | 97 | IMAGE_LINGUAS ?= "en-gb" |
100 | LIMIT_BUILT_LOCALES ?= "en_GB" | 98 | LIMIT_BUILT_LOCALES ?= "en_GB" |
101 | ENABLE_BINARY_LOCALE_GENERATION ?= "1" | 99 | ENABLE_BINARY_LOCALE_GENERATION ?= "1" |