From faf52f515539e46e6867c7ceee975576991ceb46 Mon Sep 17 00:00:00 2001 From: Denis Carikli Date: Fri, 13 May 2011 20:43:07 +0000 Subject: 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 Acked-by: Stefan Schmidt --- recipes/tasks/task-bug.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes/tasks') 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 \ -- cgit 1.2.3-korg