From cd8de7b443775f26dcfa72be9b852540f77c9af3 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Thu, 6 May 2010 15:52:36 +0100 Subject: [PATCH] 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 --- meta-moblin/classes/moblin.bbclass | 12 ------------ meta-moblin/conf/distro/moblin.conf | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 meta-moblin/classes/moblin.bbclass 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 " 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"