[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3ddd5b66a9f436c0f2f5f7a8d3b549c4f11a5e84

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 2990 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  3ddd5b66a9f436c0f2f5f7a8d3b549c4f11a5e84 (commit)
       via  6c86682e64e10cbb229e3af34f792f43c0cb974b (commit)
      from  89ad036a38e7b1239867922262d7ad49d838397e (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 3ddd5b66a9f436c0f2f5f7a8d3b549c4f11a5e84
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 24 13:17:30 2017 +0200

    Fix environment variables when building file list for core updates
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 6c86682e64e10cbb229e3af34f792f43c0cb974b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 24 13:16:44 2017 +0200

    Rootfile update for mysql
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/packages/mysql | 1 -
 lfs/core-updates                | 3 ++-
 src/scripts/archive.files       | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/rootfiles/packages/mysql b/config/rootfiles/packages/mysql
index 8f1414a..2923246 100644
--- a/config/rootfiles/packages/mysql
+++ b/config/rootfiles/packages/mysql
@@ -53,7 +53,6 @@ srv/mysql
 #srv/mysql/mysql/user.MYD
 #srv/mysql/mysql/user.MYI
 #srv/mysql/mysql/user.frm
-srv/mysql/test
 usr/bin/comp_err
 usr/bin/innochecksum
 usr/bin/msql2mysql
diff --git a/lfs/core-updates b/lfs/core-updates
index 75a8415..3c847da 100644
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -56,7 +56,8 @@ core/%:
 	eval $$(cat /usr/src/config/rootfiles/$@/meta)
 
 	#Generate ROOTFILES from filelists
-	$(DIR_SRC)/src/scripts/archive.files \
+	BUILD_ARCH=$(BUILD_ARCH) BUILDTARGET=$(BUILDTARGET) KVER=$(KVER) \
+		$(DIR_SRC)/src/scripts/archive.files \
 		$(DIR_SRC)/config/rootfiles/$@/filelists \
 		$(DIR_SRC)/config/rootfiles/$@/files \
 		$(DIR_SRC)/config/rootfiles/$@/files.$(BUILD_ARCH) \
diff --git a/src/scripts/archive.files b/src/scripts/archive.files
index 0ed237b..45de8c7 100755
--- a/src/scripts/archive.files
+++ b/src/scripts/archive.files
@@ -19,6 +19,13 @@
 #                                                                             #
 ###############################################################################
 
+for i in BUILD_ARCH BUILDTARGET KVER; do
+	if [ -z "${!i}" ]; then
+		echo "${i} not set" >&2
+		exit 1
+	fi
+done
+
 FILELIST=
 
 for dir in $@; do


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