From 613606be24cae0a114b2d1aa81ddca0d44b61a10 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 12 Feb 2007 05:57:24 +0000
Subject: slugos: Major build structure change - subsumed openslug and
 debianslug into a single slugos distribution which works with either nslu2be
 or nslu2le machines.  Kept the openslug and debianslug conf files around to
 enable people to migrate smoothly, but eventually they will disappear.

---
 packages/images/slugos-image.bb         | 3 +--
 packages/meta/slugos-native-packages.bb | 1 -
 packages/meta/slugos-native.bb          | 1 -
 packages/meta/slugos-packages.bb        | 4 ++--
 4 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'packages')

diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index 1ca30f9d9d..ce591f7e4e 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -7,11 +7,10 @@ DESCRIPTION = "Generic SlugOS image"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
 PR = "r45"
-PROVIDES += "${SLUGOS_DISTRO}-image"
 
 COMPATIBLE_MACHINE = "nslu2"
 
-IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}"
+IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}"
 IMAGE_FSTYPES = "jffs2"
 EXTRA_IMAGECMD_jffs2 += " -D ${SLUGOS_DEVICE_TABLE}"
 IMAGE_LINGUAS = ""
diff --git a/packages/meta/slugos-native-packages.bb b/packages/meta/slugos-native-packages.bb
index db2ab46a3c..4505c9979c 100644
--- a/packages/meta/slugos-native-packages.bb
+++ b/packages/meta/slugos-native-packages.bb
@@ -2,7 +2,6 @@
 DESCRIPTION = "Packages that are to be compiled natively for the SlugOS firmware"
 LICENSE = "MIT"
 PR = "r1"
-PROVIDES += "${SLUGOS_DISTRO}-native-packages"
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb
index 9a4e17d56a..3b4023ba45 100644
--- a/packages/meta/slugos-native.bb
+++ b/packages/meta/slugos-native.bb
@@ -11,7 +11,6 @@ INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
 ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
-PROVIDES += "${SLUGOS_DISTRO}-native"
 
 # Run-time only (RDEPENDS) stuff - no package explicitly provides
 # these targets.
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 507600df32..064adaf03e 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,9 +5,8 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r17"
+PR = "r18"
 CONFLICTS = "db3"
-PROVIDES += "${SLUGOS_DISTRO}-packages"
 
 COMPATIBLE_MACHINE = "nslu2"
 EXCLUDE_FROM_WORLD = "1"
@@ -106,6 +105,7 @@ SLUGOS_PACKAGES = "\
 	make \
 	masqmail \
 	mdadm \
+	mediatomb \
 	memtester \
 	mgetty \
 	miau \
-- 
cgit v1.2.3