[oe-commits] org.oe.packaged-staging conf/angstrom*: Sync with .dev

[rpurdie commit]

conf/angstrom*: Sync with .dev

Author: rpurdie at openembedded.org
Branch: org.openembedded.packaged-staging
Revision: b7fa86c2176d37f8631a883fd7549981977d1b14
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b7fa86c2176d37f8631a883fd7549981977d1b14
Files:
1
conf/distro/include/angstrom-glibc.inc
conf/distro/include/angstrom-uclibc.inc
conf/distro/include/angstrom.inc
Diffs:

#
# mt diff -re313f7ce7daac69a6356cdd029c16c234202148a -rb7fa86c2176d37f8631a883fd7549981977d1b14
#
# 
# 
# add_file "conf/distro/include/angstrom-glibc.inc"
#  content [b4781d341efc97137e0e25a65ee4db99d7df97bc]
# 
# add_file "conf/distro/include/angstrom-uclibc.inc"
#  content [882c2406ea0ebb7d5f7f97dda233b5fcbf7ec3bd]
# 
# patch "conf/distro/include/angstrom.inc"
#  from [de95ad81cd61d210b88b4127b31a44f5e95a515e]
#    to [30528adb2f5d1da8dda333d646b63273227c05d3]
# 
============================================================
--- conf/distro/include/angstrom-glibc.inc	b4781d341efc97137e0e25a65ee4db99d7df97bc
+++ conf/distro/include/angstrom-glibc.inc	b4781d341efc97137e0e25a65ee4db99d7df97bc
@@ -0,0 +1,13 @@
+# glibc:
+#fix some iconv issues, needs to be adjusted when doing uclibc builds
+PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
+PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
+
+TARGET_OS = "linux${@['','-gnueabi'][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"
+CXXFLAGS += "-fvisibility-inlines-hidden"
+
============================================================
--- conf/distro/include/angstrom-uclibc.inc	882c2406ea0ebb7d5f7f97dda233b5fcbf7ec3bd
+++ conf/distro/include/angstrom-uclibc.inc	882c2406ea0ebb7d5f7f97dda233b5fcbf7ec3bd
@@ -0,0 +1,14 @@
+# uclibc:
+#fix some iconv issues, needs to be adjusted when doing uclibc builds
+PREFERRED_PROVIDER_virtual/libc = "uclibc"
+PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
+PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
+
+TARGET_OS = "linux${@['-uclibc','-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"
+CXXFLAGS += "-fvisibility-inlines-hidden"
+
============================================================
--- conf/distro/include/angstrom.inc	de95ad81cd61d210b88b4127b31a44f5e95a515e
+++ conf/distro/include/angstrom.inc	30528adb2f5d1da8dda333d646b63273227c05d3
@@ -5,43 +5,38 @@ DISTRO_NAME = "Angstrom"
 DISTRO = "angstrom"
 DISTRO_NAME = "Angstrom"
 
+TARGET_VENDOR = "-angstrom"
+
+# Can be "glibc" and "uclibc"
+ANGSTROM_MODE ?= "glibc"
+
+DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}"
+require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc
+
 #Use this variable in feeds and other parts that need a URI
-ANGSTROM_URI = "http://www.angstrom-distribution.org/"
+ANGSTROM_URI = "http://www.angstrom-distribution.org"
 
 #Set the default maintainer to angstrom-dev
-MAINTAINER = "Angstrom Developers <angstrom-dev at handhelds.org>"
+MAINTAINER = "Angstrom Developers <angstrom-distro-devel at linuxtogo.org>"
 
 #use ipkg package format with debian style naming
-INHERIT += "package_ipk debian"
-
 #use multimachine buildrules 
-include conf/distro/include/multimachine.conf
+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 ?= ""
+PREFERRED_PROVIDER_qemu-native = "qemu-native"
+ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 
-
-#Use the ARM EABI when building for an ARM cpu. We can't use overrides
-#here because this breaks all places where ":=" is used.
-TARGET_VENDOR = "${@['','-angstrom'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
-TARGET_OS = "linux${@['','-gnueabi'][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"
+#make it overridable for platforms with FPU, like ep93xx or i.mx31
+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')}"
+
+# We want images supporting the following features (for task-base)
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"