[oe-commits] org.oe.dev merge of '3828ccf554f5383a7feb13d09fe0f6e67073ef53'

[mwester commit]

merge of '3828ccf554f5383a7feb13d09fe0f6e67073ef53'
     and 'cf5abc7766faffd221ece62edef44865e099d55f'

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: 13d9a767a5d9ea478886e81915f0ff653c060dfb
ViewMTN: http://monotone.openembedded.org/revision/info/13d9a767a5d9ea478886e81915f0ff653c060dfb
Files:
1
packages/libtorrent
packages/libtorrent/files
packages/libtorrent/files/autoconf-cross-fix.patch
packages/libtorrent/libtorrent_0.12.0.bb
packages/libtorrent/rtorrent_0.8.0.bb
packages/slugos-init/files/boot/kexec
packages/slugos-init/files/boot/network
packages/slugos-init/files/boot/nfs
packages/slugos-init/files/modulefunctions
Diffs:

#
# mt diff -r3828ccf554f5383a7feb13d09fe0f6e67073ef53 -r13d9a767a5d9ea478886e81915f0ff653c060dfb
#
# 
# 
# add_dir "packages/libtorrent"
# 
# add_dir "packages/libtorrent/files"
# 
# add_file "packages/libtorrent/files/autoconf-cross-fix.patch"
#  content [71474d3433b952bb7d62cc2dc6be8d62b670d507]
# 
# add_file "packages/libtorrent/libtorrent_0.12.0.bb"
#  content [77ab2a4c1eefc4d9e9ceecf5597a817bb8aecef4]
# 
# add_file "packages/libtorrent/rtorrent_0.8.0.bb"
#  content [d7406dc7196fbb5fd457e04f94352d5daf090ea8]
# 
============================================================
--- packages/libtorrent/files/autoconf-cross-fix.patch	71474d3433b952bb7d62cc2dc6be8d62b670d507
+++ packages/libtorrent/files/autoconf-cross-fix.patch	71474d3433b952bb7d62cc2dc6be8d62b670d507
@@ -0,0 +1,14 @@
+Index: rtorrent-0.8.0/scripts/common.m4
+===================================================================
+--- rtorrent-0.8.0.orig/scripts/common.m4	2008-01-13 15:02:03.000000000 +0000
++++ rtorrent-0.8.0/scripts/common.m4	2008-02-04 13:12:01.000000000 +0000
+@@ -192,6 +192,9 @@
+       AC_DEFINE(USE_EXECINFO, 1, Use execinfo.h)
+     ], [
+       AC_MSG_RESULT(no)
++    ], [
++      AC_MSG_RESULT(yes)
++      AC_DEFINE(USE_EXECINFO, 1, Use execinfo.h)
+   ])
+ ])
+ 
============================================================
--- packages/libtorrent/libtorrent_0.12.0.bb	77ab2a4c1eefc4d9e9ceecf5597a817bb8aecef4
+++ packages/libtorrent/libtorrent_0.12.0.bb	77ab2a4c1eefc4d9e9ceecf5597a817bb8aecef4
@@ -0,0 +1,16 @@
+DESCRIPTION = "library implementing the bittorrent protocol"
+HOMEPAGE = "http://libtorrent.rakshasa.no"
+SECTION = "libs/network"
+LICENSE = "GPL"
+DEPENDS = "libsigc++-2.0 openssl"
+
+SRC_URI = "http://libtorrent.rakshasa.no/downloads/libtorrent-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-aligned"
+
+do_stage() {
+	autotools_stage_all
+}
+
============================================================
--- packages/libtorrent/rtorrent_0.8.0.bb	d7406dc7196fbb5fd457e04f94352d5daf090ea8
+++ packages/libtorrent/rtorrent_0.8.0.bb	d7406dc7196fbb5fd457e04f94352d5daf090ea8
@@ -0,0 +1,11 @@
+DESCRIPTION = "Console bittorrent client using libtorrent"
+HOMEPAGE = "http://libtorrent.rakshasa.no"
+SECTION = "libs/network"
+LICENSE = "GPL"
+DEPENDS = "libtorrent curl ncurses gnutls libgpg-error"
+
+SRC_URI = "http://libtorrent.rakshasa.no/downloads/rtorrent-${PV}.tar.gz \
+           file://autoconf-cross-fix.patch;patch=1"
+
+inherit autotools
+


