conf/distro cleanup. conf/distro should only contain files that are ok to be directly included

by means of setting DISTRO. conf/distro/include should contain those which doesn't.

46 files changed, 54 insertions, 54 deletions

diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf
index de4b6e34c2..78b13b2590 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}"
 
-include conf/distro/familiar.conf
+require conf/distro/include/familiar.conf
 
 
 DISTRO_TYPE = "debug"
@@ -45,7 +45,7 @@ PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
 PREFERRED_VERSION_qte = "2.3.10"
 
 OPIE_VERSION = "1.2.1"
-include conf/distro/preferred-opie-versions.inc
+require conf/distro/include/preferred-opie-versions.inc
 
 #
 # GPE
@@ -55,5 +55,5 @@ PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
 PREFERRED_PROVIDER_libx11 = "diet-x11"
 
-include conf/distro/preferred-gpe-versions-2.8.inc
+require conf/distro/include/preferred-gpe-versions-2.8.inc
 
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 1fa2c607f4..b8a428455d 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -9,7 +9,7 @@
 #DISTRO_VERSION = "2006.9"
 DISTRO_VERSION = "test-${DATE}"
 
-require conf/distro/angstrom.conf
+require conf/distro/include/angstrom.conf
 require conf/distro/include/sane-srcdates.conf
 
 DISTRO_TYPE = "debug"
@@ -35,10 +35,10 @@ http://www.oesources.org/source/current/"
 PALMTOP_USE_MULTITHREADED_QT = "yes"
 QTE_VERSION = "2.3.10"
 OPIE_VERSION = "1.2.2"
-include conf/distro/preferred-opie-versions.inc
+require conf/distro/include/preferred-opie-versions.inc
 
 # GPE
-include conf/distro/preferred-gpe-versions-2.8.inc
+require conf/distro/include/preferred-gpe-versions-2.8.inc
 
 PREFERRED_VERSION_fontconfig = "2.3.95"
 PREFERRED_VERSION_freetype = "2.2.1"
@@ -47,7 +47,7 @@ PREFERRED_VERSION_freetype = "2.2.1"
 GPE_EXTRA_INSTALL = ""
 
 # E
-include conf/distro/preferred-e-versions.inc
+require conf/distro/include/preferred-e-versions.inc
 
 #Make sure we use 2.6 on machines with a 2.4/2.6 selector
 KERNEL = "kernel26"
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index f503e928d7..5c7d0b7a18 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -114,4 +114,4 @@ PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
 # a - ARM instruction set
 # g - glibc
 #
-include conf/distro/slugos-lag.conf
+require conf/distro/include/slugos-lag.conf
diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf
index 2445c8be46..5a24d22a8c 100644
--- a/conf/distro/ezx.conf
+++ b/conf/distro/ezx.conf
@@ -66,17 +66,17 @@ BOOTSTRAP_EXTRA_RDEPENDS += "ezx-gpiotool strace"
 QTE_VERSION = "2.3.10"
 OPIE_VERSION = "1.2.2"
 PALMTOP_USE_MULTITHREADED_QT = "yes"
-include conf/distro/preferred-opie-versions.inc
+require conf/distro/include/preferred-opie-versions.inc
 
 #
 # GPE
 #
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_libx11 = "diet-x11"
-include conf/distro/preferred-gpe-versions-2.8.inc
+require conf/distro/include/preferred-gpe-versions-2.8.inc
 
 #
 # E
 #
-include conf/distro/preferred-e-versions.inc
+require conf/distro/include/preferred-e-versions.inc
 
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf
index b5893b7330..d9fe834cd1 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}"
 
-include conf/distro/familiar.conf
+require conf/distro/include/familiar.conf
 
 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"
-include conf/distro/include/sane-srcdates.conf
+require conf/distro/include/sane-srcdates.conf
 
 #
 # Opie
@@ -63,7 +63,7 @@ include conf/distro/include/sane-srcdates.conf
 OPIE_VERSION = "1.2.2"
 QTE_VERSION = "2.3.10"
 PALMTOP_USE_MULTITHREADED_QT = "yes"
