diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-21 23:03:36 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-21 23:03:36 +0100 |
| commit | 80402d4b6d357070c93fa541f50f2466b2a3e7b9 (patch) | |
| tree | da6a2f8ccb009a640958e81c3eecf9af7c0d9516 /recipes | |
| parent | f1a2168b53550ff5fa9bacd85a1092b20e05e2e8 (diff) | |
| parent | 2f15c139108411520a235708e3a3b697eb12b497 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/freesmartphone/fsodeviced/fsodeviced | 2 | ||||
| -rw-r--r-- | recipes/freesmartphone/fsodeviced_git.bb | 2 | ||||
| -rw-r--r-- | recipes/squashfs-tools/squashfs-tools.inc | 4 | ||||
| -rw-r--r-- | recipes/squashfs-tools/squashfs-tools_4.0.bb | 7 | ||||
| -rw-r--r-- | recipes/tasks/task-shr-feed.bb | 1 |
5 files changed, 9 insertions, 7 deletions
diff --git a/recipes/freesmartphone/fsodeviced/fsodeviced b/recipes/freesmartphone/fsodeviced/fsodeviced index 2e701eda29..2926481e55 100644 --- a/recipes/freesmartphone/fsodeviced/fsodeviced +++ b/recipes/freesmartphone/fsodeviced/fsodeviced @@ -8,7 +8,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin NAME=fsodeviced -NICENESS=-19 +NICENESS=10 [ -f /etc/default/rcS ] && . /etc/default/rcS diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb index 56773cc6b1..0fe723ff32 100644 --- a/recipes/freesmartphone/fsodeviced_git.bb +++ b/recipes/freesmartphone/fsodeviced_git.bb @@ -6,7 +6,7 @@ RDEPENDS += "libcanberra-alsa" RRECOMMENDS += "fso-alsa-data" PV = "0.9.0+gitr${SRCREV}" PE = "1" -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" inherit update-rc.d diff --git a/recipes/squashfs-tools/squashfs-tools.inc b/recipes/squashfs-tools/squashfs-tools.inc index aa75eaa898..fb5a648545 100644 --- a/recipes/squashfs-tools/squashfs-tools.inc +++ b/recipes/squashfs-tools/squashfs-tools.inc @@ -2,14 +2,14 @@ DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux." SECTION = "base" LICENSE = "GPLv2" DEPENDS = "zlib" -INC_PR = "r2" +INC_PR = "r3" S = "${WORKDIR}/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}/squashfs-tools" # required to share same place with -lzma specific packages FILESPATHPKG = "squashfs-tools-${PV}:squashfs-tools:files" -SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz" +SRC_URI ?= "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz" prefix = "" diff --git a/recipes/squashfs-tools/squashfs-tools_4.0.bb b/recipes/squashfs-tools/squashfs-tools_4.0.bb index 29d82a83b0..886c095883 100644 --- a/recipes/squashfs-tools/squashfs-tools_4.0.bb +++ b/recipes/squashfs-tools/squashfs-tools_4.0.bb @@ -1,9 +1,10 @@ -require squashfs-tools.inc -PR = "${INC_PR}.2" - # This override is required since this has not yet been released SRC_URI = "cvs://anonymous@squashfs.cvs.sourceforge.net/cvsroot/squashfs;module=squashfs;date=${SRCDATE} \ http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2" + +require squashfs-tools.inc +PR = "${INC_PR}.2" + S = "${WORKDIR}/squashfs/squashfs-tools" EXTRA_OEMAKE += "LZMA_SUPPORT=1 LZMA_DIR=../.." diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index bff1bfad7a..3a149d6d6b 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -238,4 +238,5 @@ RDEPENDS_${PN} += "\ reiserfsprogs \ blipomoko \ imagemagick \ + xboard \ " |