[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1e4dbfbdf9a06512f52c2d49b77b5c2bc4d2a768

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1e4dbfbdf9a06512f52c2d49b77b5c2bc4d2a768

[git]

[-- Attachment #1: Type: text/plain, Size: 4678 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  1e4dbfbdf9a06512f52c2d49b77b5c2bc4d2a768 (commit)
       via  37b2466d2bcabfd25bfe9dde875784957f7231ab (commit)
       via  6a3d7dff1f82fed80c1a80519265e70e8b358a49 (commit)
       via  c0d5649e99848b7744b3f4d98a6f3854e46c326c (commit)
      from  5934eb5832d5d6c7768a78ca15b0b21ab2f4576e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1e4dbfbdf9a06512f52c2d49b77b5c2bc4d2a768
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Sep 14 13:49:40 2015 +0100

    dma: Remove package variables since dma is not a package
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 37b2466d2bcabfd25bfe9dde875784957f7231ab
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Mon Sep 14 14:33:36 2015 +0200

    DMA: add empty mail.conf needed by WIO
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 6a3d7dff1f82fed80c1a80519265e70e8b358a49
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Mon Sep 14 14:38:06 2015 +0200

    DMA: added new file mail.conf to rootfile
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit c0d5649e99848b7744b3f4d98a6f3854e46c326c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Sep 14 13:48:45 2015 +0100

    make.sh: Fix typo in variable name COMPILERCACHE -> COMPILERCHECK
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/dma | 1 +
 lfs/dma                     | 3 +--
 tools/make-functions        | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/dma b/config/rootfiles/common/dma
index ac57527..e98e674 100644
--- a/config/rootfiles/common/dma
+++ b/config/rootfiles/common/dma
@@ -9,5 +9,6 @@ usr/sbin/sendmail.dma
 var/ipfire/dma
 var/ipfire/dma/auth.conf
 var/ipfire/dma/dma.conf
+var/ipfire/dma/mail.conf
 var/lib/alternatives/sendmail
 var/spool/dma
diff --git a/lfs/dma b/lfs/dma
index 9fe49ab..977efc8 100644
--- a/lfs/dma
+++ b/lfs/dma
@@ -31,8 +31,6 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = dma
-PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
@@ -74,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	mkdir -pv /var/ipfire/dma
+	touch /var/ipfire/dma/mail.conf
 	cd $(DIR_APP) && sed -i '/PREFIX/s/usr\/local/usr/g' Makefile
 	cd $(DIR_APP) && sed -i '/CONFDIR/s/etc\/dma/var\/ipfire\/dma/g' Makefile
 	cd $(DIR_APP) && make
diff --git a/tools/make-functions b/tools/make-functions
index a94dbd7..a9baab9 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -581,7 +581,7 @@ lfsmake2() {
 						CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 						CCACHE_DIR=/usr/src/ccache \
 						CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
-						CCACHE_COMPILERCHECK="${CCACHE_COMPILERCACHE}" \
+						CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
 						KVER=$KVER MAKETUNING=$MAKETUNING \
 						BUILDTARGET="$BUILDTARGET" \
 						CROSSTARGET="${CROSSTARGET}" \
@@ -623,7 +623,7 @@ ipfiremake() {
 						CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 						CCACHE_DIR=/usr/src/ccache \
 						CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
-						CCACHE_COMPILERCHECK="${CCACHE_COMPILERCACHE}" \
+						CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
 						KVER=$KVER MAKETUNING=$MAKETUNING \
 						BUILDTARGET="$BUILDTARGET" \
 						CROSSTARGET="${CROSSTARGET}" \
@@ -663,7 +663,7 @@ ipfiredist() {
 					CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 					CCACHE_DIR=/usr/src/ccache \
 					CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
-					CCACHE_COMPILERCHECK="${CCACHE_COMPILERCACHE}" \
+					CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
 					KVER=$KVER \
 					BUILDTARGET="$BUILDTARGET" \
 					CROSSTARGET="${CROSSTARGET}" \


hooks/post-receive
--
IPFire 2.x development tree