From: Joshua Lock <josh@linux.intel.com>
Date: Thu, 6 May 2010 14:52:36 +0000 (+0100)
Subject: moblin: drop moblin.conf and inherit poky for mirror configuration
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~50153
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd8de7b443775f26dcfa72be9b852540f77c9af3;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/meta-moblin/classes/moblin.bbclass b/meta-moblin/classes/moblin.bbclass
deleted file mode 100644
index aac69575831..00000000000
--- a/meta-moblin/classes/moblin.bbclass
+++ /dev/null
@@ -1,12 +0,0 @@
-
-PREMIRRORS_append () {
-ftp://.*/.*    http://pokylinux.org/sources/
-http://.*/.*   http://pokylinux.org/sources/
-https://.*/.*   http://pokylinux.org/sources/
-}
-
-MIRRORS_append () {
-ftp://.*/.*    http://pokylinux.org/sources/
-http://.*/.*   http://pokylinux.org/sources/
-https://.*/.*   http://pokylinux.org/sources/
-}
diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf
index f322f0c5afc..05888ac667e 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>"
 
 PACKAGE_CLASSES ?= "package_ipk package_rpm"
 INHERIT_INSANE ?= "insane"
-INHERIT += "${PACKAGE_CLASSES} debian moblin devshell ${INHERIT_INSANE} packaged-staging packagehistory"
+INHERIT += "${PACKAGE_CLASSES} debian poky devshell ${INHERIT_INSANE} packaged-staging packagehistory"
 
 # For some reason, this doesn't work
 # TARGET_OS ?= "linux"