merge of 144fd340e011918ec9e2b22ebd9d65d1fc0bc371

     and 5b22925a7b123db5cb7c74c47b0d46e3a3510df6

8 files changed, 39 insertions, 22 deletions

diff --git a/packages/hping/hping2_1.9.9+2.0.0rc3.bb b/packages/hping/hping2_1.9.9+2.0.0rc3.bb
index 912f7c420e..cedcf975f9 100644
--- a/packages/hping/hping2_1.9.9+2.0.0rc3.bb
+++ b/packages/hping/hping2_1.9.9+2.0.0rc3.bb
@@ -24,14 +24,15 @@ S="${WORKDIR}/hping2-rc3"
 do_configure() {
 	# endianness fun.. inspired by openssl.inc
 	. ${CONFIG_SITE}
-        BYTEORDER="UNKNOWN"
-	if test "x$ac_cv_c_bigendian" = "xyes"; then
+	BYTEORDER="UNKNOWN"
+	if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
 	    BYTEORDER="__BIG_ENDIAN_BITFIELD"
-	elif test "x$ac_cv_c_littleendian" = "xyes"; then
+	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
 	    BYTEORDER="__LITTLE_ENDIAN_BITFIELD"
 	else
 	    oefatal do_configure cannot determine endianess
 	fi
+	oenote Determined byteorder as: $BYTEORDER
 	BYTEORDER="${BYTEORDER}" CONFIGOSTYPE="LINUX" ./configure
 }
 
diff --git a/packages/net-snmp/net-snmp_5.1.2.bb b/packages/net-snmp/net-snmp_5.1.2.bb
index d60b03a746..25c9e62f7c 100644
--- a/packages/net-snmp/net-snmp_5.1.2.bb
+++ b/packages/net-snmp/net-snmp_5.1.2.bb
@@ -18,15 +18,16 @@ EXTRA_OECONF = "--enable-shared --disable-manuals"
 EXTRA_OEMAKE = "INSTALL_PREFIX=${D}"
 
 do_configure() {
-	# endianness fun.. inspired by openssl.inc
+	# endianness fun... inspired by openssl.inc
 	. ${CONFIG_SITE}
-	if test "x$ac_cv_c_bigendian" = "xyes"; then
+	if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
 	    ENDIANESS=" --with-endianness=big"
-	elif test "x$ac_cv_c_littleendian" = "xyes"; then
+	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
 	    ENDIANESS=" --with-endianness=little"
 	else
 	    oefatal do_configure cannot determine endianess
 	fi
+	oenote Determined endianess as: $ENDIANESS
 	oe_runconf $ENDIANESS
 }
 
diff --git a/packages/openssl/openssl.inc b/packages/openssl/openssl.inc
index 027351e31a..ab99495c54 100644
--- a/packages/openssl/openssl.inc
+++ b/packages/openssl/openssl.inc
@@ -28,15 +28,12 @@ do_compile () {
 
 	# endianness fun.. whee
 	. ${CONFIG_SITE}
-	if test "x$ac_cv_c_bigendian" = "xyes"; then
+	if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
 		CFLAG="${CFLAG} -DB_ENDIAN"
-	elif test "x$ac_cv_c_littleendian" = "xyes"; then
+	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
 		CFLAG="${CFLAG} -DL_ENDIAN"
-	elif test "x$ac_cv_c_bigendian" = "xno" && test "x$ac_cv_c_littleendian" = "xno"; then
-		# no idea what to do with this...
-		:
 	else
-		CFLAG="${CFLAG} -DL_ENDIAN"
+		oefatal do_configure cannot determine endianess
 	fi
 
 	os=${HOST_OS}
diff --git a/packages/slcalc/.mtn2git_empty b/packages/slcalc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/slcalc/.mtn2git_empty
diff --git a/packages/slcalc/slcalc_1.2.1.bb b/packages/slcalc/slcalc_1.2.1.bb
new file mode 100644
index 0000000000..fa5720e0ce
--- /dev/null
+++ b/packages/slcalc/slcalc_1.2.1.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Scientific calculator with user definable constants and functions."
+HOMEPAGE = "http://homepage3.nifty.com/cam/slcalc.htm"
+SECTION = "opie/applications"
+LICENSE = "GPL"
+
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+SRC_URI = "http://homepage3.nifty.com/cam/slcalc_1.2.1_arm.tar.gz"
+
+inherit opie
+
+S = "${WORKDIR}/slcalc_source"
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics
+	install -m 0644 slcalc2.png ${D}${palmtopdir}/pics/
+}
diff --git a/packages/uclibc/uclibc-0.9.28/ixp4xx/uClibc.distro b/packages/uclibc/uclibc-0.9.28/ixp4xx/uClibc.distro
index 7019e97369..fd922e1d76 100644
--- a/packages/uclibc/uclibc-0.9.28/ixp4xx/uClibc.distro
+++ b/packages/uclibc/uclibc-0.9.28/ixp4xx/uClibc.distro
@@ -82,7 +82,7 @@ UCLIBC_HAS_PRINTF_M_SPEC=y
 UCLIBC_HAS_ERRNO_MESSAGES=y
 # UCLIBC_HAS_SYS_ERRLIST is not set
 UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_SYS_SIGLIST=y
 UCLIBC_HAS_GNU_GETOPT=y
 
 #
diff --git a/packages/uclibc/uclibc_0.9.28.bb b/packages/uclibc/uclibc_0.9.28.bb
index 1801af2861..0a0fe100cd 100644
--- a/packages/uclibc/uclibc_0.9.28.bb
+++ b/packages/uclibc/uclibc_0.9.28.bb
@@ -1,5 +1,5 @@
 DEFAULT_PREFERENCE = "1"
-PR = "r5"
+PR = "r6"
 
 require uclibc.inc
 
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb
index 236992f8f0..7af73f085c 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.5.1.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Eric Shattow <lucent@gmail.com>"
 HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
 DEPENDS = "gnutls madwifi-ng"
 
-PR = "r4"
+PR = "r5"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
@@ -40,19 +40,19 @@ do_compile () {
 
 do_install () {
 	install -d ${D}${sbindir}
-	install -m755 wpa_supplicant ${D}${sbindir}
-	install -m755 wpa_passphrase ${D}${sbindir}
-	install -m755 wpa_cli        ${D}${sbindir}
+	install -m 755 wpa_supplicant ${D}${sbindir}
+	install -m 755 wpa_passphrase ${D}${sbindir}
+	install -m 755 wpa_cli        ${D}${sbindir}
 
 	install -d ${D}${localstatedir}/run/wpa_supplicant
 
 	install -d ${D}${docdir}/wpa_supplicant
-	install -m644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant
+	install -m 644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant
 
 	install -d ${D}${sysconfdir}/init.d
-	install -m700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa
+	install -m 700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa
 
 	install -d ${D}${sysconfdir}/default
-	install -m600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa
-	install -m600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
+	install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa
+	install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
 }