From 3a8b6ae05d4eb722ca67cd4ce393a9e424160100 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 24 Feb 2017 20:09:03 +0000
Subject: [PATCH] Various rootfile fixes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/common/attr    | 12 ++----------
 config/rootfiles/packages/avahi |  3 +--
 config/rootfiles/packages/qemu  |  1 -
 lfs/qemu                        |  2 +-
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/config/rootfiles/common/attr b/config/rootfiles/common/attr
index d24d1334d5..ae8c34aa3f 100644
--- a/config/rootfiles/common/attr
+++ b/config/rootfiles/common/attr
@@ -8,7 +8,7 @@ usr/bin/setfattr
 #usr/include/attr/xattr.h
 #usr/lib/libattr.a
 #usr/lib/libattr.la
-usr/lib/libattr.so
+#usr/lib/libattr.so
 usr/lib/libattr.so.1
 usr/lib/libattr.so.1.1.0
 #usr/share/doc/attr
@@ -28,17 +28,9 @@ usr/lib/libattr.so.1.1.0
 #usr/share/man/man1/attr.1
 #usr/share/man/man1/getfattr.1
 #usr/share/man/man1/setfattr.1
-#usr/share/man/man2/fgetxattr.2
+#usr/share/man/man2/flistxattr.2
 #usr/share/man/man2/fremovexattr.2
-#usr/share/man/man2/fsetxattr.2
-#usr/share/man/man2/getxattr.2
-#usr/share/man/man2/llistxattr.2
 #usr/share/man/man2/lgetxattr.2
-#usr/share/man/man2/listxattr.2
-#usr/share/man/man2/lremovexattr.2
-#usr/share/man/man2/lsetxattr.2
-#usr/share/man/man2/removexattr.2
-#usr/share/man/man2/setxattr.2
 #usr/share/man/man3/attr_get.3
 #usr/share/man/man3/attr_getf.3
 #usr/share/man/man3/attr_list.3
diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi
index dc2c56d2ff..fa8f25b535 100644
--- a/config/rootfiles/packages/avahi
+++ b/config/rootfiles/packages/avahi
@@ -91,6 +91,7 @@ usr/lib/python2.7/site-packages/avahi/ServiceTypeDatabase.py
 usr/sbin/avahi-autoipd
 usr/sbin/avahi-daemon
 usr/sbin/avahi-dnsconfd
+#usr/share/applications
 usr/share/avahi
 usr/share/avahi/avahi-service.dtd
 usr/share/avahi/service-types
@@ -160,5 +161,3 @@ usr/share/avahi/service-types
 #usr/share/man/man8/avahi-daemon.8
 #usr/share/man/man8/avahi-dnsconfd.8
 #usr/share/man/man8/avahi-dnsconfd.action.8
-#usr/var/run
-etc/rc.d/init.d/avahi
diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index 022d4ebc8d..1adb3849b0 100644
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -105,4 +105,3 @@ usr/share/qemu/vgabios-stdvga.bin
 usr/share/qemu/vgabios-virtio.bin
 usr/share/qemu/vgabios-vmware.bin
 usr/share/qemu/vgabios.bin
-#usr/var/run
diff --git a/lfs/qemu b/lfs/qemu
index 26c2f24ec1..57d79a3560 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
-		--enable-kvm --disable-bluez --disable-attr \
+		--localstatedir=/var --enable-kvm --disable-bluez --disable-attr \
 		--target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \
 		--extra-cflags="$(CFLAGS)" --enable-spice --enable-usb-redir
 	cd $(DIR_APP) && make $(MAKETUNING)
-- 
2.39.2