[oe-commits] org.oe.dev merge of '228dd3777f4e26267c87ee4671f6679f5fecf430'
oe commit
oe at amethyst.openembedded.net
Fri Jun 13 18:27:21 UTC 2008
merge of '228dd3777f4e26267c87ee4671f6679f5fecf430'
and '420e11219be7df649557c4bbcdec50538362cb21'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 4c917e13bc231f8325cbb2478d7907d3ccc3f75b
ViewMTN: http://monotone.openembedded.org/revision/info/4c917e13bc231f8325cbb2478d7907d3ccc3f75b
Files:
1
packages/xorg-driver/xf86-input-calcomp_1.1.2.bb
packages/xorg-driver/xf86-input-digitaledge_1.1.1.bb
packages/xorg-driver/xf86-input-dmc_1.1.2.bb
packages/xorg-driver/xf86-input-dynapro_1.1.2.bb
packages/xorg-driver/xf86-input-elo2300_1.1.2.bb
packages/xorg-driver/xf86-input-elographics_1.2.2.bb
packages/xorg-driver/xf86-input-evdev_1.99.4.bb
packages/xorg-driver/xf86-input-fpit_1.2.0.bb
packages/xorg-driver/xf86-input-hyperpen_1.2.0.bb
packages/xorg-driver/xf86-input-jamstudio_1.2.0.bb
packages/xorg-driver/xf86-input-keyboard_1.3.1.bb
packages/xorg-driver/xf86-input-magellan_1.2.0.bb
packages/xorg-driver/xf86-input-microtouch_1.2.0.bb
packages/xorg-driver/xf86-input-mouse_1.3.0.bb
packages/xorg-driver/xf86-input-mutouch_1.2.0.bb
packages/xorg-driver/xf86-input-palmax_1.2.0.bb
packages/xorg-driver/xf86-input-penmount_1.3.0.bb
packages/xorg-driver/xf86-input-summa_1.2.0.bb
packages/xorg-driver/xf86-input-tek4957_1.2.0.bb
packages/xorg-driver/xf86-input-vmmouse_12.5.1.bb
packages/linux/linux-omap2-git/omap3evm/flash.patch
packages/linux/linux-omap2-git/omap3evm/no-harry-potter.diff
conf/machine/efika.conf
packages/images/beagleboard-demo-image.bb
packages/linux/linux-omap2_git.bb
Diffs:
#
# mt diff -r228dd3777f4e26267c87ee4671f6679f5fecf430 -r4c917e13bc231f8325cbb2478d7907d3ccc3f75b
#
#
#
# add_file "packages/xorg-driver/xf86-input-calcomp_1.1.2.bb"
# content [decf1925caef5ee90fbc1f3229efd19ce76d504c]
#
# add_file "packages/xorg-driver/xf86-input-digitaledge_1.1.1.bb"
# content [2a0578061130af7499914c4c68c50cb354515bfd]
#
# add_file "packages/xorg-driver/xf86-input-dmc_1.1.2.bb"
# content [b16e5813ce5b2d77ab82f1772c66f0927b81b860]
#
# add_file "packages/xorg-driver/xf86-input-dynapro_1.1.2.bb"
# content [b447a0878534562285a317ca04d9b53a567976c8]
#
# add_file "packages/xorg-driver/xf86-input-elo2300_1.1.2.bb"
# content [9bcaa8881c8602d41ec33a34cee6d303607cf256]
#
# add_file "packages/xorg-driver/xf86-input-elographics_1.2.2.bb"
# content [0eca43ba102499cf7d66da3eea2f1357b5b19b86]
#
# add_file "packages/xorg-driver/xf86-input-evdev_1.99.4.bb"
# content [a87982a9bd27a1742c9e6bdb32d13fc88506d1b9]
#
# add_file "packages/xorg-driver/xf86-input-fpit_1.2.0.bb"
# content [2a0578061130af7499914c4c68c50cb354515bfd]
#
# add_file "packages/xorg-driver/xf86-input-hyperpen_1.2.0.bb"
# content [2a0578061130af7499914c4c68c50cb354515bfd]
#
# add_file "packages/xorg-driver/xf86-input-jamstudio_1.2.0.bb"
# content [b99981280d7ecee88f77dd0a230178dc485cd943]
#
# add_file "packages/xorg-driver/xf86-input-keyboard_1.3.1.bb"
# content [f3ce46713577902364ded92fe22d0822592e2ca7]
#
# add_file "packages/xorg-driver/xf86-input-magellan_1.2.0.bb"
# content [afe6c35e368a8824676ccec320aa6b9806eedbc0]
#
# add_file "packages/xorg-driver/xf86-input-microtouch_1.2.0.bb"
# content [8b956e01215b30a3dd8ee475e06c058e6c16dc96]
#
# add_file "packages/xorg-driver/xf86-input-mouse_1.3.0.bb"
# content [2778f83d149677442ccc536b9bb2482de1b25545]
#
# add_file "packages/xorg-driver/xf86-input-mutouch_1.2.0.bb"
# content [57a48fe5e556cb01214bbec2a3c28a93b26cd808]
#
# add_file "packages/xorg-driver/xf86-input-palmax_1.2.0.bb"
# content [14c21c56ba96a92d98a9525c4450a99b590d305c]
#
# add_file "packages/xorg-driver/xf86-input-penmount_1.3.0.bb"
# content [68bc88f8b2006c4d131c7eb6945a804ee101eb38]
#
# add_file "packages/xorg-driver/xf86-input-summa_1.2.0.bb"
# content [0eb9c5694d7f3d78067935f28a2216dabd1fa961]
#
# add_file "packages/xorg-driver/xf86-input-tek4957_1.2.0.bb"
# content [ea71b44a1e3d3c184483b9c47075ebbbaacd5c40]
#
# add_file "packages/xorg-driver/xf86-input-vmmouse_12.5.1.bb"
# content [e9e8a31c2da0f89fe005b0a1ce00bf3b2d81c382]
#
============================================================
--- packages/xorg-driver/xf86-input-calcomp_1.1.2.bb decf1925caef5ee90fbc1f3229efd19ce76d504c
+++ packages/xorg-driver/xf86-input-calcomp_1.1.2.bb decf1925caef5ee90fbc1f3229efd19ce76d504c
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- Calcomp input driver"
+PE = "1"
============================================================
--- packages/xorg-driver/xf86-input-digitaledge_1.1.1.bb 2a0578061130af7499914c4c68c50cb354515bfd
+++ packages/xorg-driver/xf86-input-digitaledge_1.1.1.bb 2a0578061130af7499914c4c68c50cb354515bfd
@@ -0,0 +1,3 @@
+require xorg-driver-input.inc
+PE = "1"
+
============================================================
--- packages/xorg-driver/xf86-input-dmc_1.1.2.bb b16e5813ce5b2d77ab82f1772c66f0927b81b860
+++ packages/xorg-driver/xf86-input-dmc_1.1.2.bb b16e5813ce5b2d77ab82f1772c66f0927b81b860
@@ -0,0 +1,5 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- DMC input driver"
+PE = "1"
+
============================================================
--- packages/xorg-driver/xf86-input-dynapro_1.1.2.bb b447a0878534562285a317ca04d9b53a567976c8
+++ packages/xorg-driver/xf86-input-dynapro_1.1.2.bb b447a0878534562285a317ca04d9b53a567976c8
@@ -0,0 +1,5 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- Dynapro input driver"
+PE = "1"
+
============================================================
--- packages/xorg-driver/xf86-input-elo2300_1.1.2.bb 9bcaa8881c8602d41ec33a34cee6d303607cf256
+++ packages/xorg-driver/xf86-input-elo2300_1.1.2.bb 9bcaa8881c8602d41ec33a34cee6d303607cf256
@@ -0,0 +1,5 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- ELO2300 input driver"
+PE = "1"
+
============================================================
--- packages/xorg-driver/xf86-input-elographics_1.2.2.bb 0eca43ba102499cf7d66da3eea2f1357b5b19b86
+++ packages/xorg-driver/xf86-input-elographics_1.2.2.bb 0eca43ba102499cf7d66da3eea2f1357b5b19b86
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- ELOGraphics input driver"
+PE = "2"
============================================================
--- packages/xorg-driver/xf86-input-evdev_1.99.4.bb a87982a9bd27a1742c9e6bdb32d13fc88506d1b9
+++ packages/xorg-driver/xf86-input-evdev_1.99.4.bb a87982a9bd27a1742c9e6bdb32d13fc88506d1b9
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- evdev input driver"
+PE = "1"
============================================================
--- packages/xorg-driver/xf86-input-fpit_1.2.0.bb 2a0578061130af7499914c4c68c50cb354515bfd
+++ packages/xorg-driver/xf86-input-fpit_1.2.0.bb 2a0578061130af7499914c4c68c50cb354515bfd
@@ -0,0 +1,3 @@
+require xorg-driver-input.inc
+PE = "1"
+
============================================================
--- packages/xorg-driver/xf86-input-hyperpen_1.2.0.bb 2a0578061130af7499914c4c68c50cb354515bfd
+++ packages/xorg-driver/xf86-input-hyperpen_1.2.0.bb 2a0578061130af7499914c4c68c50cb354515bfd
@@ -0,0 +1,3 @@
+require xorg-driver-input.inc
+PE = "1"
+
============================================================
--- packages/xorg-driver/xf86-input-jamstudio_1.2.0.bb b99981280d7ecee88f77dd0a230178dc485cd943
+++ packages/xorg-driver/xf86-input-jamstudio_1.2.0.bb b99981280d7ecee88f77dd0a230178dc485cd943
@@ -0,0 +1,2 @@
+require xorg-driver-input.inc
+PE = "1"
============================================================
--- packages/xorg-driver/xf86-input-keyboard_1.3.1.bb f3ce46713577902364ded92fe22d0822592e2ca7
+++ packages/xorg-driver/xf86-input-keyboard_1.3.1.bb f3ce46713577902364ded92fe22d0822592e2ca7
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+PE = "1"
+
+DESCRIPTION = "X.Org X server -- keyboard input driver"
+
+DEPENDS += " kbproto"
============================================================
--- packages/xorg-driver/xf86-input-magellan_1.2.0.bb afe6c35e368a8824676ccec320aa6b9806eedbc0
+++ packages/xorg-driver/xf86-input-magellan_1.2.0.bb afe6c35e368a8824676ccec320aa6b9806eedbc0
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- Magellan input driver"
+PE = "1"
============================================================
--- packages/xorg-driver/xf86-input-microtouch_1.2.0.bb 8b956e01215b30a3dd8ee475e06c058e6c16dc96
+++ packages/xorg-driver/xf86-input-microtouch_1.2.0.bb 8b956e01215b30a3dd8ee475e06c058e6c16dc96
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- MicroTouch input driver"
+PE = "1"
============================================================
--- packages/xorg-driver/xf86-input-mouse_1.3.0.bb 2778f83d149677442ccc536b9bb2482de1b25545
+++ packages/xorg-driver/xf86-input-mouse_1.3.0.bb 2778f83d149677442ccc536b9bb2482de1b25545
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- mouse input driver"
+PE = "1"
============================================================
--- packages/xorg-driver/xf86-input-mutouch_1.2.0.bb 57a48fe5e556cb01214bbec2a3c28a93b26cd808
+++ packages/xorg-driver/xf86-input-mutouch_1.2.0.bb 57a48fe5e556cb01214bbec2a3c28a93b26cd808
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+PE = "1"
+
+DESCRIPTION = "X.Org X server -- muTouch input driver"
============================================================
--- packages/xorg-driver/xf86-input-palmax_1.2.0.bb 14c21c56ba96a92d98a9525c4450a99b590d305c
+++ packages/xorg-driver/xf86-input-palmax_1.2.0.bb 14c21c56ba96a92d98a9525c4450a99b590d305c
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+PE = "1"
+
+DESCRIPTION = "X.Org X server -- Palmax input driver"
============================================================
--- packages/xorg-driver/xf86-input-penmount_1.3.0.bb 68bc88f8b2006c4d131c7eb6945a804ee101eb38
+++ packages/xorg-driver/xf86-input-penmount_1.3.0.bb 68bc88f8b2006c4d131c7eb6945a804ee101eb38
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- Penmount input driver"
+PE = "1"
============================================================
--- packages/xorg-driver/xf86-input-summa_1.2.0.bb 0eb9c5694d7f3d78067935f28a2216dabd1fa961
+++ packages/xorg-driver/xf86-input-summa_1.2.0.bb 0eb9c5694d7f3d78067935f28a2216dabd1fa961
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+PE = "1"
+
+DESCRIPTION = "X.Org X server -- Summa input driver"
============================================================
--- packages/xorg-driver/xf86-input-tek4957_1.2.0.bb ea71b44a1e3d3c184483b9c47075ebbbaacd5c40
+++ packages/xorg-driver/xf86-input-tek4957_1.2.0.bb ea71b44a1e3d3c184483b9c47075ebbbaacd5c40
@@ -0,0 +1,4 @@
+require xorg-driver-input.inc
+PE = "1"
+
+DESCRIPTION = "X.Org X server -- Tek4957 input driver"
============================================================
--- packages/xorg-driver/xf86-input-vmmouse_12.5.1.bb e9e8a31c2da0f89fe005b0a1ce00bf3b2d81c382
+++ packages/xorg-driver/xf86-input-vmmouse_12.5.1.bb e9e8a31c2da0f89fe005b0a1ce00bf3b2d81c382
@@ -0,0 +1,6 @@
+require xorg-driver-input.inc
+
+DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare"
+PE = "1"
+
+COMPATIBLE_HOST = 'i.86.*-linux'
#
# mt diff -r420e11219be7df649557c4bbcdec50538362cb21 -r4c917e13bc231f8325cbb2478d7907d3ccc3f75b
#
#
#
# delete "packages/linux/linux-omap2-git/omap3evm/flash.patch"
#
# add_file "packages/linux/linux-omap2-git/omap3evm/no-harry-potter.diff"
# content [ed839a9f2631cfb7bfc8a8b341ca783a9e7f1c0c]
#
# patch "conf/machine/efika.conf"
# from [08a6498b09a4e63a1c570a6944a3d2f243c59160]
# to [c72523935798601ef0078e59ad1152c319a67fe4]
#
# patch "packages/images/beagleboard-demo-image.bb"
# from [f70ee41394921debd219b58d972968d5d915bb73]
# to [ffd33ba809f3a93260de5ffad170f0c52da8a9db]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [728a83a1d213657ee125565b0bd34a9006bcca11]
# to [947402088688f4d67b5eedf1d81246f553d9bd61]
#
============================================================
--- packages/linux/linux-omap2-git/omap3evm/no-harry-potter.diff ed839a9f2631cfb7bfc8a8b341ca783a9e7f1c0c
+++ packages/linux/linux-omap2-git/omap3evm/no-harry-potter.diff ed839a9f2631cfb7bfc8a8b341ca783a9e7f1c0c
@@ -0,0 +1,11 @@
+--- /tmp/Makefile 2008-04-24 14:36:20.509598016 +0200
++++ git/arch/arm/Makefile 2008-04-24 14:36:31.949546584 +0200
+@@ -47,7 +47,7 @@
+ # Note that GCC does not numerically define an architecture version
+ # macro, but instead defines a whole series of macros which makes
+ # testing for a specific architecture or later rather impossible.
+-arch-$(CONFIG_CPU_32v7) :=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7a,-march=armv5t -Wa$(comma)-march=armv7a)
++arch-$(CONFIG_CPU_32v7) :=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a)
+ arch-$(CONFIG_CPU_32v6) :=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)
+ # Only override the compiler option if ARMv6. The ARMv6K extensions are
+ # always available in ARMv7
============================================================
--- conf/machine/efika.conf 08a6498b09a4e63a1c570a6944a3d2f243c59160
+++ conf/machine/efika.conf c72523935798601ef0078e59ad1152c319a67fe4
@@ -5,7 +5,7 @@ PACKAGE_EXTRA_ARCHS = "ppc603e"
TARGET_ARCH = "powerpc"
PACKAGE_EXTRA_ARCHS = "ppc603e"
-#PREFERRED_PROVIDER_virtual/kernel ?= "linux-${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-rt"
MACHINE_FEATURES = "kernel26 usbhost ext2 alsa"
============================================================
--- packages/images/beagleboard-demo-image.bb f70ee41394921debd219b58d972968d5d915bb73
+++ packages/images/beagleboard-demo-image.bb ffd33ba809f3a93260de5ffad170f0c52da8a9db
@@ -20,7 +20,7 @@ IMAGE_INSTALL = "\
e-wm exhibit \
xterm xmms epiphany-firefox-replacement \
hicolor-icon-theme gnome-icon-theme \
- jaaa octave nmap iperf gnuplot \
+ jaaa nmap iperf gnuplot \
abiword gnumeric gimp minimo \
powertop \
"
============================================================
--- packages/linux/linux-omap2_git.bb 728a83a1d213657ee125565b0bd34a9006bcca11
+++ packages/linux/linux-omap2_git.bb 947402088688f4d67b5eedf1d81246f553d9bd61
@@ -13,7 +13,6 @@ SRC_URI_append_beagleboard = " file://no
SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \
- file://flash.patch;patch=1 \
file://0001-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
file://0002-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
file://0003-ARM-OMAP-SmartReflex-driver.patch;patch=1 \
More information about the Openembedded-commits
mailing list