diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-07-25 22:09:13 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-26 15:47:03 +0100 |
commit | be8f985d2c61a646b1fa2eb9378dc9ebcac0d4e7 (patch) | |
tree | b5dc812a3f81c8f5612dfaac38f363d0fff78724 | |
parent | 922eaae5d497ddbe88384020a38bb2b15953725d (diff) | |
download | poky-be8f985d2c61a646b1fa2eb9378dc9ebcac0d4e7.tar.gz |
meta: Rename SITEINFO_ENDIANESS to SITEINFO_ENDIANNESS
There is this discrepency in spelling. Lets fix it in
core. There are lot of layers using SITEINFO_ENDIANNESS
This was shielded since meta-oe had its own copy of
siteinfo class. But that class has now been deleted in
favor of oe-core
(From OE-Core rev: 54a54778fad39931ac7d43daaf37ce7c1946a29b)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/siteinfo.bbclass | 4 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-xscale.inc | 4 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl.inc | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_0.9.8r.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.12.3.bb | 4 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded.inc | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4_arch.inc | 4 |
8 files changed, 12 insertions, 12 deletions
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index c5308b3d26..f3c24e88f3 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass | |||
@@ -86,9 +86,9 @@ def siteinfo_data(d): | |||
86 | python () { | 86 | python () { |
87 | sitedata = set(siteinfo_data(d)) | 87 | sitedata = set(siteinfo_data(d)) |
88 | if "endian-little" in sitedata: | 88 | if "endian-little" in sitedata: |
89 | d.setVar("SITEINFO_ENDIANESS", "le") | 89 | d.setVar("SITEINFO_ENDIANNESS", "le") |
90 | elif "endian-big" in sitedata: | 90 | elif "endian-big" in sitedata: |
91 | d.setVar("SITEINFO_ENDIANESS", "be") | 91 | d.setVar("SITEINFO_ENDIANNESS", "be") |
92 | else: | 92 | else: |
93 | bb.error("Unable to determine endianness for architecture '%s'" % | 93 | bb.error("Unable to determine endianness for architecture '%s'" % |
94 | d.getVar("HOST_ARCH", True)) | 94 | d.getVar("HOST_ARCH", True)) |
diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc index 71dba5bb1e..7fabb4618e 100644 --- a/meta/conf/machine/include/tune-xscale.inc +++ b/meta/conf/machine/include/tune-xscale.inc | |||
@@ -4,8 +4,8 @@ INHERIT += "siteinfo" | |||
4 | 4 | ||
5 | TUNE_CCARGS = "-march=armv5te -mtune=xscale" | 5 | TUNE_CCARGS = "-march=armv5te -mtune=xscale" |
6 | TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" | 6 | TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" |
7 | TUNE_PKGARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" | 7 | TUNE_PKGARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANNESS', d, 1) == 'le']}" |
8 | PACKAGE_EXTRA_ARCHS = "${@['armeb armv4b armv4tb armv5teb', 'arm armv4 armv4t armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" | 8 | PACKAGE_EXTRA_ARCHS = "${@['armeb armv4b armv4tb armv5teb', 'arm armv4 armv4t armv5te'][bb.data.getVar('SITEINFO_ENDIANNESS', d, 1) == 'le']}" |
9 | 9 | ||
10 | # webkit-gtk has alignment issues with double instructions on armv5 so | 10 | # webkit-gtk has alignment issues with double instructions on armv5 so |
11 | # disable them here | 11 | # disable them here |
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index b134ad005a..88d5081495 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc | |||
@@ -16,7 +16,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | |||
16 | S = "${WORKDIR}/openssl-${PV}" | 16 | S = "${WORKDIR}/openssl-${PV}" |
17 | 17 | ||
18 | AR_append = " r" | 18 | AR_append = " r" |
19 | CFLAG = "${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \ | 19 | CFLAG = "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \ |
20 | -DTERMIO ${FULL_OPTIMIZATION} -Wall" | 20 | -DTERMIO ${FULL_OPTIMIZATION} -Wall" |
21 | 21 | ||
22 | # Avoid binaries being marked as requiring an executable stack (which causes | 22 | # Avoid binaries being marked as requiring an executable stack (which causes |
diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb index 344747f9a3..54bdcc2f14 100644 --- a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb +++ b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require openssl.inc | 1 | require openssl.inc |
2 | 2 | ||
3 | PR = "r4" | 3 | PR = "r5" |
4 | SRC_URI += "file://debian/ca.patch \ | 4 | SRC_URI += "file://debian/ca.patch \ |
5 | file://debian/config-hurd.patch;apply=no \ | 5 | file://debian/config-hurd.patch;apply=no \ |
6 | file://debian/debian-targets.patch \ | 6 | file://debian/debian-targets.patch \ |
diff --git a/meta/recipes-devtools/perl/perl_5.12.3.bb b/meta/recipes-devtools/perl/perl_5.12.3.bb index 4b6b5a796b..671319c4e6 100644 --- a/meta/recipes-devtools/perl/perl_5.12.3.bb +++ b/meta/recipes-devtools/perl/perl_5.12.3.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ | |||
7 | # We need gnugrep (for -I) | 7 | # We need gnugrep (for -I) |
8 | DEPENDS = "virtual/db grep-native" | 8 | DEPENDS = "virtual/db grep-native" |
9 | DEPENDS += "gdbm zlib" | 9 | DEPENDS += "gdbm zlib" |
10 | PR = "r3" | 10 | PR = "r4" |
11 | 11 | ||
12 | # 5.10.1 has Module::Build built-in | 12 | # 5.10.1 has Module::Build built-in |
13 | PROVIDES += "libmodule-build-perl" | 13 | PROVIDES += "libmodule-build-perl" |
@@ -117,7 +117,7 @@ do_configure() { | |||
117 | rm -f config.sh-${TARGET_ARCH}-${TARGET_OS} | 117 | rm -f config.sh-${TARGET_ARCH}-${TARGET_OS} |
118 | for i in ${WORKDIR}/config.sh \ | 118 | for i in ${WORKDIR}/config.sh \ |
119 | ${WORKDIR}/config.sh-${SITEINFO_BITS} \ | 119 | ${WORKDIR}/config.sh-${SITEINFO_BITS} \ |
120 | ${WORKDIR}/config.sh-${SITEINFO_BITS}-${SITEINFO_ENDIANESS}; do | 120 | ${WORKDIR}/config.sh-${SITEINFO_BITS}-${SITEINFO_ENDIANNESS}; do |
121 | cat $i >> config.sh-${TARGET_ARCH}-${TARGET_OS} | 121 | cat $i >> config.sh-${TARGET_ARCH}-${TARGET_OS} |
122 | done | 122 | done |
123 | 123 | ||
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index de311dca57..9b7e071e7a 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc | |||
@@ -3,7 +3,7 @@ SECTION = "libs" | |||
3 | LICENSE = "LGPLv2.1 | GPLv3" | 3 | LICENSE = "LGPLv2.1 | GPLv3" |
4 | HOMEPAGE = "http://qt.nokia.com" | 4 | HOMEPAGE = "http://qt.nokia.com" |
5 | DEPENDS += "directfb tslib" | 5 | DEPENDS += "directfb tslib" |
6 | INC_PR = "r27" | 6 | INC_PR = "r28" |
7 | 7 | ||
8 | QT_BASE_NAME ?= "qt4-embedded" | 8 | QT_BASE_NAME ?= "qt4-embedded" |
9 | QT_BASE_LIB ?= "libqt-embedded" | 9 | QT_BASE_LIB ?= "libqt-embedded" |
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index e6169f3dcf..b8633de741 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc | |||
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com" | |||
5 | SECTION = "x11/libs" | 5 | SECTION = "x11/libs" |
6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" | 6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" |
7 | 7 | ||
8 | INC_PR = "r24" | 8 | INC_PR = "r25" |
9 | 9 | ||
10 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " | 10 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " |
11 | QT_GLFLAGS_qemux86 = "-opengl" | 11 | QT_GLFLAGS_qemux86 = "-opengl" |
diff --git a/meta/recipes-qt/qt4/qt4_arch.inc b/meta/recipes-qt/qt4/qt4_arch.inc index 7f4be63bca..e8c8fabe68 100644 --- a/meta/recipes-qt/qt4/qt4_arch.inc +++ b/meta/recipes-qt/qt4/qt4_arch.inc | |||
@@ -17,9 +17,9 @@ def qt_arch(d): | |||
17 | 17 | ||
18 | def qt_endian(d): | 18 | def qt_endian(d): |
19 | import bb | 19 | import bb |
20 | if bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "le": | 20 | if bb.data.getVar('SITEINFO_ENDIANNESS', d, True) == "le": |
21 | return "-little-endian" | 21 | return "-little-endian" |
22 | elif bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "be": | 22 | elif bb.data.getVar('SITEINFO_ENDIANNESS', d, True) == "be": |
23 | return "-big-endian" | 23 | return "-big-endian" |
24 | else: | 24 | else: |
25 | assert False | 25 | assert False |