[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 31e8c1b406a91139663464d86b8af860b67fb070 - IPFire-SCM

2 Oct 2010

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  31e8c1b406a91139663464d86b8af860b67fb070 (commit)
       via  3b381d129d093b6fee3d5eb912e78b50028b8321 (commit)
       via  8b8ccb55cc917c5b8cd0ac74cde58c60e5127d6c (commit)
       via  eee0585c81a856db030e34dcbd744ac97bdc331c (commit)
       via  a72bb39ef94652f5e283e8184a002b8ca338be66 (commit)
       via  c5e4fc2e25be740198143aa8743f05fe2612f698 (commit)
      from  1added9123c8acfa0c12a5f5cd716adb40666a1a (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 31e8c1b406a91139663464d86b8af860b67fb070
Merge: 1added9 3b381d1
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 2 20:34:51 2010 +0200
Merge commit '3b381d129d093b6fee3d5eb912e78b50028b8321' into next
commit 3b381d129d093b6fee3d5eb912e78b50028b8321
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 2 13:09:23 2010 +0200
python-parted: Add dependency to python-decorator.
commit 8b8ccb55cc917c5b8cd0ac74cde58c60e5127d6c
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 2 13:08:52 2010 +0200
pyQt: Add development package.
commit eee0585c81a856db030e34dcbd744ac97bdc331c
Merge: a72bb39 30ed534
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sat Oct 2 13:07:21 2010 +0200
Merge remote branch 'stevee/x-fixes' into installer
commit a72bb39ef94652f5e283e8184a002b8ca338be66
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Oct 1 23:16:44 2010 +0200
python: Move some needed files to main package.
commit c5e4fc2e25be740198143aa8743f05fe2612f698
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Oct 1 23:16:11 2010 +0200
naoki: Add support for exclude patterns in filelists.
-----------------------------------------------------------------------
Summary of changes:
 pkgs/core/pyQt/pyQt.nm     |   10 +++++++
 pkgs/core/python/python.nm |    6 +++-
 tools/functions-lists      |    9 ++++++
 tools/packager             |   63 ++++++++++++++++++++++++++++++++++++-------
 4 files changed, 75 insertions(+), 13 deletions(-)
Difference in files:

diff --git a/pkgs/core/pyQt/pyQt.nm b/pkgs/core/pyQt/pyQt.nm
index a03f03c..6a85c02 100644
--- a/pkgs/core/pyQt/pyQt.nm
+++ b/pkgs/core/pyQt/pyQt.nm
@@ -35,11 +35,21 @@ PKG_LICENSE    = GPLv3 or GPLv2 with exceptions
 PKG_SUMMARY    = Python bindings for Qt4.
PKG_BUILD_DEPS+= gcc-c++ libXext-devel python-devel qt sip-devel
+PKG_DEPS      += sip
define PKG_DESCRIPTION
     Python bindings for Qt4
 endef
+PKG_PACKAGES  += $(PKG_NAME_REAL)-devel
+
+define PKG_FILES-$(PKG_NAME_REAL)-devel
+	/usr/bin
+	/usr/lib/python*/site-packages/PyQt4/pyqtconfig*
+	/usr/lib/python*/site-packages/PyQt4/uic/pyuic.py*
+	/usr/share/sip
+endef
+
 PKG_TARBALL    = PyQt-x11-gpl-$(PKG_VER).tar.gz
DIR_APP        = $(DIR_SRC)/PyQt-x11-gpl-$(PKG_VER)
diff --git a/pkgs/core/python/python.nm b/pkgs/core/python/python.nm
index 75cab19..a6875c8 100644
--- a/pkgs/core/python/python.nm
+++ b/pkgs/core/python/python.nm
@@ -50,6 +50,10 @@ PKG_TARBALL    = $(THISAPP).tgz
PKG_PACKAGES  += $(PKG_NAME_REAL)-devel
+PKG_FILES-$(PKG_NAME_REAL)-devel += \
+	!/usr/lib/python*/config/Makefile \
+	!/usr/include/python*/pyconfig.h
+
 export CFLAGS  += -D_GNU_SOURCE -fwrapv
 export CPPFLAGS = $(shell pkg-config --cflags-only-I libffi)
@@ -81,8 +85,6 @@ endef
 define STAGE_INSTALL
    cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
-	rm -rf $(BUILDROOT)/usr/lib/python*/test/
-
    # All *.py files don't need to be executeable...
    find $(BUILDROOT)/usr/lib/python*/ -name "*.py" | xargs chmod a-x -v
 endef
diff --git a/tools/functions-lists b/tools/functions-lists
index c44fd72..d8152d4 100644
--- a/tools/functions-lists
+++ b/tools/functions-lists
@@ -20,3 +20,12 @@ function listmatch() {
    return 1
 }
+function sort_by_length() {
+	local c
+	local i
+	for i in $@; do
+		echo "$(wc -c <<<${i}) ${i}"
+	done | sort -n -r | while read c i; do
+		echo "${i}"
+	done
+}
diff --git a/tools/packager b/tools/packager
index 3bb80b1..67e91b1 100755
--- a/tools/packager
+++ b/tools/packager
@@ -61,6 +61,7 @@ BUILD_ID="${BUILD_ID}"
 # Distribution information
 DISTRO_NAME="${DISTRO_NAME}"
 DISTRO_EPOCH="${DISTRO_EPOCH}"
+DISTRO_VENDOR="${DISTRO_VENDOR}"
# Package information
 PKG_NAME="${PKG_NAME}"
@@ -112,20 +113,50 @@ ${CONTROL_POSTUN}
 EOF
 }
+function find_files() {
+	local paths=$@
+	local file
+
+	for file in $(find ${paths} 2>/dev/null | sort); do
+		# Remove ${BUILDROOT}
+		file="${file#${BUILDROOT}}"
+
+		# Remove all leading slashes
+		while [ "${file:0:1}" = "/" ]; do
+			file="${file:1:${#file}}"
+		done
+
+		echo "${file}"
+	done
+}
+
 function __filelist() {
    local paths
+	local exclude_paths
# Disable globbing
    set -f
local path
+	local exclude
    for path in ${PKG_FILES}; do
+		if [ "${path:0:1}" = "!" ]; then
+			exclude="1"
+			path="${path:1:${#path}}"
+		else
+			exclude="0"
+		fi
+
    	if [ "${path:0:1}" != "/" ]; then
    		path="/${path}"
    	fi
path="${BUILDROOT}${path}"
-		paths="${paths} ${path}"
+		if [ "${exclude}" = "0" ]; then
+			paths="${paths} ${path}"
+		else
+			exclude_paths="${exclude_paths} ${path}"
+		fi
    done
# Enable globbing again
@@ -134,16 +165,19 @@ function __filelist() {
    # If not paths were found take all files
    [ -z "${paths}" ] && paths="${BUILDROOT}"
-	for file in $(find ${paths} 2>/dev/null | sort); do
-		# Remove ${BUILDROOT}
-		file="${file#${BUILDROOT}}"
-
-		# Remove all leading slashes
-		while [ "${file:0:1}" = "/" ]; do
-			file="${file:1:${#file}}"
-		done
+	local excludes
+	if [ -n "${exclude_paths}" ]; then
+		excludes=$(find_files ${exclude_paths})
+	fi
-		echo "${file}"
+	for file in $(find_files ${paths}); do
+		if [ -n "${excludes}" ]; then
+			if ! listmatch ${file} ${excludes}; then
+				echo "${file}"
+			fi
+		else
+			echo "${file}"
+		fi
    done
 }
@@ -179,11 +213,18 @@ function create_dataimg() {
    local file
# Remove the just copied files
+	sort_by_length $(<${filelist}) | \
    while read file; do
    	[ -z "${file}" ] && continue
+		if [ -d "${BUILDROOT}/${file}" ]; then
+			if dir_is_empty ${BUILDROOT}/${file}; then
+				rm -rf ${BUILDROOT}/${file}
+			fi
+			continue
+		fi
    	rm -rf ${BUILDROOT}/${file}
-	done < ${filelist}
+	done
# Return the filelist
    cd ${dir} && \
hooks/post-receive
--
IPFire 3.x development tree

    