From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 1 Aug 2011 13:32:38 +0000 (+0200)
Subject: build-essentials: Add option to disable directory check.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2eea8f632d4d9f59fca0163692ed91a6d854cc4;p=ipfire-3.x.git

build-essentials: Add option to disable directory check.

This is needed for the filesystem package.
---

diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm
index e29fa4216..01cd86390 100644
--- a/pkgs/build-essentials/build-essentials.nm
+++ b/pkgs/build-essentials/build-essentials.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = build-essentials
-PKG_VER        = 1.0
+PKG_VER        = 1.1
 PKG_REL        = 1
 PKG_EPOCH      = 2
 PKG_ARCH       = noarch
diff --git a/pkgs/build-essentials/buildsystem-tools/functions-directories b/pkgs/build-essentials/buildsystem-tools/functions-directories
index e779d75b2..700321ceb 100644
--- a/pkgs/build-essentials/buildsystem-tools/functions-directories
+++ b/pkgs/build-essentials/buildsystem-tools/functions-directories
@@ -5,6 +5,10 @@ function dir_is_empty() {
 }
 
 function directory_remove_orphans() {
+	if [ "${QUALITY_AGENT_NO_DIRECTORY_PRUNE}" = "yes" ]; then
+		return
+	fi
+
 	local basedir=${1}
 
 	log DEBUG "Removing orphans in ${basedir}"
diff --git a/pkgs/build-essentials/buildsystem/Constants b/pkgs/build-essentials/buildsystem/Constants
index d46d5f3cc..65aa2aee0 100644
--- a/pkgs/build-essentials/buildsystem/Constants
+++ b/pkgs/build-essentials/buildsystem/Constants
@@ -170,3 +170,5 @@ export QUALITY_AGENT_WHITELIST_NX
 export QUALITY_AGENT_WHITELIST_RPATH
 export QUALITY_AGENT_WHITELIST_SONAME
 export QUALITY_AGENT_WHITELIST_SYMLINK
+export QUALITY_AGENT_NO_DIRECTORY_CHECK
+export QUALITY_AGENT_NO_DIRECTORY_PRUNE
diff --git a/pkgs/build-essentials/quality-agent/quality-agent.d/095-directory-layout b/pkgs/build-essentials/quality-agent/quality-agent.d/095-directory-layout
index 14f600d7b..3f946a186 100755
--- a/pkgs/build-essentials/quality-agent/quality-agent.d/095-directory-layout
+++ b/pkgs/build-essentials/quality-agent/quality-agent.d/095-directory-layout
@@ -7,6 +7,11 @@ DESC="The filelayout should comply to the FHS."
 DIRS="/etc/init.d /etc/rc.d /lib/pkgconfig /usr/etc /usr/libexec /usr/local /usr/man /usr/usr /usr/var"
 
 function check() {
+	# Do nothing, if directory check was disabled.
+	if [ "${QUALITY_AGENT_NO_DIRECTORY_CHECK}" = "yes" ]; then
+		return 0
+	fi
+
 	local failed=0
 
 	local dir