diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-05-04 18:21:43 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-05-04 18:21:43 +0000 |
| commit | 85605efdd977ac2ee8cf665f3e9d47b62650f4c1 (patch) | |
| tree | 07ea8019377bd398bc99f5e5c6fbe5e56f6a80a8 /packages | |
| parent | 2faeb82daf7f74b0dda868adc7e4c43640e79982 (diff) | |
| parent | 568266de9dfacc7ffd261b17ff6dc5cd625769d6 (diff) | |
merge of 'c91a79a505ff2ecaedb60a24aae9a3a69e481038'
and 'cadde6e7c89af7d59a9c0f084a480835c1c4c4e1'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/images/sdr-image.bb | 16 | ||||
| -rw-r--r-- | packages/linux/linux-omap2_git.bb | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/packages/images/sdr-image.bb b/packages/images/sdr-image.bb index 28a62113ee..8ad9af7cca 100644 --- a/packages/images/sdr-image.bb +++ b/packages/images/sdr-image.bb @@ -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 @@ IMAGE_FSTYPES += "tar.bz2" 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 \ diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index 72635d12df..71bd173541 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MA 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 = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ 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" |