diff options
| author |   Denis Carikli <GNUtoo@no-log.org> | 2011-05-13 20:43:07 +0000 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2011-05-14 12:56:51 +0200 |
| commit | faf52f515539e46e6867c7ceee975576991ceb46 (patch) | |
| tree | cf7797285abd73f25cbe16f2a08aceee4a6400e4 /recipes/tasks | |
| parent | a115c3eabe914936930622657bfb9631b065d7bd (diff) | |
| download | openembedded-faf52f515539e46e6867c7ceee975576991ceb46.tar.gz | |
task-bug: fix do_rootfs conflict
Without that patch we have(at do_rootfs)
Configuring hostap-daemon.
Collected errors:
* extract_archive: Cannot create symlink from ./var/run to 'volatile/run': File exists.
* file_md5sum_alloc: Failed to open file .../rootfs/bug-image-production/etc/opkg/*.conf: No such file or directory.
* check_data_file_clashes: Package dnsmasq-dbus wants to install file .../rootfs/bug-image-production/etc/init.d/dnsmasq
But that file is already provided by package * dnsmasq
* check_data_file_clashes: Package dnsmasq-dbus wants to install file .../rootfs/bug-image-production/usr/bin/dnsmasq
But that file is already provided by package * dnsmasq
* opkg_install_cmd: Cannot install package task-bug-network.
* resolve_conffiles: Existing conffile .../rootfs/bug-image-production/etc/device_table is different from the conffile
in the new package. The new conffile will be placed at .../rootfs/bug-image-production/etc/device_table-opkg.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Acked-by: Stefan Schmidt <stefan@buglabs.net>
Diffstat (limited to 'recipes/tasks')
| -rw-r--r-- | recipes/tasks/task-bug.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes/tasks/task-bug.bb b/recipes/tasks/task-bug.bb index 1317a6ec47..f81c56a100 100644 --- a/recipes/tasks/task-bug.bb +++ b/recipes/tasks/task-bug.bb @@ -1,6 +1,6 @@ # Copyright (C) 2011 Bug Labs, Inc -PR = "r88" +PR = "r89" ALLOW_EMPTY = "1" @@ -25,7 +25,7 @@ RDEPENDS_${PN} = "${MACHINE_EXTRA_RRECOMMENDS} \ RDEPENDS_${PN}_append_bug20 = "bug2v4l2" RDEPENDS_${PN}-network = "\ - dnsmasq \ + dnsmasq-dbus \ hostap-daemon \ iptables \ eject \ |