summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-05-06 15:52:36 +0100
committerJoshua Lock <josh@linux.intel.com>2010-05-06 15:54:55 +0100
commitcd8de7b443775f26dcfa72be9b852540f77c9af3 (patch)
tree1ae3f11e6b974b0d519a231896b70aebf000b577
parent3b9ac3f017b82f5b670f2c6dcb833e30281b9911 (diff)
downloadpoky-cd8de7b443775f26dcfa72be9b852540f77c9af3.tar.gz
moblin: drop moblin.conf and inherit poky for mirror configuration
Doesn't make any sense to duplicate the mirror configuration, and all that the moblin class contained was minimal mirror config. So let's drop it. Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta-moblin/classes/moblin.bbclass12
-rw-r--r--meta-moblin/conf/distro/moblin.conf2
2 files changed, 1 insertions, 13 deletions
diff --git a/meta-moblin/classes/moblin.bbclass b/meta-moblin/classes/moblin.bbclass
deleted file mode 100644
index aac6957583..0000000000
--- a/meta-moblin/classes/moblin.bbclass
+++ /dev/null
@@ -1,12 +0,0 @@
1
2PREMIRRORS_append () {
3ftp://.*/.* http://pokylinux.org/sources/
4http://.*/.* http://pokylinux.org/sources/
5https://.*/.* http://pokylinux.org/sources/
6}
7
8MIRRORS_append () {
9ftp://.*/.* http://pokylinux.org/sources/
10http://.*/.* http://pokylinux.org/sources/
11https://.*/.* http://pokylinux.org/sources/
12}
diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf
index f322f0c5af..05888ac667 100644
--- a/meta-moblin/conf/distro/moblin.conf
+++ b/meta-moblin/conf/distro/moblin.conf
@@ -6,7 +6,7 @@ MAINTAINER = "Moblin <dev@lists.moblin.org>"
6 6
7PACKAGE_CLASSES ?= "package_ipk package_rpm" 7PACKAGE_CLASSES ?= "package_ipk package_rpm"
8INHERIT_INSANE ?= "insane" 8INHERIT_INSANE ?= "insane"
9INHERIT += "${PACKAGE_CLASSES} debian moblin devshell ${INHERIT_INSANE} packaged-staging packagehistory" 9INHERIT += "${PACKAGE_CLASSES} debian poky devshell ${INHERIT_INSANE} packaged-staging packagehistory"
10 10
11# For some reason, this doesn't work 11# For some reason, this doesn't work
12# TARGET_OS ?= "linux" 12# TARGET_OS ?= "linux"