[oe-commits] org.oe.dev merge of '425c65549a13b612465a7a2f4e273d993f692a31'
mickeyl commit
openembedded-commits at lists.openembedded.org
Tue Mar 4 15:47:09 UTC 2008
merge of '425c65549a13b612465a7a2f4e273d993f692a31'
and '5c59665d0dd415bc5372cdf976b15c13956e6f36'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: f8359facab8aa6b2607db3f4f3d254d7082a48c5
ViewMTN: http://monotone.openembedded.org/revision/info/f8359facab8aa6b2607db3f4f3d254d7082a48c5
Files:
1
classes/insane.bbclass
classes/native.bbclass
classes/pkgconfig.bbclass
classes/sdk.bbclass
conf/bitbake.conf
conf/distro/sharprom-compatible.conf
conf/sanity.conf
packages/alsa/alsa-state/fic-gta02/asound.state
packages/alsa/alsa-state/fic-gta02/gsmhandset.state
packages/alsa/alsa-state/fic-gta02/stereoout.state
packages/alsa/alsa-state.bb
packages/gcc/gcc3-build-cross.inc
packages/gcc/gcc3-build-sdk.inc
packages/gcc/gcc4-build-sdk.inc
packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch
packages/libgcrypt/libgcrypt_1.4.0.bb
packages/linux-libc-headers/linux-libc-headers.inc
packages/meta/external-toolchain.bb
packages/openssl/openssl.inc
packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
packages/roadmap/roadmap.inc
Diffs:
#
# mt diff -r425c65549a13b612465a7a2f4e273d993f692a31 -rf8359facab8aa6b2607db3f4f3d254d7082a48c5
#
#
#
# patch "classes/insane.bbclass"
# from [00d6311affb65ec365a80a9b833de2945df35660]
# to [0712df99743c442ed311e6b4d4be0d28f29d525f]
#
# patch "classes/native.bbclass"
# from [242e5b275af07bc3c8f5d3d1a6003d852ba72ec6]
# to [1b40b57b08d22639dfa0d4f7dd05dc5a77f5d82b]
#
# patch "classes/pkgconfig.bbclass"
# from [2c935b7d38f7e8274e938105750194e864d60cf7]
# to [825125168a0e350351266996b570279b35dc175f]
#
# patch "classes/sdk.bbclass"
# from [c676bc74ec4f1990541362dca4fe5698aca8eba8]
# to [b90e8104979fb4179078ad646cf8f90830e69014]
#
# patch "conf/bitbake.conf"
# from [273d61dd50eb590d1fee2b6199f5673202a94747]
# to [40df88348e50c296b273a35f3ff1870b7b20cb0f]
#
# patch "conf/distro/sharprom-compatible.conf"
# from [a56c571d457931934464e14394215bc4932503e6]
# to [4a8c4da47b66154274df571dcbb7461c90098bfd]
#
# patch "conf/sanity.conf"
# from [19e2e5d9bfa5113b4c25577b445fd588b4a0999b]
# to [0b8a4c4acfe94430a373d0c7c51dc052f45c98a7]
#
# patch "packages/alsa/alsa-state/fic-gta02/asound.state"
# from [9354a119e8ef00e14a2d0585a0477e3cd87717e3]
# to [4acb8d435fbb807a4eaab133f99c94acd9e1b3d8]
#
# patch "packages/alsa/alsa-state/fic-gta02/gsmhandset.state"
# from [22f8a7307f48f6bc8245fd1f3a1b6aae87fe1117]
# to [3db54371d119d26931ec5dc3eacd2f5658fb0982]
#
# patch "packages/alsa/alsa-state/fic-gta02/stereoout.state"
# from [9354a119e8ef00e14a2d0585a0477e3cd87717e3]
# to [4acb8d435fbb807a4eaab133f99c94acd9e1b3d8]
#
# patch "packages/alsa/alsa-state.bb"
# from [1b4bdc4da7afc43826838ecc9cf8e5031d44ef83]
# to [b78fa244fb9c836713118514b9b2a32dd5f3bd88]
#
# patch "packages/gcc/gcc3-build-cross.inc"
# from [6b61dc663b321ffd6f1992e3587e47c2440c31fe]
# to [5d07bedf9a0e89893e190e81c7733cbe6d78177b]
#
# patch "packages/gcc/gcc3-build-sdk.inc"
# from [e80775fa7cdad10299b39edefff6b5cdb7120bda]
# to [59b69e7b5420254f92421122abe64c1bafc7ca71]
#
# patch "packages/gcc/gcc4-build-sdk.inc"
# from [87829c7148dd1ac08f628d6ee4be53f410490e7b]
# to [4bccd43b332808cf66e56b0cfcdcc722e35df86c]
#
# patch "packages/libgcrypt/libgcrypt-1.4.0/add-pkgconfig-support.patch"
# from [5232a01eaab0ce7ff907ea44b68a6b042cc66cf5]
# to [b1721a7c1917fbbedd8c8384cba1b945ca321d73]
#
# patch "packages/libgcrypt/libgcrypt_1.4.0.bb"
# from [aeb06341bebcef5a09a8d2768dda9c4965b14250]
# to [6511cf175fcc175fa539dae0da56218ee04647d9]
#
# patch "packages/linux-libc-headers/linux-libc-headers.inc"
# from [87128c42990e29e5ae8b7fb5934036d4c2f46337]
# to [8d23279cdfe7a7a9d3b20655625b2c6424e25069]
#
# patch "packages/meta/external-toolchain.bb"
# from [dcaf40be62789b278a8bcf32b7d1a80010487c6a]
# to [ae708894e0ca9c843e90e9f9efa0097001c3889f]
#
# patch "packages/openssl/openssl.inc"
# from [e2020c55f48ae6edb2b96f7cb705f900d58ecc79]
# to [a0a61df4d6fc5943c3fb8c9f885caea1ebd2cb7c]
#
# patch "packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb"
# from [13c0bde7a606ffbf475967b7990ea82a22247655]
# to [bf7366a30c3b81bb4c152fef10a1d3f481091656]
#
============================================================
--- classes/insane.bbclass 00d6311affb65ec365a80a9b833de2945df35660
+++ classes/insane.bbclass 0712df99743c442ed311e6b4d4be0d28f29d525f
@@ -333,12 +333,15 @@ def package_qa_check_staged(path,d):
import os, bb
sane = True
- workdir = os.path.join(bb.data.getVar('TMPDIR', d, True), "work")
+ tmpdir = bb.data.getVar('TMPDIR', d, True)
+ workdir = os.path.join(tmpdir, "work")
- if bb.data.inherits_class("native", d):
+ if bb.data.inherits_class("native", d) or bb.data.inherits_class("cross", d):
installed = "installed=no"
+ pkgconfigcheck = workdir
else:
installed = "installed=yes"
+ pkgconfigcheck = tmpdir
# find all .la and .pc files
# read the content
@@ -356,8 +359,8 @@ def package_qa_check_staged(path,d):
sane = package_qa_handle_error(8, error_msg, "staging", path, d)
elif file[-2:] == "pc":
file_content = open(path).read()
- if workdir in file_content:
- error_msg = "%s failed sanity test (workdir) in path %s" % (file,root)
+ if pkgconfigcheck in file_content:
+ error_msg = "%s failed sanity test (tmpdir) in path %s" % (file,root)
sane = package_qa_handle_error(6, error_msg, "staging", path, d)
return sane
============================================================
--- classes/native.bbclass 242e5b275af07bc3c8f5d3d1a6003d852ba72ec6
+++ classes/native.bbclass 1b40b57b08d22639dfa0d4f7dd05dc5a77f5d82b
@@ -47,40 +47,34 @@ export STRIP = "${HOST_PREFIX}strip"
export RANLIB = "${HOST_PREFIX}ranlib"
export STRIP = "${HOST_PREFIX}strip"
-
# Path prefixes
-base_prefix = "${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}"
-prefix = "${base_prefix}"
-exec_prefix = "${base_prefix}"
+export base_prefix = "${STAGING_DIR_NATIVE}"
+export prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
+export exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
# Base paths
-base_bindir = "${base_prefix}/bin"
-base_sbindir = "${base_prefix}/bin"
-base_libdir = "${base_prefix}/lib"
+export base_bindir = "${STAGING_DIR_NATIVE}${layout_base_bindir}"
+export base_sbindir = "${STAGING_DIR_NATIVE}${layout_base_sbindir}"
+export base_libdir = "${STAGING_DIR_NATIVE}${layout_base_libdir}"
# Architecture independent paths
-sysconfdir = "${prefix}/etc"
-sharedstatedir = "${prefix}/com"
-localstatedir = "${prefix}/var"
-infodir = "${datadir}/info"
-mandir = "${datadir}/man"
-docdir = "${datadir}/doc"
-servicedir = "${prefix}/srv"
+export datadir = "${STAGING_DIR_NATIVE}${layout_datadir}"
+export sysconfdir = "${STAGING_DIR_NATIVE}${layout_sysconfdir}"
+export sharedstatedir = "${STAGING_DIR_NATIVE}${layout_sharedstatedir}"
+export localstatedir = "${STAGING_DIR_NATIVE}${layout_localstatedir}"
+export infodir = "${STAGING_DIR_NATIVE}${layout_infodir}"
+export mandir = "${STAGING_DIR_NATIVE}${layout_mandir}"
+export docdir = "${STAGING_DIR_NATIVE}${layout_docdir}"
+export servicedir = "${STAGING_DIR_NATIVE}${layout_servicedir}"
# Architecture dependent paths
-bindir = "${exec_prefix}/bin"
-sbindir = "${exec_prefix}/bin"
-libexecdir = "${exec_prefix}/libexec"
-libdir = "${exec_prefix}/lib"
-includedir = "${exec_prefix}/include"
-oldincludedir = "${exec_prefix}/include"
+export bindir = "${STAGING_DIR_NATIVE}${layout_bindir}"
+export sbindir = "${STAGING_DIR_NATIVE}${layout_sbindir}"
+export libexecdir = "${STAGING_DIR_NATIVE}${layout_libexecdir}"
+export libdir = "${STAGING_DIR_NATIVE}${layout_libdir}"
+export includedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
+export oldincludedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
-# Datadir is made arch dependent here, primarily
-# for autoconf macros, and other things that
-# may be manipulated to handle crosscompilation
-# issues.
-datadir = "${exec_prefix}/share"
-
do_stage () {
if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ]
then
@@ -93,3 +87,4 @@ PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCO
}
PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}"
+PKG_CONFIG_SYSROOT_DIR = ""
============================================================
--- classes/pkgconfig.bbclass 2c935b7d38f7e8274e938105750194e864d60cf7
+++ classes/pkgconfig.bbclass 825125168a0e350351266996b570279b35dc175f
@@ -1,37 +1,11 @@ DEPENDS_prepend = "pkgconfig-native "
inherit base
DEPENDS_prepend = "pkgconfig-native "
-# The namespaces can clash here hence the two step replace
-def get_pkgconfig_mangle(d):
- import bb.data
- s = "-e ''"
- if not bb.data.inherits_class('native', d):
- s += " -e 's:=${libdir}:=OELIBDIR:;'"
- s += " -e 's:=${includedir}:=OEINCDIR:;'"
- s += " -e 's:=${datadir}:=OEDATADIR:'"
- s += " -e 's:=${prefix}:=OEPREFIX:'"
- s += " -e 's:=${exec_prefix}:=OEEXECPREFIX:'"
- s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
- s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
- s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
- s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${layout_prefix}:'"
- s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'"
- s += " -e 's:-L${WORKDIR}\S*: :g'"
- s += " -e 's:-I${WORKDIR}\S*: :g'"
-
- return s
-
-do_install_append () {
- for pc in `find ${D} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do
- sed -i ${@get_pkgconfig_mangle(d)} -e 's:${D}::g' -e 's:${STAGING_LIBDIR}:${libdir}:g' -e 's:${STAGING_INCDIR}:${includedir}:g' -e 's:${STAGING_DIR_TARGET}:${prefix}:g' ${pc}
- done
-}
-
do_stage_append () {
+ install -d ${PKG_CONFIG_DIR}
for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do
pcname=`basename $pc`
- install -d ${PKG_CONFIG_DIR}
- cat $pc | sed ${@get_pkgconfig_mangle(d)} -e 's:${D}${libdir}\S*:${STAGING_LIBDIR}:g' -e 's:${D}${prefix}/include\S*:${STAGING_INCDIR}:g' > ${PKG_CONFIG_DIR}/$pcname
+ cat $pc > ${PKG_CONFIG_DIR}/$pcname
done
}
============================================================
--- classes/sdk.bbclass c676bc74ec4f1990541362dca4fe5698aca8eba8
+++ classes/sdk.bbclass b90e8104979fb4179078ad646cf8f90830e69014
@@ -6,15 +6,16 @@ HOST_ARCH = "${BUILD_ARCH}"
PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk"
HOST_ARCH = "${BUILD_ARCH}"
-HOST_VENDOR = "${BUILD_VENDOR}"
+# This isn't BUILD_VENDOR since we don't want to clash with native staging
+HOST_VENDOR = "${TARGET_VENDOR}"
HOST_OS = "${BUILD_OS}"
HOST_PREFIX = "${BUILD_PREFIX}"
HOST_CC_ARCH = "${BUILD_CC_ARCH}"
-CPPFLAGS = "${BUILD_CPPFLAGS}"
-CFLAGS = "${BUILD_CFLAGS}"
-CXXFLAGS = "${BUILD_CFLAGS}"
-LDFLAGS = "${BUILD_LDFLAGS}"
+CPPFLAGS = "${BUILDSDK_CPPFLAGS}"
+CFLAGS = "${BUILDSDK_CFLAGS}"
+CXXFLAGS = "${BUILDSDK_CFLAGS}"
+LDFLAGS = "${BUILDSDK_LDFLAGS}"
# Path prefixes
prefix = "${SDK_PREFIX}"
@@ -49,3 +50,4 @@ FILES_${PN}-dbg += "${prefix}/.debug \
${prefix}/bin/.debug \
"
+export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${HOST_SYS}"
============================================================
--- conf/bitbake.conf 273d61dd50eb590d1fee2b6199f5673202a94747
+++ conf/bitbake.conf 40df88348e50c296b273a35f3ff1870b7b20cb0f
@@ -1,24 +1,21 @@
##################################################################
# 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_bindir = "${layout_exec_prefix}/b
# 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 @@ export base_prefix = ""
# 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 @@ export PKG_CONFIG_PATH = "${PKG_CONFIG_D
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"
============================================================
--- conf/distro/sharprom-compatible.conf a56c571d457931934464e14394215bc4932503e6
+++ conf/distro/sharprom-compatible.conf 4a8c4da47b66154274df571dcbb7461c90098bfd
@@ -37,7 +37,6 @@ PREFERRED_PROVIDER_virtual/arm-linux-gcc
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"
============================================================
--- conf/sanity.conf 19e2e5d9bfa5113b4c25577b445fd588b4a0999b
+++ conf/sanity.conf 0b8a4c4acfe94430a373d0c7c51dc052f45c98a7
@@ -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"
============================================================
--- packages/alsa/alsa-state/fic-gta02/asound.state 9354a119e8ef00e14a2d0585a0477e3cd87717e3
+++ packages/alsa/alsa-state/fic-gta02/asound.state 4acb8d435fbb807a4eaab133f99c94acd9e1b3d8
@@ -495,6 +495,16 @@ state.neo1973gta02 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
+ comment.item.0 'Non Inverted'
+ comment.item.1 Inverted
+ iface MIXER
+ name 'ROUT2 Phase'
+ value Inverted
+ }
+ control.53 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
comment.item.0 'Mic 1'
comment.item.1 'Mic 2'
comment.item.2 'Mic 3'
@@ -502,7 +512,7 @@ state.neo1973gta02 {
name 'Mic Selection Mux'
value 'Mic 1'
}
- control.53 {
+ control.54 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -514,7 +524,7 @@ state.neo1973gta02 {
name 'Rx Mixer'
value 'RXP - RXN'
}
- control.54 {
+ control.55 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -526,7 +536,7 @@ state.neo1973gta02 {
name 'Line Mixer'
value 'Line 1 + 2'
}
- control.55 {
+ control.56 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -536,7 +546,7 @@ state.neo1973gta02 {
name 'Line Mono Mux'
value 'Line Mix'
}
- control.56 {
+ control.57 {
comment.access 'r%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r5c59665d0dd415bc5372cdf976b15c13956e6f36 -rf8359facab8aa6b2607db3f4f3d254d7082a48c5
#
#
#
# patch "packages/roadmap/roadmap.inc"
# from [46055702ecd5e97c7f30231e54b7f3d929ea0fad]
# to [9cc55a4e20979c8d8d54cf55678430dbc466d5cb]
#
============================================================
--- packages/roadmap/roadmap.inc 46055702ecd5e97c7f30231e54b7f3d929ea0fad
+++ packages/roadmap/roadmap.inc 9cc55a4e20979c8d8d54cf55678430dbc466d5cb
@@ -1,9 +1,7 @@ DESCRIPTION = "RoadMap is a program that
DESCRIPTION = "RoadMap is a program that provides car navigation for Linux and UNIX."
-PRIORITY = "optional"
-AUTHOR = "Pascal Martin <pascal.martin at iname.com>"
+AUTHOR = "Paul Fox <pgf at foxharp.boston.ma.us>"
HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
LICENSE = "GPL"
-RRECOMMENDS = "gpsd flite"
DEPENDS = "expat"
FILES_${PN} += "${datadir}/roadmap"
@@ -16,3 +14,6 @@ do_install() {
oe_runmake install
install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
}
+
+RRECOMMENDS = "gpsd flite"
+FILES_${PN} += "${datadir}/roadmap"
More information about the Openembedded-commits
mailing list