New commits:
commit 808f6a28e545f294b8febd7e470485b47306f626
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nvidia_legacy_96xx: use check_tmp_noexec()
commit ab7f270133d17bf2243021c9db89232c214d1268
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nvidia_legacy_340xx: use check_tmp_noexec()
commit f6b956d421fa65ff17f53e443adbae8d7f002bcb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nvidia_legacy_295xx: use check_tmp_noexec()
commit 834e7fb3def672cf620cd0eed54c97e6e0d25cb7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nvidia_legacy_173xx: use check_tmp_noexec()
commit 79329ee92d3f52c58df871466d59e329bc1584cb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nvidia_legacy: use check_tmp_noexec()
commit 724a17d6fdf2a8cf6fa900c8e1bd6c18cf9b4561
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nvidia_driver: use check_tmp_noexec()
commit 9e57fed926deb9a6b7707c664d1a2f5629e034e0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nvidia_legacy_304xx: use check_tmp_noexec()
commit 01d3ad135e50c976818944358857d51a9cc78b8d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
backported check_tmp_noexec() from the test grimoire
diff --git a/ChangeLog b/ChangeLog
index ce81135..70bf8b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * FUNCTIONS: backported check_tmp_noexec() from the test grimoire;
moved
+ glselect function include to the bottom
+
2015-01-28 Ladislav Hagara <hgr AT vabo.cz>
* z-kernels/nvidia_legacy_340xx: new spell, certified NVIDIA binary
drivers for older cards, based on spell nvidia_driver
diff --git a/FUNCTIONS b/FUNCTIONS
index 817adf0..59754b7 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -641,7 +641,26 @@ function is_version_less() {
[ ! $(echo -e "$1\n$2" | sort --version-sort | head -1) = "$2" ]
}
-. $GRIMOIRE/glselect.function
+#---
+## Check sanity of a temporary partition
+## @param $1 - the partition to check for
+#---
+function check_tmp_noexec() {
+ if [[ -z $1 ]]; then
+ message "${PROBLEM_COLOR}Partition name cannot be empty${DEFAULT_COLOR}"
&&
+ return 1
+ fi &&
+
+ if awk -v tmp=$1 '{ if ($2 == tmp) print $4 }' < /proc/mounts | grep -q
noexec; then
+ message -n "${MESSAGE_COLOR}Remounting $1 with exec option (required for
build)... " &&
+ mount -o exec,remount $1 &&
+ message "done${DEFAULT_COLOR}"
+ else
+ message -n "${MESSAGE_COLOR}Restoring $1 mount options... " &&
+ mount -o noexec,remount $1 &&
+ message "done${DEFAULT_COLOR}"
+ fi
+}
#---
## Select SCM branch. If no parameter is given, it assumes a single scm
branch.
@@ -674,3 +693,5 @@ function prepare_select_branch() {
function get_up_spell_name() {
echo ${1:-$SPELL} | tr "a-z-" "A-Z_"
}
+
+. $GRIMOIRE/glselect.function
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index c2c2004..686bd6e 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,6 @@
+2015-03-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: use check_tmp_noexec
+
2015-03-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 346.47