-include conf/distro/preferred-opie-versions.inc
+require conf/distro/include/preferred-opie-versions.inc
 
 #
 # GPE
@@ -72,10 +72,10 @@ include conf/distro/preferred-opie-versions.inc
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
 PREFERRED_PROVIDER_libx11 = "diet-x11"
-include conf/distro/preferred-gpe-versions-2.8.inc
+require conf/distro/include/preferred-gpe-versions-2.8.inc
 
 #
 # E
 #
-include conf/distro/preferred-e-versions.inc
+require conf/distro/include/preferred-e-versions.inc
 
diff --git a/conf/distro/freeze.conf b/conf/distro/freeze.conf
index 19014f0f1d..b5376573b6 100644
--- a/conf/distro/freeze.conf
+++ b/conf/distro/freeze.conf
@@ -1,6 +1,6 @@
 # general configuration file for freezing a distribution
 #
-# If freeze.conf is included (include conf/distro/freeze.conf) in the
+# If freeze.conf is included (require conf/distro/include/freeze.conf) 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.
-include conf/distro/${DISTRO}-packages.conf
+require conf/distro/include/${DISTRO}-packages.conf
 include conf/${DISTRO}-packages.conf
 include ${FROZEN_DIR}/${DISTRO}-packages.conf
 
-include conf/distro/${DISTRO}-bbfiles.conf
+require conf/distro/include/${DISTRO}-bbfiles.conf
 include conf/${DISTRO}-bbfiles.conf
 include ${FROZEN_DIR}/${DISTRO}-bbfiles.conf
diff --git a/conf/distro/generic-unstable.conf b/conf/distro/generic-unstable.conf
index 551f73b7e0..52659b75e2 100644
--- a/conf/distro/generic-unstable.conf
+++ b/conf/distro/generic-unstable.conf
@@ -51,16 +51,16 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 #
 # GPE
 #
-require conf/distro/preferred-gpe-versions.inc
+require conf/distro/include/preferred-gpe-versions.inc
 
 #
 # Opie
 #
 QTE_VERSION = "2.3.10"
 PALMTOP_USE_MULTITHREADED_QTE = "yes"
-require conf/distro/preferred-opie-versions.inc
+require conf/distro/include/preferred-opie-versions.inc
 
 #
 # Enlightenment
 #
-require conf/distro/preferred-e-versions.inc
+require conf/distro/include/preferred-e-versions.inc
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index bbf96062c0..9f53edbd51 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -60,16 +60,16 @@ require conf/distro/include/sane-srcdates.conf
 #
 # GPE
 #
-require conf/distro/preferred-gpe-versions.inc
+require conf/distro/include/preferred-gpe-versions.inc
 
 #
 # Opie
 #
 QTE_VERSION = "2.3.10"
 PALMTOP_USE_MULTITHREADED_QTE = "yes"
-require conf/distro/preferred-opie-versions.inc
+require conf/distro/include/preferred-opie-versions.inc
 
 #
 # Enlightenment
 #
-require conf/distro/preferred-e-versions.inc
+require conf/distro/include/preferred-e-versions.inc
diff --git a/conf/distro/angstrom.conf b/conf/distro/include/angstrom.conf
index 13ac2b16bf..13ac2b16bf 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/include/angstrom.conf
diff --git a/conf/distro/debianslug-packages.conf b/conf/distro/include/debianslug-packages.conf
index 451208fd09..a4b9a6720f 100644
--- a/conf/distro/debianslug-packages.conf
+++ b/conf/distro/include/debianslug-packages.conf
@@ -1,2 +1,2 @@
 SLUGOS_EXTRA_BBFILES = "${DEBIANSLUG_EXTRA_BBFILES}"
