[oe-commits] org.oe.dev apex: Changed ixp4xx-specific ARCH_BYTE_SEX variable usage into generic CONFIG_SITE based endianness checks

[rwhitby commit]

apex: Changed ixp4xx-specific ARCH_BYTE_SEX variable usage into generic CONFIG_SITE based endianness checks

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: ffff82acaf2905f7487678b8444fb4c9c451ab31
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ffff82acaf2905f7487678b8444fb4c9c451ab31
Files:
1
packages/apex/apex_1.4.11.bb
packages/apex/apex_1.4.7.bb
Diffs:

#
# mt diff -r49ba0c69903fdc0cbcaa25d9ea85a824765616bd -rffff82acaf2905f7487678b8444fb4c9c451ab31
#
# 
# 
# patch "packages/apex/apex_1.4.11.bb"
#  from [2d18d1d615aebbc634a7a4a1f93d49c470571962]
#    to [a4205b193f39e297baca436c22e8a63056b4dc46]
# 
# patch "packages/apex/apex_1.4.7.bb"
#  from [2d18d1d615aebbc634a7a4a1f93d49c470571962]
#    to [a4205b193f39e297baca436c22e8a63056b4dc46]
# 
============================================================
--- packages/apex/apex_1.4.11.bb	2d18d1d615aebbc634a7a4a1f93d49c470571962
+++ packages/apex/apex_1.4.11.bb	a4205b193f39e297baca436c22e8a63056b4dc46
@@ -23,18 +23,20 @@ do_configure() {
 # defconfig to .config
 do_configure() {
 	rm -f ${S}/.config
-	if test '${ARCH_BYTE_SEX}' = be
-	then
+	. ${CONFIG_SITE}
+	if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
 	  sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \
 	      -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \
 	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \
 		${WORKDIR}/defconfig > ${S}/.config
-	else
+	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
 	  sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \
 	      -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \
 	      -e 's/.*CONFIG_ENV_REGION_KERNEL_SWAP.*/CONFIG_ENV_REGION_KERNEL_SWAP=y/' \
 	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \
 		${WORKDIR}/defconfig > ${S}/.config
+	else
+	  oefatal do_configure cannot determine endianess
 	fi
 	oe_runmake oldconfig
 }
@@ -43,11 +45,14 @@ do_populate_staging() {
 
 do_populate_staging() {
 	install -d ${STAGING_LOADER_DIR}
-	# FIXME - arch-arm should not be hard-coded
-	if test '${ARCH_BYTE_SEX}' = be
-	then
+	. ${CONFIG_SITE}
+	if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
+		# FIXME - arch-arm should not be hard-coded
 		cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex.bin
-	else
+	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
+		# FIXME - arch-arm should not be hard-coded
 		devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex.bin 'xp $,4'
+	else
+		oefatal do_populate_staging cannot determine endianess
 	fi
 }
============================================================
--- packages/apex/apex_1.4.7.bb	2d18d1d615aebbc634a7a4a1f93d49c470571962
+++ packages/apex/apex_1.4.7.bb	a4205b193f39e297baca436c22e8a63056b4dc46
@@ -23,18 +23,20 @@ do_configure() {
 # defconfig to .config
 do_configure() {
 	rm -f ${S}/.config
-	if test '${ARCH_BYTE_SEX}' = be
-	then
+	. ${CONFIG_SITE}
+	if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
 	  sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \
 	      -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \
 	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \
 		${WORKDIR}/defconfig > ${S}/.config
-	else
+	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
 	  sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \
 	      -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \
 	      -e 's/.*CONFIG_ENV_REGION_KERNEL_SWAP.*/CONFIG_ENV_REGION_KERNEL_SWAP=y/' \
 	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \
 		${WORKDIR}/defconfig > ${S}/.config
+	else
+	  oefatal do_configure cannot determine endianess
 	fi
 	oe_runmake oldconfig
 }
@@ -43,11 +45,14 @@ do_populate_staging() {
 
 do_populate_staging() {
 	install -d ${STAGING_LOADER_DIR}
-	# FIXME - arch-arm should not be hard-coded
-	if test '${ARCH_BYTE_SEX}' = be
-	then
+	. ${CONFIG_SITE}
+	if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
+		# FIXME - arch-arm should not be hard-coded
 		cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex.bin
-	else
+	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
+		# FIXME - arch-arm should not be hard-coded
 		devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex.bin 'xp $,4'
+	else
+		oefatal do_populate_staging cannot determine endianess
 	fi
 }