diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 56 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 4 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-glibc.inc | 5 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 11 | ||||
| -rw-r--r-- | conf/distro/sharprom-compatible.conf | 1 | ||||
| -rw-r--r-- | conf/sanity.conf | 2 |
6 files changed, 41 insertions, 38 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index de526f0e56..4fe5c21e02 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -2,23 +2,20 @@ # Standard target filesystem layout. ################################################################## -# Note these currently match the existing staging layout but this -# is planned to change, see the oe-dev mailing list - # Path prefixes -layout_prefix = "" -layout_exec_prefix = "" +layout_prefix = "/usr" +layout_exec_prefix = "/usr" layout_base_prefix = "" # Base paths layout_base_bindir = "${layout_base_prefix}/bin" -layout_base_sbindir = "${layout_base_prefix}/bin" +layout_base_sbindir = "${layout_base_prefix}/sbin" layout_base_libdir = "${layout_base_prefix}/lib" # Architecture independent paths -layout_sysconfdir = "/etc" -layout_localstatedir = "/var" -layout_servicedir = "/srv" +layout_sysconfdir = "${layout_base_prefix}/etc" +layout_localstatedir = "${layout_base_prefix}/var" +layout_servicedir = "${layout_base_prefix}/srv" layout_sharedstatedir = "${layout_prefix}/com" layout_datadir = "${layout_prefix}/share" layout_infodir = "${layout_datadir}/info" @@ -27,7 +24,7 @@ layout_docdir = "${layout_datadir}/doc" # Architecture dependent paths layout_bindir = "${layout_exec_prefix}/bin" -layout_sbindir = "${layout_exec_prefix}/bin" +layout_sbindir = "${layout_exec_prefix}/sbin" layout_libdir = "${layout_exec_prefix}/lib" layout_includedir = "${layout_exec_prefix}/include" layout_libexecdir = "${layout_exec_prefix}/libexec" @@ -38,31 +35,31 @@ layout_libexecdir = "${layout_exec_prefix}/libexec" # Path prefixes export base_prefix = "" -export prefix = "/usr" -export exec_prefix = "${prefix}" +export prefix = "${layout_prefix}" +export exec_prefix = "${layout_exec_prefix}" # Base paths -export base_bindir = "${base_prefix}/bin" -export base_sbindir = "${base_prefix}/sbin" -export base_libdir = "${base_prefix}/lib" +export base_bindir = "${layout_base_bindir}" +export base_sbindir = "${layout_base_sbindir}" +export base_libdir = "${layout_base_libdir}" # Architecture independent paths -export datadir = "${prefix}/share" -export sysconfdir = "/etc" -export sharedstatedir = "${prefix}/com" -export localstatedir = "/var" -export infodir = "${datadir}/info" -export mandir = "${datadir}/man" -export docdir = "${datadir}/doc" -export servicedir = "/srv" +export datadir = "${layout_datadir}" +export sysconfdir = "${layout_sysconfdir}" +export sharedstatedir = "${layout_sharedstatedir}" +export localstatedir = "${layout_localstatedir}" +export infodir = "${layout_infodir}" +export mandir = "${layout_mandir}" +export docdir = "${layout_docdir}" +export servicedir = "${layout_servicedir}" # Architecture dependent paths -export bindir = "${exec_prefix}/bin" -export sbindir = "${exec_prefix}/sbin" -export libexecdir = "${exec_prefix}/libexec" -export libdir = "${exec_prefix}/lib" -export includedir = "${exec_prefix}/include" -export oldincludedir = "${exec_prefix}/include" +export bindir = "${layout_bindir}" +export sbindir = "${layout_sbindir}" +export libexecdir = "${layout_libexecdir}" +export libdir = "${layout_libdir}" +export includedir = "${layout_includedir}" +export oldincludedir = "${layout_includedir}" ################################################################## # Architecture-dependent build variables. @@ -511,6 +508,7 @@ SLOT = "0" export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig" export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}" +export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${TARGET_SYS}" export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake" diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index b8685a578e..2c9543abd9 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -1,8 +1,8 @@ -PREFERRED_VERSION_dbus = "1.1.4" PREFERRED_VERSION_busybox = "1.9.1" +PREFERRED_VERSION_dbus = "1.1.20" +PREFERRED_VERSION_glib-2.0 = "2.15.6" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_libtool = "1.5.10" PREFERRED_VERSION_pulseaudio = "0.9.9" PREFERRED_VERSION_udev = "118" PREFERRED_VERSION_vte = "0.16.10" - diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index d14c6f1b19..f606395f09 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -14,10 +14,15 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm' FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" +FULL_OPTIMIZATION_pn-glibc-intermediate = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" +FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" + BUILD_OPTIMIZATION = "-Os" BUILD_OPTIMIZATION_pn-perl = "-O1" +BUILD_OPTIMIZATION_pn-glibc-intermediate = "-O2" +BUILD_OPTIMIZATION_pn-glibc = "-O2" BUILD_OPTIMIZATION_sparc = "-O2" CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 5fa9ed7e38..b5a04deab8 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -24,16 +24,16 @@ SRCREV_pn-eglibc-initial ?= "4355" SRCREV_pn-eglibc-intermediate ?= "4355" SRCREV_pn-ezxd ?= "2074" SRCREV_pn-elf2flt ?= "1786" -SRCREV_pn-epiphany ?= "7650" +SRCREV_pn-epiphany ?= "7837" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-ffmpeg ?= "12186" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" -SRCREV_pn-gsm0710muxd ?= "85" +SRCREV_pn-gsm0710muxd ?= "90" SRCREV_pn-gtkhtml2 ?= "1158" -SRCREV_pn-gypsy ?= "56" +SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" @@ -136,6 +136,7 @@ SRCREV_pn-opkg ?= "4142" SRCREV_pn-opkg-native ?= "4142" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-psplash ?= "249" +SRCREV_pn-pylgrim ?= "20" SRCREV_pn-pyneod ?= "88" SRCREV_pn-pyneog ?= "88" SRCREV_pn-python-formencode = "3148" @@ -149,9 +150,9 @@ SRCREV_pn-tmut ?= "60" SRCREV_pn-u-boot-openmoko ?= "4100" SRCREV_pn-usbpath ?= "3108" SRCREV_pn-usbpath-native ?= "3108" -SRCREV_pn-webkit-gtk ?= "28656" +SRCREV_pn-webkit-gtk ?= "30762" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" -SRCREV_pn-xoo ?= "1623" +SRCREV_pn-xoo ?= "1971" diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index 0e130a2fd7..463c5d0442 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -37,7 +37,6 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native" -PREFERRED_PROVIDER_virtual/linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native" diff --git a/conf/sanity.conf b/conf/sanity.conf index 4af4454e2e..35d9d32de1 100644 --- a/conf/sanity.conf +++ b/conf/sanity.conf @@ -11,7 +11,7 @@ BB_MIN_VERSION = "1.8.10" # that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team. # -SANITY_ABI = "0" +SANITY_ABI = "1" SANITY_ABIFILE = "${TMPDIR}/abi_version" INHERIT += "sanity" |