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 151f824184155197951b259267b0add88506ae35 (commit) via c10e3ff758a13d6a8a7817480f3db7de7f025faf (commit) via 0c9ca16527059ad669d857e4a5da7b94454125ae (commit) via cc9afdc0dcb1d01d37bd8feb9b803c6791467b52 (commit) via 2b4464fb165308388c2761577d827519004057b4 (commit) via 41a0e50adbccb413baced693aa925a26ffca1503 (commit) from e1f6992d3668315699f029a14d7bdbdf641c1085 (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 151f824184155197951b259267b0add88506ae35 Merge: cc9afdc0dcb1d01d37bd8feb9b803c6791467b52 c10e3ff758a13d6a8a7817480f3db7de7f025faf Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 7 16:15:24 2010 +0200

Merge branch 'next'

commit c10e3ff758a13d6a8a7817480f3db7de7f025faf Merge: 0c9ca16527059ad669d857e4a5da7b94454125ae e1f6992d3668315699f029a14d7bdbdf641c1085 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 7 16:09:46 2010 +0200

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

Conflicts: tools/quality-agent.d/095-directory-layout

commit 0c9ca16527059ad669d857e4a5da7b94454125ae Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 7 16:01:18 2010 +0200

QA: Check for invalid /usr/usr.

commit cc9afdc0dcb1d01d37bd8feb9b803c6791467b52 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 7 15:51:33 2010 +0200

libusb-compat: Move libs to /lib.

commit 2b4464fb165308388c2761577d827519004057b4 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 28 14:56:09 2010 +0200

naoki: Change logdirs for packages.

commit 41a0e50adbccb413baced693aa925a26ffca1503 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 28 14:36:39 2010 +0200

naoki: Disable all architectures we won't distribute for the moment.

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

Summary of changes: config/architectures.conf | 46 ++++++++++++++-------------- naoki/backend.py | 2 +- pkgs/core/libusb-compat/libusb-compat.nm | 12 +++++++ tools/quality-agent.d/095-directory-layout | 2 +- 4 files changed, 37 insertions(+), 25 deletions(-)

Difference in files: diff --git a/config/architectures.conf b/config/architectures.conf index 8df3185..22b65e4 100644 --- a/config/architectures.conf +++ b/config/architectures.conf @@ -7,33 +7,33 @@ personality = linux32 cflags = -O2 -fomit-frame-pointer -pipe cxxflags = %(cflags)s

-[i586] - -machine = i586 -personality = linux32 - -cflags = -O2 -fomit-frame-pointer -pipe -cxxflags = %(cflags)s - -[i486] - -machine = i486 -personality = linux32 - -cflags = -O2 -fomit-frame-pointer -pipe -cxxflags = %(cflags)s - -[alix] - +;[i586] +; +;machine = i586 +;personality = linux32 +; +;cflags = -O2 -fomit-frame-pointer -pipe +;cxxflags = %(cflags)s +; +;[i486] +; +;machine = i486 +;personality = linux32 +; +;cflags = -O2 -fomit-frame-pointer -pipe +;cxxflags = %(cflags)s + +;[alix] +; ; While i586 works fine on a Geode LX, i486 should be a more performant choice ; right now due to the way Geode LX CPU pipeline ans scheduling works. glibc ; i586 assembler optimized routines are measureably slower than the i486 ones on ; a Geode LX. -machine = i486 -personality = linux32 - -cflags = -Os -march=geode -fno-align-jumps -fno-align-functions -fno-align-labels -fno-align-loops -fomit-frame-pointer -pipe -cxxflags = %(cflags)s +;machine = i486 +;personality = linux32 +; +;cflags = -Os -march=geode -fno-align-jumps -fno-align-functions -fno-align-labels -fno-align-loops -fomit-frame-pointer -pipe +;cxxflags = %(cflags)s

[x86_64] diff --git a/naoki/backend.py b/naoki/backend.py index ca12b3a..efc8c37 100644 --- a/naoki/backend.py +++ b/naoki/backend.py @@ -463,7 +463,7 @@ class Package(object):

@property def log(self): - return self.naoki.logging.getBuildLogger(self.info.id) + return self.naoki.logging.getBuildLogger(os.path.join(self.repo.name, self.info.id))

def get_repositories(toolchain=False): diff --git a/pkgs/core/libusb-compat/libusb-compat.nm b/pkgs/core/libusb-compat/libusb-compat.nm index 8efa34c..eac7dee 100644 --- a/pkgs/core/libusb-compat/libusb-compat.nm +++ b/pkgs/core/libusb-compat/libusb-compat.nm @@ -43,5 +43,17 @@ endef PKG_TARBALL = $(THISAPP).tar.gz

CONFIGURE_OPTIONS += \ + --libdir=/lib \ --disable-build-docs \ --disable-static + +define STAGE_INSTALL_CMDS + -mkdir -pv $(BUILDROOT)/usr/lib + mv -v $(BUILDROOT)/lib/pkgconfig $(BUILDROOT)/usr/lib/ + + rm -vf $(BUILDROOT)/usr/lib/libusb{,pp}-0.1.so + ln -svf ../../lib/libusb-0.1.so.4 $(BUILDROOT)/usr/lib/libusb.so + ln -svf ../../lib/libusb-0.1.so.4 $(BUILDROOT)/usr/lib/libusb-0.1.so + ln -svf ../../lib/libusbpp-0.1.so.4 $(BUILDROOT)/usr/lib/libusbpp.so + ln -svf ../../lib/libusbpp-0.1.so.4 $(BUILDROOT)/usr/lib/libusbpp-0.1.so +endef diff --git a/tools/quality-agent.d/095-directory-layout b/tools/quality-agent.d/095-directory-layout index c2896d9..14f600d 100755 --- a/tools/quality-agent.d/095-directory-layout +++ b/tools/quality-agent.d/095-directory-layout @@ -4,7 +4,7 @@

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/var" +DIRS="/etc/init.d /etc/rc.d /lib/pkgconfig /usr/etc /usr/libexec /usr/local /usr/man /usr/usr /usr/var"

function check() { local failed=0

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