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 3.x development tree".
The branch, master has been updated via fdd425b9a197cf4cc0068eeb2a01ffbf90a821c9 (commit) via 66d27fb3ab97ad5c481b67af456a62d2bb1824fb (commit) via 803dc34f90f8504c231fb5f663640d4d39a9fdd9 (commit) via b2eea8f632d4d9f59fca0163692ed91a6d854cc4 (commit) from 4c528699d890e109beddde481ec64d11f376f902 (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 fdd425b9a197cf4cc0068eeb2a01ffbf90a821c9 Merge: 66d27fb 4c52869 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 1 17:14:00 2011 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit 66d27fb3ab97ad5c481b67af456a62d2bb1824fb Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 1 15:34:58 2011 +0200
basesystem: Add dependency to filesystem package.
commit 803dc34f90f8504c231fb5f663640d4d39a9fdd9 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 1 15:33:16 2011 +0200
filesystem: New package.
Package, which created the basic directory layout on an IPFire system.
commit b2eea8f632d4d9f59fca0163692ed91a6d854cc4 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 1 15:32:38 2011 +0200
build-essentials: Add option to disable directory check.
This is needed for the filesystem package.
-----------------------------------------------------------------------
Summary of changes: pkgs/basesystem/basesystem.nm | 6 +- pkgs/build-essentials/build-essentials.nm | 2 +- .../buildsystem-tools/functions-directories | 4 + pkgs/build-essentials/buildsystem/Constants | 2 + .../quality-agent.d/095-directory-layout | 5 + pkgs/{setup/setup.nm => filesystem/filesystem.nm} | 92 ++++++++++++++----- 6 files changed, 83 insertions(+), 28 deletions(-) copy pkgs/{setup/setup.nm => filesystem/filesystem.nm} (52%)
Difference in files: diff --git a/pkgs/basesystem/basesystem.nm b/pkgs/basesystem/basesystem.nm index d4bec5c..ec7780a 100644 --- a/pkgs/basesystem/basesystem.nm +++ b/pkgs/basesystem/basesystem.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = basesystem PKG_VER = 2.99 -PKG_REL = 1 +PKG_REL = 2 PKG_EPOCH = 1 PKG_ARCH = noarch
@@ -41,8 +41,8 @@ PKG_BUILD_DEPS = # There are no build dependencies # This is a package that pulls lots of other dependencies to always have a # useable system. PKG_DEPS += /bin/sh /sbin/init \ - coreutils file findutils gawk grep iana-etc initscripts kbd less \ - module-init-tools network pakfire passwd procps psmisc sed setup \ + coreutils file filesystem findutils gawk grep iana-etc initscripts kbd \ + less module-init-tools network pakfire passwd procps psmisc sed setup \ shadow syslog system-release tar udev util-linux vim
define PKG_DESCRIPTION diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm index e29fa42..01cd863 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 e779d75..700321c 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 d46d5f3..65aa2ae 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 14f600d..3f946a1 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 diff --git a/pkgs/filesystem/filesystem.nm b/pkgs/filesystem/filesystem.nm new file mode 100644 index 0000000..7c7115b --- /dev/null +++ b/pkgs/filesystem/filesystem.nm @@ -0,0 +1,110 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = filesystem +PKG_VER = 001 +PKG_REL = 1 + +PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org +PKG_GROUPS = Base System/Base +PKG_URL = +PKG_LICENSE = Public Domain +PKG_SUMMARY = The basic directory layout for a Linux system. + +PKG_BUILD_DEPS = build-essentials>=2:1.1-1 +PKG_PREREQUIRES += setup + +define PKG_DESCRIPTION + The filesystem package is one of the basic packages that is installed + on a Linux system. Filesystem contains the basic directory layout + for a Linux operating system, including the correct permissions for + the directories. +endef + +DIR_APP = $(DIR_SRC) + +QUALITY_AGENT_NO_DIRECTORY_CHECK = yes +QUALITY_AGENT_NO_DIRECTORY_PRUNE = yes + +STAGE_BUILD = # Nothing to do + +define STAGE_INSTALL + cd $(BUILDROOT) && mkdir -pv \ + bin \ + boot \ + dev \ + etc/pki \ + etc/skel \ + etc/sysconfig \ + home \ + lib/modules \ + media \ + mnt \ + opt \ + proc \ + root \ + run/lock \ + sbin \ + srv \ + sys \ + tmp \ + usr/bin \ + usr/include \ + usr/lib \ + usr/lib/locale \ + usr/sbin \ + usr/share/{aclocal,dict,doc,empty,info,mime-info,misc} \ + usr/share/man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p} \ + usr/src \ + usr/local/bin \ + usr/local/etc \ + usr/local/lib \ + usr/local/sbin \ + usr/local/share \ + usr/local/share/man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x} \ + usr/local/share/info \ + usr/local/include \ + var/empty \ + var/lib \ + var/local \ + var/lock/subsys \ + var/log \ + var/nis \ + var/preserve \ + var/run \ + var/spool/{mail,lpd} \ + var/tmp \ + var/db \ + var/cache + + cd $(BUILDROOT) && ln -snf ../var/tmp usr/tmp + cd $(BUILDROOT) && ln -snf spool/mail var/mail + + # Setting correct permissions. + chmod 1777 $(BUILDROOT)/{,var/}tmp + chown root:mail $(BUILDROOT)/var/spool/mail + chmod 775 $(BUILDROOT)/var/spool/mail +endef
hooks/post-receive -- IPFire 3.x development tree