diff options
| -rw-r--r-- | recipes/linux/linux-openmoko-2.6.32_git.bb | 4 | ||||
| -rw-r--r-- | recipes/xorg-app/bdftopcf-native_1.0.0.bb | 12 | ||||
| -rw-r--r-- | recipes/xorg-app/bdftopcf-native_1.0.2.bb | 12 | ||||
| -rw-r--r-- | recipes/xorg-app/bdftopcf_1.0.1.bb | 3 | ||||
| -rw-r--r-- | recipes/xorg-app/bdftopcf_1.0.2.bb | 3 |
5 files changed, 7 insertions, 27 deletions
diff --git a/recipes/linux/linux-openmoko-2.6.32_git.bb b/recipes/linux/linux-openmoko-2.6.32_git.bb index dfae93104b..56e8698bf4 100644 --- a/recipes/linux/linux-openmoko-2.6.32_git.bb +++ b/recipes/linux/linux-openmoko-2.6.32_git.bb @@ -4,7 +4,7 @@ require linux-openmoko.inc KERNEL_RELEASE="2.6.32.13" SRCREV = "a9254be10ac2294ea20165a87c09ea6afcf66d94" -OEV = "oe3" +OEV = "oe3.1" PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}" SRC_URI = "\ @@ -34,6 +34,8 @@ SRC_URI = "\ file://0014-Fix-claim-of-2D-register-resource.patch \ # fix for lost touchscreen https://docs.openmoko.org/trac/ticket/2328 file://touchscreen_ignoreunexpectedintr29.patch \ +# fix WS + file://0001-glamo-core-initialize-engine-states-as-disabled.patch \ " SRC_URI[stablepatch.md5sum] = "ba6abb1ffee513a1d4f831599ddae490" diff --git a/recipes/xorg-app/bdftopcf-native_1.0.0.bb b/recipes/xorg-app/bdftopcf-native_1.0.0.bb deleted file mode 100644 index fec5575701..0000000000 --- a/recipes/xorg-app/bdftopcf-native_1.0.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -inherit native -require xorg-app-common.inc -PE = "1" - -XORG_PN = "bdftopcf" - -DEPENDS = "libxfont-native" - - -SRC_URI[archive.md5sum] = "41f4ac6760ef5e671ba8d4baa7236f12" -SRC_URI[archive.sha256sum] = "8c01b85eab01f35ed6bc9d597d4c6c76cf9ddbe2596d9120d66e66135df1f9a1" -PR = "${INC_PR}.0" diff --git a/recipes/xorg-app/bdftopcf-native_1.0.2.bb b/recipes/xorg-app/bdftopcf-native_1.0.2.bb deleted file mode 100644 index fc750808ba..0000000000 --- a/recipes/xorg-app/bdftopcf-native_1.0.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -inherit native -require xorg-app-common.inc -PE = "1" - -XORG_PN = "bdftopcf" - -DEPENDS = "libxfont-native" - - -SRC_URI[archive.md5sum] = "148f20d28caaa69bbe7dcca7c2674fb6" -SRC_URI[archive.sha256sum] = "11017f0dd637fd3228bd56fdbbd72193fd747c10d893a711c25bf6734c4da06b" -PR = "${INC_PR}.0" diff --git a/recipes/xorg-app/bdftopcf_1.0.1.bb b/recipes/xorg-app/bdftopcf_1.0.1.bb index e740625e6b..c647d4fee6 100644 --- a/recipes/xorg-app/bdftopcf_1.0.1.bb +++ b/recipes/xorg-app/bdftopcf_1.0.1.bb @@ -5,7 +5,8 @@ DESCRIPTION = "converts BDF fonts to PCF fonts" DEPENDS += " libxfont" +BBCLASSEXTEND = "native" SRC_URI[archive.md5sum] = "9685fab33d39954ab8a0d22e0969d5a4" SRC_URI[archive.sha256sum] = "aaaa45ab361781aebda2093fdc7eb5c187f6215b4ba308dd6b9ff2b727e805d3" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" diff --git a/recipes/xorg-app/bdftopcf_1.0.2.bb b/recipes/xorg-app/bdftopcf_1.0.2.bb index 35007a8433..891ff8398a 100644 --- a/recipes/xorg-app/bdftopcf_1.0.2.bb +++ b/recipes/xorg-app/bdftopcf_1.0.2.bb @@ -5,7 +5,8 @@ DESCRIPTION = "converts BDF fonts to PCF fonts" DEPENDS += " libxfont" +BBCLASSEXTEND = "native" SRC_URI[archive.md5sum] = "148f20d28caaa69bbe7dcca7c2674fb6" SRC_URI[archive.sha256sum] = "11017f0dd637fd3228bd56fdbbd72193fd747c10d893a711c25bf6734c4da06b" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" |