[oe-commits] org.oe.dev merge of '71635c6dc57d6cc221c7f87d1820130c74ed3ba1'

[oe commit]

merge of '71635c6dc57d6cc221c7f87d1820130c74ed3ba1'
     and 'e5ca2be92e2e455ddafe9234b967650570ba1462'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: cadde6e7c89af7d59a9c0f084a480835c1c4c4e1
ViewMTN: http://monotone.openembedded.org/revision/info/cadde6e7c89af7d59a9c0f084a480835c1c4c4e1
Files:
1
packages/geany
packages/geany/geany_0.14.bb
packages/images/sdr-image.bb
packages/linux/linux-omap2_git.bb
Diffs:

#
# mt diff -r71635c6dc57d6cc221c7f87d1820130c74ed3ba1 -rcadde6e7c89af7d59a9c0f084a480835c1c4c4e1
#
#
#
# add_dir "packages/geany"
# 
# add_file "packages/geany/geany_0.14.bb"
#  content [e9b4cac4e48f2bb791e6ae247a3a3c18a516e6e5]
#
============================================================
--- packages/geany/geany_0.14.bb	e9b4cac4e48f2bb791e6ae247a3a3c18a516e6e5
+++ packages/geany/geany_0.14.bb	e9b4cac4e48f2bb791e6ae247a3a3c18a516e6e5
@@ -0,0 +1,13 @@
+DESCRIPTION = "Text editor with some IDE functionality"
+HOMEPAGE = "http://geany.sf.net"
+SECTION = "editors"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/geany/${P}.tar.bz2"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-plugins --disable-vte"


#
# mt diff -re5ca2be92e2e455ddafe9234b967650570ba1462 -rcadde6e7c89af7d59a9c0f084a480835c1c4c4e1
#
#
#
# patch "packages/images/sdr-image.bb"
#  from [241b2b3b56e218b3bf887378f5eab66ef049a4b9]
#    to [b98be7ed4825c6edd9d9db45907e271785280358]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [7a39d0ef4c7985483f4482973e1604b71e56b7e3]
#    to [99e634f6d619f025715a2fded7d772dd67561890]
#
============================================================
--- packages/images/sdr-image.bb	241b2b3b56e218b3bf887378f5eab66ef049a4b9
+++ packages/images/sdr-image.bb	b98be7ed4825c6edd9d9db45907e271785280358
@@ -2,11 +2,10 @@
 # An image with tools for software defined radio and unicorn radio
 
 # TODO: 
-# http://poh9.blogspot.com/2008/02/for-my-own-future-reference-how-to.html
 # X demo
 # xorg.conf
 
-PR = "r2"
+PR = "r3"
 
 IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
@@ -15,9 +14,10 @@ DISTRO_SSH_DAEMON ?= "dropbear"
 
 ANGSTROM_EXTRA_INSTALL ?= ""
 DISTRO_SSH_DAEMON ?= "dropbear"
+XSERVER ?= "xserver-kdrive-fbdev"
 
 # Install "big" X if the target has a screen
-GUIPACKAGES = " \
+GUIPACKAGES_BIGX = " \
         xf86-input-evdev \
         xf86-input-mouse \
         xf86-video-dummy \
@@ -26,10 +26,18 @@ GUIPACKAGES = " \
         xf86-video-vesa \
 "
 
+GUIPACKAGES = " \
+	${XSERVER} \
+	angstrom-x11-base-depends \
+	angstrom-gpe-task-base \
+	angstrom-gpe-task-settings \
+	xterm e-wm \
+"
+
 IMAGE_INSTALL = " task-base-extended \
 	kernel-modules \
 	gnuradio gnuradio-usrp \
-	gnuplot \
+	screen procps \
 	${@base_contains("MACHINE_FEATURES", "screen", "${GUIPACKAGES}", "",d)} \
 	python-core perl \
 	uucp picocom \
============================================================
--- packages/linux/linux-omap2_git.bb	7a39d0ef4c7985483f4482973e1604b71e56b7e3
+++ packages/linux/linux-omap2_git.bb	99e634f6d619f025715a2fded7d772dd67561890
@@ -5,7 +5,7 @@ PV = "2.6.25+git${SRCREV}"
 SRCREV = "547ba9200727d2334f779cbf46ab62accb1281aa"
 
 PV = "2.6.25+git${SRCREV}"
-PR = "r7"
+PR = "r8"
 
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
@@ -13,7 +13,7 @@ SRC_URI_append_beagleboard = " file://no
 
 SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
 			       file://usb-timout.patch;patch=1 \
-			       file://l2-cache.patch;patch=1 \ 	
+#			       file://l2-cache.patch;patch=1 \ 	
 "
 
 COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard"