[oe-commits] org.oe.dev merge of '700ee409f8ee36c40f4c50e4ce581e1d11fd5fa0'

[coredump2 commit]

merge of '700ee409f8ee36c40f4c50e4ce581e1d11fd5fa0'
     and 'b9d02215b2fc8567ca9440f96665d1645ec21d56'

Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: e6858d7efc8dabfe5569175c65dc71b0e94e25c6
ViewMTN: http://monotone.openembedded.org/revision/info/e6858d7efc8dabfe5569175c65dc71b0e94e25c6
Files:
1
packages/xserver-common/files/unbreak-simpad.patch
classes/image.bbclass
conf/documentation.conf
conf/machine/h2200.conf
packages/tasks/task-boot.bb
packages/xserver-common/xserver-common_1.18.bb
packages/altboot/altboot_1.1.1+wip-SVNR69.bb
packages/altboot/altboot_1.1.1+wip-SVNR70.bb
packages/fstests/fstests.bb
Diffs:

#
# mt diff -r700ee409f8ee36c40f4c50e4ce581e1d11fd5fa0 -re6858d7efc8dabfe5569175c65dc71b0e94e25c6
#
# 
# 
# add_file "packages/xserver-common/files/unbreak-simpad.patch"
#  content [52af625aa3d8a233a99575211661571e46945840]
# 
# patch "classes/image.bbclass"
#  from [57e9ee07875e7423b6e199df2c69e55bdcdb8a69]
#    to [4d92381733b09bae07a07da35bd0024744924c3c]
# 
# patch "conf/documentation.conf"
#  from [bdfe2a042dd570980cb40a9e27a56cb7e06f2a57]
#    to [d10c13b6402c7c828d664a5fda04d2ad3050a4cc]
# 
# patch "conf/machine/h2200.conf"
#  from [517c64f5b7a22dd1f67791d8534910358ca7b6e1]
#    to [631917e12eef6e20330b4c190ce6f535a9eb3ed3]
# 
# patch "packages/tasks/task-boot.bb"
#  from [20830050f274ccd1736b3833d5540df643b893c8]
#    to [0fdedbe09f9a03c68bf7b5ba674c82b029187bb3]
# 
# patch "packages/xserver-common/xserver-common_1.18.bb"
#  from [14f7d103bf373a302fc67211bc1c91f71605d7fb]
#    to [3409a8ba366a252767d2dd923e81b9c7ea5c824d]
# 
============================================================
--- packages/xserver-common/files/unbreak-simpad.patch	52af625aa3d8a233a99575211661571e46945840
+++ packages/xserver-common/files/unbreak-simpad.patch	52af625aa3d8a233a99575211661571e46945840
@@ -0,0 +1,18 @@
+--- xserver-common-1.18/X11/Xinit.d/12keymap.org	2007-08-24 14:14:31.000000000 +0300
++++ xserver-common-1.18/X11/Xinit.d/12keymap	2007-12-22 15:06:52.000000000 +0200
+@@ -15,14 +15,11 @@
+         "Sharp-Collie")
+                 xmodmap - < /etc/X11/collie.xmodmap
+                 ;;
+-	"Simpad")
+-		xmodmap - < /etc/X11/simpad.xmodmap
+-		;;
+ 	"HP iPAQ h6300")
+ 		xmodmap - < /etc/X11/h6300.xmodmap
+ 		;;
+ 	# All the rest of keyboardless PDA machines use common buttonmap
+-	"HP iPAQ"* | "Asus MyPal"*)
++	"Simpad" | "HP iPAQ"* | "Asus MyPal"*)
+ 		xmodmap - < /etc/X11/keyboardless.xmodmap
+ 		;;
+ esac
============================================================
--- classes/image.bbclass	57e9ee07875e7423b6e199df2c69e55bdcdb8a69
+++ classes/image.bbclass	4d92381733b09bae07a07da35bd0024744924c3c
@@ -125,6 +125,17 @@ insert_feed_uris () {
 		# insert new feed-sources
 		echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg/${feed_name}-feed.conf
 	done			
+
+	# Allow to use package deploy directory contents as quick devel-testing
+	# feed. This creates individual feed configs for each arch subdir of those
+	# specified as compatible for the current machine.
+	# NOTE: Development-helper feature, NOT a full-fledged feed.
+	if [ -n "${FEED_DEPLOYDIR_BASE_URI}" ]; then
+	    for arch in ${PACKAGE_ARCHS}
+	    do
+		echo "src/gz local-$arch ${FEED_DEPLOYDIR_BASE_URI}/$arch" >> ${IMAGE_ROOTFS}/etc/ipkg/local-$arch-feed.conf
+	    done
+	fi
 }
 
 log_check() {
============================================================
--- conf/documentation.conf	bdfe2a042dd570980cb40a9e27a56cb7e06f2a57
+++ conf/documentation.conf	d10c13b6402c7c828d664a5fda04d2ad3050a4cc
@@ -103,6 +103,9 @@ SYSVINIT_ENABLED_GETTYS[doc] = "Specify 
 
 SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1"
 
+FEED_URIS[doc] = "List of ipkg feed records to put into generated image."
+FEED_DEPLOYDIR_BASE_URI[doc] = "Allow to serve ipk deploy dir as an adhoc feed (bogofeed). Set to base URL of the dir as exported by HTTP. Set of adhoc feed configs will be generated in image."
+
 # insane bbclass
 QA_LOG[doc] = "Enable logging of QA errors to log.qa_package. Default is not to log."
 
============================================================
--- conf/machine/h2200.conf	517c64f5b7a22dd1f67791d8534910358ca7b6e1
+++ conf/machine/h2200.conf	631917e12eef6e20330b4c190ce6f535a9eb3ed3
@@ -26,7 +26,8 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 
-MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround"
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS = " h2200-bootloader "
+MACHINE_EXTRA_RDEPENDS = " udev-hostap-cs-vcc-workaround "
 MACHINE_EXTRA_RRECOMMENDS = "\
     kernel-module-snd-h2200-audio \
     kernel-module-i2c-pxa \
============================================================
--- packages/tasks/task-boot.bb	20830050f274ccd1736b3833d5540df643b893c8
+++ packages/tasks/task-boot.bb	0fdedbe09f9a03c68bf7b5ba674c82b029187bb3
@@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a devic
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r42"
+PR = "r43"
 
 inherit task
 
============================================================
--- packages/xserver-common/xserver-common_1.18.bb	14f7d103bf373a302fc67211bc1c91f71605d7fb
+++ packages/xserver-common/xserver-common_1.18.bb	3409a8ba366a252767d2dd923e81b9c7ea5c824d
@@ -1,15 +1,15 @@ RDEPENDS_${PN} = "xmodmap xrandr xdpyinf
 DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r0"
+PR = "r1"
 
 PACKAGE_ARCH = "all"
 
 # we are using a gpe-style Makefile
 inherit gpe
 
-SRC_URI_append = " file://setDPI.sh "
+SRC_URI_append = " file://unbreak-simpad.patch;patch=1 file://setDPI.sh "
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"


#
# mt diff -rb9d02215b2fc8567ca9440f96665d1645ec21d56 -re6858d7efc8dabfe5569175c65dc71b0e94e25c6
#
# 
# 
# rename "packages/altboot/altboot_1.1.1+wip-SVNR69.bb"
#     to "packages/altboot/altboot_1.1.1+wip-SVNR70.bb"
# 
# patch "packages/altboot/altboot_1.1.1+wip-SVNR70.bb"
#  from [f853485448631fad56e6fb98656afc1312240e9e]
#    to [d8549450283b67303bed9444e9ce7b672b4ef6b7]
# 
# patch "packages/fstests/fstests.bb"
#  from [8e68d354171ec166486b05d059c1d89ac0a78db5]
#    to [a6dc455c3f5af4948f0f78ed2476ee4147530492]
# 
============================================================
--- packages/altboot/altboot_1.1.1+wip-SVNR69.bb	f853485448631fad56e6fb98656afc1312240e9e
+++ packages/altboot/altboot_1.1.1+wip-SVNR70.bb	d8549450283b67303bed9444e9ce7b672b4ef6b7
@@ -1,8 +1,8 @@ PR = "r0"
 require altboot.inc
 
 PR = "r0"
 
-SVN_REV = "69"
+SVN_REV = "70"
 SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
 	  "
 
============================================================
--- packages/fstests/fstests.bb	8e68d354171ec166486b05d059c1d89ac0a78db5
+++ packages/fstests/fstests.bb	a6dc455c3f5af4948f0f78ed2476ee4147530492
@@ -1,10 +1,12 @@ PV = "0.0+svn${SRCDATE}"
 DESCRIPTION = "Various benchmarking tests for X"
 HOMEPAGE = "http://www.o-hand.com"
 SECTION = "devel"
 LICENSE = "GPL"
 PV = "0.0+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
+DEPENDS = "gtk+"
+
 inherit autotools
 
 SRC_URI = \