debianslug.conf, openslug.conf: Deprecated in favour of common slugos.conf

diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
deleted file mode 100644 (file)
index 59123fd..0000000
--- a/conf/distro/debianslug.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#@TYPE: Distribution
-#@NAME: DebianSlug
-#@DESCRIPTION: DebianSlug Linux Distribution for the NSLU2
-
-DISTRO_NAME = "DebianSlug"
-IMAGE_BASENAME = "debianslug"
-TARGET_ARCH = "arm"
-ARM_INSTRUCTION_SET = "arm"
-TARGET_OS = "linux"
-
-require conf/distro/slugos.conf

diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
deleted file mode 100644 (file)
index f03c4f6..0000000
--- a/conf/distro/openslug.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#@TYPE: Distribution
-#@NAME: OpenSlug
-#@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
-
-DISTRO_NAME = "OpenSlug"
-IMAGE_BASENAME = "openslug"
-TARGET_ARCH = "armeb"
-ARM_INSTRUCTION_SET = "arm"
-TARGET_OS = "linux"
-
-require conf/distro/slugos.conf

diff --git a/conf/distro/openslug-native.conf b/conf/distro/slugos-native.conf
similarity index 81%
rename from conf/distro/openslug-native.conf
rename to conf/distro/slugos-native.conf
index ac77532..77258c7 100644 (file)
--- a/conf/distro/openslug-native.conf
+++ b/conf/distro/slugos-native.conf
@@ -1,9 +1,9 @@
 # Our build host is armeb, not armv5eb that the kernel reports
 BUILD_ARCH = "armeb"
 
-require conf/distro/openslug.conf
+require conf/distro/slugos.conf
 
-# Corresponding packages should be in openslug-native.bb,
+# Corresponding packages should be in slugos-native.bb,
 # currently missing: ipkg-utils libtool quilt pkgconfig
 ASSUME_PROVIDED = "libtool-cross \
                   libtool-native \