move env-oe.sh and local.conf to multitech/contrib

2 files changed, 2 insertions, 62 deletions

diff --git a/multitech/contrib/env-oe.sh b/multitech/contrib/env-oe.sh
index 17e37a7..eb5e4ca 100644
--- a/multitech/contrib/env-oe.sh
+++ b/multitech/contrib/env-oe.sh
@@ -9,7 +9,5 @@ fi
 # define if you wish to create soft links to the image in the tftpboot dir
 #export TFTPBOOT_DIR=/tftpboot
 
-export BBPATH=${OETREE}/build:${OETREE}/openembedded
+export BBPATH=${OETREE}
 export BB_ENV_EXTRAWHITE="MACHINE DISTRO OETREE ANGSTROM_MODE ANGSTROMLIBC LIBC TFTPBOOT_DIR"
-
-
diff --git a/multitech/contrib/local.conf b/multitech/contrib/local.conf
index 8fd1f7a..3d125ba 100644
--- a/multitech/contrib/local.conf
+++ b/multitech/contrib/local.conf
@@ -15,30 +15,7 @@
 # Use this to specify where BitBake should place the downloaded sources into
 DL_DIR = "${OETREE}/sources"
 
-# Use the BBMASK below to instruct BitBake to _NOT_ consider some .bb files
-# This is a regular expression, so be sure to get your parenthesis balanced.
-BBMASK = ""
-
-# Uncomment this if you want to use a prebuilt toolchain. You will need to
-# provide packages for toolchain and additional libraries yourself. You also
-# have to set PATH in your environment to make sure BitBake finds additional binaries.
-# ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
-
-# Uncomment this if you're building for an arch that uses emulated locale 
-# generation under qemu (mainly arm glibc) and have an external gcc 3.x compiler
-# that OE recognises. This will mean the gcc-native build is skipped, speeding 
-# builds up.
-# ASSUME_PROVIDED += "gcc3-native"
-
-# Select between multiple alternative providers, if more than one is eligible.
-PREFERRED_PROVIDERS = "virtual/qte:qte virtual/libqpe:libqpe-opie"
-PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-# Uncomment this to specify where BitBake should create its temporary files.
+# Use this to specify where BitBake should create its temporary files.
 # Note that a full build of everything in OpenEmbedded will take GigaBytes of hard
 # disk space, so make sure to free enough space. The default TMPDIR is
 # <build directory>/tmp
@@ -51,23 +28,6 @@ MACHINE ?= "mtcdp"
 # Use Multi-Tech CoreCDP distribution
 DISTRO = "corecdp"
 
-# So far, angstrom.conf sets ENABLE_BINARY_LOCALE_GENERATION
-# to generate binary locale packages at build time using qemu-native and
-# thereby guarantee i18n support on all devices. If your build breaks on 
-# qemu-native consider disabling ENABLE_BINARY_LOCALE_GENERATION (note that
-# this breaks i18n on devices with less than 128MB RAM) or installing
-# a working third-party qemu (e.g. provided by your distribution) and
-# adding qemu-native to ASSUME_PROVIDED. Caveat emptor, since third-party
-# qemus lack patches needed to work with various OE targets.
-ENABLE_BINARY_LOCALE_GENERATION = "0"
-# ASSUME_PROVIDED += "qemu-native"
-
-# If ENABLE_BINARY_LOCALE_GENERATION is set to "1", you can limit locales
-# generated to the list provided by GLIBC_GENERATE_LOCALES. This is huge
-# time-savior for developmental builds. Format: list of locale.encoding pairs
-# with spaces as separators.
-# GLIBC_GENERATE_LOCALES = "en_US.UTF-8 en_GB.UTF-8 de_DE.UTF-8"
-
 # Add the required image file system types below. Valid are 
 # jffs2, tar(.gz|bz2), cpio(.gz), cramfs, ext2(.gz), ext3(.gz)
 # squashfs, squashfs-lzma
@@ -92,16 +52,6 @@ INHERIT += "rm_work"
 # DEBUG_BUILD = "1"
 # INHIBIT_PACKAGE_STRIP = "1"
 
-# Uncomment these to build a package such that you can use gprof to profile it.
-# NOTE: This will only work with 'linux' targets, not
-# 'linux-uclibc', as uClibc doesn't provide the necessary
-# object files.  Also, don't build glibc itself with these
-# flags, or it'll fail to build.
-#
-# PROFILE_OPTIMIZATION = "-pg"
-# SELECTED_OPTIMIZATION = "${PROFILE_OPTIMIZATION}"
-# LDFLAGS =+ "-pg"
-
 # Uncomment this to enable parallel make.
 # This allows make to spawn mutliple processes to take advantage of multiple 
 # processors. Useful on SMP machines. This may break some packages - we're
@@ -116,11 +66,3 @@ BB_NUMBER_THREADS = "2"
 
 # Uncomment this if you want BitBake to emit the log if a build fails.
 BBINCLUDELOGS = "yes"
-
-# Specifies a location to search for pre-generated tarballs when fetching
-# a cvs:// URI. Outcomment this, if you always want to pull directly from CVS.
-#CVS_TARBALL_STASH = ""
-
-# Uncomment this if you want to install shared libraries directly under their SONAME,
-# rather than installing as the full version and symlinking to the SONAME.
-# PACKAGE_SNAP_LIB_SYMLINKS = "1"