uinput,mesa: fix merge

diff --git a/recipes/mamona/uinput_2.6.21.bb b/recipes/mamona/uinput_2.6.21.bb
index 8877146..b7e31d0 100644 (file)
--- a/recipes/mamona/uinput_2.6.21.bb
+++ b/recipes/mamona/uinput_2.6.21.bb
@@ -1,48 +1,3 @@
-<<<<<<< HEAD
-DESCRIPTION = "uinput support to Nokia 770/8*0 using Nokia kernel"\r
-SECTION = "kernel/modules"\r
-LICENSE = "GPL"\r
-PR = "r0"\r
-\r
-PACKAGES = "${PN}"\r
-\r
-FILES_${PN} += "/lib/modules/uinput.ko /etc/init.d/uinput"\r
-\r
-COMPATIBLE_MACHINE = "(nokia770|nokia800)"\r
-\r
-SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2005q3-2-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 \\r
- http://dev.openbossa.org/mamona/sources/kernel-source-rx-34_2.6.21.0.tar.gz \\r
- file://defconfig \\r
- file://uinput \\r
-"\r
-\r
-LDFLAGS=""\r
-BUILD_LDFLAGS=""\r
-CFLAGS=""\r
-BUILD_CFLAGS=""\r
-TARGET_LDFLAGS=""\r
-\r
-S = "${WORKDIR}/kernel-source-rx-34-2.6.21.0"\r
-\r
-do_configure() {\r
-}\r
-\r
-do_compile() {\r
-    cp ${WORKDIR}/defconfig ${S}/.config\r
-    PATH=${WORKDIR}/bin/:$PATH CROSS_COMPILE=arm-none-eabi- make modules\r
-}\r
-\r
-do_install() {\r
-    install -d ${D}/lib/modules/\r
-    install -m 0644 ${S}/drivers/input/misc/uinput.ko ${D}/lib/modules/\r
-    install -d ${D}/etc/init.d/\r
-    install -m 0755 ${WORKDIR}/uinput ${D}/etc/init.d/\r
-}\r
-\r
-pkg_postinst () {\r
-    update-rc.d uinput defaults 10\r
-}
-=======
 DESCRIPTION = "uinput support to Nokia 770/8*0 using Nokia kernel"
 SECTION = "kernel/modules"
 LICENSE = "GPL"
@@ -92,4 +47,3 @@ do_install() {
 pkg_postinst () {
     update-rc.d uinput defaults 10
 }
->>>>>>> b6d0763... recipes: add missing checksums

diff --git a/recipes/mesa/mesa-full_7.0.2.bb b/recipes/mesa/mesa-full_7.0.2.bb
index f552a21..2e0b8b6 100644 (file)
--- a/recipes/mesa/mesa-full_7.0.2.bb
+++ b/recipes/mesa/mesa-full_7.0.2.bb
@@ -18,8 +18,6 @@ PACKAGES =+ "libglut libglut-dev mesa-utils"
 FILES_libglut = "${libdir}/libglut.so.*"
 FILES_libglut-dev = "${libdir}/libglut.* ${includedir}/GL/glut*"
 FILES_mesa-utils = "${bindir}/*"
-<<<<<<< HEAD
-=======
 
 SRC_URI[archive.md5sum] = "93e6ed7924ff069a4f883b4fce5349dc"
 SRC_URI[archive.sha256sum] = "9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e"
@@ -27,4 +25,3 @@ SRC_URI[glut.md5sum] = "3a33f8efc8c58a592a854cfc7a643286"
 SRC_URI[glut.sha256sum] = "fa31ca39f00ff92c7da59d9993d0eefb8d901eb8a519743942e523fde120eb6c"
 SRC_URI[demos.md5sum] = "11a10410bae7be85cf25bc7119966468"
 SRC_URI[demos.sha256sum] = "ce39b26085acd8e5dffa8233618acac2605cc42203bc4f81c6e4504265f0ffaa"
->>>>>>> b6d0763... recipes: add missing checksums