From e3db3e898d593acc7fcfc3f48a356bbe6bd0b6a0 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 14 Jul 2006 22:27:42 +0000
Subject: [PATCH] distro configurations: rename include files to *.inc and
 adjust those which include it accordingly

---
 conf/distro/amsdelta-oe.conf                                | 2 +-
 conf/distro/angstrom-2006.9.conf                            | 4 ++--
 conf/distro/familiar-unstable.conf                          | 4 ++--
 conf/distro/generic.conf                                    | 2 +-
 conf/distro/include/{angstrom.conf => angstrom.inc}         | 0
 .../{debianslug-packages.conf => debianslug-packages.inc}   | 0
 conf/distro/include/{familiar.conf => familiar.inc}         | 0
 conf/distro/{freeze.conf => include/freeze.inc}             | 6 +++---
 .../include/{ludeos-packages.conf => ludeos-packages.inc}   | 0
 ...ug-native-packages.conf => openslug-native-packages.inc} | 0
 .../{openslug-packages.conf => openslug-packages.inc}       | 0
 conf/distro/include/{openzaurus.conf => openzaurus.inc}     | 0
 .../include/{sane-srcdates.conf => sane-srcdates.inc}       | 0
 .../include/{slugos-packages.conf => slugos-packages.inc}   | 0
 conf/distro/include/{slugos.conf => slugos.inc}             | 0
 .../include/{ucslugc-packages.conf => ucslugc-packages.inc} | 0
 .../include/{unslung-packages.conf => unslung-packages.inc} | 0
 conf/distro/ludeos.conf                                     | 2 +-
 conf/distro/maemo-1.0.conf                                  | 2 +-
 conf/distro/openzaurus-unstable-uclibc.conf                 | 2 +-
 conf/distro/openzaurus-unstable.conf                        | 2 +-
 conf/distro/slugos-bag.conf                                 | 2 +-
 conf/distro/slugos-bau.conf                                 | 2 +-
 conf/distro/slugos-btu.conf                                 | 2 +-
 conf/distro/slugos-lag.conf                                 | 2 +-
 conf/distro/slugos-lau.conf                                 | 2 +-
 conf/distro/slugos-ltu.conf                                 | 2 +-
 conf/distro/unslung.conf                                    | 2 +-
 28 files changed, 20 insertions(+), 20 deletions(-)
 rename conf/distro/include/{angstrom.conf => angstrom.inc} (100%)
 rename conf/distro/include/{debianslug-packages.conf => debianslug-packages.inc} (100%)
 rename conf/distro/include/{familiar.conf => familiar.inc} (100%)
 rename conf/distro/{freeze.conf => include/freeze.inc} (89%)
 rename conf/distro/include/{ludeos-packages.conf => ludeos-packages.inc} (100%)
 rename conf/distro/include/{openslug-native-packages.conf => openslug-native-packages.inc} (100%)
 rename conf/distro/include/{openslug-packages.conf => openslug-packages.inc} (100%)
 rename conf/distro/include/{openzaurus.conf => openzaurus.inc} (100%)
 rename conf/distro/include/{sane-srcdates.conf => sane-srcdates.inc} (100%)
 rename conf/distro/include/{slugos-packages.conf => slugos-packages.inc} (100%)
 rename conf/distro/include/{slugos.conf => slugos.inc} (100%)
 rename conf/distro/include/{ucslugc-packages.conf => ucslugc-packages.inc} (100%)
 rename conf/distro/include/{unslung-packages.conf => unslung-packages.inc} (100%)

diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf
index 78b13b2590..4827e458d1 100644
--- a/conf/distro/amsdelta-oe.conf
+++ b/conf/distro/amsdelta-oe.conf
@@ -2,7 +2,7 @@ DISTRO = "amsdelta-oe"
 DISTRO_NAME = "AmsDelta Linux"
 DISTRO_VERSION = "unstable-${DATE}"
 
-require conf/distro/include/familiar.conf
+require conf/distro/include/familiar.inc
 
 
 DISTRO_TYPE = "debug"
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index b8a428455d..f1a2a74523 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -9,8 +9,8 @@
 #DISTRO_VERSION = "2006.9"
 DISTRO_VERSION = "test-${DATE}"
 
-require conf/distro/include/angstrom.conf
-require conf/distro/include/sane-srcdates.conf
+require conf/distro/include/angstrom.inc
+require conf/distro/include/sane-srcdates.inc
 
 DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf
index d9fe834cd1..a04b526f5f 100644
--- a/conf/distro/familiar-unstable.conf
+++ b/conf/distro/familiar-unstable.conf
@@ -2,7 +2,7 @@ DISTRO = "familiar"
 DISTRO_NAME = "Familiar Linux"
 DISTRO_VERSION = "unstable-${DATE}"
 
-require conf/distro/include/familiar.conf
+require conf/distro/include/familiar.inc
 
 DISTRO_TYPE = "debug"
 #DISTRO_TYPE = "release"
@@ -54,7 +54,7 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
 #
 PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-require conf/distro/include/sane-srcdates.conf
