[oe-commits] org.oe.dev merge of '5da7cf9aa3826def2c6dd499a01135180d7d6920'

oe commit openembedded-commits at lists.openembedded.org
Mon Dec 3 03:55:29 UTC 2007 

merge of '5da7cf9aa3826def2c6dd499a01135180d7d6920'
     and 'c2229d2baf9f3a015f0aa6354d84590f73a5ca0a'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 8367a4cfd1c1ef806c07cd89f66066c394a3b5a7
ViewMTN: http://monotone.openembedded.org/revision/info/8367a4cfd1c1ef806c07cd89f66066c394a3b5a7
Files:
1
packages/psplash/files/angstrom/angstrom-psplash-qvga-img.h
packages/psplash/files/angstrom/angstrom-psplash-vga-img.h
packages/dropbear/dropbear-early
packages/update-rc.d/files
packages/xkbd/xkbd-layout-ru
contrib/angstrom/angstrom.png
packages/directfb/files/fix-configure-include-path.patch
packages/dropbear/dropbear-early/dropbear-early
packages/dropbear/dropbear-early_1.0.bb
packages/images/initramfs-bootmenu-image.bb
packages/ipkg/files/ipkg-configure
packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
packages/psplash/files/logo-math.patch
packages/update-rc.d/files/add-verbose.patch
packages/xkbd/xkbd-0.8.15/differentiate-desktop-name.patch
packages/xkbd/xkbd-layout-ru/en-ru-123.xkbd
contrib/angstrom/angstrom.svg
packages/angstrom/angstrom-gpe-task-base.bb
packages/angstrom/angstrom-gpe-task-settings.bb
packages/directfb/directfb-examples_1.0.0.bb
packages/directfb/directfb_1.1.0.bb
packages/ipkg/ipkg.inc
packages/ipkg/ipkg_0.99.163.bb
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
packages/psplash/files/angstrom/psplash-hand-img.h
packages/psplash/files/psplash-init
packages/psplash/psplash_svn.bb
packages/update-rc.d/update-rc.d_0.7.bb
packages/xkbd/xkbd-layout-ru_0.1.1.bb
packages/xkbd/xkbd_0.8.15.bb
mtn:manual_merge
true
classes/nslu2-image.bbclass
conf/machine/include/ixp4xx.inc
Diffs:

#
# mt diff -r5da7cf9aa3826def2c6dd499a01135180d7d6920 -r8367a4cfd1c1ef806c07cd89f66066c394a3b5a7
#
# 
# 
# delete "packages/psplash/files/angstrom/angstrom-psplash-qvga-img.h"
# 
# delete "packages/psplash/files/angstrom/angstrom-psplash-vga-img.h"
# 
# add_dir "packages/dropbear/dropbear-early"
# 
# add_dir "packages/update-rc.d/files"
# 
# add_dir "packages/xkbd/xkbd-layout-ru"
# 
# add_file "contrib/angstrom/angstrom.png"
#  content [9213fe50ab828fe0492d8c97cfdaf90e1c6c15cd]
# 
# add_file "packages/directfb/files/fix-configure-include-path.patch"
#  content [95a5712b69ed26362c0a8e8e8624e9b05fb506b2]
# 
# add_file "packages/dropbear/dropbear-early/dropbear-early"
#  content [e2408ee87210f48cc8b47a8f34b5bb1bf49cdba6]
# 
# add_file "packages/dropbear/dropbear-early_1.0.bb"
#  content [cdaf892564086415c02630de43886143350b375b]
# 
# add_file "packages/images/initramfs-bootmenu-image.bb"
#  content [8f1db3a032593d55326052d8031210f27d4194a9]
# 
# add_file "packages/ipkg/files/ipkg-configure"
#  content [38012e0e1b7b0690b187e43e83c2e33fbc0bc9e8]
# 
# add_file "packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb"
#  content [252b9c26ddd2fda4271f4352999ce0facbfece99]
# 
# add_file "packages/psplash/files/logo-math.patch"
#  content [3863c6539054b0633895cdd79f7940fde4987c4f]
# 
# add_file "packages/update-rc.d/files/add-verbose.patch"
#  content [048e2e241d96d7bbd0f1a8a75440348719c9a168]
# 
# add_file "packages/xkbd/xkbd-0.8.15/differentiate-desktop-name.patch"
#  content [5b3f1a05266b9f5386bba4d560d28692b8d75e45]
# 
# add_file "packages/xkbd/xkbd-layout-ru/en-ru-123.xkbd"
#  content [fbe00f80ca40257ecff86fb7d211b925edfa7b5b]
# 
# patch "contrib/angstrom/angstrom.svg"
#  from [b5659f7c38dc54dcc4ad153de0e5afa5ccefc00f]
#    to [447e9be910fbd6667c31c1b301ee9896fd5e0b96]
# 
# patch "packages/angstrom/angstrom-gpe-task-base.bb"
#  from [30a23f6dee4925d21a3bf27405e8f4c25f29be2c]
#    to [93d648076841f25d763321ea213968e31aac2624]
# 
# patch "packages/angstrom/angstrom-gpe-task-settings.bb"
#  from [04963f41f9195b2a20bddc9409a53ad153e779ff]
#    to [e3e3966d2fb5eb15fbab7a53b32397746e21a4b1]
# 
# patch "packages/directfb/directfb-examples_1.0.0.bb"
#  from [88c9cc59f32b02ec4cd0c0f876b204399b265bdf]
#    to [1905769a0ea0cc18c68ea7969adaa55fe65ad9aa]
# 
# patch "packages/directfb/directfb_1.1.0.bb"
#  from [c9da95fb956d450af0c360a3364023c960f9d1af]
#    to [1af7bf22ffbfcbc869a08e6664c2dde2ff16c7d2]
# 
# patch "packages/ipkg/ipkg.inc"
#  from [d30b7883173e0c568eca20df33d213945f55d864]
#    to [fc113df6d214da7a33273c7512dac5215da76f90]
# 
# patch "packages/ipkg/ipkg_0.99.163.bb"
#  from [eb539f2d4afc5f5d3617816a1d41afb6953cd070]
#    to [3a58f561fcf234def5a100e624f4c721f8694641]
# 
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
#  from [78905ac03fe3db35fb352b69c6d94fa42889ce6a]
#    to [9ec0920876981474a325a47766fa7d50bbb1cfd3]
# 
# patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
#  from [d35a7304f640113a413721c8b4758cfad4a17c72]
#    to [f248fbf9a457e0555c36e5377bc412ced8f568db]
# 
# patch "packages/psplash/files/angstrom/psplash-hand-img.h"
#  from [01b8752ff29f7c525a80ea6b1a8d4bad2b5df6b5]
#    to [577b452f887a9b23c1d553da6633798490f07e95]
# 
# patch "packages/psplash/files/psplash-init"
#  from [3772ad3a62a548c557d719d87d586d1d4ea6044f]
#    to [920674c4b9876275351f49712ab0fa731a6ca7a9]
# 
# patch "packages/psplash/psplash_svn.bb"
#  from [4614b6fa0d17df94d33a6949963375bf587e08e7]
#    to [5f388d9f92a2d8c405d7d667d3c6c45c288c82bb]
# 
# patch "packages/update-rc.d/update-rc.d_0.7.bb"
#  from [28b3abe47b31ca41c3a409d73fa6383056db6bf2]
#    to [db8c8fda3527ff9f206b916648f803b0b9f08adb]
# 
# patch "packages/xkbd/xkbd-layout-ru_0.1.1.bb"
#  from [f6660e1740ac5bf87fb2dd36aeba4e17dd585cfa]
#    to [5d506235088e5e21a91d23d03a7196ff1c569c49]
# 
# patch "packages/xkbd/xkbd_0.8.15.bb"
#  from [9013b4a317fe2b993dc22cd9fae92e3e670c0939]
#    to [087f363f1700e269f80d882f9ef70135bee264d9]
# 
#   set "contrib/angstrom/angstrom.png"
#  attr "mtn:manual_merge"
# value "true"
# 
============================================================
# contrib/angstrom/angstrom.png is binary
============================================================
--- packages/directfb/files/fix-configure-include-path.patch	95a5712b69ed26362c0a8e8e8624e9b05fb506b2
+++ packages/directfb/files/fix-configure-include-path.patch	95a5712b69ed26362c0a8e8e8624e9b05fb506b2
@@ -0,0 +1,13 @@
+--- DirectFB-1.1.0/configure.in-orig	2007-08-27 00:07:00.000000000 -0700
++++ DirectFB-1.1.0/configure.in	2007-11-26 12:05:52.000000000 -0800
+@@ -1380,8 +1380,8 @@
+ 
+ MODULEDIR=$libdir/$MODULEDIRNAME
+ DATADIR=$datadir/directfb-$VERSION
+-INCLUDEDIR=$includedir/directfb
+-INTERNALINCLUDEDIR=$includedir/directfb-internal
++INCLUDEDIR=$includedir/
++INTERNALINCLUDEDIR=$includedir/
+ 
+ SOPATH=$libdir/libdirectfb-$LT_RELEASE.so.$LT_CURRENT
+ AC_SUBST(SOPATH)
============================================================
--- packages/dropbear/dropbear-early/dropbear-early	e2408ee87210f48cc8b47a8f34b5bb1bf49cdba6
+++ packages/dropbear/dropbear-early/dropbear-early	e2408ee87210f48cc8b47a8f34b5bb1bf49cdba6
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+for x in $(cat /proc/cmdline); do
+        case $x in
+        dropbear=early)
+                echo "Starting dropbear early"
+                exec /etc/init.d/dropbear $*
+                ;;
+        esac
+done
============================================================
--- packages/dropbear/dropbear-early_1.0.bb	cdaf892564086415c02630de43886143350b375b
+++ packages/dropbear/dropbear-early_1.0.bb	cdaf892564086415c02630de43886143350b375b
@@ -0,0 +1,17 @@
+DESCRIPTION = "Allow to start dropbear soon after boot, depending on kernel command line option."
+SECTION = "devel"
+PR = "r1"
+
+SRC_URI = "file://dropbear-early"
+
+inherit update-rc.d
+
+do_install() {
+        install -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${WORKDIR}/${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d/
+}
+
+PACKAGE_ARCH = "all"
+
+INITSCRIPT_NAME = "dropbear-early"
+INITSCRIPT_PARAMS = "start 00 S ."
============================================================
--- packages/images/initramfs-bootmenu-image.bb	8f1db3a032593d55326052d8031210f27d4194a9
+++ packages/images/initramfs-bootmenu-image.bb	8f1db3a032593d55326052d8031210f27d4194a9
@@ -0,0 +1,11 @@
+# Sample initramfs image
+
+IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu"
+IMAGE_LINGUAS = ""
+
+# Remove any kernel-image that the kernel-module-* packages may have pulled in.
+PACKAGE_REMOVE = "kernel-image-* update-modules module-init-tools-depmod uclibc update-rc.d"
+ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \
+                                remove ${PACKAGE_REMOVE};"
+
+inherit image
============================================================
--- packages/ipkg/files/ipkg-configure	38012e0e1b7b0690b187e43e83c2e33fbc0bc9e8
+++ packages/ipkg/files/ipkg-configure	38012e0e1b7b0690b187e43e83c2e33fbc0bc9e8
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo "Starting to configure packages..."
+ipkg-cl configure
+echo "Finished to configure packages."
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb	252b9c26ddd2fda4271f4352999ce0facbfece99
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb	252b9c26ddd2fda4271f4352999ce0facbfece99
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig"
+
+require linux-handhelds-2.6.inc
============================================================
--- packages/psplash/files/logo-math.patch	3863c6539054b0633895cdd79f7940fde4987c4f
+++ packages/psplash/files/logo-math.patch	3863c6539054b0633895cdd79f7940fde4987c4f
@@ -0,0 +1,13 @@
+Do better math when showing logo vs progressbar.
+
+--- psplash/psplash.c.org	2007-09-22 20:33:36.000000000 +0300
++++ psplash/psplash.c	2007-12-01 21:27:08.000000000 +0200
+@@ -258,7 +258,7 @@
+   /* Draw the OH logo  */
+   psplash_fb_draw_image (fb, 
+ 			 (fb->width  - HAND_IMG_WIDTH)/2, 
+-			 (fb->height - HAND_IMG_HEIGHT)/2, 
++			 ((fb->height * 5) / 6 - HAND_IMG_HEIGHT)/2, 
+ 			 HAND_IMG_WIDTH,
+ 			 HAND_IMG_HEIGHT,
+ 			 HAND_IMG_BYTES_PER_PIXEL,
============================================================
--- packages/update-rc.d/files/add-verbose.patch	048e2e241d96d7bbd0f1a8a75440348719c9a168
+++ packages/update-rc.d/files/add-verbose.patch	048e2e241d96d7bbd0f1a8a75440348719c9a168
@@ -0,0 +1,47 @@
+--- update-rc.d/update-rc.d.org	2005-01-03 00:30:47.000000000 +0200
++++ update-rc.d/update-rc.d	2007-12-01 19:41:08.000000000 +0200
+@@ -19,6 +19,7 @@
+ notreally=0
+ force=0
+ dostart=0
++verbose=0
+ 
+ usage()
+ {
+@@ -28,6 +29,7 @@
+        update-rc.d [-n] [-r <root>] [-s] <basename> start|stop NN runlvl [runlvl] [...] .
+ 		-n: not really
+ 		-f: force
++		-v: verbose
+ 		-r: alternate root path (default is /)
+ 		-s: invoke start methods if appropriate to current runlevel
+ EOF
+@@ -69,7 +71,7 @@
+ 	lev=`echo $2 | cut -d/ -f1`
+ 	nn=`echo $2 | cut -d/ -f2`
+ 	fn="${etcd}${lev}.d/${startstop}${nn}${bn}"
+-	echo "  $fn -> ../init.d/$bn"
++	[ $verbose -eq 1 ] && echo "  $fn -> ../init.d/$bn"
+ 	if [ $notreally -eq 0 ]; then
+ 		mkdir -p `dirname $fn`
+  		ln -s ../init.d/$bn $fn
+@@ -89,7 +91,7 @@
+ 		exit 0
+ 	fi
+ 
+-	echo " Adding system startup for $initd/$bn ..."
++	echo " Adding system startup for $initd/$bn."
+ 
+ 	for i in $startlinks; do
+ 		dolink S $i
+@@ -105,6 +107,10 @@
+ 			shift
+ 			continue
+ 			;;
++		-v)	verbose=1
++			shift
++			continue
++			;;
+ 		-f)	force=1
+ 			shift
+ 			continue
============================================================
--- packages/xkbd/xkbd-0.8.15/differentiate-desktop-name.patch	5b3f1a05266b9f5386bba4d560d28692b8d75e45
+++ packages/xkbd/xkbd-0.8.15/differentiate-desktop-name.patch	5b3f1a05266b9f5386bba4d560d28692b8d75e45
@@ -0,0 +1,12 @@
+diff -r 1eb4100bbe39 xkbd.desktop
+--- a/xkbd.desktop	Wed Nov 28 02:14:35 2007 +0200
++++ b/xkbd.desktop	Wed Nov 28 02:15:01 2007 +0200
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+-Name=Keyboard
+-Comment=Virtual Keyboard
++Name=Ol' Good Keyboard
++Comment=xkbd the Virtual Keyboard
+ Exec=xkbd
+ Type=Application
+ Icon=xkbd.png
============================================================
--- packages/xkbd/xkbd-layout-ru/en-ru-123.xkbd	fbe00f80ca40257ecff86fb7d211b925edfa7b5b
+++ packages/xkbd/xkbd-layout-ru/en-ru-123.xkbd	fbe00f80ca40257ecff86fb7d211b925edfa7b5b
@@ -0,0 +1,1353 @@
+#Птн, 01 Апр 2005 01:56:58 +0300 
+#It was downloaded from http://whitenoise.ssrlab.com/pda/xkbd
+#Copyright:
+#This software is copyright (c) 2005 by Dmitry Zhadinets
+#You are free to distribute this keyboard file under the terms of
+#the GNU General Public License.
+#Version: 0.1.1
+#For posting bugreports use this way <whitenoise at ssrlab dot com>
+<global>
+	render xft
+	font Verdana-6|fixed
+	col  200:255:200
+	down_col  100:100:200
+	txt_col  0:0:0
+	border_col 128:128:128
+	button_style rounded
+</global>
+<layout>
+	<row>
+		<key>
+			key_span_width	1
+			bg		196:216:248
+			default		Esc
+			default_ks	Escape
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		`
+			default_ks	quoteleft
+			shift		~
+			shift_ks	asciitilde
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		1
+			default_ks	1
+			shift		!
+			shift_ks	exclam
+		</key>
+		<key>
+			key_span_width	1
+			bg		248:216:196
+			default		2
+			default_ks	2
+			shift		@
+			shift_ks	at
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		3
+			default_ks	3
+			shift		#
+			shift_ks	numbersign
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		4
+			default_ks	4
+			shift		$
+			shift_ks	dollar
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		5
+			default_ks	5
+			shift		%
+			shift_ks	percent
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		6
+			default_ks	6
+			shift		^
+			shift_ks	asciicircum
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		7
+			default_ks	7
+			shift		&
+			shift_ks	ampersand
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		8
+			default_ks	8
+			shift		*
+			shift_ks	asterisk
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		9
+			default_ks	9
+			shift		(
+			shift_ks	parenleft
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:216:196
+			default		0
+			default_ks	0
+			shift		)
+			shift_ks	parenright
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		-
+			default_ks	minus
+			shift		_
+			shift_ks	underscore
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		= 
+			default_ks	equal
+			shift		+
+			shift_ks	plus
+		</key>
+		<key>
+			key_span_width	1
+			bg 		196:216:248
+#			img		/usr/share/xkbd/img/backspace.xpm
+			default		<-
+			default_ks	BackSpace
+		</key>
+	</row>
+	<row>
+		<key>
+			key_span_width	1
+			bg 		196:216:248
+			default		Tab
+			default_ks	Tab
+		</key>
+		<key>
+			key_span_width	1
+			default		q
+			default_ks	q
+			shift		Q
+			shift_ks	Q
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		w
+			default_ks	w
+			shift		W
+			shift_ks	W
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		e
+			default_ks	e
+			shift		E
+			shift_ks	E
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		r
+			default_ks	r
+			shift		R
+			shift_ks	R
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		t
+			default_ks	t
+			shift		T
+			shift_ks	T
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		y
+			default_ks	y
+			shift		Y
+			shift_ks	Y
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		u
+			default_ks	u
+			shift		U
+			shift_ks	U
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		i
+			default_ks	i
+			shift		I
+			shift_ks	I
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		o
+			default_ks	o
+			shift		O
+			shift_ks	O
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		p
+			default_ks	p
+			shift		P
+			shift_ks	P
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		[
+			default_ks	bracketleft
+			shift		{
+			shift_ks	braceleft
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		]
+			default_ks	bracketright
+			shift		}
+			shift_ks	braceright
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		\
+			default_ks	backslash
+			shift		|
+			shift_ks	bar
+		</key>
+	</row>
+	<row>
+		<key>
+			key_span_width	1
+			bg 		196:216:248
+			default		CAP
+			default_ks	Caps_Lock
+		</key>
+		<key>
+			key_span_width	1
+			default		a
+			default_ks	a
+			shift		A
+			shift_ks	A
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		s
+			default_ks	s
+			shift		S
+			shift_ks	S
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		d
+			default_ks	d
+			shift		D
+			shift_ks	D
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		f
+			default_ks	f
+			shift		F
+			shift_ks	F
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		g
+			default_ks	g
+			shift		G
+			shift_ks	G
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		h
+			default_ks	h
+			shift		H
+			shift_ks	H
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		j
+			default_ks	j
+			shift		J
+			shift_ks	J
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		k
+			default_ks	k
+			shift		K
+			shift_ks	K
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			default		l
+			default_ks	l
+			shift		L
+			shift_ks	L
+			obey_capslock	yes
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		;
+			default_ks	semicolon
+			shift		:
+			shift_ks	colon
+		</key>
+		<key>
+			key_span_width	1
+			bg 		248:255:196
+			default		'
+			default_ks	quoteright
+			shift		"
+			shift_ks	quotedbl
+		</key>
+		<key>
+			key_span_width	1
+			bg 		196:216:248
+			default		Ret
+			default_ks	Return%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rc2229d2baf9f3a015f0aa6354d84590f73a5ca0a -r8367a4cfd1c1ef806c07cd89f66066c394a3b5a7
#
# 
# 
# patch "classes/nslu2-image.bbclass"
#  from [3ba57cc877ce3060583122672952bf4a937be2d7]
#    to [3be606504758bf5647ff8fed09280bbd1b34944c]
# 
# patch "conf/machine/include/ixp4xx.inc"
#  from [061e47cc6cd7843090e32bb8bbe59909e1f3df1e]
#    to [9b1bce804bb05f3a19b3b29e053d8eeb3ee452d1]
# 
============================================================
--- classes/nslu2-image.bbclass	3ba57cc877ce3060583122672952bf4a937be2d7
+++ classes/nslu2-image.bbclass	3be606504758bf5647ff8fed09280bbd1b34944c
@@ -19,5 +19,5 @@ nslu2_pack_image () {
 		-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin
 }
 
-EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native apex-nslu2 apex-nslu2-16mb'
+EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe apex-nslu2 apex-nslu2-16mb'
 IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; "
============================================================
--- conf/machine/include/ixp4xx.inc	061e47cc6cd7843090e32bb8bbe59909e1f3df1e
+++ conf/machine/include/ixp4xx.inc	9b1bce804bb05f3a19b3b29e053d8eeb3ee452d1
@@ -1,33 +1,24 @@
 #@TYPE: Machine configuration
 #@NAME: ixp4xx
 #@DESCRIPTION: genric machine configuration for ixp4xx platforms
 
-# Set default for nslu2 - can be overridden for machines with other features.
+# Set default for common ixp4xx-based machines
 MACHINE_FEATURES ?= "kernel26 usbhost ext2 redboot apex"
 
+# Select an appropriate default kernel
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
 PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}"
 
-# Add modules required for basic networking support
+# Add packages required for basic networking support
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= " \
-	ixp4xx-npe \
-	"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \
-	kernel-module-mii \
-	kernel-module-ixp4xx-mac \
-	kernel-module-ixp4xx-qmgr \
-	kernel-module-via-velocity \
-	"
-
 # Set default for 16MB machines - can be overridden for more or less flash.
 ROOT_FLASH_SIZE ?= "12"
 
 # Allow for rootfs loaded direct from internal hard disk
 IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
-# Set default for nslu2, nas100d, dsmg600
+# Set default for common ixp4xx-based machines
 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
 
 require conf/machine/include/tune-xscale.inc

More information about the Openembedded-commits mailing list