summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2006-01-07 08:58:44 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-07 08:58:44 +0000
commit8fb6b2d3d410ad2badf0c99ed7a66b698aafaa17 (patch)
tree8a700d795bdf33061b8bccc353fe0aaffa044036 /conf
parent0b67482ddc4fe571d16fa094627abb447b9a8edb (diff)
slugos: Major rename of common SlugOS files and directories from openslug to slugos.
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/slugos-packages.conf2
-rw-r--r--conf/distro/slugos.conf10
2 files changed, 4 insertions, 8 deletions
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index 36c48e219e..efafe698dd 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -148,7 +148,6 @@ ${PKGDIR}/packages/openldap/*.bb \
${PKGDIR}/packages/openntpd/*.bb \
${PKGDIR}/packages/openobex-apps/*.bb \
${PKGDIR}/packages/openobex/*.bb \
-${PKGDIR}/packages/openslug-init/*.bb \
${PKGDIR}/packages/opensp/*.bb \
${PKGDIR}/packages/openssh/*.bb \
${PKGDIR}/packages/openssl/*.bb \
@@ -185,6 +184,7 @@ ${PKGDIR}/packages/sed/*.bb \
${PKGDIR}/packages/setpwc/*.bb \
${PKGDIR}/packages/sgml-common/*.bb \
${PKGDIR}/packages/slugimage/*.bb \
+${PKGDIR}/packages/slugos-init/*.bb \
${PKGDIR}/packages/ssmtp/*.bb \
${PKGDIR}/packages/strace/*.bb \
${PKGDIR}/packages/streamripper/*.bb \
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 6ebec413c5..21f1ae5bb9 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -21,9 +21,8 @@
#
# The following names are deprecated:
#
-# openslug - the historical name of a canonical nslu2-bag distro,
-# used generically for NSLU2 specific distro features and
-# the default OVERRIDE for all these NSLU2 builds
+# openslug - the historical name of a canonical nslu2-bag distro
+# also the name of a standard nslu2-bag distro with a package feed
# ucslugc - the historical (and obsolete) name of nslu2-btu
# also the name of a standard nslu2-btu distro with a package feed
#
@@ -62,10 +61,7 @@ USE_NLS_glib-2.0 = "yes"
INHERIT += "package_ipk debian"
-# The value of DISTRO_BASE is set to 'openslug' to pick up the original openslug
-# overrides, slugos is the preferred override!
-#FIXME: remove openslug
-DISTRO_BASE = ":slugos:openslug"
+DISTRO_BASE = ":slugos"
# packages/meta/slugos-image.bb generates a binary image of the root file system
# with a name controlled by the following setting - it defaults to the top level