+require conf/distro/include/sane-srcdates.inc
 
 #
 # Opie
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index 9f53edbd51..b95cc42020 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -55,7 +55,7 @@ PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
 # Bootstrap & Init
 #
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-require conf/distro/include/sane-srcdates.conf
+require conf/distro/include/sane-srcdates.inc
 
 #
 # GPE
diff --git a/conf/distro/include/angstrom.conf b/conf/distro/include/angstrom.inc
similarity index 100%
rename from conf/distro/include/angstrom.conf
rename to conf/distro/include/angstrom.inc
diff --git a/conf/distro/include/debianslug-packages.conf b/conf/distro/include/debianslug-packages.inc
similarity index 100%
rename from conf/distro/include/debianslug-packages.conf
rename to conf/distro/include/debianslug-packages.inc
diff --git a/conf/distro/include/familiar.conf b/conf/distro/include/familiar.inc
similarity index 100%
rename from conf/distro/include/familiar.conf
rename to conf/distro/include/familiar.inc
diff --git a/conf/distro/freeze.conf b/conf/distro/include/freeze.inc
similarity index 89%
rename from conf/distro/freeze.conf
rename to conf/distro/include/freeze.inc
index b5376573b6..d41cb89111 100644
--- a/conf/distro/freeze.conf
+++ b/conf/distro/include/freeze.inc
@@ -1,6 +1,6 @@
 # general configuration file for freezing a distribution
 #
-# If freeze.conf is included (require conf/distro/include/freeze.conf) in the
+# If freeze.conf is included (require conf/distro/include/freeze.inc) in the
 # distro conf file it will define BBFILES from the information in
 # ${DISTRO}-bbfiles.conf or ${DISTRO}-packages.conf (whichever
 # exists in that order of preference.)
@@ -16,10 +16,10 @@ FROZEN_DIR ?= "/non/-existent/-directory/-for/-security"
 # includes allow the frozen file to be stored alongside local.conf
 # and in the conf/distro directory - the former take precedence over
 # the latter.
-require conf/distro/include/${DISTRO}-packages.conf
+require conf/distro/include/${DISTRO}-packages.inc
 include conf/${DISTRO}-packages.conf
 include ${FROZEN_DIR}/${DISTRO}-packages.conf
 
-require conf/distro/include/${DISTRO}-bbfiles.conf
+require conf/distro/include/${DISTRO}-bbfiles.inc
 include conf/${DISTRO}-bbfiles.conf
 include ${FROZEN_DIR}/${DISTRO}-bbfiles.conf
diff --git a/conf/distro/include/ludeos-packages.conf b/conf/distro/include/ludeos-packages.inc
similarity index 100%
rename from conf/distro/include/ludeos-packages.conf
rename to conf/distro/include/ludeos-packages.inc
diff --git a/conf/distro/include/openslug-native-packages.conf b/conf/distro/include/openslug-native-packages.inc
similarity index 100%
rename from conf/distro/include/openslug-native-packages.conf
rename to conf/distro/include/openslug-native-packages.inc
diff --git a/conf/distro/include/openslug-packages.conf b/conf/distro/include/openslug-packages.inc
similarity index 100%
rename from conf/distro/include/openslug-packages.conf
rename to conf/distro/include/openslug-packages.inc
diff --git a/conf/distro/include/openzaurus.conf b/conf/distro/include/openzaurus.inc
similarity index 100%
rename from conf/distro/include/openzaurus.conf
rename to conf/distro/include/openzaurus.inc
diff --git a/conf/distro/include/sane-srcdates.conf b/conf/distro/include/sane-srcdates.inc
similarity index 100%
rename from conf/distro/include/sane-srcdates.conf
rename to conf/distro/include/sane-srcdates.inc
diff --git a/conf/distro/include/slugos-packages.conf b/conf/distro/include/slugos-packages.inc
similarity index 100%
rename from conf/distro/include/slugos-packages.conf
rename to conf/distro/include/slugos-packages.inc
diff --git a/conf/distro/include/slugos.conf b/conf/distro/include/slugos.inc
similarity index 100%
rename from conf/distro/include/slugos.conf
rename to conf/distro/include/slugos.inc
diff --git a/conf/distro/include/ucslugc-packages.conf b/conf/distro/include/ucslugc-packages.inc
similarity index 100%
rename from conf/distro/include/ucslugc-packages.conf
rename to conf/distro/include/ucslugc-packages.inc
diff --git a/conf/distro/include/unslung-packages.conf b/conf/distro/include/unslung-packages.inc
similarity index 100%
rename from conf/distro/include/unslung-packages.conf
rename to conf/distro/include/unslung-packages.inc
diff --git a/conf/distro/ludeos.conf b/conf/distro/ludeos.conf
index aa3af96b25..c6722619f8 100644
--- a/conf/distro/ludeos.conf
+++ b/conf/distro/ludeos.conf
@@ -33,4 +33,4 @@ kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
-require conf/distro/include/slugos.conf
+require conf/distro/include/slugos.inc
diff --git a/conf/distro/maemo-1.0.conf b/conf/distro/maemo-1.0.conf
index 4dd9c49bfb..900f24dd03 100644
--- a/conf/distro/maemo-1.0.conf
+++ b/conf/distro/maemo-1.0.conf
@@ -1,4 +1,4 @@
-require conf/distro/include/familiar.conf
+require conf/distro/include/familiar.inc
 
 DISTRO = "maemo"
 DISTRO_NAME = "Maemo Linux"
