From 45fc36a32fb23c513833d7e27fb4b9cd8be68fb5 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sun, 20 Jun 2010 14:35:05 -0700 Subject: Siteinfo cleanup v2 - 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. - Drop the ${FILE_DIRNAME}/site- stuff, there are other ways to do it. - SITEINFO_ENDIANESS -> SITEINFO_ENDIANNESS. Signed-off-by: Chris Larson --- recipes/apex/apex-nslu2-16mb_1.5.14.bb | 8 ++++---- recipes/apex/apex-nslu2_1.5.14.bb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'recipes/apex') 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 -- cgit 1.2.3-korg