diff options
-rw-r--r-- | conf/distro/amsdelta-oe.conf | 2 | ||||
-rw-r--r-- | conf/distro/angstrom-2006.9.conf | 4 | ||||
-rw-r--r-- | conf/distro/familiar-unstable.conf | 4 | ||||
-rw-r--r-- | conf/distro/generic.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/angstrom.inc (renamed from conf/distro/include/angstrom.conf) | 0 | ||||
-rw-r--r-- | conf/distro/include/debianslug-packages.inc (renamed from conf/distro/include/debianslug-packages.conf) | 0 | ||||
-rw-r--r-- | conf/distro/include/familiar.inc (renamed from conf/distro/include/familiar.conf) | 0 | ||||
-rw-r--r-- | conf/distro/include/freeze.inc (renamed from conf/distro/freeze.conf) | 6 | ||||
-rw-r--r-- | conf/distro/include/ludeos-packages.inc (renamed from conf/distro/include/ludeos-packages.conf) | 0 | ||||
-rw-r--r-- | conf/distro/include/openslug-native-packages.inc (renamed from conf/distro/include/openslug-native-packages.conf) | 0 | ||||
-rw-r--r-- | conf/distro/include/openslug-packages.inc (renamed from conf/distro/include/openslug-packages.conf) | 0 | ||||
-rw-r--r-- | conf/distro/include/openzaurus.inc (renamed from conf/distro/include/openzaurus.conf) | 0 | ||||
-rw-r--r-- | conf/distro/include/sane-srcdates.inc (renamed from conf/distro/include/sane-srcdates.conf) | 0 | ||||
-rw-r--r-- | conf/distro/include/slugos-packages.inc (renamed from conf/distro/include/slugos-packages.conf) | 0 | ||||
-rw-r--r-- | conf/distro/include/slugos.inc (renamed from conf/distro/include/slugos.conf) | 0 | ||||
-rw-r--r-- | conf/distro/include/ucslugc-packages.inc (renamed from conf/distro/include/ucslugc-packages.conf) | 0 | ||||
-rw-r--r-- | conf/distro/include/unslung-packages.inc (renamed from conf/distro/include/unslung-packages.conf) | 0 | ||||
-rw-r--r-- | conf/distro/ludeos.conf | 2 | ||||
-rw-r--r-- | conf/distro/maemo-1.0.conf | 2 | ||||
-rw-r--r-- | conf/distro/openzaurus-unstable-uclibc.conf | 2 | ||||
-rw-r--r-- | conf/distro/openzaurus-unstable.conf | 2 | ||||
-rw-r--r-- | conf/distro/slugos-bag.conf | 2 | ||||
-rw-r--r-- | conf/distro/slugos-bau.conf | 2 | ||||
-rw-r--r-- | conf/distro/slugos-btu.conf | 2 | ||||
-rw-r--r-- | conf/distro/slugos-lag.conf | 2 | ||||
-rw-r--r-- | conf/distro/slugos-lau.conf | 2 | ||||
-rw-r--r-- | conf/distro/slugos-ltu.conf | 2 | ||||
-rw-r--r-- | conf/distro/unslung.conf | 2 |
28 files changed, 20 insertions, 20 deletions
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 index 13ac2b16bf..13ac2b16bf 100644 --- a/conf/distro/include/angstrom.conf +++ b/conf/distro/include/angstrom.inc diff --git a/conf/distro/include/debianslug-packages.conf b/conf/distro/include/debianslug-packages.inc index a4b9a6720f..a4b9a6720f 100644 --- a/conf/distro/include/debianslug-packages.conf +++ b/conf/distro/include/debianslug-packages.inc diff --git a/conf/distro/include/familiar.conf b/conf/distro/include/familiar.inc index 2646fe78a6..2646fe78a6 100644 --- a/conf/distro/include/familiar.conf +++ b/conf/distro/include/familiar.inc diff --git a/conf/distro/freeze.conf b/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 index f88d593a17..f88d593a17 100644 --- a/conf/distro/include/ludeos-packages.conf +++ b/conf/distro/include/ludeos-packages.inc diff --git a/conf/distro/include/openslug-native-packages.conf b/conf/distro/include/openslug-native-packages.inc index 7f7a448434..7f7a448434 100644 --- a/conf/distro/include/openslug-native-packages.conf +++ b/conf/distro/include/openslug-native-packages.inc diff --git a/conf/distro/include/openslug-packages.conf b/conf/distro/include/openslug-packages.inc index fe09a7bcfa..fe09a7bcfa 100644 --- a/conf/distro/include/openslug-packages.conf +++ b/conf/distro/include/openslug-packages.inc diff --git a/conf/distro/include/openzaurus.conf b/conf/distro/include/openzaurus.inc index b7f456320f..b7f456320f 100644 --- a/conf/distro/include/openzaurus.conf +++ b/conf/distro/include/openzaurus.inc diff --git a/conf/distro/include/sane-srcdates.conf b/conf/distro/include/sane-srcdates.inc index 9a88449e07..9a88449e07 100644 --- a/conf/distro/include/sane-srcdates.conf +++ b/conf/distro/include/sane-srcdates.inc diff --git a/conf/distro/include/slugos-packages.conf b/conf/distro/include/slugos-packages.inc index 650368a990..650368a990 100644 --- a/conf/distro/include/slugos-packages.conf +++ b/conf/distro/include/slugos-packages.inc diff --git a/conf/distro/include/slugos.conf b/conf/distro/include/slugos.inc index c2b169106f..c2b169106f 100644 --- a/conf/distro/include/slugos.conf +++ b/conf/distro/include/slugos.inc diff --git a/conf/distro/include/ucslugc-packages.conf b/conf/distro/include/ucslugc-packages.inc index 3b3e9fca75..3b3e9fca75 100644 --- a/conf/distro/include/ucslugc-packages.conf +++ b/conf/distro/include/ucslugc-packages.inc diff --git a/conf/distro/include/unslung-packages.conf b/conf/distro/include/unslung-packages.inc index e889a65df5..e889a65df5 100644 --- a/conf/distro/include/unslung-packages.conf +++ b/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" |