diff --git a/conf/distro/openzaurus-unstable-uclibc.conf b/conf/distro/openzaurus-unstable-uclibc.conf
index 09c18e717a..28b740c3dd 100644
--- a/conf/distro/openzaurus-unstable-uclibc.conf
+++ b/conf/distro/openzaurus-unstable-uclibc.conf
@@ -1,4 +1,4 @@
-require conf/distro/include/openzaurus-unstable.conf
+require conf/distro/include/openzaurus-unstable.inc
 
 TARGET_OS = "linux-uclibc"
 PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index d5ada850be..8487c7c6e6 100644
--- a/conf/distro/openzaurus-unstable.conf
+++ b/conf/distro/openzaurus-unstable.conf
@@ -10,7 +10,7 @@ CVS_TARBALL_STASH = "\
 http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
 http://www.oesources.org/source/current/"
 
-require conf/distro/include/openzaurus.conf
+require conf/distro/include/openzaurus.inc
 
 DISTRO_TYPE = "debug"
 # DISTRO_TYPE = "release"
diff --git a/conf/distro/slugos-bag.conf b/conf/distro/slugos-bag.conf
index 825c731ce3..12deb5e7d8 100644
--- a/conf/distro/slugos-bag.conf
+++ b/conf/distro/slugos-bag.conf
@@ -18,4 +18,4 @@ SLUGOS_IMAGESEX  ?= "big-endian"
 FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-bag/cross/${DISTRO_FEED}"
 FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-bag/native/${DISTRO_FEED}"
 
-require conf/distro/include/slugos.conf
+require conf/distro/include/slugos.inc
diff --git a/conf/distro/slugos-bau.conf b/conf/distro/slugos-bau.conf
index a320eb3ac8..1e74dfc526 100644
--- a/conf/distro/slugos-bau.conf
+++ b/conf/distro/slugos-bau.conf
@@ -16,4 +16,4 @@ ARM_INSTRUCTION_SET = "arm"
 TARGET_OS = "linux-uclibc"
 SLUGOS_IMAGESEX  ?= "big-endian"
 
-require conf/distro/include/slugos.conf
+require conf/distro/include/slugos.inc
diff --git a/conf/distro/slugos-btu.conf b/conf/distro/slugos-btu.conf
index 96bb168c96..125d6e0746 100644
--- a/conf/distro/slugos-btu.conf
+++ b/conf/distro/slugos-btu.conf
@@ -18,4 +18,4 @@ SLUGOS_IMAGESEX  ?= "big-endian"
 FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-btu/cross/${DISTRO_FEED}"
 FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-btu/native/${DISTRO_FEED}"
 
-require conf/distro/include/slugos.conf
+require conf/distro/include/slugos.inc
diff --git a/conf/distro/slugos-lag.conf b/conf/distro/slugos-lag.conf
index 3111a0cc2e..5d65fcd78b 100644
--- a/conf/distro/slugos-lag.conf
+++ b/conf/distro/slugos-lag.conf
@@ -19,4 +19,4 @@ FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-lag/cross/$
 FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-lag/native/${DISTRO_FEED}"
 
 
-require conf/distro/include/slugos.conf
+require conf/distro/include/slugos.inc
diff --git a/conf/distro/slugos-lau.conf b/conf/distro/slugos-lau.conf
index 3b3515c7d0..56c71fb329 100644
--- a/conf/distro/slugos-lau.conf
+++ b/conf/distro/slugos-lau.conf
@@ -16,4 +16,4 @@ SLUGOS_IMAGESEX  ?= "big-endian"
 
 # no feeds
 
-require conf/distro/include/slugos.conf
+require conf/distro/include/slugos.inc
diff --git a/conf/distro/slugos-ltu.conf b/conf/distro/slugos-ltu.conf
index f1014be3d6..5a4f22f017 100644
--- a/conf/distro/slugos-ltu.conf
+++ b/conf/distro/slugos-ltu.conf
@@ -18,4 +18,4 @@ FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-ltu/cross/$
 FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-ltu/native/${DISTRO_FEED}"
 
 
-require conf/distro/include/slugos.conf
+require conf/distro/include/slugos.inc
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index dc49242dc2..4dd67ca8f4 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -12,7 +12,7 @@ FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/stable
 
 # pull in the frozen list of bbfiles
 UNSLUNG_EXTRA_BBFILES ?= ""
-require conf/distro/include/freeze.conf
+require conf/distro/include/freeze.inc
 
 TARGET_FPU = "soft"
 TARGET_OS = "linux"
-- 
2.39.5