diff options
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 2 | ||||
| -rw-r--r-- | conf/machine/h1910.conf | 1 | ||||
| -rwxr-xr-x | packages/gpsd/files/gpsd | 6 | ||||
| -rw-r--r-- | packages/gpsd/gpsd_2.28.bb | 2 | ||||
| -rw-r--r-- | packages/gpsd/gpsd_2.34.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb | 11 | ||||
| -rw-r--r-- | packages/musicpd/mpd-alsa_svn.bb | 50 |
7 files changed, 65 insertions, 9 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 3b14fd82a9..d291fbd3ac 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -217,7 +217,7 @@ MACHINE_KERNEL_VERSION = "2.6" PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh16" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh17" RDEPENDS_kernel-base_hx4700 = "" RDEPENDS_kernel-base_htcuniversal = "" diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf index 2dac4b48af..15390d2d56 100644 --- a/conf/machine/h1910.conf +++ b/conf/machine/h1910.conf @@ -21,7 +21,6 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" # Software/packages selection # PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9" PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/packages/gpsd/files/gpsd b/packages/gpsd/files/gpsd index 2cf26c5f3a..3a14867f8a 100755 --- a/packages/gpsd/files/gpsd +++ b/packages/gpsd/files/gpsd @@ -6,10 +6,6 @@ # description: Gpsd manages access to a serial- or USB-connected GPS # processname: gpsd -# If you must specify a non-NMEA driver, uncomment and modify the next line -#GPSD_OPTS= -GPS_DEV="/dev/ttyS3" - # Source function library. #. /etc/rc.d/init.d/functions @@ -39,7 +35,7 @@ start() { echo "success" else # User needs to symlink ${GPS_DEV} to the right thing - echo "No ${GPS_DEV} device, aborting gpsd startup." + echo "No ${GPS_DEV} GPS device, aborting gpsd startup. Check /etc/default/$prog" fi RETVAL=$? echo diff --git a/packages/gpsd/gpsd_2.28.bb b/packages/gpsd/gpsd_2.28.bb index d51d088807..c16de2e951 100644 --- a/packages/gpsd/gpsd_2.28.bb +++ b/packages/gpsd/gpsd_2.28.bb @@ -1,2 +1,2 @@ require gpsd.inc -PR = "r3" +PR = "r4" diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb index 1399dba53b..32cb4b925d 100644 --- a/packages/gpsd/gpsd_2.34.bb +++ b/packages/gpsd/gpsd_2.34.bb @@ -1,4 +1,4 @@ require gpsd.inc -PR = "r4" +PR = "r5" diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb new file mode 100644 index 0000000000..275602762d --- /dev/null +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb @@ -0,0 +1,11 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." +LICENSE = "GPL" +PR = "r2" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig" + +require linux-handhelds-2.6.inc diff --git a/packages/musicpd/mpd-alsa_svn.bb b/packages/musicpd/mpd-alsa_svn.bb new file mode 100644 index 0000000000..932295c3a6 --- /dev/null +++ b/packages/musicpd/mpd-alsa_svn.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "Music Player Daemon (mpd). This version is configured for alsa support" +HOMEPAGE = "http://www.musicpd.org" +SECTION = "console/multimedia" +LICENSE = "GPLv2" +DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmikmod libmad flac audiofile virtual/libiconv" +RDEPENDS = "libao-alsa" +PR = "r0" + +SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \ + file://mpd/mpd.init" +# file://mpd/save-volume-state.patch;patch=1 \ + +S = "${WORKDIR}/trunk" + +inherit autotools update-rc.d +INITSCRIPT_NAME = "mpd" + +# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to +# be built, instead we use the OE built versions which should be installed +# in staging - remove the --with and replace with --enable to use the local +# versions. + +EXTRA_OECONF = "\ +--disable-ogg \ +--disable-oggvorbis \ +--disable-oggflac \ +--disable-flac \ +--without-faad \ +--with-iconv-libraries=${STAGING_LIBDIR} \ +--with-iconv-includes=${STAGING_INCDIR} \ +--with-ao-libraries=${STAGING_LIBDIR} \ +--with-ao-includes=${STAGING_INCDIR} \ +--with-id3tag-libraries=${STAGING_LIBDIR} \ +--with-id3tag-includes=${STAGING_INCDIR} \ +--with-mad-libraries=${STAGING_LIBDIR} \ +--with-mad-includes=${STAGING_INCDIR} \ +--disable-aotest \ +--disable-alsatest \ +--disable-oggtest \ +--disable-vorbistest \ +--disable-libFLACtest \ +--disable-libOggFLACtest \ +--disable-audiofiletest \ +--disable-libmikmodtest \ +" + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/mpd/mpd.init ${D}${sysconfdir}/init.d/mpd +} |