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