mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 12:50:22 +02:00
libvirt: convert WORKDIR references to UNPACKDIR
Converting WORDIR references to UNPACKDIR. Our generated keys and other references to WORKDIR continue to be fine. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
parent
7e5d098342
commit
9388aae0f3
|
@ -195,8 +195,8 @@ do_install:append() {
|
||||||
install -d ${D}/etc/libvirt
|
install -d ${D}/etc/libvirt
|
||||||
install -d ${D}/etc/dnsmasq.d
|
install -d ${D}/etc/dnsmasq.d
|
||||||
|
|
||||||
install -m 0755 ${WORKDIR}/libvirtd.sh ${D}/etc/init.d/libvirtd
|
install -m 0755 ${UNPACKDIR}/libvirtd.sh ${D}/etc/init.d/libvirtd
|
||||||
install -m 0644 ${WORKDIR}/libvirtd.conf ${D}/etc/libvirt/libvirtd.conf
|
install -m 0644 ${UNPACKDIR}/libvirtd.conf ${D}/etc/libvirt/libvirtd.conf
|
||||||
|
|
||||||
if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
|
if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
|
||||||
# This will wind up in the libvirtd package, but will NOT be invoked by default.
|
# This will wind up in the libvirtd package, but will NOT be invoked by default.
|
||||||
|
@ -255,12 +255,12 @@ do_install:append() {
|
||||||
mkdir -p ${D}/etc/libvirt/hooks
|
mkdir -p ${D}/etc/libvirt/hooks
|
||||||
for hook in "daemon" "lxc" "network" "qemu"
|
for hook in "daemon" "lxc" "network" "qemu"
|
||||||
do
|
do
|
||||||
install -m 0755 ${WORKDIR}/hook_support.py ${D}/etc/libvirt/hooks/${hook}
|
install -m 0755 ${UNPACKDIR}/hook_support.py ${D}/etc/libvirt/hooks/${hook}
|
||||||
done
|
done
|
||||||
|
|
||||||
# Force the main dnsmasq instance to bind only to specified interfaces and
|
# Force the main dnsmasq instance to bind only to specified interfaces and
|
||||||
# to not bind to virbr0. Libvirt will run its own instance on this interface.
|
# to not bind to virbr0. Libvirt will run its own instance on this interface.
|
||||||
install -m 644 ${WORKDIR}/dnsmasq.conf ${D}/${sysconfdir}/dnsmasq.d/libvirt-daemon
|
install -m 644 ${UNPACKDIR}/dnsmasq.conf ${D}/${sysconfdir}/dnsmasq.d/libvirt-daemon
|
||||||
|
|
||||||
# remove .la references to our working diretory
|
# remove .la references to our working diretory
|
||||||
for i in `find ${D}${libdir} -type f -name *.la`; do
|
for i in `find ${D}${libdir} -type f -name *.la`; do
|
||||||
|
|
Loading…
Reference in New Issue
Block a user