From 1c4c0ac5c8b1acc666a79ebaab484a1807a1487b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 24 Jun 2008 20:59:38 +0000 Subject: rename generic[-uclibc].conf to minimal[-uclibc].conf to better indicate that this is a distribution configuration that serves as a lean-and-mean starting point, imposing only a minimal amount of policies. --- conf/distro/generic-uclibc.conf | 36 ------------------ conf/distro/generic.conf | 83 ----------------------------------------- conf/distro/minimal-uclibc.conf | 36 ++++++++++++++++++ conf/distro/minimal.conf | 83 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 119 insertions(+), 119 deletions(-) delete mode 100644 conf/distro/generic-uclibc.conf delete mode 100644 conf/distro/generic.conf create mode 100644 conf/distro/minimal-uclibc.conf create mode 100644 conf/distro/minimal.conf (limited to 'conf/distro') diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf deleted file mode 100644 index 1f2356e734..0000000000 --- a/conf/distro/generic-uclibc.conf +++ /dev/null @@ -1,36 +0,0 @@ -#----------------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: Generic uClibC -#@DESCRIPTION: Generic uClibC Embedded Linux Distribution Configuration -# -#@COMMENT: This distribution configuration serves as a starting point for -#@COMMENT: the integration of new target platforms, machines, or distributions. -#@COMMENT: It bases on conservative settings and should always be buildable. -#----------------------------------------------------------------------------- - -require conf/distro/generic.conf - -# -# Header -# -DISTRO_NAME = "generic-uClibC" - -# -# Target OS & FPU system -# -TARGET_OS = "linux-uclibc" -TARGET_FPU_arm = "soft" -TARGET_FPU_armeb = "soft" -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" -PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" -PREFERRED_PROVIDER_virtual/libiconv = "libiconv" -PREFERRED_PROVIDER_virtual/libintl = "gettext" - -USE_NLS ?= "no" -USE_NLS_glib-2.0 = "yes" - -PREFERRED_VERSION_uclibc = "0.9.29" -PREFERRED_VERSION_uclibc-initial = "0.9.29" - diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf deleted file mode 100644 index 681e70db9f..0000000000 --- a/conf/distro/generic.conf +++ /dev/null @@ -1,83 +0,0 @@ -#----------------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: Generic -#@DESCRIPTION: Generic Embedded Linux Distribution Configuration -# -#@COMMENT: This distribution configuration serves as a starting point for -#@COMMENT: the integration of new target platforms, machines, or distributions. -#@COMMENT: It bases on conservative settings and should always be buildable. -#----------------------------------------------------------------------------- - -# -# Header -# -DISTRO_NAME = "generic-glibc" -DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" -#DISTRO_TYPE = "release" -DISTRO_TYPE = "debug" - -# -# Naming schemes -# -INHERIT += "debian multimachine" - -# -# Packaging and output format -# -INHERIT += "package_ipk" -IMAGE_FSTYPES ?= "tar.gz ext2.gz jffs2" - -# -# Kernel -# -KERNEL = "kernel26" -MACHINE_KERNEL_VERSION = "2.6" - -# -# Binutils & Compiler -# -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" -PREFERRED_PROVIDER_virtual/arm-linux-binutils = "binutils-cross" -PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" - -PREFERRED_VERSION_gcc ?= "4.1.1" -PREFERRED_VERSION_gcc-cross ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_binutils ?= "2.18" -PREFERRED_VERSION_binutils-cross ?= "2.18" - -# -# Target OS & FPU system -# -TARGET_OS = "linux" -TARGET_FPU_arm = "soft" -TARGET_FPU_armeb = "soft" - -# -# C library -# -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" -PREFERRED_PROVIDER_virtual/libc = "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.23" -PREFERRED_VERSION_glibc ?= "2.5" -PREFERRED_VERSION_glibc-intermediate ?= "2.5" - -# -# Bootstrap & Init -# -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - -# -# Preferred versions -# - -require conf/distro/include/sane-srcdates.inc -require conf/distro/include/sane-srcrevs.inc - -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" -require conf/distro/include/preferred-xorg-versions-X11R7.4.inc diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf new file mode 100644 index 0000000000..d76a9c444f --- /dev/null +++ b/conf/distro/minimal-uclibc.conf @@ -0,0 +1,36 @@ +#----------------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Minimal uClibC +#@DESCRIPTION: uClibC Embedded Linux Distribution Configuration (minimal) +# +#@COMMENT: This distribution configuration serves as a starting point for +#@COMMENT: the integration of new target platforms, machines, or distributions. +#@COMMENT: It bases on conservative settings and should always be buildable. +#----------------------------------------------------------------------------- + +require conf/distro/generic.conf + +# +# Header +# +DISTRO_NAME = "minimal-uclibc" + +# +# Target OS & FPU system +# +TARGET_OS = "linux-uclibc" +TARGET_FPU_arm = "soft" +TARGET_FPU_armeb = "soft" +PREFERRED_PROVIDER_virtual/libc = "uclibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" +PREFERRED_PROVIDER_virtual/libiconv = "libiconv" +PREFERRED_PROVIDER_virtual/libintl = "gettext" + +USE_NLS ?= "no" +USE_NLS_glib-2.0 = "yes" + +PREFERRED_VERSION_uclibc = "0.9.29" +PREFERRED_VERSION_uclibc-initial = "0.9.29" + diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf new file mode 100644 index 0000000000..b54b0c8c8b --- /dev/null +++ b/conf/distro/minimal.conf @@ -0,0 +1,83 @@ +#----------------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Minimal +#@DESCRIPTION: Embedded Linux Distribution Configuration (minimal) +# +#@COMMENT: This distribution configuration serves as a starting point for +#@COMMENT: the integration of new target platforms, machines, or distributions. +#@COMMENT: It bases on conservative settings and should always be buildable. +#----------------------------------------------------------------------------- + +# +# Header +# +DISTRO_NAME = "minimal-glibc" +DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" +#DISTRO_TYPE = "release" +DISTRO_TYPE = "debug" + +# +# Naming schemes +# +INHERIT += "debian multimachine" + +# +# Packaging and output format +# +INHERIT += "package_ipk" +IMAGE_FSTYPES ?= "tar.gz ext2.gz jffs2" + +# +# Kernel +# +KERNEL = "kernel26" +MACHINE_KERNEL_VERSION = "2.6" + +# +# Binutils & Compiler +# +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" +PREFERRED_PROVIDER_virtual/arm-linux-binutils = "binutils-cross" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" + +PREFERRED_VERSION_gcc ?= "4.1.1" +PREFERRED_VERSION_gcc-cross ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" +PREFERRED_VERSION_binutils ?= "2.18" +PREFERRED_VERSION_binutils-cross ?= "2.18" + +# +# Target OS & FPU system +# +TARGET_OS = "linux" +TARGET_FPU_arm = "soft" +TARGET_FPU_armeb = "soft" + +# +# C library +# +PREFERRED_PROVIDER_virtual/libiconv = "glibc" +PREFERRED_PROVIDER_virtual/libintl = "glibc" +PREFERRED_PROVIDER_virtual/libc = "glibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.23" +PREFERRED_VERSION_glibc ?= "2.5" +PREFERRED_VERSION_glibc-intermediate ?= "2.5" + +# +# Bootstrap & Init +# +PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" + +# +# Preferred versions +# + +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/sane-srcrevs.inc + +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +require conf/distro/include/preferred-xorg-versions-X11R7.4.inc -- cgit v1.2.3