diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
commit | 293b05335ab540c4c8402e0a5caf2886b786a318 (patch) | |
tree | 11e5a7c2dce338058f150e08d1ff47c9d4d8eccd /recipes/lm_sensors/lmsensors-apps_2.10.8.bb | |
parent | 1ee2156592ba17f64f3c9b8970285a259730b871 (diff) | |
parent | e9aacc4ce4784c91cb4908145b8fb7b3ec8aa6e0 (diff) | |
download | openembedded-293b05335ab540c4c8402e0a5caf2886b786a318.tar.gz |
Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010
Conflicts:
recipes/linux/linux-openmoko-devel_git.bb
recipes/openmoko-3rdparty/pisi_0.5.2.bb
recipes/openmoko-3rdparty/pisi_0.5.3.bb
recipes/openmoko-3rdparty/pisi_0.5.bb
recipes/uclibc/uclibc_nptl.bb
Diffstat (limited to 'recipes/lm_sensors/lmsensors-apps_2.10.8.bb')
-rw-r--r-- | recipes/lm_sensors/lmsensors-apps_2.10.8.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes/lm_sensors/lmsensors-apps_2.10.8.bb b/recipes/lm_sensors/lmsensors-apps_2.10.8.bb index 6411e33ec5..dcc33ac3ad 100644 --- a/recipes/lm_sensors/lmsensors-apps_2.10.8.bb +++ b/recipes/lm_sensors/lmsensors-apps_2.10.8.bb @@ -5,10 +5,10 @@ LICENSE = "GPL" PR = "r1" SRC_URI = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${PV}.tar.gz \ - file://prefix-fix.patch;patch=1 \ - file://add-sysfs-ldflags.patch;patch=1" + file://prefix-fix.patch \ + file://add-sysfs-ldflags.patch" -SRC_URI_append_uclibc = "file://iconv.patch;patch=1" +SRC_URI_append_uclibc = "file://iconv.patch" S = "${WORKDIR}/lm_sensors-${PV}" |