aboutsummaryrefslogtreecommitdiffstats
path: root/recipes
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2010-06-20 14:35:05 -0700
committerChris Larson <chris_larson@mentor.com>2010-07-26 10:59:36 -0700
commit87dc166bade8722af4076c8644cac6a0a437826f (patch)
treee52609ad65bb807cd6856cbe95c2f28783000618 /recipes
parentc47c6611be11d3b80f61a75f80187e9398eccbd4 (diff)
downloadopenembedded-87dc166bade8722af4076c8644cac6a0a437826f.tar.gz
openembedded-87dc166bade8722af4076c8644cac6a0a437826f.tar.bz2
openembedded-87dc166bade8722af4076c8644cac6a0a437826f.zip
Siteinfo cleanup
- Don't supply site files for native - Split up the site information, so we don't need to add every single combination of os and architecture to the siteinfo.bbclass - Instead of specifically looking for '${FILE_DIRNAME}/site-${PV}/<sitefile>', leverage FILESPATH. Now it searches the paths in both BBPATH and FILESPATH for "site/<sitefile>". - SITEINFO_ENDIANESS -> SITEINFO_ENDIANNESS Signed-off-by: Chris Larson <clarson@kergoth.com>
Diffstat (limited to 'recipes')
-rw-r--r--recipes/apex/apex-nslu2-16mb_1.5.14.bb8
-rw-r--r--recipes/apex/apex-nslu2_1.5.14.bb8
-rw-r--r--recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb8
-rw-r--r--recipes/espeak/espeak_1.37.bb4
-rw-r--r--recipes/gnash/gnash-fb_0.8.5.bb2
-rw-r--r--recipes/gnash/gnash_0.8.5.bb2
-rw-r--r--recipes/gnash/gnash_0.8.7.bb2
-rw-r--r--recipes/hping/hping2_1.9.9+2.0.0rc3.bb2
-rw-r--r--recipes/linux/ixp4xx-kernel.inc50
-rw-r--r--recipes/linux/linux.inc2
-rw-r--r--recipes/meta/canadian-sdk.bb2
-rw-r--r--recipes/net-snmp/net-snmp.inc2
-rw-r--r--recipes/ogre/ogre-egl_svn.bb2
-rw-r--r--recipes/openssl/openssl.inc2
-rw-r--r--recipes/openttd/openttd.inc2
-rw-r--r--recipes/openttd/openttd_0.7.4.bb2
-rw-r--r--recipes/qt4/qt4_arch.inc4
17 files changed, 52 insertions, 52 deletions
diff --git a/recipes/apex/apex-nslu2-16mb_1.5.14.bb b/recipes/apex/apex-nslu2-16mb_1.5.14.bb
index 1e654df5d3..4d19f9ed10 100644
--- a/recipes/apex/apex-nslu2-16mb_1.5.14.bb
+++ b/recipes/apex/apex-nslu2-16mb_1.5.14.bb
@@ -29,14 +29,14 @@ oe_runmake() {
# defconfig to .config
do_configure() {
rm -f ${S}/.config
- if [ "x${SITEINFO_ENDIANESS}" = "xbe" ]; then
+ if [ "x${SITEINFO_ENDIANNESS}" = "xbe" ]; then
sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \
-e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \
-e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/BE (16MiB Flash)\"/' \
-e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
-e 's|CONFIG_ENV_DEFAULT_CMDLINE_ALT=|CONFIG_ENV_DEFAULT_CMDLINE_ALT=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
${WORKDIR}/defconfig > ${S}/.config
- elif [ "x${SITEINFO_ENDIANESS}" = "xle" ]; then
+ elif [ "x${SITEINFO_ENDIANNESS}" = "xle" ]; then
sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \
-e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \
-e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (16MiB Flash)\"/' \
@@ -53,9 +53,9 @@ DEPENDS += "devio-native"
do_stage() {
install -d ${STAGING_LOADER_DIR}
- if [ "x${SITEINFO_ENDIANESS}" = "xbe" ]; then
+ if [ "x${SITEINFO_ENDIANNESS}" = "xbe" ]; then
cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin
- elif [ "x${SITEINFO_ENDIANESS}" = "xle" ]; then
+ elif [ "x${SITEINFO_ENDIANNESS}" = "xle" ]; then
devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin 'xp $,4'
else
oefatal do_populate_sysroot cannot determine endianess
diff --git a/recipes/apex/apex-nslu2_1.5.14.bb b/recipes/apex/apex-nslu2_1.5.14.bb
index efab695c61..2bea9e2970 100644
--- a/recipes/apex/apex-nslu2_1.5.14.bb
+++ b/recipes/apex/apex-nslu2_1.5.14.bb
@@ -29,14 +29,14 @@ oe_runmake() {
# defconfig to .config
do_configure() {
rm -f ${S}/.config
- if [ "x${SITEINFO_ENDIANESS}" = "xbe" ]; then
+ if [ "x${SITEINFO_ENDIANNESS}" = "xbe" ]; then
sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \
-e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \
-e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/BE (8MiB Flash)\"/' \
-e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
-e 's|CONFIG_ENV_DEFAULT_CMDLINE_ALT=|CONFIG_ENV_DEFAULT_CMDLINE_ALT=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
${WORKDIR}/defconfig > ${S}/.config
- elif [ "x${SITEINFO_ENDIANESS}" = "xle" ]; then
+ elif [ "x${SITEINFO_ENDIANNESS}" = "xle" ]; then
sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \
-e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \
-e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (8MiB Flash)\"/' \
@@ -53,9 +53,9 @@ DEPENDS += "devio-native"
do_stage() {
install -d ${STAGING_LOADER_DIR}
- if [ "x${SITEINFO_ENDIANESS}" = "xbe" ]; then
+ if [ "x${SITEINFO_ENDIANNESS}" = "xbe" ]; then
cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex-nslu2.bin
- elif [ "x${SITEINFO_ENDIANESS}" = "xle" ]; then
+ elif [ "x${SITEINFO_ENDIANNESS}" = "xle" ]; then
devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2.bin 'xp $,4'
else
oefatal do_populate_sysroot cannot determine endianess
diff --git a/recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb b/recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb
index 76e26065cd..40bf8e9a8f 100644
--- a/recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb
+++ b/recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb
@@ -32,7 +32,7 @@ EXTRA_OEMAKE_append = " CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/
oe_runmake() {
mv ${S}/config.h ${S}/config.h.orig
# NSLU2
- if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+ if [ ${SITEINFO_ENDIANNESS} == "be" ] ; then
sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
${WORKDIR}/config-nslu2.h > ${S}/config.h
else
@@ -44,7 +44,7 @@ oe_runmake() {
oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2
make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed"
# NAS100d
- if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+ if [ ${SITEINFO_ENDIANNESS} == "be" ] ; then
sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
${WORKDIR}/config-nas100d.h > ${S}/config.h
else
@@ -56,7 +56,7 @@ oe_runmake() {
oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d
make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed"
# DSMG-600
- if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+ if [ ${SITEINFO_ENDIANNESS} == "be" ] ; then
sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
${WORKDIR}/config-dsmg600.h > ${S}/config.h
else
@@ -68,7 +68,7 @@ oe_runmake() {
oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600
make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed"
# FSG-3
- if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+ if [ ${SITEINFO_ENDIANNESS} == "be" ] ; then
sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
${WORKDIR}/config-fsg3.h > ${S}/config.h
else
diff --git a/recipes/espeak/espeak_1.37.bb b/recipes/espeak/espeak_1.37.bb
index fb94bd347e..37af83d89d 100644
--- a/recipes/espeak/espeak_1.37.bb
+++ b/recipes/espeak/espeak_1.37.bb
@@ -1,7 +1,7 @@
require espeak.inc
inherit siteinfo
-EXTRA_PHONEMES = '${@base_contains("SITEINFO_ENDIANESS", "be", "espeak-data (= ${PV})", "", d)}'
+EXTRA_PHONEMES = '${@base_contains("SITEINFO_ENDIANNESS", "be", "espeak-data (= ${PV})", "", d)}'
RDEPENDS_${PN} = "portaudio-v19 ${EXTRA_PHONEMES}"
PR = "r0"
@@ -32,7 +32,7 @@ do_install() {
install -m 0644 ${S}/src/speak_lib.h ${D}${includedir}
oe_libinstall -so -C src libespeak ${D}${libdir}
- if [ "${SITEINFO_ENDIANESS}" = "be" ] ; then
+ if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then
# the big-endian phon* files are provided by the package espeak-data
rm -f ${S}/espeak-data/phon*
fi
diff --git a/recipes/gnash/gnash-fb_0.8.5.bb b/recipes/gnash/gnash-fb_0.8.5.bb
index fecb3a0ce6..77f1b48237 100644
--- a/recipes/gnash/gnash-fb_0.8.5.bb
+++ b/recipes/gnash/gnash-fb_0.8.5.bb
@@ -12,7 +12,7 @@ SRC_URI += "file://gnash-glib-dependency.patch"
S = "${WORKDIR}/gnash-${PV}"
# Boost lacks defines for lots of archs
-TARGET_CC_ARCH_append = " -I${STAGING_INCDIR}/libxml2 -DHAVE_POLL_H ${@[' -D_BIG_ENDIAN', ' -D_LITTLE_ENDIAN'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
+TARGET_CC_ARCH_append = " -I${STAGING_INCDIR}/libxml2 -DHAVE_POLL_H ${@[' -D_BIG_ENDIAN', ' -D_LITTLE_ENDIAN'][bb.data.getVar('SITEINFO_ENDIANNESS', d, 1) == 'le']}"
do_configure_prepend() {
diff --git a/recipes/gnash/gnash_0.8.5.bb b/recipes/gnash/gnash_0.8.5.bb
index 1394e2b5b8..669bb6a693 100644
--- a/recipes/gnash/gnash_0.8.5.bb
+++ b/recipes/gnash/gnash_0.8.5.bb
@@ -8,7 +8,7 @@ DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_angstrom = "1"
# Boost lacks defines for lots of archs
-TARGET_CC_ARCH_append = " -I${STAGING_INCDIR}/libxml2 -DHAVE_POLL_H ${@[' -D_BIG_ENDIAN', ' -D_LITTLE_ENDIAN'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
+TARGET_CC_ARCH_append = " -I${STAGING_INCDIR}/libxml2 -DHAVE_POLL_H ${@[' -D_BIG_ENDIAN', ' -D_LITTLE_ENDIAN'][bb.data.getVar('SITEINFO_ENDIANNESS', d, 1) == 'le']}"
do_configure_prepend() {
diff --git a/recipes/gnash/gnash_0.8.7.bb b/recipes/gnash/gnash_0.8.7.bb
index 2926fa7e88..a63e4d097c 100644
--- a/recipes/gnash/gnash_0.8.7.bb
+++ b/recipes/gnash/gnash_0.8.7.bb
@@ -44,7 +44,7 @@ RDEPENDS_${PN}-browser-plugin += "${PN}"
acpaths = " -Imacros"
# Boost lacks defines for lots of archs
-TARGET_CC_ARCH_append = " -I${STAGING_INCDIR}/libxml2 -DHAVE_POLL_H ${@[' -D_BIG_ENDIAN', ' -D_LITTLE_ENDIAN'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
+TARGET_CC_ARCH_append = " -I${STAGING_INCDIR}/libxml2 -DHAVE_POLL_H ${@[' -D_BIG_ENDIAN', ' -D_LITTLE_ENDIAN'][bb.data.getVar('SITEINFO_ENDIANNESS', d, 1) == 'le']}"
do_install_append() {
diff --git a/recipes/hping/hping2_1.9.9+2.0.0rc3.bb b/recipes/hping/hping2_1.9.9+2.0.0rc3.bb
index 4a7fe8bb95..0b7ca71ee9 100644
--- a/recipes/hping/hping2_1.9.9+2.0.0rc3.bb
+++ b/recipes/hping/hping2_1.9.9+2.0.0rc3.bb
@@ -24,7 +24,7 @@ inherit siteinfo
#
do_configure() {
# Additional flag based on target endiness (see siteinfo.bbclass)
- BYTEORDER="${@base_conditional('SITEINFO_ENDIANESS', 'le', '__LITTLE_ENDIAN_BITFIELD', '__BIG_ENDIAN_BITFIELD', d)}"
+ BYTEORDER="${@base_conditional('SITEINFO_ENDIANNESS', 'le', '__LITTLE_ENDIAN_BITFIELD', '__BIG_ENDIAN_BITFIELD', d)}"
oenote Determined byteorder as: $BYTEORDER
BYTEORDER="${BYTEORDER}" CONFIGOSTYPE="LINUX" ./configure
}
diff --git a/recipes/linux/ixp4xx-kernel.inc b/recipes/linux/ixp4xx-kernel.inc
index ddcc81cdd1..cd5a952381 100644
--- a/recipes/linux/ixp4xx-kernel.inc
+++ b/recipes/linux/ixp4xx-kernel.inc
@@ -187,7 +187,7 @@ EXTRA_OEMAKE += "MAKEFLAGS='--no-print-directory'"
do_configure_prepend() {
rm -f ${S}/.config
echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config'
- if test '${SITEINFO_ENDIANESS}' = be
+ if test '${SITEINFO_ENDIANNESS}' = be
then
echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config'
fi
@@ -254,56 +254,56 @@ FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}-${MACHINE_ARCH}-${KERNEL_VERSION
nslu2_MACHID = "597"
PACKAGES += "kernel-image-nslu2"
PKG_kernel-image-nslu2 = "kernel-image-${KERNEL_VERSION}"
-PACKAGE_ARCH_kernel-image-nslu2 = "nslu2${SITEINFO_ENDIANESS}"
+PACKAGE_ARCH_kernel-image-nslu2 = "nslu2${SITEINFO_ENDIANNESS}"
DESCRIPTION_kernel-image-nslu2 = "Linux kernel for the LinkSys NSLU2"
-FILES_kernel-image-nslu2 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANESS}-${KERNEL_VERSION}"
+FILES_kernel-image-nslu2 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANNESS}-${KERNEL_VERSION}"
pkg_postinst_kernel-image-nslu2 () {
- update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
+ update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANNESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
}
pkg_postrm_kernel-image-nslu2 () {
- update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true
+ update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANNESS}-${KERNEL_VERSION} || true
}
# The correct settings for the NAS100D board:
nas100d_MACHID = "865"
PACKAGES += "kernel-image-nas100d"
PKG_kernel-image-nas100d = "kernel-image-${KERNEL_VERSION}"
-PACKAGE_ARCH_kernel-image-nas100d = "nas100d${SITEINFO_ENDIANESS}"
+PACKAGE_ARCH_kernel-image-nas100d = "nas100d${SITEINFO_ENDIANNESS}"
DESCRIPTION_kernel-image-nas100d = "Linux kernel for the IOMega NAS100D"
-FILES_kernel-image-nas100d = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANESS}-${KERNEL_VERSION}"
+FILES_kernel-image-nas100d = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANNESS}-${KERNEL_VERSION}"
pkg_postinst_kernel-image-nas100d () {
- update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
+ update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANNESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
}
pkg_postrm_kernel-image-nas100d () {
- update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true
+ update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANNESS}-${KERNEL_VERSION} || true
}
# The correct settings for the DSMG600 board:
dsmg600_MACHID = "964"
PACKAGES += "kernel-image-dsmg600"
PKG_kernel-image-dsmg600 = "kernel-image-${KERNEL_VERSION}"
-PACKAGE_ARCH_kernel-image-dsmg600 = "dsmg600${SITEINFO_ENDIANESS}"
+PACKAGE_ARCH_kernel-image-dsmg600 = "dsmg600${SITEINFO_ENDIANNESS}"
DESCRIPTION_kernel-image-dsmg600 = "Linux kernel for the D-Link DSM-G600"
-FILES_kernel-image-dsmg600 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANESS}-${KERNEL_VERSION}"
+FILES_kernel-image-dsmg600 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANNESS}-${KERNEL_VERSION}"
pkg_postinst_kernel-image-dsmg600 () {
- update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
+ update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANNESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
}
pkg_postrm_kernel-image-dsmg600 () {
- update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true
+ update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANNESS}-${KERNEL_VERSION} || true
}
# The correct settings for the FSG-3 board:
fsg3_MACHID = "1091"
PACKAGES += "kernel-image-fsg3"
PKG_kernel-image-fsg3 = "kernel-image-${KERNEL_VERSION}"
-PACKAGE_ARCH_kernel-image-fsg3 = "fsg3${SITEINFO_ENDIANESS}"
+PACKAGE_ARCH_kernel-image-fsg3 = "fsg3${SITEINFO_ENDIANNESS}"
DESCRIPTION_kernel-image-fsg3 = "Linux kernel for the Freecom FSG-3"
-FILES_kernel-image-fsg3 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION}"
+FILES_kernel-image-fsg3 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANNESS}-${KERNEL_VERSION}"
pkg_postinst_kernel-image-fsg3 () {
- update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
+ update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANNESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
}
pkg_postrm_kernel-image-fsg3 () {
- update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true
+ update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANNESS}-${KERNEL_VERSION} || true
}
BYTESWAP_armeb = "cp$"
@@ -347,10 +347,10 @@ do_install_append() {
install_image '${MACHINE_ARCH}'
# Add the machine specific images, with appropriate suffixes
- install_image 'nslu2${SITEINFO_ENDIANESS}' 'nslu2'
- install_image 'nas100d${SITEINFO_ENDIANESS}' 'nas100d'
- install_image 'dsmg600${SITEINFO_ENDIANESS}' 'dsmg600'
- install_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3'
+ install_image 'nslu2${SITEINFO_ENDIANNESS}' 'nslu2'
+ install_image 'nas100d${SITEINFO_ENDIANNESS}' 'nas100d'
+ install_image 'dsmg600${SITEINFO_ENDIANNESS}' 'dsmg600'
+ install_image 'fsg3${SITEINFO_ENDIANNESS}' 'fsg3'
}
deploy_image() {
@@ -362,8 +362,8 @@ do_deploy() {
deploy_image '${MACHINE_ARCH}'
# And the machine specific images
- deploy_image 'nslu2${SITEINFO_ENDIANESS}' 'nslu2'
- deploy_image 'nas100d${SITEINFO_ENDIANESS}' 'nas100d'
- deploy_image 'dsmg600${SITEINFO_ENDIANESS}' 'dsmg600'
- deploy_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3'
+ deploy_image 'nslu2${SITEINFO_ENDIANNESS}' 'nslu2'
+ deploy_image 'nas100d${SITEINFO_ENDIANNESS}' 'nas100d'
+ deploy_image 'dsmg600${SITEINFO_ENDIANNESS}' 'dsmg600'
+ deploy_image 'fsg3${SITEINFO_ENDIANNESS}' 'fsg3'
}
diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc
index e70a2ead89..29cffef27c 100644
--- a/recipes/linux/linux.inc
+++ b/recipes/linux/linux.inc
@@ -110,7 +110,7 @@ do_configure_prepend() {
#
# endian support
#
- if [ "${SITEINFO_ENDIANESS}" = "be" ]; then
+ if [ "${SITEINFO_ENDIANNESS}" = "be" ]; then
echo "CONFIG_CPU_BIG_ENDIAN=y" >> ${S}/.config
fi
diff --git a/recipes/meta/canadian-sdk.bb b/recipes/meta/canadian-sdk.bb
index 7a10304146..701a02d1a6 100644
--- a/recipes/meta/canadian-sdk.bb
+++ b/recipes/meta/canadian-sdk.bb
@@ -4,7 +4,7 @@ DEPENDS = "opkg-native ipkg-utils-native fakeroot-native sed-native zip-native"
PR = "r5"
# NOTE: We need to save and restore PACKAGE_ARCHS, because sdk.bbclass
-# will change HOST_ARCH, which can result in SITEINFO_ENDIANESS (which
+# will change HOST_ARCH, which can result in SITEINFO_ENDIANNESS (which
# is computed in siteinfo.bbclass) in changing if the original HOST_ARCH
# endianess differs from the new HOST_ARCH endianess. SITEINFO_ENDIANNESS
# is used in a number of places, including the construction of the
diff --git a/recipes/net-snmp/net-snmp.inc b/recipes/net-snmp/net-snmp.inc
index 81bc079ab3..92df575378 100644
--- a/recipes/net-snmp/net-snmp.inc
+++ b/recipes/net-snmp/net-snmp.inc
@@ -14,7 +14,7 @@ TARGET_CC_ARCH += "${LDFLAGS}"
do_configure() {
# Additional flag based on target endiness (see siteinfo.bbclass)
- ENDIANESS="${@base_conditional('SITEINFO_ENDIANESS', 'le', '--with-endianness=little', '--with-endianness=big', d)}"
+ ENDIANESS="${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)}"
oenote Determined endianess as: $ENDIANESS
oe_runconf $ENDIANESS
}
diff --git a/recipes/ogre/ogre-egl_svn.bb b/recipes/ogre/ogre-egl_svn.bb
index 4e66e2ecb9..d002687cfd 100644
--- a/recipes/ogre/ogre-egl_svn.bb
+++ b/recipes/ogre/ogre-egl_svn.bb
@@ -19,7 +19,7 @@ EXTRA_OECONF = " --with-gui=gtk --disable-freetypetest --enable-ogre-demos --wit
S = "${WORKDIR}/trunk"
-EXTRA_OEMAKE = " ZZIPLIB_CFLAGS=\"${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DOGRE_CONFIG_LITTLE_ENDIAN', '-DOGRE_CONFIG_BIG_ENDIAN', d)}\" "
+EXTRA_OEMAKE = " ZZIPLIB_CFLAGS=\"${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-DOGRE_CONFIG_LITTLE_ENDIAN', '-DOGRE_CONFIG_BIG_ENDIAN', d)}\" "
do_configure_prepend() {
sed -i -e /OGRE_DETECT_ENDIAN/d ${S}/configure.in
diff --git a/recipes/openssl/openssl.inc b/recipes/openssl/openssl.inc
index 329c6614d8..7fd7ea0c29 100644
--- a/recipes/openssl/openssl.inc
+++ b/recipes/openssl/openssl.inc
@@ -11,7 +11,7 @@ inherit siteinfo
INC_PR = "r12"
AR_append = " r"
-CFLAG = "${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
+CFLAG = "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
-DTERMIO ${FULL_OPTIMIZATION} -Wall"
# -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom
diff --git a/recipes/openttd/openttd.inc b/recipes/openttd/openttd.inc
index b1a5e956d7..e9bb8c367e 100644
--- a/recipes/openttd/openttd.inc
+++ b/recipes/openttd/openttd.inc
@@ -26,7 +26,7 @@ do_configure() {
--host=${TARGET_SYS} \
--windres=${MACHINE_DISPLAY_WIDTH_PIXELS}x${MACHINE_DISPLAY_HEIGHT_PIXELS} \
--os=UNIX \
- --endian=${SITEINFO_ENDIANESS} \
+ --endian=${SITEINFO_ENDIANNESS} \
--prefix-dir=${prefix} \
--binary-dir=bin \
--with-midi=/bin/true \
diff --git a/recipes/openttd/openttd_0.7.4.bb b/recipes/openttd/openttd_0.7.4.bb
index e052d1efed..a286135c18 100644
--- a/recipes/openttd/openttd_0.7.4.bb
+++ b/recipes/openttd/openttd_0.7.4.bb
@@ -21,7 +21,7 @@ do_configure() {
--host=${TARGET_SYS} \
--windres=${MACHINE_DISPLAY_WIDTH_PIXELS}x${MACHINE_DISPLAY_HEIGHT_PIXELS} \
--os=UNIX \
- --endian=${SITEINFO_ENDIANESS} \
+ --endian=${SITEINFO_ENDIANNESS} \
--prefix-dir=${prefix} \
--binary-dir=bin \
--with-midi=/bin/true \
diff --git a/recipes/qt4/qt4_arch.inc b/recipes/qt4/qt4_arch.inc
index 7f4be63bca..e8c8fabe68 100644
--- a/recipes/qt4/qt4_arch.inc
+++ b/recipes/qt4/qt4_arch.inc
@@ -17,9 +17,9 @@ def qt_arch(d):
def qt_endian(d):
import bb
- if bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "le":
+ if bb.data.getVar('SITEINFO_ENDIANNESS', d, True) == "le":
return "-little-endian"
- elif bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "be":
+ elif bb.data.getVar('SITEINFO_ENDIANNESS', d, True) == "be":
return "-big-endian"
else:
assert False