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 efa6b008b64df19fbf425408f15bdd8e068ad8a2 (commit) via a15473a725740219e4bfc1bfe8bb55cee7ac2036 (commit) via b0d78cd815f284785cf169486124bcdcdba5e88b (commit) via 743f346c6d510553910c74383d5870b88a471291 (commit) via 8d55b92081d5c7837e36698ca54cd506bda1e15e (commit) via d3c3c880954dda0376725642043b73f34b5d9297 (commit) via 2626094988721d625e01d12f008cde73c067ab0b (commit) via 7d57ed0c514bdec3182481914586715dcaacb13b (commit) via 00d2ca57c7c07ee06ec99b4fbfec3d8b4fc093c3 (commit) via 5720e50a97a17626887780ce9a0571262e5df011 (commit) via 170cefb5e1a50cd4f4c99a0bf45bb4c82eceb842 (commit) via 7a538e71aa47dcb463cae90412982ce534f4a883 (commit) via b3fd9ae251c94728af986b3f64e636e5eae1f5fc (commit) via c89d06df241ff50cd59eddf9d1ef6baf9e9ec98c (commit) via 4f99bb9aa1052ee5cecd501e211d89915d7e4e90 (commit) via df29ce9e38ff7847c72748317f1435a06db5d916 (commit) from eb3ed8cc26b7c49deffe18e37bb5ab50ce8b568a (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 efa6b008b64df19fbf425408f15bdd8e068ad8a2 Merge: 743f346 a15473a Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Sep 18 12:25:10 2010 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
commit a15473a725740219e4bfc1bfe8bb55cee7ac2036 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Sep 18 12:24:44 2010 +0200
readline: Remove awkward files in /usr/share/readline.
Fixes #57.
commit b0d78cd815f284785cf169486124bcdcdba5e88b Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Sep 18 11:33:58 2010 +0200
naoki: Fix epoch property of packages.
This could be an empty string. We need to catch this case.
commit 743f346c6d510553910c74383d5870b88a471291 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Sep 18 00:41:50 2010 +0200
dracut: Update to 007.
commit 8d55b92081d5c7837e36698ca54cd506bda1e15e Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 23:41:05 2010 +0200
pyQt: Fix build with new version of the buildsystem.
commit d3c3c880954dda0376725642043b73f34b5d9297 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 23:40:36 2010 +0200
sip: Create dependency of sip-devel to sip.
This was not autodetected.
commit 2626094988721d625e01d12f008cde73c067ab0b Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 23:40:14 2010 +0200
naoki: Better catch for download exceptions.
commit 7d57ed0c514bdec3182481914586715dcaacb13b Merge: 5720e50 7a538e7 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 23:40:04 2010 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
commit 00d2ca57c7c07ee06ec99b4fbfec3d8b4fc093c3 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 23:25:18 2010 +0200
generator: Cut names of files loaded by bootloader.
syslinux is apperently not able to read files with names longer than 8 characters.
commit 5720e50a97a17626887780ce9a0571262e5df011 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 22:28:06 2010 +0200
naoki: Fix package list functionality.
commit 170cefb5e1a50cd4f4c99a0bf45bb4c82eceb842 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 17 21:44:56 2010 +0200
naoki: Also create raw output for binary packages.
commit 7a538e71aa47dcb463cae90412982ce534f4a883 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 16 13:27:07 2010 +0200
naoki: Add placeholder for signature in package.
commit b3fd9ae251c94728af986b3f64e636e5eae1f5fc Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 16 13:24:13 2010 +0200
naoki: Add distribution information to packages.
commit c89d06df241ff50cd59eddf9d1ef6baf9e9ec98c Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 16 13:16:54 2010 +0200
naoki: Add epoch information to packages.
commit 4f99bb9aa1052ee5cecd501e211d89915d7e4e90 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 16 00:43:19 2010 +0200
naoki: Fix output of package information in human readable format.
commit df29ce9e38ff7847c72748317f1435a06db5d916 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 16 00:37:37 2010 +0200
naoki: Add "./make.sh package raw <package>"-command.
This command allows to extract package information and let this be parsed by any other software.
-----------------------------------------------------------------------
Summary of changes: naoki/__init__.py | 63 ++++++++++++++++++++++++++++------------ naoki/exception.py | 2 +- naoki/packages.py | 21 ++++++++++++- naoki/terminal.py | 5 +++ pkgs/Constants | 4 ++ pkgs/Targets | 2 + pkgs/core/dracut/dracut.nm | 8 ++++- pkgs/core/pyQt/pyQt.nm | 3 +- pkgs/core/readline/readline.nm | 5 ++- pkgs/core/sip/sip.nm | 4 ++- src/bootloader/installer.conf | 8 ++-- tools/generator | 4 +- tools/packager | 13 ++++++-- 13 files changed, 106 insertions(+), 36 deletions(-)
Difference in files: diff --git a/naoki/__init__.py b/naoki/__init__.py index 7ffff0b..166abbf 100644 --- a/naoki/__init__.py +++ b/naoki/__init__.py @@ -12,6 +12,7 @@ import build import environ import generators import logger +import packages import repositories import terminal import util @@ -91,6 +92,7 @@ class Naoki(object): "info" : self.call_package_info, "list" : self.call_package_list, "groups" : self.call_package_groups, + "raw" : self.call_package_raw, }
return actionmap[args.action.name](args.action) @@ -100,33 +102,36 @@ class Naoki(object): repo = self._get_source_repos()
for package in repo.packages: + if args.packages: + if not package.name in args.packages: + continue + if args.long: print package.fmtstr("""\ -------------------------------------------------------------------------------- -Name : %(name)s -Version : %(version)s -Release : %(release)s +Name : %(PKG_NAME)s +Version : %(PKG_VER)s +Release : %(PKG_REL)s
- %(summary)s + %(PKG_SUMMARY)s
-%(description)s +%(PKG_DESCRIPTION)s
-Maintainer : %(maintainer)s -License : %(license)s +Maintainer : %(PKG_MAINTAINER)s +License : %(PKG_LICENSE)s
-Files : %(files)s -Objects : %(objects)s -Patches : %(patches)s +Objects : %(PKG_OBJECTS)s +Patches : %(PKG_PATCHES)s --------------------------------------------------------------------------------\ """) else: print package.fmtstr("""\ -------------------------------------------------------------------------------- -Name : %(name)s -Version : %(version)s -Release : %(release)s +Name : %(PKG_NAME)s +Version : %(PKG_VER)s +Release : %(PKG_REL)s
- %(summary)s + %(PKG_SUMMARY)s
--------------------------------------------------------------------------------\ """) @@ -144,15 +149,35 @@ Release : %(release)s continue
if args.long: - print package.fmtstr("%(name)-32s | %(version)-15s | %(summary)s") + print package.fmtstr("%(PKG_NAME)-32s | %(PKG_VER)-15s | %(PKG_SUMMARY)s") else: print package.name
def call_package_groups(self, args): - # XXX - #groups = backend.get_group_names() - #print "\n".join(groups) - pass + groups = [] + + repo = self._get_source_repos() + + for package in repo.packages: + group = package.group + if not group in groups: + groups.append(group) + + print "\n".join(sorted(groups)) + + def call_package_raw(self, args): + filename = args.package + + if os.path.exists(filename): + p = packages.BinaryPackage(filename) + else: + repo = self._get_source_repos() + + p = repo.find_package_by_name(args.package) + if not p: + raise Exception, "Could not find package: %s" % args.package + + p.print_raw_info()
def call_source(self, args): if not args.has_key("action"): diff --git a/naoki/exception.py b/naoki/exception.py index 1713010..703b6b5 100644 --- a/naoki/exception.py +++ b/naoki/exception.py @@ -28,7 +28,7 @@ class commandTimeoutExpired(Error): self.resultcode = 10
-class DownloadError(Exception): +class DownloadError(Error): pass
diff --git a/naoki/packages.py b/naoki/packages.py index 51b3253..e726607 100644 --- a/naoki/packages.py +++ b/naoki/packages.py @@ -48,13 +48,20 @@ class Package(object):
@property def epoch(self): - return int(self._info.get("PKG_EPOCH", 0)) + epoch = self._info.get("PKG_EPOCH", None) + if not epoch: + epoch = 0 + return int(epoch)
@property def name(self): return self._info["PKG_NAME"]
@property + def group(self): + return self._info["PKG_GROUP"] + + @property def id(self): return "%s-%s-%s.%s" % \ (self.name, self.version, self.release, self.arch.name) @@ -67,6 +74,13 @@ class Package(object): def version(self): return self._info["PKG_VER"]
+ def print_raw_info(self): + for k in sorted(self._info.keys()): + print "%s="%s"" % (k, self._info.get(k)) + + def fmtstr(self, s): + return s % self._info +
class SourcePackage(Package): def __init__(self, filename, repo, arch): @@ -154,7 +168,10 @@ class SourcePackage(Package):
util.mkdir(CACHEDIR)
- g.urlgrab(os.path.basename(file), filename=file) + try: + g.urlgrab(os.path.basename(file), filename=file) + except urlgrabber.grabber.URLGrabError,e : + raise DownloadError, "%s %s" % (os.path.basename(file), e)
class BinaryPackage(Package): diff --git a/naoki/terminal.py b/naoki/terminal.py index 0ec6f57..8e9d71d 100644 --- a/naoki/terminal.py +++ b/naoki/terminal.py @@ -312,6 +312,11 @@ class Commandline(object): Parser("groups", help="Show package groups", ), + Parser("raw", + help="Show package information in a machine parseable format.", + arguments=[ + Argument("package", help="Name of the package."), + ]), ]),
# Source diff --git a/pkgs/Constants b/pkgs/Constants index 8f5c980..e88552b 100644 --- a/pkgs/Constants +++ b/pkgs/Constants @@ -60,6 +60,7 @@ PKG_VARIABLES = \ PKG_BUILD_DEPS \ PKG_DEPS \ PKG_DESCRIPTION \ + PKG_EPOCH \ PKG_FILES \ PKG_GROUP \ PKG_MAINTAINER \ @@ -96,6 +97,9 @@ PKG_SUFFIX = -$(PKG_VER)-$(DISTRO_SNAME)$(DISTRO_EPOCH)-$(PKG_ARCH).$(PKG_REL).i PKG_NAME_REAL = $(notdir $(CURDIR)) PKG_NAME = $(PKG_NAME_REAL)
+# Set default epoch +PKG_EPOCH = 0 + # Shortcut to package name + version THISAPP = $(PKG_NAME)-$(PKG_VER)
diff --git a/pkgs/Targets b/pkgs/Targets index 0ee051c..a8d9caf 100644 --- a/pkgs/Targets +++ b/pkgs/Targets @@ -7,9 +7,11 @@
.PHONY: info info: + @echo "PKG_ARCH="$(PKG_ARCH)"" @echo "PKG_BUILD_DEPENDENCIES="$(PKG_BUILD_DEPS)"" @echo "PKG_DEPENDENCIES="$(PKG_DEPS)"" @echo "PKG_DESCRIPTION="$(strip $(PKG_DESCRIPTION))"" + @echo "PKG_EPOCH="$(PKG_EPOCH)"" @echo "PKG_GROUP="$(PKG_GROUP)"" @echo "PKG_LICENSE="$(PKG_LICENSE)"" @echo "PKG_MAINTAINER="$(PKG_MAINTAINER)"" diff --git a/pkgs/core/dracut/dracut.nm b/pkgs/core/dracut/dracut.nm index 7059b2f..704e423 100644 --- a/pkgs/core/dracut/dracut.nm +++ b/pkgs/core/dracut/dracut.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include
PKG_NAME = dracut -PKG_VER = 005 +PKG_VER = 007 PKG_REL = 0
PKG_MAINTAINER = @@ -46,6 +46,12 @@ PKG_TARBALL = $(THISAPP).tar.bz2 define STAGE_PREPARE_CMDS # All check scripts must be executeable cd $(DIR_APP) && chmod 0755 modules.d/*/check + + # Remove all man pages. + # XXX requires docbook + cd $(DIR_APP) && sed -i Makefile \ + -e "s/^all:.*/all: $$(targets)/" \ + -e "/.*man.*/d" endef
define STAGE_BUILD diff --git a/pkgs/core/pyQt/pyQt.nm b/pkgs/core/pyQt/pyQt.nm index d92b00d..a03f03c 100644 --- a/pkgs/core/pyQt/pyQt.nm +++ b/pkgs/core/pyQt/pyQt.nm @@ -34,8 +34,7 @@ PKG_URL = http://www.riverbankcomputing.com/software/pyqt/ PKG_LICENSE = GPLv3 or GPLv2 with exceptions PKG_SUMMARY = Python bindings for Qt4.
-PKG_BUILD_DEPS+= sip -PKG_DEPS += python qt +PKG_BUILD_DEPS+= gcc-c++ libXext-devel python-devel qt sip-devel
define PKG_DESCRIPTION Python bindings for Qt4 diff --git a/pkgs/core/readline/readline.nm b/pkgs/core/readline/readline.nm index 4528a6b..53c98a7 100644 --- a/pkgs/core/readline/readline.nm +++ b/pkgs/core/readline/readline.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = readline PKG_VER = 6.1 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = System/Libraries @@ -55,6 +55,9 @@ CONFIGURE_OPTIONS += \ --libdir=/lib \
define STAGE_INSTALL_CMDS + # Remove a bunch of *.c files + rm -rfv $(BUILDROOT)/usr/share/readline + -mkdir -pv $(BUILDROOT)/usr/lib rm -fv $(BUILDROOT)/lib/lib{readline,history}.so ln -sfv ../../lib/libreadline.so.6 $(BUILDROOT)/usr/lib/libreadline.so diff --git a/pkgs/core/sip/sip.nm b/pkgs/core/sip/sip.nm index 4e1eebd..ca3ad4e 100644 --- a/pkgs/core/sip/sip.nm +++ b/pkgs/core/sip/sip.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include
PKG_NAME = sip PKG_VER = 4.10.5 -PKG_REL = 0 +PKG_REL = 1
PKG_MAINTAINER = PKG_GROUP = Development/Tools @@ -47,6 +47,8 @@ PKG_TARBALL = $(THISAPP).tar.gz
PKG_PACKAGES += $(PKG_NAME)-devel
+PKG_DEPS-$(PKG_NAME_REAL)-devel = sip + define STAGE_BUILD cd $(DIR_APP) && python configure.py \ CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" diff --git a/src/bootloader/installer.conf b/src/bootloader/installer.conf index 9022972..4e1ac98 100644 --- a/src/bootloader/installer.conf +++ b/src/bootloader/installer.conf @@ -22,12 +22,12 @@ MENU hiddenrow 5 LABEL install MENU label ^Install a new @NAME@ system MENU default - KERNEL vmlinuz-@KERNEL@ - APPEND initrd=initrd-@KERNEL@.img root=CDLABEL=@NAME@_@VERSION@ rootfstype=iso9660 mode=install quiet ro + KERNEL vmlinuz + APPEND initrd=initrd root=CDLABEL=@NAME@_@VERSION@ rootfstype=iso9660 mode=install quiet ro label rescue MENU label ^Rescue installed @NAME@ system - KERNEL vmlinuz-@KERNEL@ - APPEND initrd=initrd-@KERNEL@.img root=CDLABEL=@NAME@_@VERSION@ rootfstype=iso9660 mode=rescue quiet ro + KERNEL vmlinuz + APPEND initrd=initrd root=CDLABEL=@NAME@_@VERSION@ rootfstype=iso9660 mode=rescue quiet ro label local MENU label Boot from ^local drive LOCALBOOT 0xffff diff --git a/tools/generator b/tools/generator index 69a1024..7f673ff 100755 --- a/tools/generator +++ b/tools/generator @@ -60,8 +60,8 @@ function install_kernel() { mkdir -p ${dest} 2>/dev/null
local file - for file in vmlinuz-${KERNEL_RELEASE} initrd-${KERNEL_RELEASE}.img; do - cp -f /boot/${file} ${dest}/${file} + for file in vmlinuz initrd; do + cp -f /boot/${file}-${KERNEL_RELEASE}* ${dest}/${file} done }
diff --git a/tools/packager b/tools/packager index 6bd50b5..3bb80b1 100755 --- a/tools/packager +++ b/tools/packager @@ -19,8 +19,6 @@ # # ###############################################################################
-## XXX SYMLINK DEPENDENCIES - BASEDIR=$(dirname ${0})
PACKAGER_HASH_ALGORITHMS="md5 sha1 sha256 sha512" @@ -60,10 +58,16 @@ BUILD_DATE="${BUILD_DATE}" BUILD_HOST="${BUILD_HOST}" BUILD_ID="${BUILD_ID}"
-# Version info +# Distribution information +DISTRO_NAME="${DISTRO_NAME}" +DISTRO_EPOCH="${DISTRO_EPOCH}" + +# Package information PKG_NAME="${PKG_NAME}" PKG_VER="${PKG_VER}" PKG_REL="${PKG_REL}" +PKG_EPOCH="${PKG_EPOCH}" + PKG_GROUP="${PKG_GROUP}" PKG_ARCH="${PKG_ARCH}" PKG_ORIGIN="${PKG_ORIGIN}" @@ -203,6 +207,9 @@ function create_package() { create_metafile ${files} > ${tmp}/info create_controlfile > ${tmp}/control
+ # Add an empty file to hold place for the signature + touch ${tmp}/signature + # Calculate hash sums of the package files log DEBUG "Calculating hash sums." local algorithm
hooks/post-receive -- IPFire 3.x development tree