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 9023bb126871c7ba1e75be3ebaadaa24331c7fb3 (commit) via 3300f6e520c42c2b321e7644ae2b7d9316ece8b4 (commit) via 50a45274205f1d51e616233ba4a4fdef21d9e358 (commit) via e7315d9997071441c008a7382fd6e5775233422e (commit) via c500daf68960dc69b6b11d53f3667a2a66b9e2e2 (commit) from 1ae0d8cd29145138c4afa1a816b04bdd93990527 (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 9023bb126871c7ba1e75be3ebaadaa24331c7fb3 Merge: 3300f6e520c42c2b321e7644ae2b7d9316ece8b4 1ae0d8cd29145138c4afa1a816b04bdd93990527 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 21 15:06:09 2010 +0100

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit 3300f6e520c42c2b321e7644ae2b7d9316ece8b4 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 21 15:05:40 2010 +0100

tar: Add a fix.

commit 50a45274205f1d51e616233ba4a4fdef21d9e358 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 21 15:04:53 2010 +0100

naoki: Rewrite the /dev/ptmx stuff.

I didn't like that hack that we check this afterwards.

commit e7315d9997071441c008a7382fd6e5775233422e Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 21 14:56:18 2010 +0100

naoki: Make /dev/fd symlink in chroot.

commit c500daf68960dc69b6b11d53f3667a2a66b9e2e2 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 21 14:45:19 2010 +0100

naoki: Allow to put packages in random order.

-----------------------------------------------------------------------

Summary of changes: naoki/__init__.py | 21 ++++++++++++--------- naoki/chroot.py | 41 +++++++++++++++++++++++------------------ pkgs/core/tar/tar.nm | 4 ++++ 3 files changed, 39 insertions(+), 27 deletions(-)

Difference in files: diff --git a/naoki/__init__.py b/naoki/__init__.py index 6a83d36..de97ced 100644 --- a/naoki/__init__.py +++ b/naoki/__init__.py @@ -80,21 +80,24 @@ class Naoki(object): for package in backend.parse_package(package_names, naoki=self): if not force and package.built: self.log.warn("Skipping %s which was already built" % package.name) - continue - - if not package.buildable: - self.log.error("%s is currently not buildable" % package.name) - self.log.error(" The package requires these packages to be built first: %s" \ - % [dep.name for dep in package.dependencies_unbuilt]) - continue

packages.append(package)

if len(packages) >= 2: packages_sorted = backend.depsort(packages) - if packages_sorted == packages: + if packages_sorted != packages: self.log.warn("Packages were resorted for build: %s" % packages_sorted) - packages = packages_sorted + packages = packages_sorted + + for i in range(0, len(packages)): + package = packages[i] + if not package.buildable: + for dep in package.dependencies_unbuilt: + if not dep in packages[:i]: + self.log.error("%s is currently not buildable" % package.name) + self.log.error(" The package requires these packages to be built first: %s" \ + % [dep.name for dep in package.dependencies_unbuilt]) + return

for package in packages: package.download() diff --git a/naoki/chroot.py b/naoki/chroot.py index f63013d..a4a99a5 100644 --- a/naoki/chroot.py +++ b/naoki/chroot.py @@ -155,21 +155,34 @@ class Environment(object): util.mkdir(self.chrootPath("dev", "pts")) util.mkdir(self.chrootPath("dev", "shm")) prevMask = os.umask(0000) - for i in ( - (stat.S_IFCHR | 0666, os.makedev(1, 3), "dev/null"), - (stat.S_IFCHR | 0666, os.makedev(1, 7), "dev/full"), - (stat.S_IFCHR | 0666, os.makedev(1, 5), "dev/zero"), - (stat.S_IFCHR | 0666, os.makedev(1, 8), "dev/random"), - (stat.S_IFCHR | 0444, os.makedev(1, 9), "dev/urandom"), - (stat.S_IFCHR | 0666, os.makedev(5, 0), "dev/tty"), - (stat.S_IFCHR | 0600, os.makedev(5, 1), "dev/console") - ): + + kernel_version = os.uname()[2] + devNodes = [ + (stat.S_IFCHR | 0666, os.makedev(1, 3), "dev/null"), + (stat.S_IFCHR | 0666, os.makedev(1, 7), "dev/full"), + (stat.S_IFCHR | 0666, os.makedev(1, 5), "dev/zero"), + (stat.S_IFCHR | 0666, os.makedev(1, 8), "dev/random"), + (stat.S_IFCHR | 0444, os.makedev(1, 9), "dev/urandom"), + (stat.S_IFCHR | 0666, os.makedev(5, 0), "dev/tty"), + (stat.S_IFCHR | 0600, os.makedev(5, 1), "dev/console") + ] + + # make device node for el4 and el5 + if kernel_version < "2.6.19": + devNodes.append((stat.S_IFCHR | 0666, os.makedev(5, 2), "dev/ptmx")) + + for i in devNodes: # create node os.mknod(self.chrootPath(i[2]), i[0], i[1])

os.symlink("/proc/self/fd/0", self.chrootPath("dev", "stdin")) os.symlink("/proc/self/fd/1", self.chrootPath("dev", "stdout")) os.symlink("/proc/self/fd/2", self.chrootPath("dev", "stderr")) + os.symlink("/proc/self/fd", self.chrootPath("dev", "fd")) + + if kernel_version >= "2.6.19": + os.symlink("/dev/pts/ptmx", self.chrootPath("dev", "ptmx")) + os.umask(prevMask)

# mount/umount @@ -180,7 +193,7 @@ class Environment(object): self.umountCmds.append(devUnmtCmd)

mountopt = "gid=%d,mode=0620,ptmxmode=0666" % grp.getgrnam("tty").gr_gid - if os.uname()[2] >= "2.6.29": + if kernel_version >= "2.6.29": mountopt += ",newinstance"

for devMntCmd in ( @@ -189,13 +202,6 @@ class Environment(object): if devMntCmd not in self.mountCmds: self.mountCmds.append(devMntCmd)

- def _checkDev(self): - if os.path.exists(self.chrootPath("dev", "pts", "ptmx")): - os.symlink("/dev/pts/ptmx", self.chrootPath("dev", "ptmx")) - else: - os.mknod(self.chrootPath("dev", "ptmx"), stat.S_IFCHR | 0666, os.makedev(5, 2)) - os.chmod(self.chrootPath("dev", "ptmx"), 666) - def _setupUsers(self): ## XXX Could be done better self.log.debug("Creating users") @@ -219,7 +225,6 @@ class Environment(object): """mount 'normal' fs like /dev/ /proc/ /sys""" for cmd in self.mountCmds: util.do(cmd, shell=True) - self._checkDev()

def _umountall(self): """umount all mounted chroot fs.""" diff --git a/pkgs/core/tar/tar.nm b/pkgs/core/tar/tar.nm index cc1ffbb..a78c332 100644 --- a/pkgs/core/tar/tar.nm +++ b/pkgs/core/tar/tar.nm @@ -55,6 +55,10 @@ CONFIGURE_OPTIONS += \ --bindir=/bin \ --libexecdir=/usr/sbin

+define STAGE_PREPARE_CMDS + cd $(DIR_APP) && sed -i /SIGPIPE/d src/tar.c +endef + define STAGE_TEST cd $(DIR_APP) && sed -i '35 i AT_UNPRIVILEGED_PREREQ' tests/remfiles01.at cd $(DIR_APP) && make check

hooks/post-receive -- IPFire 3.x development tree