-include conf/distro/slugos-packages.conf
+require conf/distro/include/slugos-packages.conf
diff --git a/conf/distro/familiar.conf b/conf/distro/include/familiar.conf
index 2646fe78a6..2646fe78a6 100644
--- a/conf/distro/familiar.conf
+++ b/conf/distro/include/familiar.conf
diff --git a/conf/distro/include/ludeos-packages.conf b/conf/distro/include/ludeos-packages.conf
new file mode 100644
index 0000000000..f88d593a17
--- /dev/null
+++ b/conf/distro/include/ludeos-packages.conf
@@ -0,0 +1,2 @@
+SLUGOS_EXTRA_BBFILES = ""
+require conf/distro/include/slugos-packages.conf
diff --git a/conf/distro/maemo-preferred.inc b/conf/distro/include/maemo-preferred.inc
index 943f244326..943f244326 100644
--- a/conf/distro/maemo-preferred.inc
+++ b/conf/distro/include/maemo-preferred.inc
diff --git a/conf/distro/openslug-native-packages.conf b/conf/distro/include/openslug-native-packages.conf
index 7f7a448434..7f7a448434 100644
--- a/conf/distro/openslug-native-packages.conf
+++ b/conf/distro/include/openslug-native-packages.conf
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/include/openslug-packages.conf
index f8722d4b4d..fe09a7bcfa 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/include/openslug-packages.conf
@@ -1,2 +1,2 @@
 SLUGOS_EXTRA_BBFILES = "${OPENSLUG_EXTRA_BBFILES}"
-include conf/distro/slugos-packages.conf
+require conf/distro/include/slugos-packages.conf
diff --git a/conf/distro/openzaurus.conf b/conf/distro/include/openzaurus.conf
index b7f456320f..b7f456320f 100644
--- a/conf/distro/openzaurus.conf
+++ b/conf/distro/include/openzaurus.conf
diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/include/preferred-e-versions.inc
index 607acad858..607acad858 100644
--- a/conf/distro/preferred-e-versions.inc
+++ b/conf/distro/include/preferred-e-versions.inc
diff --git a/conf/distro/preferred-gpe-versions-2.6.inc b/conf/distro/include/preferred-gpe-versions-2.6.inc
index 1d09ae6051..1d09ae6051 100644
--- a/conf/distro/preferred-gpe-versions-2.6.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.6.inc
diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc
index 933195977d..933195977d 100644
--- a/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.7.inc
diff --git a/conf/distro/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc
index 9c9be528df..9c9be528df 100644
--- a/conf/distro/preferred-gpe-versions-2.8.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.8.inc
diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc
index 676e0ee9f9..676e0ee9f9 100644
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/include/preferred-gpe-versions.inc
diff --git a/conf/distro/preferred-opie-cvs-versions.inc b/conf/distro/include/preferred-opie-cvs-versions.inc
index 93b068ee65..93b068ee65 100644
--- a/conf/distro/preferred-opie-cvs-versions.inc
+++ b/conf/distro/include/preferred-opie-cvs-versions.inc
diff --git a/conf/distro/preferred-opie-versions.inc b/conf/distro/include/preferred-opie-versions.inc
index 51c9937628..51c9937628 100644
--- a/conf/distro/preferred-opie-versions.inc
+++ b/conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/distro/preferred-x-versions-pre-X11R7.inc b/conf/distro/include/preferred-x-versions-pre-X11R7.inc
index b8cd34a3fb..b8cd34a3fb 100644
--- a/conf/distro/preferred-x-versions-pre-X11R7.inc
+++ b/conf/distro/include/preferred-x-versions-pre-X11R7.inc
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/include/slugos-packages.conf
index 650368a990..650368a990 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/include/slugos-packages.conf
diff --git a/conf/distro/slugos.conf b/conf/distro/include/slugos.conf
index b9b169b359..c2b169106f 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/include/slugos.conf
@@ -78,7 +78,7 @@ SLUGOS_IMAGENAME ?= "${DISTRO_NAME}"
 # pull in the frozen list of bbfiles - this sets BBFILES and this will override any
 # setting in local.conf  Since this depends on ${DISTRO} it doesn't actually do
 # anything by default unless conf/distro/${DISTRO}-packages.conf exists.
-# include conf/distro/freeze.conf
+# require conf/distro/include/freeze.conf
 
 #----------------------------------------------------------------------------------
 # FEEDS
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/include/ucslugc-packages.conf
index a423b1d9fd..3b3e9fca75 100644
--- a/conf/distro/ucslugc-packages.conf
+++ b/conf/distro/include/ucslugc-packages.conf
@@ -1,2 +1,2 @@
 SLUGOS_EXTRA_BBFILES = "${UCSLUGC_EXTRA_BBFILES}"
