MERGE: Clean up some merge mess when pulling in 'org.openembeded.dev'.
authorDavid-John Willis <John.Willis@Distant-earth.com>
Tue, 22 Feb 2011 13:03:59 +0000 (13:03 +0000)
committerDavid-John Willis <John.Willis@Distant-earth.com>
Mon, 4 Apr 2011 19:15:47 +0000 (20:15 +0100)
conf/machine/omap3-pandora.conf
recipes/alsa/alsa-state/omap3-pandora/asound.state [deleted file]
recipes/aufs/aufs2-27_git.bb [deleted file]
recipes/aufs/files/rc.aufs2 [deleted file]
recipes/bluez/bluez4_4.62.bb [deleted file]
recipes/smpeg/smpeg_svn.bb

index 93bc8c4..5ce8b41 100644 (file)
@@ -63,6 +63,7 @@ UBOOT_LOADADDRESS = "0x80008000"
 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "omap3_pandora_config"
 
+PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora"
 PREFERRED_PROVIDER_x-load = "x-load-omap3pandora"
 EXTRA_IMAGEDEPENDS += "u-boot x-load"
 
diff --git a/recipes/alsa/alsa-state/omap3-pandora/asound.state b/recipes/alsa/alsa-state/omap3-pandora/asound.state
deleted file mode 100644 (file)
index d0e048d..0000000
+++ /dev/null
@@ -1,323 +0,0 @@
-state.omap3beagle {
-       control.1 {
-               comment.access 'read write'
-               comment.type INTEGER
-               comment.count 2
-               comment.range '0 - 63'
-               comment.dbmin -6300
-               comment.dbmax 0
-               iface MIXER
-               name 'DAC1 Digital Fine Playback Volume'
-               value.0 0
-               value.1 0
-       }
-       control.2 {
-               comment.access 'read write'
-               comment.type INTEGER
-               comment.count 2
-               comment.range '0 - 63'
-               comment.dbmin -6300
-               comment.dbmax 0
-               iface MIXER
-               name 'DAC2 Digital Fine Playback Volume'
-               value.0 63
-               value.1 63
-       }
-       control.3 {
-               comment.access 'read write'
-               comment.type INTEGER
-               comment.count 2
-               comment.range '0 - 2'
-               comment.dbmin 0
-               comment.dbmax 1200
-               iface MIXER
-               name 'DAC1 Digital Coarse Playback Volume'
-               value.0 0
-               value.1 0
-       }
-       control.4 {
-               comment.access 'read write'
-               comment.type INTEGER
-               comment.count 2
-               comment.range '0 - 2'
-               comment.dbmin 0
-               comment.dbmax 1200
-               iface MIXER
-               name 'DAC2 Digital Coarse Playback Volume'
-               value.0 2
-               value.1 2
-       }
-       control.5 {
-               comment.access 'read write'
-               comment.type INTEGER
-               comment.count 2
-               comment.range '0 - 18'
-               comment.dbmin -2400
-               comment.dbmax 1200
-               iface MIXER
-               name 'DAC1 Analog Playback Volume'
-               value.0 0
-               value.1 0
-       }
-       control.6 {
-               comment.access 'read write'
-               comment.type INTEGER
-               comment.count 2
-               comment.range '0 - 18'
-               comment.dbmin -2400
-               comment.dbmax 1200
-               iface MIXER
-               name 'DAC2 Analog Playback Volume'
-               value.0 12
-               value.1 12
-       }
-       control.7 {
-               comment.access 'read write'
-               comment.type BOOLEAN
-               comment.count 2
-               iface MIXER
-               name 'DAC1 Analog Playback Switch'
-               value.0 false
-               value.1 false
-       }
-       control.8 {
-               comment.access 'read write'
-               comment.type BOOLEAN
-               comment.count 2
-               iface MIXER
-               name 'DAC2 Analog Playback Switch'
-               value.0 true
-               value.1 true
-       }
-       control.9 {
-               comment.access 'read write'
-               comment.type INTEGER
-               comment.count 2
-               comment.range '0 - 3'
-               comment.dbmin -1200
-               comment.dbmax 600
-               iface MIXER
-               name 'PreDriv Playback Volume'
-               value.0 0
-               value.1 0
-       }
-       control.10 {
-               comment.access 'read write'
-               comment.type INTEGER
-               comment.count 2
-               comment.range '0 - 3'
-               comment.dbmin -1200
-               comment.dbmax 600
-               iface MIXER
-               name 'Headset Playback Volume'
-               value.0 2
-               value.1 2
-       }
-       control.11 {
-               comment.access 'read write'
-               comment.type INTEGER
-               comment.count 2
-               comment.range '0 - 3'
-               comment.dbmin -1200
-               comment.dbmax 600
-               iface MIXER
-               name 'Carkit Playback Volume'
-               value.0 0
-               value.1 0
-       }
-       control.12 {
-               comment.access 'read write'
-               comment.type INTEGER
-               comment.count 1
-               comment.range '0 - 3'
-               comment.dbmin -1200
-               comment.dbmax 600
-               iface MIXER
-               name 'Earpiece Playback Volume'
-               value 0
-       }
-       control.13 {
-               comment.access 'read write'
-               comment.type INTEGER
-               comment.count 2
-               comment.range '0 - 31'
-               comment.dbmin 0
-               comment.dbmax 3100
-               iface MIXER
-               name 'TX1 Digital Capture Volume'
-               value.0 12
-               value.1 12
-       }
-       control.14 {
-               comment.access 'read write'
-               comment.type INTEGER
-               comment.count 2
-               comment.range '0 - 31'
-               comment.dbmin 0
-               comment.dbmax 3100
-               iface MIXER
-               name 'TX2 Digital Capture Volume'
-               value.0 0
-               value.1 0
-       }
-       control.15 {
-               comment.access 'read write'
-               comment.type INTEGER
-               comment.count 2
-               comment.range '0 - 5'
-               comment.dbmin 0
-               comment.dbmax 3000
-               iface MIXER
-               name 'Analog Capture Volume'
-               value.0 0
-               value.1 0
-       }
-       control.16 {
-               comment.access 'read write'
-               comment.type ENUMERATED
-               comment.count 1
-               comment.item.0 Off
-               comment.item.1 'Sub mic'
-               comment.item.2 AUXR
-               iface MIXER
-               name 'Analog Right Capture Route'
-               value AUXR
-       }
-       control.17 {
-               comment.access 'read write'
-               comment.type ENUMERATED
-               comment.count 1
-               comment.item.0 Off
-               comment.item.1 'Main mic'
-               comment.item.2 'Headset mic'
-               comment.item.3 AUXL
-               comment.item.4 'Carkit mic'
-               iface MIXER
-               name 'Analog Left Capture Route'
-               value AUXL
-       }
-       control.18 {
-               comment.access 'read write'
-               comment.type ENUMERATED
-               comment.count 1
-               comment.item.0 Analog
-               comment.item.1 Digimic1
-               iface MIXER
-               name 'TX2 Capture Route'
-               value Analog
-       }
-       control.19 {
-               comment.access 'read write'
-               comment.type ENUMERATED
-               comment.count 1
-               comment.item.0 Analog
-               comment.item.1 Digimic0
-               iface MIXER
-               name 'TX1 Capture Route'
-               value Analog
-       }
-       control.20 {
-               comment.access 'read write'
-               comment.type ENUMERATED
-               comment.count 1
-               comment.item.0 Voice
-               comment.item.1 DACR1
-               comment.item.2 DACR2
-               comment.item.3 DACL2
-               iface MIXER
-               name 'HandsfreeR Mux'
-               value DACR2
-       }
-       control.21 {
-               comment.access 'read write'
-               comment.type ENUMERATED
-               comment.count 1
-               comment.item.0 Voice
-               comment.item.1 DACL1
-               comment.item.2 DACL2
-               comment.item.3 DACR2
-               iface MIXER
-               name 'HandsfreeL Mux'
-               value DACL2
-       }
-       control.22 {
-               comment.access 'read write'
-               comment.type ENUMERATED
-               comment.count 1
-               comment.item.0 Off
-               comment.item.1 DACR1
-               comment.item.2 DACR2
-               iface MIXER
-               name 'CarkitR Mux'
-               value Off
-       }
-       control.23 {
-               comment.access 'read write'
-               comment.type ENUMERATED
-               comment.count 1
-               comment.item.0 Off
-               comment.item.1 DACL1
-               comment.item.2 DACL2
-               iface MIXER
-               name 'CarkitL Mux'
-               value Off
-       }
-       control.24 {
-               comment.access 'read write'
-               comment.type ENUMERATED
-               comment.count 1
-               comment.item.0 Off
-               comment.item.1 DACR1
-               comment.item.2 DACR2
-               iface MIXER
-               name 'HeadsetR Mux'
-               value DACR2
-       }
-       control.25 {
-               comment.access 'read write'
-               comment.type ENUMERATED
-               comment.count 1
-               comment.item.0 Off
-               comment.item.1 DACL1
-               comment.item.2 DACL2
-               iface MIXER
-               name 'HeadsetL Mux'
-               value DACL2
-       }
-       control.26 {
-               comment.access 'read write'
-               comment.type ENUMERATED
-               comment.count 1
-               comment.item.0 Off
-               comment.item.1 DACR1
-               comment.item.2 DACR2
-               comment.item.3 DACL2
-               iface MIXER
-               name 'PredriveR Mux'
-               value Off
-       }
-       control.27 {
-               comment.access 'read write'
-               comment.type ENUMERATED
-               comment.count 1
-               comment.item.0 Off
-               comment.item.1 DACL1
-               comment.item.2 DACL2
-               comment.item.3 DACR2
-               iface MIXER
-               name 'PredriveL Mux'
-               value Off
-       }
-       control.28 {
-               comment.access 'read write'
-               comment.type ENUMERATED
-               comment.count 1
-               comment.item.0 Off
-               comment.item.1 DACL1
-               comment.item.2 DACL2
-               comment.item.3 DACR1
-               iface MIXER
-               name 'Earpiece Mux'
-               value Off
-       }
-}
diff --git a/recipes/aufs/aufs2-27_git.bb b/recipes/aufs/aufs2-27_git.bb
deleted file mode 100644 (file)
index 61d09ef..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-# Note: This recipe is a bit of a hack (READ: Massive hack) for now as it needs kernel 
-# patches in the source tree in order to build. Without those patches it will fail.
-
-DESCRIPTION = "Aufs2 is a stackable unification filesystem."
-LICENSE = "GPL"
-DEPENDS = "virtual/kernel"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-RRECOMMENDS_${PN} = "aufs2-util"
-
-inherit module
-
-SRCREV = "3dee4b597c9c8d02157603f9018e22a5fa898621"
-
-SRC_URI = " \
-           git://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git;protocol=http;branch=aufs2-27 \
-          file://rc.aufs2 \
-"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "aufs2-init"
-INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ."
-
-S = "${WORKDIR}/git"
-
-EXTRA_OEMAKE = "CONFIG_AUFS_FS=m  KDIR=${STAGING_KERNEL_DIR} DESTDIR=${D}"
-
-# Enable inotify, export, sysrq and loop support.
-do_compile_prepend() {
-          sed -i  "s:HINOTIFY =:HINOTIFY = y:g" ${S}/config.mk
-          sed -i  "s:EXPORT =:EXPORT = y:g" ${S}/config.mk
-          sed -i  "s:MAGIC_SYSRQ =:MAGIC_SYSRQ = y:g" ${S}/config.mk
-          sed -i  "s:BDEV_LOOP =:BDEV_LOOP = y:g" ${S}/config.mk 
-}
-
-do_install() {
-          mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/misc
-          cp ${S}/*.ko ${D}/lib/modules/${KERNEL_VERSION}/misc
-          install -d ${D}${sysconfdir}/init.d/
-          install -m 0755 ${WORKDIR}/rc.aufs2 ${D}${sysconfdir}/init.d/aufs2-init
-}
-
-# This is really crufty but I don't want to change the aufs2-utils recipe as I know it's used by the Touchbook. - DJWillis
-# The reason for this is so the userspace ABI is there when the utils are built later 
-#   (if you build 'in tree' you will have this but this recipe builds as a module)
-
-do_stage() {
-          install -d ${STAGING_KERNEL_DIR}/include/linux/
-          install -m 0644 ${S}/include/linux/aufs_type.h ${STAGING_KERNEL_DIR}/include/linux/
-}
-
-FILES_${PN} += "/lib/modules/${KERNEL_VERSION}/misc/*.ko.*"
diff --git a/recipes/aufs/files/rc.aufs2 b/recipes/aufs/files/rc.aufs2
deleted file mode 100644 (file)
index 79bfa91..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-DESC="AUFS2 union file system module."
-NAME="aufs2"
-
-d_stop() {
-       if `grep -q aufs /proc/modules` ; then
-               rmmod aufs
-       fi
-}
-
-d_start() {
-       insmod $(busybox find /lib/modules/$(uname -r) -name "aufs.ko")
-}
-
-case "$1" in
-  start)
-       echo -n "Starting $DESC: $NAME"
-       d_start
-       echo "."
-       ;;
-  stop)
-       echo -n "Stopping $DESC: $NAME"
-       d_stop
-       echo "."
-       ;;
-  restart|force-reload)
-       echo -n "Restarting $DESC: $NAME"
-       d_stop
-       sleep 1
-       d_start
-       echo "."
-       ;;
-  *)
-       echo "Usage: $0 {start|stop|restart|force-reload}" >&2
-       exit 1
-       ;;
-esac
-
-exit 0
diff --git a/recipes/bluez/bluez4_4.62.bb b/recipes/bluez/bluez4_4.62.bb
deleted file mode 100644 (file)
index a2da444..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-require bluez4.inc
-
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_angstrom = "1"
-
-DEPENDS += "libsndfile1 libnl"
-
-PR = "${INC_PR}.0"
-
-# Checksums
-SRC_URI[bluez-4.62.md5sum] = "e5bb2f7eb8e8f9bb7ee2733de7080259"
-SRC_URI[bluez-4.62.sha256sum] = "f63203cbbd5be7d9986d5df42c7a96c3edb7442d99539fbe9c7964243b286792"
-
-# Not all distros have a recent enough udev
-BTUDEV = " --disable-udevrules"
-BTUDEV_angstrom = " --enable-udevrules"
-BTUDEV_shr = " --enable-udevrules"
-EXTRA_OECONF += "${BTUDEV}"
index 8213877..f9e8e2b 100644 (file)
@@ -7,32 +7,40 @@ PROVIDES = "smpeg"
 PV = "0.4.5+svnr${SRCPV}"
 PE = "2"
 SRCREV = "387"
-PR = "r1"
 
-SRC_URI = "svn://svn.icculus.org/smpeg/;module=trunk \
-       file://add-disable-rpath.patch"
+SRC_URI = "svn://svn.icculus.org/smpeg/;module=trunk  \
+          file://m4.patch;patch=1 \
+          file://as-fix.patch;patch=1"
 
 S = "${WORKDIR}/trunk"
 
-inherit autotools binconfig
+inherit autotools
 
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
+CFLAGS_append = " -I${STAGING_INCDIR}/SDL"
 EXTRA_OECONF = "--disable-gtktest --disable-opengl-player --without-x \
-               --without-gtk --disable-gtk-player --disable-rpath"
+               --without-gtk --disable-gtk-player"
 
 do_configure_prepend () {
        touch NEWS AUTHORS ChangeLog
-       # drop all .m4 which are available in staging
-       rm -f acinclude/gtk-2.0.m4 \
-             acinclude/libtool.m4 \
-             acinclude/ltdl.m4 \
-             acinclude/ltoptions.m4 \
-             acinclude/ltsugar.m4 \
-             acinclude/ltversion.m4 \
-             acinclude/lt~obsolete.m4 \
-             acinclude/pkg.m4 \
-             acinclude/sdl.m4 \
-             aclocal.m4 \
-             acinclude.m4
+       rm -f acinclude.m4
+}
+
+do_stage() {
+       oe_libinstall -so -C .libs libsmpeg-0.4 ${STAGING_LIBDIR}
+       ln -sf libsmpeg-0.4.so ${STAGING_LIBDIR}/libsmpeg.so
+
+       for f in "*.h"
+       do
+               install -m 0644 ${f} ${STAGING_INCDIR}/SDL
+       done
+
+        cat smpeg-config | sed -e "s,-I/usr/include/SDL,-I${STAGING_INCDIR}/SDL," \
+                         | sed -e "s,-I/usr/include/smpeg, ," \
+                         | sed -e "s,libdirs ,mickey_is_cool ," \
+                         | sed -e "s,-lSDL ,-lSDL-1.2 , "> ${STAGING_BINDIR_CROSS}/smpeg-config
+        chmod a+rx ${STAGING_BINDIR_CROSS}/smpeg-config
 }
 
 do_install_prepend() {