From e3db3e898d593acc7fcfc3f48a356bbe6bd0b6a0 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 14 Jul 2006 22:27:42 +0000 Subject: 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/freeze.conf | 25 --- conf/distro/generic.conf | 2 +- conf/distro/include/angstrom.conf | 48 ---- conf/distro/include/angstrom.inc | 48 ++++ conf/distro/include/debianslug-packages.conf | 2 - conf/distro/include/debianslug-packages.inc | 2 + conf/distro/include/familiar.conf | 17 -- conf/distro/include/familiar.inc | 17 ++ conf/distro/include/freeze.inc | 25 +++ conf/distro/include/ludeos-packages.conf | 2 - conf/distro/include/ludeos-packages.inc | 2 + conf/distro/include/openslug-native-packages.conf | 11 - conf/distro/include/openslug-native-packages.inc | 11 + conf/distro/include/openslug-packages.conf | 2 - conf/distro/include/openslug-packages.inc | 2 + conf/distro/include/openzaurus.conf | 18 -- conf/distro/include/openzaurus.inc | 18 ++ conf/distro/include/sane-srcdates.conf | 29 --- conf/distro/include/sane-srcdates.inc | 29 +++ conf/distro/include/slugos-packages.conf | 259 ---------------------- conf/distro/include/slugos-packages.inc | 259 ++++++++++++++++++++++ conf/distro/include/slugos.conf | 195 ---------------- conf/distro/include/slugos.inc | 195 ++++++++++++++++ conf/distro/include/ucslugc-packages.conf | 2 - conf/distro/include/ucslugc-packages.inc | 2 + conf/distro/include/unslung-packages.conf | 41 ---- conf/distro/include/unslung-packages.inc | 41 ++++ 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 +- 41 files changed, 668 insertions(+), 668 deletions(-) delete mode 100644 conf/distro/freeze.conf delete mode 100644 conf/distro/include/angstrom.conf create mode 100644 conf/distro/include/angstrom.inc delete mode 100644 conf/distro/include/debianslug-packages.conf create mode 100644 conf/distro/include/debianslug-packages.inc delete mode 100644 conf/distro/include/familiar.conf create mode 100644 conf/distro/include/familiar.inc create mode 100644 conf/distro/include/freeze.inc delete mode 100644 conf/distro/include/ludeos-packages.conf create mode 100644 conf/distro/include/ludeos-packages.inc delete mode 100644 conf/distro/include/openslug-native-packages.conf create mode 100644 conf/distro/include/openslug-native-packages.inc delete mode 100644 conf/distro/include/openslug-packages.conf create mode 100644 conf/distro/include/openslug-packages.inc delete mode 100644 conf/distro/include/openzaurus.conf create mode 100644 conf/distro/include/openzaurus.inc delete mode 100644 conf/distro/include/sane-srcdates.conf create mode 100644 conf/distro/include/sane-srcdates.inc delete mode 100644 conf/distro/include/slugos-packages.conf create mode 100644 conf/distro/include/slugos-packages.inc delete mode 100644 conf/distro/include/slugos.conf create mode 100644 conf/distro/include/slugos.inc delete mode 100644 conf/distro/include/ucslugc-packages.conf create mode 100644 conf/distro/include/ucslugc-packages.inc delete mode 100644 conf/distro/include/unslung-packages.conf create mode 100644 conf/distro/include/unslung-packages.inc 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/freeze.conf b/conf/distro/freeze.conf deleted file mode 100644 index b5376573b6..0000000000 --- a/conf/distro/freeze.conf +++ /dev/null @@ -1,25 +0,0 @@ -# general configuration file for freezing a distribution -# -# 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.) -# -# NOTE that these conf files use ${PKGDIR} and therefore that -# variable must be defined before this file is included, or the -# definition below (${TOPDIR}/openmebedded) must be correct. -# -PKGDIR ?= "${TOPDIR}/openembedded" -FROZEN_DIR ?= "/non/-existent/-directory/-for/-security" - -# Pull in the frozen definitions (if they exist) The multiple -# 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 -include conf/${DISTRO}-packages.conf -include ${FROZEN_DIR}/${DISTRO}-packages.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.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.conf deleted file mode 100644 index 13ac2b16bf..0000000000 --- a/conf/distro/include/angstrom.conf +++ /dev/null @@ -1,48 +0,0 @@ -#@TYPE: Distribution -#@NAME: Angstrom -#@DESCRIPTION: Distribution configuration for Angstrom - -DISTRO = "angstrom" -DISTRO_NAME = "Angstrom" - -#Use this variable in feeds and other parts that need a URI -ANGSTROM_URI = "http://www.angstrom-distribution.org" - -#Set the default maintainer to angstrom-dev -MAINTAINER = "Angstrom Developers " - -#use ipkg package format with debian style naming -#use multimachine buildrules -INHERIT += "package_ipk debian multimachine" - -#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable -PREFERRED_PROVIDER_qemu-native = "qemu-qop-nogfx-native" -ENABLE_BINARY_LOCALE_GENERATION ?= "" - - -#Use the ARM EABI when building for an ARM cpu. We can't use overrides -#here because this breaks all places where ":=" is used. -#if you want to build using uclibc, specify "-uclibcgnueabi" -TARGET_VENDOR = "-angstrom" -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" -#uclibc (needs gcc 4.1.1 or newer) -#TARGET_OS = "linux${@['','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" - -#mess with compiler flags to use -Os instead of -O2 -#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" -BUILD_OPTIMIZATION = "-Os" - -#ARM EABI is softfloat by default, but let's make sure :) -TARGET_FPU_arm = "soft" - -#Always ship these packages -BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version coreutils dropbear sysvinit" -BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit" - -#Name the generated images in a sane way -IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" -DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE} - -# Angstrom *always* has some form of release config, so error out if someone thinks he knows better -DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc new file mode 100644 index 0000000000..13ac2b16bf --- /dev/null +++ b/conf/distro/include/angstrom.inc @@ -0,0 +1,48 @@ +#@TYPE: Distribution +#@NAME: Angstrom +#@DESCRIPTION: Distribution configuration for Angstrom + +DISTRO = "angstrom" +DISTRO_NAME = "Angstrom" + +#Use this variable in feeds and other parts that need a URI +ANGSTROM_URI = "http://www.angstrom-distribution.org" + +#Set the default maintainer to angstrom-dev +MAINTAINER = "Angstrom Developers " + +#use ipkg package format with debian style naming +#use multimachine buildrules +INHERIT += "package_ipk debian multimachine" + +#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable +PREFERRED_PROVIDER_qemu-native = "qemu-qop-nogfx-native" +ENABLE_BINARY_LOCALE_GENERATION ?= "" + + +#Use the ARM EABI when building for an ARM cpu. We can't use overrides +#here because this breaks all places where ":=" is used. +#if you want to build using uclibc, specify "-uclibcgnueabi" +TARGET_VENDOR = "-angstrom" +TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" +#uclibc (needs gcc 4.1.1 or newer) +#TARGET_OS = "linux${@['','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" + +#mess with compiler flags to use -Os instead of -O2 +#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" +BUILD_OPTIMIZATION = "-Os" + +#ARM EABI is softfloat by default, but let's make sure :) +TARGET_FPU_arm = "soft" + +#Always ship these packages +BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version coreutils dropbear sysvinit" +BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit" + +#Name the generated images in a sane way +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" +DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE} + +# Angstrom *always* has some form of release config, so error out if someone thinks he knows better +DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/conf/distro/include/debianslug-packages.conf b/conf/distro/include/debianslug-packages.conf deleted file mode 100644 index a4b9a6720f..0000000000 --- a/conf/distro/include/debianslug-packages.conf +++ /dev/null @@ -1,2 +0,0 @@ -SLUGOS_EXTRA_BBFILES = "${DEBIANSLUG_EXTRA_BBFILES}" -require conf/distro/include/slugos-packages.conf diff --git a/conf/distro/include/debianslug-packages.inc b/conf/distro/include/debianslug-packages.inc new file mode 100644 index 0000000000..a4b9a6720f --- /dev/null +++ b/conf/distro/include/debianslug-packages.inc @@ -0,0 +1,2 @@ +SLUGOS_EXTRA_BBFILES = "${DEBIANSLUG_EXTRA_BBFILES}" +require conf/distro/include/slugos-packages.conf diff --git a/conf/distro/include/familiar.conf b/conf/distro/include/familiar.conf deleted file mode 100644 index 2646fe78a6..0000000000 --- a/conf/distro/include/familiar.conf +++ /dev/null @@ -1,17 +0,0 @@ -#@TYPE: Distribution -#@NAME: Familiar Linux -#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org) - -MAINTAINER ?= "Familiar Developers " - -INHERIT += "package_ipk debian multimachine" -TARGET_OS = "linux" - -BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version" -IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" - -ENABLE_BINARY_LOCALE_GENERATION ?= "1" -PARALLEL_INSTALL_MODULES = "1" -UDEV_DEVFS_RULES = "1" - -DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/conf/distro/include/familiar.inc b/conf/distro/include/familiar.inc new file mode 100644 index 0000000000..2646fe78a6 --- /dev/null +++ b/conf/distro/include/familiar.inc @@ -0,0 +1,17 @@ +#@TYPE: Distribution +#@NAME: Familiar Linux +#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org) + +MAINTAINER ?= "Familiar Developers " + +INHERIT += "package_ipk debian multimachine" +TARGET_OS = "linux" + +BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version" +IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" + +ENABLE_BINARY_LOCALE_GENERATION ?= "1" +PARALLEL_INSTALL_MODULES = "1" +UDEV_DEVFS_RULES = "1" + +DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/conf/distro/include/freeze.inc b/conf/distro/include/freeze.inc new file mode 100644 index 0000000000..d41cb89111 --- /dev/null +++ b/conf/distro/include/freeze.inc @@ -0,0 +1,25 @@ +# general configuration file for freezing a distribution +# +# 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.) +# +# NOTE that these conf files use ${PKGDIR} and therefore that +# variable must be defined before this file is included, or the +# definition below (${TOPDIR}/openmebedded) must be correct. +# +PKGDIR ?= "${TOPDIR}/openembedded" +FROZEN_DIR ?= "/non/-existent/-directory/-for/-security" + +# Pull in the frozen definitions (if they exist) The multiple +# 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.inc +include conf/${DISTRO}-packages.conf +include ${FROZEN_DIR}/${DISTRO}-packages.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.conf deleted file mode 100644 index f88d593a17..0000000000 --- a/conf/distro/include/ludeos-packages.conf +++ /dev/null @@ -1,2 +0,0 @@ -SLUGOS_EXTRA_BBFILES = "" -require conf/distro/include/slugos-packages.conf diff --git a/conf/distro/include/ludeos-packages.inc b/conf/distro/include/ludeos-packages.inc new file mode 100644 index 0000000000..f88d593a17 --- /dev/null +++ b/conf/distro/include/ludeos-packages.inc @@ -0,0 +1,2 @@ +SLUGOS_EXTRA_BBFILES = "" +require conf/distro/include/slugos-packages.conf diff --git a/conf/distro/include/openslug-native-packages.conf b/conf/distro/include/openslug-native-packages.conf deleted file mode 100644 index 7f7a448434..0000000000 --- a/conf/distro/include/openslug-native-packages.conf +++ /dev/null @@ -1,11 +0,0 @@ -# automatically generated by bitbake freeze -BBFILES := "\ -${PKGDIR}/packages/apache/*.bb \ -${PKGDIR}/packages/openssl/*.bb \ -${PKGDIR}/packages/ipkg-utils/*.bb \ -${PKGDIR}/packages/meta/package-index.bb \ -${PKGDIR}/packages/meta/openslug-native-packages.bb \ -${PKGDIR}/packages/freeze/*.bb \ -${PKGDIR}/packages/pcre/*.bb \ -${PKGDIR}/packages/expat/*.bb \ -${OPENSLUG_NATIVE_EXTRA_BBFILES}" diff --git a/conf/distro/include/openslug-native-packages.inc b/conf/distro/include/openslug-native-packages.inc new file mode 100644 index 0000000000..7f7a448434 --- /dev/null +++ b/conf/distro/include/openslug-native-packages.inc @@ -0,0 +1,11 @@ +# automatically generated by bitbake freeze +BBFILES := "\ +${PKGDIR}/packages/apache/*.bb \ +${PKGDIR}/packages/openssl/*.bb \ +${PKGDIR}/packages/ipkg-utils/*.bb \ +${PKGDIR}/packages/meta/package-index.bb \ +${PKGDIR}/packages/meta/openslug-native-packages.bb \ +${PKGDIR}/packages/freeze/*.bb \ +${PKGDIR}/packages/pcre/*.bb \ +${PKGDIR}/packages/expat/*.bb \ +${OPENSLUG_NATIVE_EXTRA_BBFILES}" diff --git a/conf/distro/include/openslug-packages.conf b/conf/distro/include/openslug-packages.conf deleted file mode 100644 index fe09a7bcfa..0000000000 --- a/conf/distro/include/openslug-packages.conf +++ /dev/null @@ -1,2 +0,0 @@ -SLUGOS_EXTRA_BBFILES = "${OPENSLUG_EXTRA_BBFILES}" -require conf/distro/include/slugos-packages.conf diff --git a/conf/distro/include/openslug-packages.inc b/conf/distro/include/openslug-packages.inc new file mode 100644 index 0000000000..fe09a7bcfa --- /dev/null +++ b/conf/distro/include/openslug-packages.inc @@ -0,0 +1,2 @@ +SLUGOS_EXTRA_BBFILES = "${OPENSLUG_EXTRA_BBFILES}" +require conf/distro/include/slugos-packages.conf diff --git a/conf/distro/include/openzaurus.conf b/conf/distro/include/openzaurus.conf deleted file mode 100644 index b7f456320f..0000000000 --- a/conf/distro/include/openzaurus.conf +++ /dev/null @@ -1,18 +0,0 @@ -#@TYPE: Distribution -#@NAME: OpenZaurus -#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org) - -DISTRO = "openzaurus" -DISTRO_NAME = "OpenZaurus" - -INHERIT += " package_ipk debian multimachine" -# For some reason, this doesn't work -# TARGET_OS ?= "linux" -TARGET_OS = "linux" -TARGET_FPU = "soft" - -BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version" - -PARALLEL_INSTALL_MODULES = "1" - -DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc new file mode 100644 index 0000000000..b7f456320f --- /dev/null +++ b/conf/distro/include/openzaurus.inc @@ -0,0 +1,18 @@ +#@TYPE: Distribution +#@NAME: OpenZaurus +#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org) + +DISTRO = "openzaurus" +DISTRO_NAME = "OpenZaurus" + +INHERIT += " package_ipk debian multimachine" +# For some reason, this doesn't work +# TARGET_OS ?= "linux" +TARGET_OS = "linux" +TARGET_FPU = "soft" + +BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version" + +PARALLEL_INSTALL_MODULES = "1" + +DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/conf/distro/include/sane-srcdates.conf b/conf/distro/include/sane-srcdates.conf deleted file mode 100644 index 9a88449e07..0000000000 --- a/conf/distro/include/sane-srcdates.conf +++ /dev/null @@ -1,29 +0,0 @@ -# Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version - -SRCDATE_gconf-dbus ?= "20060119" -SRCDATE_gnome-vfs-dbus ?= "20060119" -SRCDATE_contacts ?= "20060707" -SRCDATE_dates ?= "20060707" -SRCDATE_gtkhtml2 ?= "20060323" -SRCDATE_web ?= "20060613" -SRCDATE_eds-dbus ?= "20060707" -SRCDATE_minimo ?= "20050401" -SRCDATE_ipkg-utils-native ?= "20050930" -SRCDATE_ipkg-link-1 ?= "20050930" -SRCDATE_ipkg-utils ?= "20050930" -SRCDATE_ipkg-link ?= "20050930" -SRCDATE_matchbox-common ?= "20060612" -SRCDATE_matchbox-config-gtk ?= "20060612" -SRCDATE_matchbox-desktop ?= "20060612" -SRCDATE_matchbox-keyboard ?= "20060612" -SRCDATE_matchbox-panel ?= "20060612" -SRCDATE_matchbox-panel-manager ?= "20060612" -SRCDATE_matchbox-stroke ?= "20060612" -SRCDATE_matchbox-themes-extra ?= "20060612" -SRCDATE_matchbox-wm ?= "20060612" -SRCDATE_libmatchbox ?= "20060612" -SRCDATE_tslib ?= "20051101" -SRCDATE_libfakekey ?= "20051101" -SRCDATE_qemu-native ?= "20060526" -SRCDATE_oprofile ?= "20060214" -SRCDATE_zaurusd ?= "20060628" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc new file mode 100644 index 0000000000..9a88449e07 --- /dev/null +++ b/conf/distro/include/sane-srcdates.inc @@ -0,0 +1,29 @@ +# Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version + +SRCDATE_gconf-dbus ?= "20060119" +SRCDATE_gnome-vfs-dbus ?= "20060119" +SRCDATE_contacts ?= "20060707" +SRCDATE_dates ?= "20060707" +SRCDATE_gtkhtml2 ?= "20060323" +SRCDATE_web ?= "20060613" +SRCDATE_eds-dbus ?= "20060707" +SRCDATE_minimo ?= "20050401" +SRCDATE_ipkg-utils-native ?= "20050930" +SRCDATE_ipkg-link-1 ?= "20050930" +SRCDATE_ipkg-utils ?= "20050930" +SRCDATE_ipkg-link ?= "20050930" +SRCDATE_matchbox-common ?= "20060612" +SRCDATE_matchbox-config-gtk ?= "20060612" +SRCDATE_matchbox-desktop ?= "20060612" +SRCDATE_matchbox-keyboard ?= "20060612" +SRCDATE_matchbox-panel ?= "20060612" +SRCDATE_matchbox-panel-manager ?= "20060612" +SRCDATE_matchbox-stroke ?= "20060612" +SRCDATE_matchbox-themes-extra ?= "20060612" +SRCDATE_matchbox-wm ?= "20060612" +SRCDATE_libmatchbox ?= "20060612" +SRCDATE_tslib ?= "20051101" +SRCDATE_libfakekey ?= "20051101" +SRCDATE_qemu-native ?= "20060526" +SRCDATE_oprofile ?= "20060214" +SRCDATE_zaurusd ?= "20060628" diff --git a/conf/distro/include/slugos-packages.conf b/conf/distro/include/slugos-packages.conf deleted file mode 100644 index 650368a990..0000000000 --- a/conf/distro/include/slugos-packages.conf +++ /dev/null @@ -1,259 +0,0 @@ -BBFILES := "\ -${PKGDIR}/packages/alsa/*.bb \ -${PKGDIR}/packages/apr/*.bb \ -${PKGDIR}/packages/asterisk/*.bb \ -${PKGDIR}/packages/asterisk-sounds/*.bb \ -${PKGDIR}/packages/atftp/*.bb \ -${PKGDIR}/packages/audiofile/*.bb \ -${PKGDIR}/packages/aumix/*.bb \ -${PKGDIR}/packages/autoconf/*.bb \ -${PKGDIR}/packages/automake/*.bb \ -${PKGDIR}/packages/base-files/*.bb \ -${PKGDIR}/packages/base-passwd/*.bb \ -${PKGDIR}/packages/bash/*.bb \ -${PKGDIR}/packages/beep/*.bb \ -${PKGDIR}/packages/bind/*.bb \ -${PKGDIR}/packages/binutils/*.bb \ -${PKGDIR}/packages/bison/*.bb \ -${PKGDIR}/packages/bluez/*.bb \ -${PKGDIR}/packages/bogofilter/*.bb \ -${PKGDIR}/packages/boost/*.bb \ -${PKGDIR}/packages/bridge-utils/*.bb \ -${PKGDIR}/packages/btsco/*.bb \ -${PKGDIR}/packages/busybox/*.bb \ -${PKGDIR}/packages/bwmon/*.bb \ -${PKGDIR}/packages/bzip2/*.bb \ -${PKGDIR}/packages/ccxstream/*.bb \ -${PKGDIR}/packages/cdparanoia/*.bb \ -${PKGDIR}/packages/cdstatus/*.bb \ -${PKGDIR}/packages/cherokee/*.bb \ -${PKGDIR}/packages/coreutils/*.bb \ -${PKGDIR}/packages/cpio/*.bb \ -${PKGDIR}/packages/cron/*.bb \ -${PKGDIR}/packages/ctorrent/*.bb \ -${PKGDIR}/packages/ctrlproxy/*.bb \ -${PKGDIR}/packages/curl/*.bb \ -${PKGDIR}/packages/cvs/*.bb \ -${PKGDIR}/packages/cyrus-imapd/*.bb \ -${PKGDIR}/packages/cyrus-sasl/*.bb \ -${PKGDIR}/packages/davfs2/*.bb \ -${PKGDIR}/packages/db/*.bb \ -${PKGDIR}/packages/dbus/*.bb \ -${PKGDIR}/packages/devio/*.bb \ -${PKGDIR}/packages/device-mapper/*.bb \ -${PKGDIR}/packages/devlabel/*.bb \ -${PKGDIR}/packages/dhcp/*.bb \ -${PKGDIR}/packages/didiwiki/*.bb \ -${PKGDIR}/packages/diffstat/*.bb \ -${PKGDIR}/packages/diffutils/*.bb \ -${PKGDIR}/packages/dnsmasq/*.bb \ -${PKGDIR}/packages/docbook-utils/*.bb \ -${PKGDIR}/packages/dropbear/*.bb \ -${PKGDIR}/packages/dsniff/*.bb \ -${PKGDIR}/packages/e2fsprogs/*.bb \ -${PKGDIR}/packages/e2fsprogs-libs/*.bb \ -${PKGDIR}/packages/eciadsl/*.bb \ -${PKGDIR}/packages/expat/*.bb \ -${PKGDIR}/packages/ez-ipupdate/*.bb \ -${PKGDIR}/packages/fakeroot/*.bb \ -${PKGDIR}/packages/fetchmail/*.bb \ -${PKGDIR}/packages/file/*.bb \ -${PKGDIR}/packages/findutils/*.bb \ -${PKGDIR}/packages/flac/*.bb \ -${PKGDIR}/packages/flex/*.bb \ -${PKGDIR}/packages/freeze/*.bb \ -${PKGDIR}/packages/ftpd-topfield/*.bb \ -${PKGDIR}/packages/gawk/*.bb \ -${PKGDIR}/packages/gcc/*.bb \ -${PKGDIR}/packages/gd/*.bb \ -${PKGDIR}/packages/gdb/*.bb \ -${PKGDIR}/packages/gdbm/*.bb \ -${PKGDIR}/packages/gettext/*.bb \ -${PKGDIR}/packages/glib-1.2/*.bb \ -${PKGDIR}/packages/glib-2.0/*.bb \ -${PKGDIR}/packages/glibc/*.bb \ -${PKGDIR}/packages/gnu-config/*.bb \ -${PKGDIR}/packages/gnutls/*.bb \ -${PKGDIR}/packages/gphoto2/*.bb \ -${PKGDIR}/packages/gpsd/*.bb \ -${PKGDIR}/packages/grep/*.bb \ -${PKGDIR}/packages/groff/*.bb \ -${PKGDIR}/packages/gtk-doc/*.bb \ -${PKGDIR}/packages/gzip/*.bb \ -${PKGDIR}/packages/hal/*.bb \ -${PKGDIR}/packages/hotplug-ng/*.bb \ -${PKGDIR}/packages/icecast/*.bb \ -${PKGDIR}/packages/ifupdown/*.bb \ -${PKGDIR}/packages/initscripts/*.bb \ -${PKGDIR}/packages/install/*.bb \ -${PKGDIR}/packages/intltool/*.bb \ -${PKGDIR}/packages/iperf/*.bb \ -${PKGDIR}/packages/ipkg-utils/*.bb \ -${PKGDIR}/packages/ipkg/*.bb \ -${PKGDIR}/packages/iptables/*.bb \ -${PKGDIR}/packages/ircp/*.bb \ -${PKGDIR}/packages/irssi/*.bb \ -${PKGDIR}/packages/ixp425-eth/*.bb \ -${PKGDIR}/packages/ixp4xx/*.bb \ -${PKGDIR}/packages/joe/*.bb \ -${PKGDIR}/packages/jpeg/*.bb \ -${PKGDIR}/packages/lcdproc/*.bb \ -${PKGDIR}/packages/less/*.bb \ -${PKGDIR}/packages/libaal/*.bb \ -${PKGDIR}/packages/libao/*.bb \ -${PKGDIR}/packages/libdvb/*.bb \ -${PKGDIR}/packages/libexif/*.bb \ -${PKGDIR}/packages/libgcrypt/*.bb \ -${PKGDIR}/packages/libgpg-error/*.bb \ -${PKGDIR}/packages/libgphoto2/*.bb \ -${PKGDIR}/packages/libgsm/*.bb \ -${PKGDIR}/packages/libiconv/*.bb \ -${PKGDIR}/packages/libid3tag/*.bb \ -${PKGDIR}/packages/liblockfile/*.bb \ -${PKGDIR}/packages/libmad/*.bb \ -${PKGDIR}/packages/libmikmod/*.bb \ -${PKGDIR}/packages/libnet/*.bb \ -${PKGDIR}/packages/libnids/*.bb \ -${PKGDIR}/packages/libogg/*.bb \ -${PKGDIR}/packages/libol/*.bb \ -${PKGDIR}/packages/libpcap/*.bb \ -${PKGDIR}/packages/libpng/*.bb \ -${PKGDIR}/packages/libtiff/*.bb \ -${PKGDIR}/packages/libtool/*.bb \ -${PKGDIR}/packages/libusb/*.bb \ -${PKGDIR}/packages/libvorbis/*.bb \ -${PKGDIR}/packages/libxml/*.bb \ -${PKGDIR}/packages/libxslt/* \ -${PKGDIR}/packages/linux-libc-headers/*.bb \ -${PKGDIR}/packages/linux/*.bb \ -${PKGDIR}/packages/lirc/*.bb \ -${PKGDIR}/packages/lrzsz/*.bb \ -${PKGDIR}/packages/lsof/*.bb \ -${PKGDIR}/packages/lvm2/*.bb \ -${PKGDIR}/packages/lzo/*.bb \ -${PKGDIR}/packages/m4/*.bb \ -${PKGDIR}/packages/madplay/*.bb \ -${PKGDIR}/packages/madwifi/*.bb \ -${PKGDIR}/packages/mailx/*.bb \ -${PKGDIR}/packages/make/*.bb \ -${PKGDIR}/packages/makedevs/*.bb \ -${PKGDIR}/packages/man-pages/*.bb \ -${PKGDIR}/packages/man/*.bb \ -${PKGDIR}/packages/masqmail/*.bb \ -${PKGDIR}/packages/mdadm/*.bb \ -${PKGDIR}/packages/memtester/*.bb \ -${PKGDIR}/packages/meta/*.bb \ -${PKGDIR}/packages/mgetty/*.bb \ -${PKGDIR}/packages/miau/*.bb \ -${PKGDIR}/packages/microcom/*.bb \ -${PKGDIR}/packages/minicom/*.bb \ -${PKGDIR}/packages/module-init-tools/*.bb \ -${PKGDIR}/packages/modutils/*.bb \ -${PKGDIR}/packages/monotone/*.bb \ -${PKGDIR}/packages/motion/*.bb \ -${PKGDIR}/packages/mt-daapd/*.bb \ -${PKGDIR}/packages/mtd/*.bb \ -${PKGDIR}/packages/musicpd/*.bb \ -${PKGDIR}/packages/mutt/*.bb \ -${PKGDIR}/packages/mysql/*.bb \ -${PKGDIR}/packages/nail/*.bb \ -${PKGDIR}/packages/nano/*.bb \ -${PKGDIR}/packages/ncftp/*.bb \ -${PKGDIR}/packages/ncurses/*.bb \ -${PKGDIR}/packages/neon/*.bb \ -${PKGDIR}/packages/netbase/*.bb \ -${PKGDIR}/packages/netcat/*.bb \ -${PKGDIR}/packages/netpbm/*.bb \ -${PKGDIR}/packages/nfs-utils/*.bb \ -${PKGDIR}/packages/nis/*.bb \ -${PKGDIR}/packages/nmap/*.bb \ -${PKGDIR}/packages/nslu2-binary-only/*.bb \ -${PKGDIR}/packages/ntp/*.bb \ -${PKGDIR}/packages/obexftp/*.bb \ -${PKGDIR}/packages/openjade/*.bb \ -${PKGDIR}/packages/openldap/*.bb \ -${PKGDIR}/packages/openntpd/*.bb \ -${PKGDIR}/packages/openobex/*.bb \ -${PKGDIR}/packages/opensp/*.bb \ -${PKGDIR}/packages/openssh/*.bb \ -${PKGDIR}/packages/openssl/*.bb \ -${PKGDIR}/packages/openvpn/*.bb \ -${PKGDIR}/packages/pam/*.bb \ -${PKGDIR}/packages/patch/*.bb \ -${PKGDIR}/packages/patcher/*.bb \ -${PKGDIR}/packages/patchutils/*.bb \ -${PKGDIR}/packages/pciutils/*.bb \ -${PKGDIR}/packages/pcmcia-cs/*.bb \ -${PKGDIR}/packages/pcre/*.bb \ -${PKGDIR}/packages/perl/*.bb \ -${PKGDIR}/packages/php/*.bb \ -${PKGDIR}/packages/pkgconfig/*.bb \ -${PKGDIR}/packages/popt/*.bb \ -${PKGDIR}/packages/portmap/*.bb \ -${PKGDIR}/packages/postfix/*.bb \ -${PKGDIR}/packages/ppp/*.bb \ -${PKGDIR}/packages/procps/*.bb \ -${PKGDIR}/packages/psmisc/*.bb \ -${PKGDIR}/packages/puppy/*.bb \ -${PKGDIR}/packages/pvrusb2-mci/*.bb \ -${PKGDIR}/packages/pwc/*.bb \ -${PKGDIR}/packages/python/*.bb \ -${PKGDIR}/packages/qc-usb/*.bb \ -${PKGDIR}/packages/quilt/*.bb \ -${PKGDIR}/packages/radlib/*.bb \ -${PKGDIR}/packages/readline/*.bb \ -${PKGDIR}/packages/reiser4progs/*.bb \ -${PKGDIR}/packages/reiserfsprogs/*.bb \ -${PKGDIR}/packages/rsync/*.bb \ -${PKGDIR}/packages/samba/*.bb \ -${PKGDIR}/packages/sane-backends/*.bb \ -${PKGDIR}/packages/screen/*.bb \ -${PKGDIR}/packages/sed/*.bb \ -${PKGDIR}/packages/setpwc/*.bb \ -${PKGDIR}/packages/setserial/*.bb \ -${PKGDIR}/packages/sgml-common/*.bb \ -${PKGDIR}/packages/slugimage/*.bb \ -${PKGDIR}/packages/slugos-init/*.bb \ -${PKGDIR}/packages/spca5xx/*.bb \ -${PKGDIR}/packages/ssmtp/*.bb \ -${PKGDIR}/packages/strace/*.bb \ -${PKGDIR}/packages/streamripper/*.bb \ -${PKGDIR}/packages/subversion/*.bb \ -${PKGDIR}/packages/sudo/*.bb \ -${PKGDIR}/packages/sysfsutils/*.bb \ -${PKGDIR}/packages/syslog-ng/*.bb \ -${PKGDIR}/packages/sysvinit/*.bb \ -${PKGDIR}/packages/tar/*.bb \ -${PKGDIR}/packages/tcltk/*.bb \ -${PKGDIR}/packages/thttpd/*.bb \ -${PKGDIR}/packages/time/*.bb \ -${PKGDIR}/packages/timezones/*.bb \ -${PKGDIR}/packages/tinylogin/*.bb \ -${PKGDIR}/packages/uclibc/*.bb \ -${PKGDIR}/packages/udev/*.bb \ -${PKGDIR}/packages/unionfs/*.bb \ -${PKGDIR}/packages/unzip/*.bb \ -${PKGDIR}/packages/update-modules/*.bb \ -${PKGDIR}/packages/update-rc.d/*.bb \ -${PKGDIR}/packages/upslug/*.bb \ -${PKGDIR}/packages/usbutils/*.bb \ -${PKGDIR}/packages/util-linux/*.bb \ -${PKGDIR}/packages/vim/*.bb \ -${PKGDIR}/packages/vlan/*.bb \ -${PKGDIR}/packages/vpnc/*.bb \ -${PKGDIR}/packages/vsftpd/*.bb \ -${PKGDIR}/packages/w3cam/*.bb \ -${PKGDIR}/packages/wakelan/*.bb \ -${PKGDIR}/packages/wget/*.bb \ -${PKGDIR}/packages/whois/*.bb \ -${PKGDIR}/packages/wireless-tools/*.bb \ -${PKGDIR}/packages/wpa-supplicant/*.bb \ -${PKGDIR}/packages/wview/*.bb \ -${PKGDIR}/packages/xlibs/*.bb \ -${PKGDIR}/packages/xextensions/*.bb \ -${PKGDIR}/packages/xinetd/*.bb \ -${PKGDIR}/packages/xproto/*.bb \ -${PKGDIR}/packages/zd1211/*.bb \ -${PKGDIR}/packages/zip/*.bb \ -${PKGDIR}/packages/zlib/*.bb \ -${SLUGOS_EXTRA_BBFILES}" diff --git a/conf/distro/include/slugos-packages.inc b/conf/distro/include/slugos-packages.inc new file mode 100644 index 0000000000..650368a990 --- /dev/null +++ b/conf/distro/include/slugos-packages.inc @@ -0,0 +1,259 @@ +BBFILES := "\ +${PKGDIR}/packages/alsa/*.bb \ +${PKGDIR}/packages/apr/*.bb \ +${PKGDIR}/packages/asterisk/*.bb \ +${PKGDIR}/packages/asterisk-sounds/*.bb \ +${PKGDIR}/packages/atftp/*.bb \ +${PKGDIR}/packages/audiofile/*.bb \ +${PKGDIR}/packages/aumix/*.bb \ +${PKGDIR}/packages/autoconf/*.bb \ +${PKGDIR}/packages/automake/*.bb \ +${PKGDIR}/packages/base-files/*.bb \ +${PKGDIR}/packages/base-passwd/*.bb \ +${PKGDIR}/packages/bash/*.bb \ +${PKGDIR}/packages/beep/*.bb \ +${PKGDIR}/packages/bind/*.bb \ +${PKGDIR}/packages/binutils/*.bb \ +${PKGDIR}/packages/bison/*.bb \ +${PKGDIR}/packages/bluez/*.bb \ +${PKGDIR}/packages/bogofilter/*.bb \ +${PKGDIR}/packages/boost/*.bb \ +${PKGDIR}/packages/bridge-utils/*.bb \ +${PKGDIR}/packages/btsco/*.bb \ +${PKGDIR}/packages/busybox/*.bb \ +${PKGDIR}/packages/bwmon/*.bb \ +${PKGDIR}/packages/bzip2/*.bb \ +${PKGDIR}/packages/ccxstream/*.bb \ +${PKGDIR}/packages/cdparanoia/*.bb \ +${PKGDIR}/packages/cdstatus/*.bb \ +${PKGDIR}/packages/cherokee/*.bb \ +${PKGDIR}/packages/coreutils/*.bb \ +${PKGDIR}/packages/cpio/*.bb \ +${PKGDIR}/packages/cron/*.bb \ +${PKGDIR}/packages/ctorrent/*.bb \ +${PKGDIR}/packages/ctrlproxy/*.bb \ +${PKGDIR}/packages/curl/*.bb \ +${PKGDIR}/packages/cvs/*.bb \ +${PKGDIR}/packages/cyrus-imapd/*.bb \ +${PKGDIR}/packages/cyrus-sasl/*.bb \ +${PKGDIR}/packages/davfs2/*.bb \ +${PKGDIR}/packages/db/*.bb \ +${PKGDIR}/packages/dbus/*.bb \ +${PKGDIR}/packages/devio/*.bb \ +${PKGDIR}/packages/device-mapper/*.bb \ +${PKGDIR}/packages/devlabel/*.bb \ +${PKGDIR}/packages/dhcp/*.bb \ +${PKGDIR}/packages/didiwiki/*.bb \ +${PKGDIR}/packages/diffstat/*.bb \ +${PKGDIR}/packages/diffutils/*.bb \ +${PKGDIR}/packages/dnsmasq/*.bb \ +${PKGDIR}/packages/docbook-utils/*.bb \ +${PKGDIR}/packages/dropbear/*.bb \ +${PKGDIR}/packages/dsniff/*.bb \ +${PKGDIR}/packages/e2fsprogs/*.bb \ +${PKGDIR}/packages/e2fsprogs-libs/*.bb \ +${PKGDIR}/packages/eciadsl/*.bb \ +${PKGDIR}/packages/expat/*.bb \ +${PKGDIR}/packages/ez-ipupdate/*.bb \ +${PKGDIR}/packages/fakeroot/*.bb \ +${PKGDIR}/packages/fetchmail/*.bb \ +${PKGDIR}/packages/file/*.bb \ +${PKGDIR}/packages/findutils/*.bb \ +${PKGDIR}/packages/flac/*.bb \ +${PKGDIR}/packages/flex/*.bb \ +${PKGDIR}/packages/freeze/*.bb \ +${PKGDIR}/packages/ftpd-topfield/*.bb \ +${PKGDIR}/packages/gawk/*.bb \ +${PKGDIR}/packages/gcc/*.bb \ +${PKGDIR}/packages/gd/*.bb \ +${PKGDIR}/packages/gdb/*.bb \ +${PKGDIR}/packages/gdbm/*.bb \ +${PKGDIR}/packages/gettext/*.bb \ +${PKGDIR}/packages/glib-1.2/*.bb \ +${PKGDIR}/packages/glib-2.0/*.bb \ +${PKGDIR}/packages/glibc/*.bb \ +${PKGDIR}/packages/gnu-config/*.bb \ +${PKGDIR}/packages/gnutls/*.bb \ +${PKGDIR}/packages/gphoto2/*.bb \ +${PKGDIR}/packages/gpsd/*.bb \ +${PKGDIR}/packages/grep/*.bb \ +${PKGDIR}/packages/groff/*.bb \ +${PKGDIR}/packages/gtk-doc/*.bb \ +${PKGDIR}/packages/gzip/*.bb \ +${PKGDIR}/packages/hal/*.bb \ +${PKGDIR}/packages/hotplug-ng/*.bb \ +${PKGDIR}/packages/icecast/*.bb \ +${PKGDIR}/packages/ifupdown/*.bb \ +${PKGDIR}/packages/initscripts/*.bb \ +${PKGDIR}/packages/install/*.bb \ +${PKGDIR}/packages/intltool/*.bb \ +${PKGDIR}/packages/iperf/*.bb \ +${PKGDIR}/packages/ipkg-utils/*.bb \ +${PKGDIR}/packages/ipkg/*.bb \ +${PKGDIR}/packages/iptables/*.bb \ +${PKGDIR}/packages/ircp/*.bb \ +${PKGDIR}/packages/irssi/*.bb \ +${PKGDIR}/packages/ixp425-eth/*.bb \ +${PKGDIR}/packages/ixp4xx/*.bb \ +${PKGDIR}/packages/joe/*.bb \ +${PKGDIR}/packages/jpeg/*.bb \ +${PKGDIR}/packages/lcdproc/*.bb \ +${PKGDIR}/packages/less/*.bb \ +${PKGDIR}/packages/libaal/*.bb \ +${PKGDIR}/packages/libao/*.bb \ +${PKGDIR}/packages/libdvb/*.bb \ +${PKGDIR}/packages/libexif/*.bb \ +${PKGDIR}/packages/libgcrypt/*.bb \ +${PKGDIR}/packages/libgpg-error/*.bb \ +${PKGDIR}/packages/libgphoto2/*.bb \ +${PKGDIR}/packages/libgsm/*.bb \ +${PKGDIR}/packages/libiconv/*.bb \ +${PKGDIR}/packages/libid3tag/*.bb \ +${PKGDIR}/packages/liblockfile/*.bb \ +${PKGDIR}/packages/libmad/*.bb \ +${PKGDIR}/packages/libmikmod/*.bb \ +${PKGDIR}/packages/libnet/*.bb \ +${PKGDIR}/packages/libnids/*.bb \ +${PKGDIR}/packages/libogg/*.bb \ +${PKGDIR}/packages/libol/*.bb \ +${PKGDIR}/packages/libpcap/*.bb \ +${PKGDIR}/packages/libpng/*.bb \ +${PKGDIR}/packages/libtiff/*.bb \ +${PKGDIR}/packages/libtool/*.bb \ +${PKGDIR}/packages/libusb/*.bb \ +${PKGDIR}/packages/libvorbis/*.bb \ +${PKGDIR}/packages/libxml/*.bb \ +${PKGDIR}/packages/libxslt/* \ +${PKGDIR}/packages/linux-libc-headers/*.bb \ +${PKGDIR}/packages/linux/*.bb \ +${PKGDIR}/packages/lirc/*.bb \ +${PKGDIR}/packages/lrzsz/*.bb \ +${PKGDIR}/packages/lsof/*.bb \ +${PKGDIR}/packages/lvm2/*.bb \ +${PKGDIR}/packages/lzo/*.bb \ +${PKGDIR}/packages/m4/*.bb \ +${PKGDIR}/packages/madplay/*.bb \ +${PKGDIR}/packages/madwifi/*.bb \ +${PKGDIR}/packages/mailx/*.bb \ +${PKGDIR}/packages/make/*.bb \ +${PKGDIR}/packages/makedevs/*.bb \ +${PKGDIR}/packages/man-pages/*.bb \ +${PKGDIR}/packages/man/*.bb \ +${PKGDIR}/packages/masqmail/*.bb \ +${PKGDIR}/packages/mdadm/*.bb \ +${PKGDIR}/packages/memtester/*.bb \ +${PKGDIR}/packages/meta/*.bb \ +${PKGDIR}/packages/mgetty/*.bb \ +${PKGDIR}/packages/miau/*.bb \ +${PKGDIR}/packages/microcom/*.bb \ +${PKGDIR}/packages/minicom/*.bb \ +${PKGDIR}/packages/module-init-tools/*.bb \ +${PKGDIR}/packages/modutils/*.bb \ +${PKGDIR}/packages/monotone/*.bb \ +${PKGDIR}/packages/motion/*.bb \ +${PKGDIR}/packages/mt-daapd/*.bb \ +${PKGDIR}/packages/mtd/*.bb \ +${PKGDIR}/packages/musicpd/*.bb \ +${PKGDIR}/packages/mutt/*.bb \ +${PKGDIR}/packages/mysql/*.bb \ +${PKGDIR}/packages/nail/*.bb \ +${PKGDIR}/packages/nano/*.bb \ +${PKGDIR}/packages/ncftp/*.bb \ +${PKGDIR}/packages/ncurses/*.bb \ +${PKGDIR}/packages/neon/*.bb \ +${PKGDIR}/packages/netbase/*.bb \ +${PKGDIR}/packages/netcat/*.bb \ +${PKGDIR}/packages/netpbm/*.bb \ +${PKGDIR}/packages/nfs-utils/*.bb \ +${PKGDIR}/packages/nis/*.bb \ +${PKGDIR}/packages/nmap/*.bb \ +${PKGDIR}/packages/nslu2-binary-only/*.bb \ +${PKGDIR}/packages/ntp/*.bb \ +${PKGDIR}/packages/obexftp/*.bb \ +${PKGDIR}/packages/openjade/*.bb \ +${PKGDIR}/packages/openldap/*.bb \ +${PKGDIR}/packages/openntpd/*.bb \ +${PKGDIR}/packages/openobex/*.bb \ +${PKGDIR}/packages/opensp/*.bb \ +${PKGDIR}/packages/openssh/*.bb \ +${PKGDIR}/packages/openssl/*.bb \ +${PKGDIR}/packages/openvpn/*.bb \ +${PKGDIR}/packages/pam/*.bb \ +${PKGDIR}/packages/patch/*.bb \ +${PKGDIR}/packages/patcher/*.bb \ +${PKGDIR}/packages/patchutils/*.bb \ +${PKGDIR}/packages/pciutils/*.bb \ +${PKGDIR}/packages/pcmcia-cs/*.bb \ +${PKGDIR}/packages/pcre/*.bb \ +${PKGDIR}/packages/perl/*.bb \ +${PKGDIR}/packages/php/*.bb \ +${PKGDIR}/packages/pkgconfig/*.bb \ +${PKGDIR}/packages/popt/*.bb \ +${PKGDIR}/packages/portmap/*.bb \ +${PKGDIR}/packages/postfix/*.bb \ +${PKGDIR}/packages/ppp/*.bb \ +${PKGDIR}/packages/procps/*.bb \ +${PKGDIR}/packages/psmisc/*.bb \ +${PKGDIR}/packages/puppy/*.bb \ +${PKGDIR}/packages/pvrusb2-mci/*.bb \ +${PKGDIR}/packages/pwc/*.bb \ +${PKGDIR}/packages/python/*.bb \ +${PKGDIR}/packages/qc-usb/*.bb \ +${PKGDIR}/packages/quilt/*.bb \ +${PKGDIR}/packages/radlib/*.bb \ +${PKGDIR}/packages/readline/*.bb \ +${PKGDIR}/packages/reiser4progs/*.bb \ +${PKGDIR}/packages/reiserfsprogs/*.bb \ +${PKGDIR}/packages/rsync/*.bb \ +${PKGDIR}/packages/samba/*.bb \ +${PKGDIR}/packages/sane-backends/*.bb \ +${PKGDIR}/packages/screen/*.bb \ +${PKGDIR}/packages/sed/*.bb \ +${PKGDIR}/packages/setpwc/*.bb \ +${PKGDIR}/packages/setserial/*.bb \ +${PKGDIR}/packages/sgml-common/*.bb \ +${PKGDIR}/packages/slugimage/*.bb \ +${PKGDIR}/packages/slugos-init/*.bb \ +${PKGDIR}/packages/spca5xx/*.bb \ +${PKGDIR}/packages/ssmtp/*.bb \ +${PKGDIR}/packages/strace/*.bb \ +${PKGDIR}/packages/streamripper/*.bb \ +${PKGDIR}/packages/subversion/*.bb \ +${PKGDIR}/packages/sudo/*.bb \ +${PKGDIR}/packages/sysfsutils/*.bb \ +${PKGDIR}/packages/syslog-ng/*.bb \ +${PKGDIR}/packages/sysvinit/*.bb \ +${PKGDIR}/packages/tar/*.bb \ +${PKGDIR}/packages/tcltk/*.bb \ +${PKGDIR}/packages/thttpd/*.bb \ +${PKGDIR}/packages/time/*.bb \ +${PKGDIR}/packages/timezones/*.bb \ +${PKGDIR}/packages/tinylogin/*.bb \ +${PKGDIR}/packages/uclibc/*.bb \ +${PKGDIR}/packages/udev/*.bb \ +${PKGDIR}/packages/unionfs/*.bb \ +${PKGDIR}/packages/unzip/*.bb \ +${PKGDIR}/packages/update-modules/*.bb \ +${PKGDIR}/packages/update-rc.d/*.bb \ +${PKGDIR}/packages/upslug/*.bb \ +${PKGDIR}/packages/usbutils/*.bb \ +${PKGDIR}/packages/util-linux/*.bb \ +${PKGDIR}/packages/vim/*.bb \ +${PKGDIR}/packages/vlan/*.bb \ +${PKGDIR}/packages/vpnc/*.bb \ +${PKGDIR}/packages/vsftpd/*.bb \ +${PKGDIR}/packages/w3cam/*.bb \ +${PKGDIR}/packages/wakelan/*.bb \ +${PKGDIR}/packages/wget/*.bb \ +${PKGDIR}/packages/whois/*.bb \ +${PKGDIR}/packages/wireless-tools/*.bb \ +${PKGDIR}/packages/wpa-supplicant/*.bb \ +${PKGDIR}/packages/wview/*.bb \ +${PKGDIR}/packages/xlibs/*.bb \ +${PKGDIR}/packages/xextensions/*.bb \ +${PKGDIR}/packages/xinetd/*.bb \ +${PKGDIR}/packages/xproto/*.bb \ +${PKGDIR}/packages/zd1211/*.bb \ +${PKGDIR}/packages/zip/*.bb \ +${PKGDIR}/packages/zlib/*.bb \ +${SLUGOS_EXTRA_BBFILES}" diff --git a/conf/distro/include/slugos.conf b/conf/distro/include/slugos.conf deleted file mode 100644 index c2b169106f..0000000000 --- a/conf/distro/include/slugos.conf +++ /dev/null @@ -1,195 +0,0 @@ -#@TYPE: Distribution -#@NAME: SlugOS -#@DESCRIPTION: SlugOS Linux Distribution for the NSLU2 - -# WARNING: this file should not be used directly, use one of -# the supported slugos-???.conf instead: - -# Explanation of the naming -# -# slugos-dist - the base distro configuration for an NSLU2 -# slugos-[bl][at][gu] - a specific configuration encoded as follows: -# -# b or l - big or little endian -# set ARCH_BYTE_SEX to match -# -# a or t - ARM or Thumb instructions in the low level libraries -# set ARM_INSTRUCTION_SET to match -# -# g or u - glibc or uclibc libc implementation -# set TARGET_OS to match -# -# The following names are deprecated: -# -# openslug - the historical name of a canonical slugos-bag distro -# also the name of a standard slugos-bag distro with a package feed -# ucslugc - the historical (and obsolete) name of slugos-btu -# also the name of a standard slugos-btu distro with a package feed -# - -#---------------------------------------------------------------------------------- -# STANDARD SLUGOS DEFINITIONS -#---------------------------------------------------------------------------------- -# The following must be set in the top level distro file: -# -#DISTRO_NAME -#DISTRO_TYPE - -# The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.0" -DISTRO_REVISION ?= "" -DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" -# For release (only): -# DISTRO_FEED ?= "${SLUGOS_VERSION}-${DISTRO_TYPE}" -DISTRO_FEED ?= "unstable" - -# The following must also be set, they define the basic format of the build -# -#ARCH_BYTE_SEX "be" or "le" -#ARM_INSTRUCTION_SET "arm" or "thumb" -#TARGET_OS "linux" or "linux-uclibc" -#SLUGOS_IMAGESEX "big-endian" or "little-endian" (JFFS2 format) - -# The following need not be set, the defaults should be adequate -#USE_NLS = "no" or "yes" -USE_NLS ?= "no" - -# To make errors easier to identify: -DISTRO_NAME ?= "INVALID-${ARCH_BYTE_SEX}-${ARM_INSTRUCTION_SET}-${TARGET_OS}" -DISTRO_TYPE ?= "INVALID" - -# The following must not be changed. -TARGET_FPU = "soft" - -# glib-2.0 builds require USE_NLS to be overridden -USE_NLS_glib-2.0 = "yes" - -INHERIT += "package_ipk debian" - -DISTRO_BASE = ":slugos" - -# packages/meta/slugos-image.bb generates a binary image of the root file system -# with a name controlled by the following setting - it defaults to the top level -# ${DISTRO_NAME} and this should always be correct, but it may be too specific (e.g. -# if you change the DISTRO from one of the standard ones in a way which does not -# change the generated image). -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. -# require conf/distro/include/freeze.conf - -#---------------------------------------------------------------------------------- -# FEEDS -# The FEED_URIS lines define where on the internet SlugOS looks for packages -# when downloading new packages or updating existing packages. Additional feeds -# (such as a local feed) can be defined in local.conf -#---------------------------------------------------------------------------------- -# Add to the user's feeds from local.conf (there may be none). -# In general slugos-[bl][at][gu] is sufficient to identify a set of packages which -# will work on any derived distro. The slugos-???.conf files set the FEED_URIS to -# an appropriate ipkg.nslu2-linux.org default if nslu2-linux is actually building -# such a feed: -# -#FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/cross/${DISTRO_FEED}" -#FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/native/${DISTRO_FEED}" -# -# When such a feed exists the corresponding 'unstable' feed will normally also -# exist - the packages in unstable are the latest but very unlikely to be the -# greatest. Use at your own risk! -# -#FEED_URIS_append += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/cross/unstable" -#FEED_URIS_append += "unstable_native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/native/unstable" - -#---------------------------------------------------------------------------------- -# FIRMWARE CONFIGURATION -#---------------------------------------------------------------------------------- -# IMAGE BUILD OPTIONS -# ------------------- -# CMDLINE* macros define the kernel command line. CMDLINE_DEBUG is provided -# to enable/disable debugging in the distro. Here noirqdebug is used to -# remove the messages about unhandled interrupts - people debugging interrupt -# issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) -CMDLINE_DEBUG = "noirqdebug" - -# Building a full image. If you set SLUGOS_FLASH_IMAGE to "yes" a complete -# 8MByte flash image will be built after the rootfs JFFS2 image. -# -# If you do this you will need to find a source for the LinkSys software to be -# placed in the full image - 'RedBoot' (the boot loader), 'Trailer' (just a bunch -# of bytes to flag the image as valid) and 'SysConf' (actually just a block of -# unset data - you could modify this to pre-configure the SysConf partition of the -# image). If you own an NSLU2 then this data is already in the flash of the NSLU2 -# and you can download it (including new versions) from the LinkSys web site - see -# packages/meta/slugos-image.bb for information about where to put the downloaded -# data. -SLUGOS_FLASH_IMAGE ?= "no" - -# EXTRA PACKAGES -# -------------- -# SlugOS builds an image with no extra packages - to add packages to the -# firmware include this file in a new 'distro' configuration file) and set -# the definition below to include the requirements. -# NOTE: as built this system will *not* be able to boot off anything other than -# the flash file system ('turnup' will not work). You need to add the filesystem -# modules for your chosen root file system (and any others which will be used). -# See openslug.conf for a more full-featured system! -# -# Everything in this list gets added to the flash image, along with any RDEPENDS -# it has itself! -SLUGOS_EXTRA_RDEPENDS ?= "" - -#---------------------------------------------------------------------------------- -# PACKAGE VERSION CONTROL -#---------------------------------------------------------------------------------- -# Define how to bootstrap the system - we need cross compilers. It is also -# necessary to define which gets generated first, glibc or the kernel, and -# this is done by selecting the provider of libc (in this case it needs the -# kernel, so there has to be a non-libc gcc to build the kernel!) -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -# Select 2.6 versions of the depmod support -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" - -# compiler/binary/library versions (unslung uses different ones so these -# cannot be in ${MACHINE}.conf) -PREFERRED_VERSION_binutils ?= "2.16" -PREFERRED_VERSION_binutils-cross ?= "2.16" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_gcc-cross ?= "4.1.1" -PREFERRED_VERSION_gcc ?= "4.1.1" -PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" -#For SVN uclibc: -#SRCDATE_uclibc ?= "20060120" -#PREFERRED_VERSION_uclibc ?= "0.9.28+svn${SRCDATE_uclibc}" - -# Select the correct versions of the kernel and modules (these are the -# defaults, override in the conf/distro top-level distro file). -PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" -PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.17" - -# Built-in ethernet modules -PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth" -PREFERRED_VERSION_ixp4xx-csr ?= "2.1" -PREFERRED_VERSION_ixp-osal ?= "2.1" -PREFERRED_VERSION_ixp400-eth ?= "1.5" - -# Select the smallest provider of x11 libraries -PREFERRED_PROVIDER_libx11 ?= "diet-x11" -SRCDATE_diet-x11 ?= "20060106" - -# Latest wpa-supplicant which supports madwifi-ng -PREFERRED_VERSION_wpa-supplicant ?= "0.5.1" - -# Ensure consistency across all SlugOS builds for the provider of a -# relational database - use the latest version of the SleepyCat -# Berkeley database -PREFERRED_PROVIDER_virtual/db = "db" -PREFERRED_PROVIDER_virtual/db-native = "db-native" - -#FIXME: HACK: REMOVE THIS -IGNORE_STRIP_ERRORS = "" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc new file mode 100644 index 0000000000..c2b169106f --- /dev/null +++ b/conf/distro/include/slugos.inc @@ -0,0 +1,195 @@ +#@TYPE: Distribution +#@NAME: SlugOS +#@DESCRIPTION: SlugOS Linux Distribution for the NSLU2 + +# WARNING: this file should not be used directly, use one of +# the supported slugos-???.conf instead: + +# Explanation of the naming +# +# slugos-dist - the base distro configuration for an NSLU2 +# slugos-[bl][at][gu] - a specific configuration encoded as follows: +# +# b or l - big or little endian +# set ARCH_BYTE_SEX to match +# +# a or t - ARM or Thumb instructions in the low level libraries +# set ARM_INSTRUCTION_SET to match +# +# g or u - glibc or uclibc libc implementation +# set TARGET_OS to match +# +# The following names are deprecated: +# +# openslug - the historical name of a canonical slugos-bag distro +# also the name of a standard slugos-bag distro with a package feed +# ucslugc - the historical (and obsolete) name of slugos-btu +# also the name of a standard slugos-btu distro with a package feed +# + +#---------------------------------------------------------------------------------- +# STANDARD SLUGOS DEFINITIONS +#---------------------------------------------------------------------------------- +# The following must be set in the top level distro file: +# +#DISTRO_NAME +#DISTRO_TYPE + +# The following may be overridden to make sub-versions +SLUGOS_VERSION = "4.0" +DISTRO_REVISION ?= "" +DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" +# For release (only): +# DISTRO_FEED ?= "${SLUGOS_VERSION}-${DISTRO_TYPE}" +DISTRO_FEED ?= "unstable" + +# The following must also be set, they define the basic format of the build +# +#ARCH_BYTE_SEX "be" or "le" +#ARM_INSTRUCTION_SET "arm" or "thumb" +#TARGET_OS "linux" or "linux-uclibc" +#SLUGOS_IMAGESEX "big-endian" or "little-endian" (JFFS2 format) + +# The following need not be set, the defaults should be adequate +#USE_NLS = "no" or "yes" +USE_NLS ?= "no" + +# To make errors easier to identify: +DISTRO_NAME ?= "INVALID-${ARCH_BYTE_SEX}-${ARM_INSTRUCTION_SET}-${TARGET_OS}" +DISTRO_TYPE ?= "INVALID" + +# The following must not be changed. +TARGET_FPU = "soft" + +# glib-2.0 builds require USE_NLS to be overridden +USE_NLS_glib-2.0 = "yes" + +INHERIT += "package_ipk debian" + +DISTRO_BASE = ":slugos" + +# packages/meta/slugos-image.bb generates a binary image of the root file system +# with a name controlled by the following setting - it defaults to the top level +# ${DISTRO_NAME} and this should always be correct, but it may be too specific (e.g. +# if you change the DISTRO from one of the standard ones in a way which does not +# change the generated image). +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. +# require conf/distro/include/freeze.conf + +#---------------------------------------------------------------------------------- +# FEEDS +# The FEED_URIS lines define where on the internet SlugOS looks for packages +# when downloading new packages or updating existing packages. Additional feeds +# (such as a local feed) can be defined in local.conf +#---------------------------------------------------------------------------------- +# Add to the user's feeds from local.conf (there may be none). +# In general slugos-[bl][at][gu] is sufficient to identify a set of packages which +# will work on any derived distro. The slugos-???.conf files set the FEED_URIS to +# an appropriate ipkg.nslu2-linux.org default if nslu2-linux is actually building +# such a feed: +# +#FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/cross/${DISTRO_FEED}" +#FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/native/${DISTRO_FEED}" +# +# When such a feed exists the corresponding 'unstable' feed will normally also +# exist - the packages in unstable are the latest but very unlikely to be the +# greatest. Use at your own risk! +# +#FEED_URIS_append += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/cross/unstable" +#FEED_URIS_append += "unstable_native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS-foo}/native/unstable" + +#---------------------------------------------------------------------------------- +# FIRMWARE CONFIGURATION +#---------------------------------------------------------------------------------- +# IMAGE BUILD OPTIONS +# ------------------- +# CMDLINE* macros define the kernel command line. CMDLINE_DEBUG is provided +# to enable/disable debugging in the distro. Here noirqdebug is used to +# remove the messages about unhandled interrupts - people debugging interrupt +# issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) +CMDLINE_DEBUG = "noirqdebug" + +# Building a full image. If you set SLUGOS_FLASH_IMAGE to "yes" a complete +# 8MByte flash image will be built after the rootfs JFFS2 image. +# +# If you do this you will need to find a source for the LinkSys software to be +# placed in the full image - 'RedBoot' (the boot loader), 'Trailer' (just a bunch +# of bytes to flag the image as valid) and 'SysConf' (actually just a block of +# unset data - you could modify this to pre-configure the SysConf partition of the +# image). If you own an NSLU2 then this data is already in the flash of the NSLU2 +# and you can download it (including new versions) from the LinkSys web site - see +# packages/meta/slugos-image.bb for information about where to put the downloaded +# data. +SLUGOS_FLASH_IMAGE ?= "no" + +# EXTRA PACKAGES +# -------------- +# SlugOS builds an image with no extra packages - to add packages to the +# firmware include this file in a new 'distro' configuration file) and set +# the definition below to include the requirements. +# NOTE: as built this system will *not* be able to boot off anything other than +# the flash file system ('turnup' will not work). You need to add the filesystem +# modules for your chosen root file system (and any others which will be used). +# See openslug.conf for a more full-featured system! +# +# Everything in this list gets added to the flash image, along with any RDEPENDS +# it has itself! +SLUGOS_EXTRA_RDEPENDS ?= "" + +#---------------------------------------------------------------------------------- +# PACKAGE VERSION CONTROL +#---------------------------------------------------------------------------------- +# Define how to bootstrap the system - we need cross compilers. It is also +# necessary to define which gets generated first, glibc or the kernel, and +# this is done by selecting the provider of libc (in this case it needs the +# kernel, so there has to be a non-libc gcc to build the kernel!) +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" +# Select 2.6 versions of the depmod support +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" + +# compiler/binary/library versions (unslung uses different ones so these +# cannot be in ${MACHINE}.conf) +PREFERRED_VERSION_binutils ?= "2.16" +PREFERRED_VERSION_binutils-cross ?= "2.16" +PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" +PREFERRED_VERSION_gcc-cross ?= "4.1.1" +PREFERRED_VERSION_gcc ?= "4.1.1" +PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" +#For SVN uclibc: +#SRCDATE_uclibc ?= "20060120" +#PREFERRED_VERSION_uclibc ?= "0.9.28+svn${SRCDATE_uclibc}" + +# Select the correct versions of the kernel and modules (these are the +# defaults, override in the conf/distro top-level distro file). +PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.17" + +# Built-in ethernet modules +PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth" +PREFERRED_VERSION_ixp4xx-csr ?= "2.1" +PREFERRED_VERSION_ixp-osal ?= "2.1" +PREFERRED_VERSION_ixp400-eth ?= "1.5" + +# Select the smallest provider of x11 libraries +PREFERRED_PROVIDER_libx11 ?= "diet-x11" +SRCDATE_diet-x11 ?= "20060106" + +# Latest wpa-supplicant which supports madwifi-ng +PREFERRED_VERSION_wpa-supplicant ?= "0.5.1" + +# Ensure consistency across all SlugOS builds for the provider of a +# relational database - use the latest version of the SleepyCat +# Berkeley database +PREFERRED_PROVIDER_virtual/db = "db" +PREFERRED_PROVIDER_virtual/db-native = "db-native" + +#FIXME: HACK: REMOVE THIS +IGNORE_STRIP_ERRORS = "" diff --git a/conf/distro/include/ucslugc-packages.conf b/conf/distro/include/ucslugc-packages.conf deleted file mode 100644 index 3b3e9fca75..0000000000 --- a/conf/distro/include/ucslugc-packages.conf +++ /dev/null @@ -1,2 +0,0 @@ -SLUGOS_EXTRA_BBFILES = "${UCSLUGC_EXTRA_BBFILES}" -require conf/distro/include/slugos-packages.conf diff --git a/conf/distro/include/ucslugc-packages.inc b/conf/distro/include/ucslugc-packages.inc new file mode 100644 index 0000000000..3b3e9fca75 --- /dev/null +++ b/conf/distro/include/ucslugc-packages.inc @@ -0,0 +1,2 @@ +SLUGOS_EXTRA_BBFILES = "${UCSLUGC_EXTRA_BBFILES}" +require conf/distro/include/slugos-packages.conf diff --git a/conf/distro/include/unslung-packages.conf b/conf/distro/include/unslung-packages.conf deleted file mode 100644 index e889a65df5..0000000000 --- a/conf/distro/include/unslung-packages.conf +++ /dev/null @@ -1,41 +0,0 @@ -BBFILES := "\ -${PKGDIR}/packages/autoconf/*.bb \ -${PKGDIR}/packages/automake/*.bb \ -${PKGDIR}/packages/binutils/*.bb \ -${PKGDIR}/packages/bison/*.bb \ -${PKGDIR}/packages/busybox/*.bb \ -${PKGDIR}/packages/cpio/*.bb \ -${PKGDIR}/packages/devio/*.bb \ -${PKGDIR}/packages/fakeroot/*.bb \ -${PKGDIR}/packages/file/*.bb \ -${PKGDIR}/packages/findutils/*.bb \ -${PKGDIR}/packages/flex/*.bb \ -${PKGDIR}/packages/freeze/*.bb \ -${PKGDIR}/packages/gcc/*.bb \ -${PKGDIR}/packages/genext2fs/*.bb \ -${PKGDIR}/packages/gettext/*.bb \ -${PKGDIR}/packages/glibc/*.bb \ -${PKGDIR}/packages/gnu-config/*.bb \ -${PKGDIR}/packages/ipkg-utils/*.bb \ -${PKGDIR}/packages/ipkg/*.bb \ -${PKGDIR}/packages/libtool/*.bb \ -${PKGDIR}/packages/linux-libc-headers/*.bb \ -${PKGDIR}/packages/linux/*.bb \ -${PKGDIR}/packages/m4/*.bb \ -${PKGDIR}/packages/makedevs/*.bb \ -${PKGDIR}/packages/meta/*.bb \ -${PKGDIR}/packages/modutils/*.bb \ -${PKGDIR}/packages/mtd/*.bb \ -${PKGDIR}/packages/nslu2-binary-only/*.bb \ -${PKGDIR}/packages/pkgconfig/*.bb \ -${PKGDIR}/packages/portmap/*.bb \ -${PKGDIR}/packages/python/*.bb \ -${PKGDIR}/packages/quilt/*.bb \ -${PKGDIR}/packages/slugimage/*.bb \ -${PKGDIR}/packages/unzip/*.bb \ -${PKGDIR}/packages/update-modules/*.bb \ -${PKGDIR}/packages/wget/*.bb \ -${PKGDIR}/packages/wireless-tools/*.bb \ -${PKGDIR}/packages/zlib/*.bb \ -${PKGDIR}/packages/zd1211/*.bb \ -${UNSLUNG_EXTRA_BBFILES}" diff --git a/conf/distro/include/unslung-packages.inc b/conf/distro/include/unslung-packages.inc new file mode 100644 index 0000000000..e889a65df5 --- /dev/null +++ b/conf/distro/include/unslung-packages.inc @@ -0,0 +1,41 @@ +BBFILES := "\ +${PKGDIR}/packages/autoconf/*.bb \ +${PKGDIR}/packages/automake/*.bb \ +${PKGDIR}/packages/binutils/*.bb \ +${PKGDIR}/packages/bison/*.bb \ +${PKGDIR}/packages/busybox/*.bb \ +${PKGDIR}/packages/cpio/*.bb \ +${PKGDIR}/packages/devio/*.bb \ +${PKGDIR}/packages/fakeroot/*.bb \ +${PKGDIR}/packages/file/*.bb \ +${PKGDIR}/packages/findutils/*.bb \ +${PKGDIR}/packages/flex/*.bb \ +${PKGDIR}/packages/freeze/*.bb \ +${PKGDIR}/packages/gcc/*.bb \ +${PKGDIR}/packages/genext2fs/*.bb \ +${PKGDIR}/packages/gettext/*.bb \ +${PKGDIR}/packages/glibc/*.bb \ +${PKGDIR}/packages/gnu-config/*.bb \ +${PKGDIR}/packages/ipkg-utils/*.bb \ +${PKGDIR}/packages/ipkg/*.bb \ +${PKGDIR}/packages/libtool/*.bb \ +${PKGDIR}/packages/linux-libc-headers/*.bb \ +${PKGDIR}/packages/linux/*.bb \ +${PKGDIR}/packages/m4/*.bb \ +${PKGDIR}/packages/makedevs/*.bb \ +${PKGDIR}/packages/meta/*.bb \ +${PKGDIR}/packages/modutils/*.bb \ +${PKGDIR}/packages/mtd/*.bb \ +${PKGDIR}/packages/nslu2-binary-only/*.bb \ +${PKGDIR}/packages/pkgconfig/*.bb \ +${PKGDIR}/packages/portmap/*.bb \ +${PKGDIR}/packages/python/*.bb \ +${PKGDIR}/packages/quilt/*.bb \ +${PKGDIR}/packages/slugimage/*.bb \ +${PKGDIR}/packages/unzip/*.bb \ +${PKGDIR}/packages/update-modules/*.bb \ +${PKGDIR}/packages/wget/*.bb \ +${PKGDIR}/packages/wireless-tools/*.bb \ +${PKGDIR}/packages/zlib/*.bb \ +${PKGDIR}/packages/zd1211/*.bb \ +${UNSLUNG_EXTRA_BBFILES}" 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" -- cgit v1.2.3