-include conf/distro/slugos-packages.conf
+require conf/distro/include/slugos-packages.conf
diff --git a/conf/distro/unslung-packages.conf b/conf/distro/include/unslung-packages.conf
index e889a65df5..e889a65df5 100644
--- a/conf/distro/unslung-packages.conf
+++ b/conf/distro/include/unslung-packages.conf
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index dc5e43d740..b3be297e53 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -90,7 +90,7 @@ PALMTOP_USE_MULTITHREADED_QT = "yes"
 PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt"
 PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie"
 OPIE_VERSION = "20060709"
-include conf/distro/preferred-opie-cvs-versions.inc
+require conf/distro/include/preferred-opie-cvs-versions.inc
 
 #<>
 #<> We want pcmciautils, not pcmcia-cs
diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf
index 22fd792f85..b4875dc37b 100644
--- a/conf/distro/jlime-shrek.conf
+++ b/conf/distro/jlime-shrek.conf
@@ -49,4 +49,4 @@ kernel-module-nmclan-cs   kernel-module-pcnet-cs    e2tools e2fsprogs"
 TARGET_OS = "linux"
 
 OPIE_VERSION = "1.2.1"  
-include conf/distro/preferred-opie-versions.inc  
+require conf/distro/include/preferred-opie-versions.inc  
diff --git a/conf/distro/ludeos-packages.conf b/conf/distro/ludeos-packages.conf
deleted file mode 100644
index 7f347e7887..0000000000
--- a/conf/distro/ludeos-packages.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-SLUGOS_EXTRA_BBFILES = ""
-include conf/distro/slugos-packages.conf
diff --git a/conf/distro/ludeos.conf b/conf/distro/ludeos.conf
index 5ebe98b254..aa3af96b25 100644
--- a/conf/distro/ludeos.conf
+++ b/conf/distro/ludeos.conf
@@ -33,4 +33,4 @@ kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
-include conf/distro/slugos.conf
+require conf/distro/include/slugos.conf
diff --git a/conf/distro/maemo-1.0.conf b/conf/distro/maemo-1.0.conf
index d30ecc9084..4dd9c49bfb 100644
--- a/conf/distro/maemo-1.0.conf
+++ b/conf/distro/maemo-1.0.conf
@@ -1,4 +1,4 @@
-include conf/distro/familiar.conf
+require conf/distro/include/familiar.conf
 
 DISTRO = "maemo"
 DISTRO_NAME = "Maemo Linux"
@@ -31,10 +31,10 @@ PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
 PREFERRED_PROVIDER_libx11 = "diet-x11"
 
-include conf/distro/preferred-gpe-versions.inc
+require conf/distro/include/preferred-gpe-versions.inc
 
 #
 # Maemo
 #
 
-include conf/distro/maemo-preferred.inc
+require conf/distro/include/maemo-preferred.inc
diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf
index 708bbf1360..0366998e79 100644
--- a/conf/distro/openslug-native.conf
+++ b/conf/distro/openslug-native.conf
@@ -1,4 +1,4 @@
-include conf/distro/openslug.conf
+require conf/distro/openslug.conf
 
 # Corresponting packages should be in openslug-native.bb,
 # currently missing: ipkg-utils libtool quilt pkgconfig
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 94574c3fe0..113ee658d3 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -114,4 +114,4 @@ PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
 # a - ARM instruction set
 # g - glibc
 #
-include conf/distro/slugos-bag.conf
+require conf/distro/include/slugos-bag.conf
diff --git a/conf/distro/openzaurus-unstable-uclibc.conf b/conf/distro/openzaurus-unstable-uclibc.conf
index 6ff43f565a..09c18e717a 100644
--- a/conf/distro/openzaurus-unstable-uclibc.conf
+++ b/conf/distro/openzaurus-unstable-uclibc.conf
@@ -1,4 +1,4 @@
-require conf/distro/openzaurus-unstable.conf
+require conf/distro/include/openzaurus-unstable.conf
 
 TARGET_OS = "linux-uclibc"
 PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
