summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/poky.bbclass29
-rw-r--r--meta/conf/distro/poky.conf28
2 files changed, 27 insertions, 30 deletions
diff --git a/meta/classes/poky.bbclass b/meta/classes/poky.bbclass
deleted file mode 100644
index 7d3c28ffe2..0000000000
--- a/meta/classes/poky.bbclass
+++ /dev/null
@@ -1,29 +0,0 @@
1PREMIRRORS_append () {
2bzr://.*/.* http://pokylinux.org/sources/
3cvs://.*/.* http://pokylinux.org/sources/
4git://.*/.* http://pokylinux.org/sources/
5hg://.*/.* http://pokylinux.org/sources/
6osc://.*/.* http://pokylinux.org/sources/
7p4://.*/.* http://pokylinux.org/sources/
8svk://.*/.* http://pokylinux.org/sources/
9svn://.*/.* http://pokylinux.org/sources/
10
11bzr://.*/.* http://autobuilder.pokylinux.org/sources/
12cvs://.*/.* http://autobuilder.pokylinux.org/sources/
13git://.*/.* http://autobuilder.pokylinux.org/sources/
14hg://.*/.* http://autobuilder.pokylinux.org/sources/
15osc://.*/.* http://autobuilder.pokylinux.org/sources/
16p4://.*/.* http://autobuilder.pokylinux.org/sources/
17svk://.*/.* http://autobuilder.pokylinux.org/sources/
18svn://.*/.* http://autobuilder.pokylinux.org/sources/
19}
20
21MIRRORS_append () {
22ftp://.*/.* http://pokylinux.org/sources/
23http://.*/.* http://pokylinux.org/sources/
24https://.*/.* http://pokylinux.org/sources/
25
26ftp://.*/.* http://autobuilder.pokylinux.org/sources/
27http://.*/.* http://autobuilder.pokylinux.org/sources/
28https://.*/.* http://autobuilder.pokylinux.org/sources/
29}
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index ee390dca85..fe2d49a3a9 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -12,7 +12,7 @@ USER_CLASSES ?= ""
12 12
13PACKAGE_CLASSES ?= "package_ipk" 13PACKAGE_CLASSES ?= "package_ipk"
14INHERIT_INSANE ?= "insane" 14INHERIT_INSANE ?= "insane"
15INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} debian poky devshell ${INHERIT_INSANE} sstate" 15INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} debian devshell ${INHERIT_INSANE} sstate"
16# For some reason, this doesn't work 16# For some reason, this doesn't work
17# TARGET_OS ?= "linux" 17# TARGET_OS ?= "linux"
18# TARGET_VENDOR ?= "-poky" 18# TARGET_VENDOR ?= "-poky"
@@ -141,6 +141,32 @@ COMMERCIAL_QT ?= ""
141 141
142require conf/distro/include/world-broken.inc 142require conf/distro/include/world-broken.inc
143 143
144PREMIRRORS_append = "\
145bzr://.*/.* http://pokylinux.org/sources/ \n \
146cvs://.*/.* http://pokylinux.org/sources/ \n \
147git://.*/.* http://pokylinux.org/sources/ \n \
148hg://.*/.* http://pokylinux.org/sources/ \n \
149osc://.*/.* http://pokylinux.org/sources/ \n \
150p4://.*/.* http://pokylinux.org/sources/ \n \
151svk://.*/.* http://pokylinux.org/sources/ \n \
152svn://.*/.* http://pokylinux.org/sources/ \n \
153bzr://.*/.* http://autobuilder.pokylinux.org/sources/ \n \
154cvs://.*/.* http://autobuilder.pokylinux.org/sources/ \n \
155git://.*/.* http://autobuilder.pokylinux.org/sources/ \n \
156hg://.*/.* http://autobuilder.pokylinux.org/sources/ \n \
157osc://.*/.* http://autobuilder.pokylinux.org/sources/ \n \
158p4://.*/.* http://autobuilder.pokylinux.org/sources/ \n \
159svk://.*/.* http://autobuilder.pokylinux.org/sources/ \n \
160svn://.*/.* http://autobuilder.pokylinux.org/sources/ \n"
161
162MIRRORS_append = "\
163ftp://.*/.* http://pokylinux.org/sources/ \n \
164http://.*/.* http://pokylinux.org/sources/ \n \
165https://.*/.* http://pokylinux.org/sources/ \n \
166ftp://.*/.* http://autobuilder.pokylinux.org/sources/ \n \
167http://.*/.* http://autobuilder.pokylinux.org/sources/ \n \
168https://.*/.* http://autobuilder.pokylinux.org/sources/ \n"
169
144# Setup our hash policy 170# Setup our hash policy
145BB_SIGNATURE_HANDLER = "basic" 171BB_SIGNATURE_HANDLER = "basic"
146BB_HASHTASK_WHITELIST = "(.*-cross$|.*-native$|.*-cross-initial$|.*-cross-intermediate$|^virtual:native:.*|^virtual:nativesdk:.*)" 172BB_HASHTASK_WHITELIST = "(.*-cross$|.*-native$|.*-cross-initial$|.*-cross-intermediate$|^virtual:native:.*|^virtual:nativesdk:.*)"