From 8fb6b2d3d410ad2badf0c99ed7a66b698aafaa17 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 7 Jan 2006 08:58:44 +0000 Subject: slugos: Major rename of common SlugOS files and directories from openslug to slugos. --- conf/distro/slugos-packages.conf | 2 +- conf/distro/slugos.conf | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'conf') 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 -- cgit v1.2.3