#
# mt diff -rcf5abc7766faffd221ece62edef44865e099d55f -r13d9a767a5d9ea478886e81915f0ff653c060dfb
#
# 
# 
# patch "packages/slugos-init/files/boot/kexec"
#  from [673016bf05b9aa6cb772a7c6b241caedab27151a]
#    to [b0e2e879f12512f15d3ef86fe627eef2b46a7ed9]
# 
# patch "packages/slugos-init/files/boot/network"
#  from [1998f275fdd6f6ea83d325e7fe519c4357799e70]
#    to [4fe9fe097faa17da41a09d209399c67df115768c]
# 
# patch "packages/slugos-init/files/boot/nfs"
#  from [2dd5b0495bf2f88479a72713be1c9a3de7c9b396]
#    to [772d67b18a86541ab6d0a05f9384e822c82131e0]
# 
# patch "packages/slugos-init/files/modulefunctions"
#  from [4b87b10cbcadb95da00017ee6f9d7f80b767719b]
#    to [7ffd6c95d6a361b24b12da8f5bae1e016237a845]
# 
============================================================
--- packages/slugos-init/files/boot/kexec	673016bf05b9aa6cb772a7c6b241caedab27151a
+++ packages/slugos-init/files/boot/kexec	b0e2e879f12512f15d3ef86fe627eef2b46a7ed9
@@ -91,6 +91,7 @@ if [ -n "$1" -a -n "$2" ] ; then
 			t=`basename "$kpath"`
 			kexec_image="/mnt/$t"
 		    fi
+		    umount /sys
 		fi
 		;;
 
@@ -98,11 +99,13 @@ if [ -n "$1" -a -n "$2" ] ; then
 		if /boot/network ; then
 		    echo "Loading kexec kernel using nfs \"$kpath\"..."
 		    echo "mounting nfs partition..."
+		    loadnfsmods
 		    if mount -o ro,nolock -t nfs `dirname "$kpath"` /mnt ; then
 			need_umount=1
 			t=`basename "$kpath"`
 			kexec_image="/mnt/$t"
 		    fi
+		    umount /sys
 		fi
 		;;
 
@@ -140,6 +143,7 @@ if [ -n "$1" -a -n "$2" ] ; then
 			echo "Loading kexec kernel using tftp \"$kpath\"..."
 			tftp -g -l "$kexec_image" -r "${kpath#*:}" "${kpath%%:*}"
 		    fi
+		    umount /sys
 		fi
 		;;
 
============================================================
--- packages/slugos-init/files/boot/network	1998f275fdd6f6ea83d325e7fe519c4357799e70
+++ packages/slugos-init/files/boot/network	4fe9fe097faa17da41a09d209399c67df115768c
@@ -8,6 +8,11 @@
 # function!
 . /etc/default/functions
 #
+# /proc is needed for the module loading, and /sys is
+# necessary to load firmware (if required).
+mount -t proc  proc  /proc
+mount -t sysfs sysfs /sys
+#
 # We may need to load the network driver modules here
 . /etc/default/modulefunctions
 loadnetmods
@@ -17,5 +22,22 @@ iface="$(config iface)"
 # file.  Config the loopback and network interfaces.
 ifconfig lo 127.0.0.1 up
 iface="$(config iface)"
-test -n "$iface" && ifup "$iface"
+test -z "$iface" && exit 1 
+#
+# Fire up a process in the background to load the firmware if necessary
+sysf="/sys/class/firmware/$iface"
+(
+	# Wait for the firware to be requested, if required
+	[ -f $sysf/loading ] || sleep 1
+	[ -f $sysf/loading ] || sleep 1
+	if [ -f $sysf/loading ] ; then
+		echo "1" >$sysf/loading
+		cat /lib/firmware/NPE-B >$sysf/data
+		echo "0" >$sysf/loading
+	fi
+) &
+# Trigger the firmware load proactively
+ifconfig "$iface" up
+#
+ifup "$iface"
 # exit code is true only if the interface config has succeeded
============================================================
--- packages/slugos-init/files/boot/nfs	2dd5b0495bf2f88479a72713be1c9a3de7c9b396
+++ packages/slugos-init/files/boot/nfs	772d67b18a86541ab6d0a05f9384e822c82131e0
@@ -7,10 +7,15 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bi
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
 #
 . /etc/default/functions
+. /etc/default/modulefunctions
+#
 leds boot system
 #
 if /boot/network
 then
+	# load the nfs kernel module
+	loadnfsmods
+
 	# network is up and running, the NFS mount will
 	# now succeed (possibly), use /boot/disk
 	exec /boot/disk "$@"
============================================================
--- packages/slugos-init/files/modulefunctions	4b87b10cbcadb95da00017ee6f9d7f80b767719b
+++ packages/slugos-init/files/modulefunctions	7ffd6c95d6a361b24b12da8f5bae1e016237a845
@@ -1,5 +1,6 @@
 #!/bin/sh
 # . this file to load the functions for automatically loading modules
+# NB: /proc must be mounted for correct evaluation of "$(machine)".
 
 . /etc/default/functions
 
@@ -34,6 +35,10 @@ loadnetmods(){
 	esac
 }
 
+loadnfsmods(){
+	modprobe nfs
+}
+
 loadmiscmods(){
 	true
 }