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 e29fa4216d47cf0ed65f6461c5c603a44b5d5e5a..01cd8639084d4f60006bebf00c238a6783ae7320 100644 (file)
--- 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 e779d75b245d7c63e50d8605227386a4a9ec5eb0..700321ceb23bfa0ae4c13c2994ba7d9825e5ab68 100644 (file)
--- 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 d46d5f3cc7f96146d38f88979d4461a0914f34a5..65aa2aee001ed67c601f8deb15c1ec12c9284bfa 100644 (file)
--- 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 14f600d7bcf2c7f3d580f53f74c2ff15bbe506a8..3f946a18660f73b9cf8f2c6db882f65362fc30f6 100755 (executable)
--- 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