Buildfixes

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@976 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/common/grub b/config/rootfiles/common/grub
index 3f3ff559719eb7c4961472e49b8eece5ba636e70..2324e1cfb5df09979a725a86f716ca6c5764abf1 100644 (file)
--- a/config/rootfiles/common/grub
+++ b/config/rootfiles/common/grub
@@ -1,5 +1,5 @@
 #boot/grub
-boot/grub/default
+#boot/grub/default
 boot/grub/grub.conf
 boot/grub/ipfire.xpm.gz
 boot/grub/stage1

diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index d59c27a82f7d2c908f6c0d449759598116f8fc81..5b9673cef35d5db0a6a8a074e9811a6f705fc19d 100644 (file)
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -9,7 +9,7 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.2
-usr/lib/libclamav.so.2.0.7
+usr/lib/libclamav.so.2.0.8
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav

diff --git a/config/rootfiles/packages/mpfire b/config/rootfiles/packages/mpfire
index dc0ba428d31c1b6dbeba79a02254d99b6d730903..7c6f01bf72549adb97af096e92e91ae4be18a010 100644 (file)
--- a/config/rootfiles/packages/mpfire
+++ b/config/rootfiles/packages/mpfire
@@ -1,6 +1,6 @@
 usr/local/bin/mpfirectrl
 srv/web/ipfire/cgi-bin/mpfire.cgi
-var/ipfire/backup/addons/include/mpfire
+var/ipfire/backup/addons/includes/mpfire
 var/ipfire/menu.d/EX-mpfire.menu
 var/ipfire/mpfire
 var/ipfire/mpfire/bin

diff --git a/config/rootfiles/packages/samba b/config/rootfiles/packages/samba
index 35bc24b4072cddb93f4ee91676ed4b01fde608cb..a50a8a5a1eacf38bfdd565cbd950ee979354645a 100644 (file)
--- a/config/rootfiles/packages/samba
+++ b/config/rootfiles/packages/samba
@@ -574,7 +574,7 @@ usr/sbin/winbindd
 #usr/share/samba/swat/using_samba/samba2_s.gif
 #usr/share/samba/swat/using_samba/samba2_xs.gif
 #usr/share/samba/swat/using_samba/toc.html
-var/ipfire/backup/addons/include/samba
+var/ipfire/backup/addons/includes/samba
 #var/ipfire/samba
 var/ipfire/samba/default.global
 var/ipfire/samba/default.pdc

diff --git a/lfs/backup b/lfs/backup
index d11e7ea2c2e0b4871b8e8768f59b0f6e2bee4715..d0038724c02a1272c44185981c3d7a88d27b3781 100644 (file)
--- a/lfs/backup
+++ b/lfs/backup
@@ -61,6 +61,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        install -v -m 644 $(DIR_SRC)/config/backup/exclude /var/ipfire/backup/
        chown nobody:nobody -R /var/ipfire/backup/
        -mkdir -p /var/ipfire/backup/addons
-       -mkdir -p /var/ipfire/backup/addons/include
+       -mkdir -p /var/ipfire/backup/addons/includes
        -mkdir -p /var/ipfire/backup/addons/backup
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index c42cc821b1b8d0fc73960b8c58ff7315b7f18532..dbaa1fc2b02d5090e056c3373508bd50fcbb91ff 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -318,6 +318,7 @@ buildipfire() {
   LOGFILE="$BASEDIR/log/_build.ipfire.log"
   export LOGFILE
   ipfiremake configroot
+  ipfiremake backup
   ipfiremake dhcp
   ipfiremake dhcpcd
   ipfiremake libusb
@@ -500,7 +501,6 @@ buildipfire() {
   ipfiremake libpri
   ipfiremake stund
   ipfiremake asterisk
-  ipfiremake backup
   ipfiremake gnump3d
   ipfiremake libsigc++
   ipfiremake applejuice