[oe-commits] org.oe.dev merge of '00d41f081f30bcac8a8430efc5e722f474a6aca5'
pfalcon commit
openembedded-commits at lists.openembedded.org
Tue Jul 17 23:49:02 UTC 2007
merge of '00d41f081f30bcac8a8430efc5e722f474a6aca5'
and '4ffc891bb5558651038564ec75a40ea5c963ecd3'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: ecb7ac6569bc1bc246c9cfd0a239ef8b0f14585b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ecb7ac6569bc1bc246c9cfd0a239ef8b0f14585b
Files:
1
packages/initrdscripts/initramfs-nfsboot_0.1.bb
packages/initrdscripts/initramfs-nfsboot_0.2.bb
packages/initrdscripts/files/nfsboot.sh
packages/libsdl/files/kernel-asm-page.patch
conf/machine/compulab-pxa270.conf
packages/libsdl/libsdl-native_1.2.11.bb
packages/linphone/linphone_1.6.0.bb
packages/webkit/webkit/WebKit.pri
Diffs:
#
# mt diff -r00d41f081f30bcac8a8430efc5e722f474a6aca5 -recb7ac6569bc1bc246c9cfd0a239ef8b0f14585b
#
#
#
# rename "packages/initrdscripts/initramfs-nfsboot_0.1.bb"
# to "packages/initrdscripts/initramfs-nfsboot_0.2.bb"
#
# patch "packages/initrdscripts/files/nfsboot.sh"
# from [952d621fdfedf6f2003c5954e37190bf24809bb5]
# to [afb73401091d5a724bee10191fa902d1a44e7658]
#
============================================================
--- packages/initrdscripts/files/nfsboot.sh 952d621fdfedf6f2003c5954e37190bf24809bb5
+++ packages/initrdscripts/files/nfsboot.sh afb73401091d5a724bee10191fa902d1a44e7658
@@ -1,10 +1,50 @@ mount -t proc proc /proc
#!/bin/sh
echo "Starting initramfs boot..."
mkdir /proc
mount -t proc proc /proc
-ifconfig eth0 192.168.20.230
+
+for arg in `cat /proc/cmdline`; do
+ echo $arg
+ optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'`
+ echo $optarg
+ case $arg in
+ root=*)
+ root=$optarg ;;
+ nfsroot=*)
+ nfsroot=$optarg ;;
+ ip=*)
+ ip=$optarg ;;
+ esac
+done
+
+echo $ip | (IFS=: read client_ip server_ip gw_ip netmask hostname device autoconf; \
+echo client_ip=$client_ip;
+echo server_ip=$server_ip;
+echo gw_ip=$gw_ip;
+echo netmask=$netmask;
+echo hostname=$hostname;
+echo device=$device;
+echo autoconf=$autoconf;
+
+case "x$device" in
+ usb*)
+ echo "USB"
+ modprobe g_ether
+ ;;
+esac
+
+ifconfig $device $client_ip
+)
+
mkdir /mnt
-mount -t nfs 192.168.20.210:/home/nfs/Angstrom-opie-image-test-h4000 /mnt
+if [ "x$root" = "x/dev/nfs" ]; then
+ echo "booting from NFS: $nfsroot"
+ mount -t nfs $nfsroot /mnt
+else
+ echo "booting from: $root"
+ mount $root /mnt
+fi
+
cd /mnt
exec switch_root -c /dev/console /mnt /sbin/init
#
# mt diff -r4ffc891bb5558651038564ec75a40ea5c963ecd3 -recb7ac6569bc1bc246c9cfd0a239ef8b0f14585b
#
#
#
# add_file "packages/libsdl/files/kernel-asm-page.patch"
# content [c330d9173694f5d2da97b4be571622fb8ad8d195]
#
# patch "conf/machine/compulab-pxa270.conf"
# from [e1433a559cc7c747740b88df5f017a83d402e34a]
# to [d9dda180b32b678bbc7dc3203f202d0227bd7798]
#
# patch "packages/libsdl/libsdl-native_1.2.11.bb"
# from [e9e581735b9f05b42424cddeb52b17e590296483]
# to [5e5d90533f76a9b2ce70d129759c139f4c7df596]
#
# patch "packages/linphone/linphone_1.6.0.bb"
# from [77c69b1286f82211e37b6d6cde29f8fc492c17c7]
# to [12fa57bdfc35f887f98bd8c835b566f34d02f011]
#
# patch "packages/webkit/webkit/WebKit.pri"
# from [66a2198f6e713621703e637cb558322feb4153e5]
# to [7f89130236b19b36013eb4b046d00719507e4f12]
#
============================================================
--- packages/libsdl/files/kernel-asm-page.patch c330d9173694f5d2da97b4be571622fb8ad8d195
+++ packages/libsdl/files/kernel-asm-page.patch c330d9173694f5d2da97b4be571622fb8ad8d195
@@ -0,0 +1,13 @@
+diff --git a/src/video/Xext/Xxf86dga/XF86DGA.c b/src/video/Xext/Xxf86dga/XF86DGA.c
+index 4e3d662..de38a3c 100644
+--- a/src/video/Xext/Xxf86dga/XF86DGA.c
++++ b/src/video/Xext/Xxf86dga/XF86DGA.c
+@@ -18,7 +18,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
+ #define HAS_MMAP_ANON
+ #include <sys/types.h>
+ #include <sys/mman.h>
+-#include <asm/page.h> /* PAGE_SIZE */
++#include <unistd.h>
+ #define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
+ #define HAS_GETPAGESIZE
+ #endif /* linux */
============================================================
--- conf/machine/compulab-pxa270.conf e1433a559cc7c747740b88df5f017a83d402e34a
+++ conf/machine/compulab-pxa270.conf d9dda180b32b678bbc7dc3203f202d0227bd7798
@@ -21,7 +21,7 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad=0x20000 --no-cleanmarkers;\
sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
- -e 0x20000 -p\
+ -e 0x20000 -p; \
cd ${DEPLOY_DIR_IMAGE}; \
rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs-summary.jffs2; \
ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \
============================================================
--- packages/libsdl/libsdl-native_1.2.11.bb e9e581735b9f05b42424cddeb52b17e590296483
+++ packages/libsdl/libsdl-native_1.2.11.bb 5e5d90533f76a9b2ce70d129759c139f4c7df596
@@ -1,11 +1,12 @@ LICENSE = "LGPL"
DESCRIPTION = "Simple DirectMedia Layer - native Edition"
HOMEPAGE = "http://www.libsdl.org"
SECTION = "libs"
LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
- file://acinclude.m4"
+ file://acinclude.m4 \
+ file://kernel-asm-page.patch;patch=1 "
S = "${WORKDIR}/SDL-${PV}"
inherit autotools binconfig pkgconfig native
============================================================
--- packages/linphone/linphone_1.6.0.bb 77c69b1286f82211e37b6d6cde29f8fc492c17c7
+++ packages/linphone/linphone_1.6.0.bb 12fa57bdfc35f887f98bd8c835b566f34d02f011
@@ -16,9 +16,9 @@ RDEPENDS_libmediastreamer = "speex libog
RDEPENDS_libquickstream = "speex libmediastreamer libasound"
RDEPENDS_libmediastreamer = "speex libogg libasound libortp"
-PROVIDES = "linphone linphonec liblinphone"
+PROVIDES += "linphone linphonec liblinphone"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.6.x/sources/linphone-${PV}.tar.gz \
http://download.devbase.at/voip/linphone-1.6.0-pl0.patch;patch=1"
@@ -61,9 +61,9 @@ FILES_${PN}-rings = "${datadir}/sounds/l
FILES_${PN} = "${bindir}/linphone ${datadir}/pixmaps ${datadir}/applications ${datadir}/gnome/apps"
FILES_${PN}c = "${bindir}/linphonec ${bindir}/sipomatic ${datadir}/sounds/linphone/ringback.wav"
FILES_${PN}-rings = "${datadir}/sounds/linphone/rings"
-FILES_liblinphone = "${libdir}/liblinphone.so*"
-FILES_libquickstream = "${libdir}/libquickstream.so*"
-FILES_libmediastreamer = "${libdir}/libmediastreamer.so*"
-FILES_libortp = "${libdir}/libortp.so*"
-FILES_${PN}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/pkgconfig ${includedir}"
+FILES_liblinphone = "${libdir}/liblinphone.so.*"
+FILES_libquickstream = "${libdir}/libquickstream.so.*"
+FILES_libmediastreamer = "${libdir}/libmediastreamer.so.*"
+FILES_libortp = "${libdir}/libortp.so.*"
+FILES_${PN}-dev += "${libdir}/*.a ${libdir}/*.la ${libdir}/pkgconfig ${includedir}"
============================================================
--- packages/webkit/webkit/WebKit.pri 66a2198f6e713621703e637cb558322feb4153e5
+++ packages/webkit/webkit/WebKit.pri 7f89130236b19b36013eb4b046d00719507e4f12
@@ -1,7 +1,10 @@
# Include file to make it easy to include WebKit into Qt projects
-isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/WebKitBuild/Release
+isEmpty(OUTPUT_DIR) {
+ CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release
+ CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug
+}
!gdk-port:CONFIG += qt-port
qt-port:DEFINES += BUILDING_QT__=1
@@ -32,6 +35,7 @@ INCLUDEPATH += \
$$BASE_DIR/JavaScriptCore/bindings \
$$BASE_DIR/JavaScriptCore/bindings/c \
$$BASE_DIR/JavaScriptCore/wtf \
+ $$BASE_DIR/JavaScriptCore/ForwardingHeaders \
$$BASE_DIR/WebCore \
$$BASE_DIR/WebCore/ForwardingHeaders \
$$BASE_DIR/WebCore/platform \
More information about the Openembedded-commits
mailing list