index 30d361b2fb..d5ada850be 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/"
 
-include conf/distro/openzaurus.conf
+require conf/distro/include/openzaurus.conf
 
 DISTRO_TYPE = "debug"
 # DISTRO_TYPE = "release"
@@ -58,17 +58,17 @@ PREFERRED_VERSION_binutils = "2.15.94.0.1"
 QTE_VERSION = "2.3.10"
 OPIE_VERSION = "1.2.2"
 PALMTOP_USE_MULTITHREADED_QT = "yes"
-include conf/distro/preferred-opie-versions.inc
+require conf/distro/include/preferred-opie-versions.inc
 
 #
 # GPE
 #
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDER_libx11 = "diet-x11"
-include conf/distro/preferred-gpe-versions-2.8.inc
+require conf/distro/include/preferred-gpe-versions-2.8.inc
 
 #
 # E
 #
-include conf/distro/preferred-e-versions.inc
+require conf/distro/include/preferred-e-versions.inc
 
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index c059775576..1395f09a7e 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -45,7 +45,7 @@ PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
 QTE_VERSION = "2.3.10"
 OPIE_VERSION = "1.2.2"
 PALMTOP_USE_MULTITHREADED_QT = "no"
-include conf/distro/preferred-opie-versions.inc
+require conf/distro/include/preferred-opie-versions.inc
 
 #
 # GPE
@@ -53,7 +53,7 @@ include conf/distro/preferred-opie-versions.inc
 SRCDATE_xserver-kdrive = "20050208"
 PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
 PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
-include conf/distro/preferred-gpe-versions.inc
+require conf/distro/include/preferred-gpe-versions.inc
 
 #
 # E
diff --git a/conf/distro/slugos-bag.conf b/conf/distro/slugos-bag.conf
index 037ca09644..825c731ce3 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}"
 
-include conf/distro/slugos.conf
+require conf/distro/include/slugos.conf
diff --git a/conf/distro/slugos-bau.conf b/conf/distro/slugos-bau.conf
index 5f4cb26ba8..a320eb3ac8 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"
 
-include conf/distro/slugos.conf
+require conf/distro/include/slugos.conf
diff --git a/conf/distro/slugos-btu.conf b/conf/distro/slugos-btu.conf
index fc584d75d9..96bb168c96 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}"
 
-include conf/distro/slugos.conf
+require conf/distro/include/slugos.conf
diff --git a/conf/distro/slugos-lag.conf b/conf/distro/slugos-lag.conf
index f8a0631ef8..3111a0cc2e 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}"
 
 
-include conf/distro/slugos.conf
+require conf/distro/include/slugos.conf
diff --git a/conf/distro/slugos-lau.conf b/conf/distro/slugos-lau.conf
index 6bf60df15f..3b3515c7d0 100644
--- a/conf/distro/slugos-lau.conf
+++ b/conf/distro/slugos-lau.conf
@@ -16,4 +16,4 @@ SLUGOS_IMAGESEX  ?= "big-endian"
 
 # no feeds
 
-include conf/distro/slugos.conf
+require conf/distro/include/slugos.conf
diff --git a/conf/distro/slugos-ltu.conf b/conf/distro/slugos-ltu.conf
index dbf444748c..f1014be3d6 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}"
 
 
-include conf/distro/slugos.conf
+require conf/distro/include/slugos.conf
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index b6f19308d1..2ee41350ae 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -23,4 +23,4 @@ UCSLUGC_EXTRA_RDEPENDS ?= ""
 #
 SLUGOS_EXTRA_RDEPENDS ?= "${UCSLUGC_EXTRA_RDEPENDS}"
 
-include conf/distro/slugos-btu.conf
+require conf/distro/include/slugos-btu.conf
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 6d76e0946a..dc49242dc2 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 ?= ""
-include conf/distro/freeze.conf
+require conf/distro/include/freeze.conf
 
 TARGET_FPU = "soft"
 TARGET_OS = "linux"