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

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

diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf
index de4b6e34c2f5a8643f59f91461e5a886854ece58..78b13b2590e734b94c276abb3c4c304da4e7cfea 100644 (file)
--- 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 1fa2c607f46124a3dcb10aa12677f600d7d0d981..b8a428455d4d84e88e9e010a9cfdc2f11b16886a 100644 (file)
--- 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 f503e928d7216fbb5f90acec060d24de00142f42..5c7d0b7a18fb991f34a5582d4fb7844ce48fb41e 100644 (file)
--- 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 2445c8be46675d6117536ebb1dd45c57d08f2c7c..5a24d22a8cdab4a8d08b837c76bf38af8ebb889e 100644 (file)
--- 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 b5893b7330776ec49a356845a70d82191a735e88..d9fe834cd12b02d11cf5aba596137af9ea93eafc 100644 (file)
--- 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 19014f0f1d0229debbfa3bd1a03bc45eaab1a6be..b5376573b6df8e274695320089db464a3dc224f0 100644 (file)
--- 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 551f73b7e08f9d3989785cc39008c3aa62440c11..52659b75e282ee1f5765e9021da7c16dbb96b5b2 100644 (file)
--- 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 bbf96062c09a86a6a530e93f45acf3948038e4b7..9f53edbd511962b44defa00ea8829232efe75371 100644 (file)
--- 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
similarity index 100%
rename from conf/distro/angstrom.conf
rename to conf/distro/include/angstrom.conf

diff --git a/conf/distro/debianslug-packages.conf b/conf/distro/include/debianslug-packages.conf
similarity index 51%
rename from conf/distro/debianslug-packages.conf
rename to conf/distro/include/debianslug-packages.conf
index 451208fd0944d9c9e2ea8be1d204e98ee9790e7b..a4b9a6720fcfb1d7e4d56e1b1c3ff8b58756363a 100644 (file)
--- 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
similarity index 100%
rename from conf/distro/familiar.conf
rename to 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 (file)
index 0000000..f88d593
--- /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
similarity index 100%
rename from conf/distro/maemo-preferred.inc
rename to conf/distro/include/maemo-preferred.inc

diff --git a/conf/distro/openslug-native-packages.conf b/conf/distro/include/openslug-native-packages.conf
similarity index 100%
rename from conf/distro/openslug-native-packages.conf
rename to conf/distro/include/openslug-native-packages.conf

diff --git a/conf/distro/openslug-packages.conf b/conf/distro/include/openslug-packages.conf
similarity index 51%
rename from conf/distro/openslug-packages.conf
rename to conf/distro/include/openslug-packages.conf
index f8722d4b4d30ccc4037c5aee77e3ac2b5e154f10..fe09a7bcfa13959b6399ec6bc9d7495acb190860 100644 (file)
--- 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
similarity index 100%
rename from conf/distro/openzaurus.conf
rename to conf/distro/include/openzaurus.conf

diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/include/preferred-e-versions.inc
similarity index 100%
rename from conf/distro/preferred-e-versions.inc
rename to 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
similarity index 100%
rename from conf/distro/preferred-gpe-versions-2.6.inc
rename to 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
similarity index 100%
rename from conf/distro/preferred-gpe-versions-2.7.inc
rename to 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
similarity index 100%
rename from conf/distro/preferred-gpe-versions-2.8.inc
rename to 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
similarity index 100%
rename from conf/distro/preferred-gpe-versions.inc
rename to 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
similarity index 100%
rename from conf/distro/preferred-opie-cvs-versions.inc
rename to 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
similarity index 100%
rename from conf/distro/preferred-opie-versions.inc
rename to 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
similarity index 100%
rename from conf/distro/preferred-x-versions-pre-X11R7.inc
rename to conf/distro/include/preferred-x-versions-pre-X11R7.inc

diff --git a/conf/distro/slugos-packages.conf b/conf/distro/include/slugos-packages.conf
similarity index 100%
rename from conf/distro/slugos-packages.conf
rename to conf/distro/include/slugos-packages.conf

diff --git a/conf/distro/slugos.conf b/conf/distro/include/slugos.conf
similarity index 99%
rename from conf/distro/slugos.conf
rename to conf/distro/include/slugos.conf
index b9b169b359f5db8df7835d8d1eaa9250d6b76be1..c2b169106fe53151766096e38046cf2f2353a06a 100644 (file)
--- 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
similarity index 50%
rename from conf/distro/ucslugc-packages.conf
rename to conf/distro/include/ucslugc-packages.conf
index a423b1d9fd8d87db8a6a2535448ccf5dac7d796d..3b3e9fca752fa6fa65f39dcfa5a8b47e9d30339c 100644 (file)
--- 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
similarity index 100%
rename from conf/distro/unslung-packages.conf
rename to conf/distro/include/unslung-packages.conf

diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index dc5e43d7408b13c9310dbff256c0808cdbeb3084..b3be297e53c9f75de0e94dae7974713ccade2012 100644 (file)
--- 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 22fd792f852bad77c69e81eac70465d5c08ebd4e..b4875dc37b15ba715ddb836065fc59379976060f 100644 (file)
--- 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 (file)
index 7f347e7..0000000
--- 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 5ebe98b254a2e533d8c39b8218d624fd0279f09b..aa3af96b2538bed8721c25e410eaa786e70798fd 100644 (file)
--- 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 d30ecc9084885ffc04d5b128fc590bb61a6033ad..4dd9c49bfb05f59a05874d1a2d00aeb4f7891441 100644 (file)
--- 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 708bbf1360a920cccb4db5574a17ad1a25a502e1..0366998e79e3f0b5c1699361796a2521b486ae9d 100644 (file)
--- 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 94574c3fe0e6248af08256cf142ea2e29271ad4e..113ee658d3a498d641d1c57f0fcbc7b9f99fff37 100644 (file)
--- 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 6ff43f565a252f4f75068f820e6062920827fb7f..09c18e717a1fec29c145a2fa55a1f95e365829a4 100644 (file)
--- 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 30d361b2fba6b2ba2d9a665ae59a6c8055d217f4..d5ada850bec7cfb76afe0a591104604e0142105d 100644 (file)
--- 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 c05977557693255851dd9e11d10b9cc1250352d5..1395f09a7e0e268eed91ed9a07057a855698f54b 100644 (file)
--- 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 037ca09644a15192499549eb68ad9f02a8ad1aa9..825c731ce3b0e707c548b7e47662ef5ab151fd14 100644 (file)
--- 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 5f4cb26ba8f10e1b955a3596c63686970ddffdce..a320eb3ac8cf62f0d30aa6347d2c7c113998e811 100644 (file)
--- 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 fc584d75d988dbe2c3a26e2e3c0fbd38d02ae1cc..96bb168c96176b48107b877bc29260ee9f700458 100644 (file)
--- 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 f8a0631ef8a63e396a8bcbf8e33470eff5cf1b17..3111a0cc2e50d3cfde934a4e8e50ba1226e331ed 100644 (file)
--- 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 6bf60df15f817f0ee549b025abb5f377a8b01f32..3b3515c7d01bb41a2a89abed2263b120da084724 100644 (file)
--- 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 dbf444748c6fb014f160862cc1eb1d863c674853..f1014be3d68426bebf7eca7f0b0fde3247999d27 100644 (file)
--- 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 b6f19308d117e9f3558c6b32acc049dceedc6d84..2ee41350ae9c0d68bb0014edf060b4169c07251b 100644 (file)
--- 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 6d76e0946ad0d709a71b3cbda62c97f0151b7630..dc49242dc29a47295ce66c9479623b529abbbffd 100644 (file)
--- 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"