Ver Fonte

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>
Joshua Lock há 15 anos atrás
pai
commit
cd8de7b443
2 ficheiros alterados com 1 adições e 13 exclusões
  1. 0 12
      meta-moblin/classes/moblin.bbclass
  2. 1 1
      meta-moblin/conf/distro/moblin.conf

+ 0 - 12
meta-moblin/classes/moblin.bbclass

@@ -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/
-}

+ 1 - 1
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"