diff options
| author |   Joshua Lock <josh@linux.intel.com> | 2010-05-06 15:52:36 +0100 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-05-06 15:54:55 +0100 |
| commit | cd8de7b443775f26dcfa72be9b852540f77c9af3 (patch) | |
| tree | 1ae3f11e6b974b0d519a231896b70aebf000b577 /meta-moblin | |
| parent | 3b9ac3f017b82f5b670f2c6dcb833e30281b9911 (diff) | |
| download | openembedded-core-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>
Diffstat (limited to 'meta-moblin')
| -rw-r--r-- | meta-moblin/classes/moblin.bbclass | 12 | ||||
| -rw-r--r-- | meta-moblin/conf/distro/moblin.conf | 2 |
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" |