[oe-commits] org.oe.dev merge of '45ed3a3d615ea56e696ea876589e529d4f1d96e3'

[xora commit]

merge of '45ed3a3d615ea56e696ea876589e529d4f1d96e3'
     and 'd6c5f92657001382dc587916da1fbce73d196bb6'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 8e323660a5946bc28a90208d8588cd90ee1271c4
ViewMTN: http://monotone.openembedded.org/revision/info/8e323660a5946bc28a90208d8588cd90ee1271c4
Files:
1
conf/machine/eseries.conf
packages/libxml/libxml2_2.6.29.bb
packages/asleap
packages/asleap/files
packages/asleap/asleap_2.1.bb
packages/asleap/files/if.h.patch
Diffs:

#
# mt diff -r45ed3a3d615ea56e696ea876589e529d4f1d96e3 -r8e323660a5946bc28a90208d8588cd90ee1271c4
#
# 
# 
# add_file "conf/machine/eseries.conf"
#  content [3f83124e6eed89c020dad8a5c709286fd7457cc6]
# 
# patch "packages/libxml/libxml2_2.6.29.bb"
#  from [0801963b752b6faa0b5b6a013a196fa4da72f1e4]
#    to [c2449acb83459ee9a068c8c6044ea5de37d714ce]
# 
============================================================
--- conf/machine/eseries.conf	3f83124e6eed89c020dad8a5c709286fd7457cc6
+++ conf/machine/eseries.conf	3f83124e6eed89c020dad8a5c709286fd7457cc6
@@ -0,0 +1,39 @@
+#@TYPE: Machine
+#@NAME: eseries
+#@DESCRIPTION: Machine configuration for the Toshiba eseries (e3xx/e4xx/e7xx/e8xx)
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
+
+#Compile with armv5te optimizations, incompatible with armv4(t) cpus
+require conf/machine/include/tune-xscale.inc
+
+#Set some hints for metadata  
+VOLATILE_STORAGE_SIZE = "64"
+ROOT_FLASH_SIZE = "32"
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen"
+
+#
+# Software/packages selection
+#
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
+
+#
+# Modules autoload and other boot properties
+#
+module_autoload_snd-pcm-oss 	= "snd-pcm-oss"
+
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+USE_VT = "0"
+
+require conf/machine/include/LAB-settings.inc
============================================================
--- packages/libxml/libxml2_2.6.29.bb	0801963b752b6faa0b5b6a013a196fa4da72f1e4
+++ packages/libxml/libxml2_2.6.29.bb	c2449acb83459ee9a068c8c6044ea5de37d714ce
@@ -14,9 +14,12 @@ do_stage() {
 
 do_stage() {
 	autotools_stage_all
-	install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
-        #this is need it by php during its install
-        install -m 0755 xml2-config ${STAGING_BINDIR_CROSS}
+	install -d ${STAGING_DATADIR}/aclocal/
+	install -d ${STAGING_BINDIR_CROSS}
+
+ 	install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
+	#this is need it by php during its install
+	install -m 0755 xml2-config ${STAGING_BINDIR_CROSS}
 }
 
 python populate_packages_prepend () {


#
# mt diff -rd6c5f92657001382dc587916da1fbce73d196bb6 -r8e323660a5946bc28a90208d8588cd90ee1271c4
#
# 
# 
# add_dir "packages/asleap"
# 
# add_dir "packages/asleap/files"
# 
# add_file "packages/asleap/asleap_2.1.bb"
#  content [73cae9c6c779ad079b792950c9c7f84393120b09]
# 
# add_file "packages/asleap/files/if.h.patch"
#  content [15adf874d83e62fd0a8ee0dfd5bcecb577ec0a27]
# 
============================================================
--- packages/asleap/asleap_2.1.bb	73cae9c6c779ad079b792950c9c7f84393120b09
+++ packages/asleap/asleap_2.1.bb	73cae9c6c779ad079b792950c9c7f84393120b09
@@ -0,0 +1,27 @@
+SECTION = "console/network"
+DESCRIPTION = "Proof of concept Cisco Leap Cracker"
+HOMEPAGE = "http://asleap.sourceforge.net - outdated"
+LICENSE = "GPLv2"
+DEPENDS = "libpcap openssl"
+
+SRC_URI = "http://802.11ninja.net/~jwright/code/${PN}-${PV}.tgz \
+           file://if.h.patch;patch=1 \
+           "
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+CFLAGS_append = " -D_LINUX -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+                  -D_OPENSSL_MD4 -L${STAGING_LIBDIR}"
+
+do_install() {
+        install -d ${D}/${sbindir}
+        install -m 0755 asleap       ${D}/${sbindir}
+	install -d ${D}/${bindir}
+	install -m 0755 genkeys      ${D}/${bindir}
+}
+
+#
+# Maintainer's note: I am currently not including the test dump file or the
+# scripts directory due to size constraints and the fact that it seems
+# pointless.  If someone requests it, I might add it as a seperate package.
+#
============================================================
--- packages/asleap/files/if.h.patch	15adf874d83e62fd0a8ee0dfd5bcecb577ec0a27
+++ packages/asleap/files/if.h.patch	15adf874d83e62fd0a8ee0dfd5bcecb577ec0a27
@@ -0,0 +1,11 @@
+diff -ur asleap/asleap.c asleap-10/asleap.c
+--- asleap/asleap.c	2007-05-10 15:29:06.000000000 -0400
++++ asleap-10/asleap.c	2007-06-22 22:05:20.000000000 -0400
+@@ -43,6 +43,7 @@
+ #include <sys/types.h>
+ #include <pcap.h>
+ #include <netpacket/packet.h>
++#include <linux/if.h>
+ #include <linux/wireless.h>
+ 
+ #include "asleap.h"