Hello community, here is the log from the commit of package pbuilder for openSUSE:Factory checked in at 2013-04-07 14:25:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pbuilder (Old) and /work/SRC/openSUSE:Factory/.pbuilder.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pbuilder", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/pbuilder/pbuilder.changes 2013-04-02 12:36:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pbuilder.new/pbuilder.changes 2013-04-07 14:25:01.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Apr 5 18:05:19 UTC 2013 - frank.lichtenh...@sophos.com + +- update to 0.215 +* Do not try to use /dev/shm if /run/shm is not present + (deb#702811, deb#702102) +* Add clang support hook script from Hideki Yamane (deb#700290) + +------------------------------------------------------------------- Old: ---- pbuilder_0.214.tar.gz New: ---- pbuilder_0.215.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pbuilder.spec ++++++ --- /var/tmp/diff_new_pack.9M9Acf/_old 2013-04-07 14:25:03.000000000 +0200 +++ /var/tmp/diff_new_pack.9M9Acf/_new 2013-04-07 14:25:03.000000000 +0200 @@ -18,7 +18,7 @@ Name: pbuilder -Version: 0.214 +Version: 0.215 Release: 0 Summary: Personal package builder for .deb packages License: GPL-2.0+ ++++++ pbuilder_0.214.tar.gz -> pbuilder_0.215.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbuilder-0.214/Makefile new/pbuilder-0.215/Makefile --- old/pbuilder-0.214/Makefile 2012-06-04 00:11:14.000000000 +0200 +++ new/pbuilder-0.215/Makefile 2013-03-26 10:19:42.000000000 +0100 @@ -91,6 +91,7 @@ examples/C11screen \ examples/D10tmp \ examples/D20addnonfree \ + examples/D65various-compiler-support \ examples/D80no-man-db-rebuild \ examples/D90chrootmemo \ examples/F90chrootmemo \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbuilder-0.214/debian/changelog new/pbuilder-0.215/debian/changelog --- old/pbuilder-0.214/debian/changelog 2013-03-02 08:47:04.000000000 +0100 +++ new/pbuilder-0.215/debian/changelog 2013-03-30 03:06:05.000000000 +0100 @@ -1,3 +1,10 @@ +pbuilder (0.215) unstable; urgency=low + + * Do not try to use /dev/shm if /run/shm is not present. (closes: #702811, #702102) + * Add clang support hook script from Hideki Yamane. (closes: #700290) + + -- Junichi Uekawa <dan...@debian.org> Sat, 30 Mar 2013 11:06:05 +0900 + pbuilder (0.214) unstable; urgency=low [ Junichi Uekawa ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbuilder-0.214/examples/D30clang new/pbuilder-0.215/examples/D30clang --- old/pbuilder-0.214/examples/D30clang 2013-02-27 23:23:23.000000000 +0100 +++ new/pbuilder-0.215/examples/D30clang 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -#!/bin/bash -# Force use of clang instead of GCC. -function setup_clang() { - local GCC_VERSION=$(readlink /usr/bin/gcc | sed 's/^gcc\-//') - - apt-get -y "${APTGETOPT[@]}" install clang - - echo -e "\e[33mReplace gcc, g++ & cpp by clang\e[m" - for compiler in gcc-"$GCC_VERSION" cpp-"$GCC_VERSION" g++-"$GCC_VERSION"; do - rm /usr/bin/$compiler && - ln -s /usr/bin/clang /usr/bin/$compiler - done - - echo -e "\e[33mCheck if gcc, g++ & cpp are actually clang\e[m" - usr/bin/gcc --version| grep clang > /dev/null || exit 1 -} - -setup_clang diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbuilder-0.214/examples/D65various-compiler-support new/pbuilder-0.215/examples/D65various-compiler-support --- old/pbuilder-0.214/examples/D65various-compiler-support 1970-01-01 01:00:00.000000000 +0100 +++ new/pbuilder-0.215/examples/D65various-compiler-support 2013-03-26 10:11:53.000000000 +0100 @@ -0,0 +1,70 @@ +#!/bin/sh +# +# pbuilder hook script: choose optional compiler rather than default one +# +# Sometimes we want to choose other compiler than default, because of improving +# code to conform to standard, check compiler quality or so. This script will +# ease it. Try enable hook script and set "CHOOSE_COMPILER" variables as clang, +# gcc-*, or other compilers (note: however, now only clang and gcc can works +# well and others fails to build). +# +# i.e.) +# $ sudo CHOOSE_COMPILER="clang" pbuilder --build foobar_1.0-1.dsc +# $ sudo CHOOSE_COMPILER="gcc-4.6" pbuilder --build foobar_1.0-1.dsc +# + +set -e + +# check whether we are asked to change the compiler. +case "${CHOOSE_COMPILER}" in + clang) + newcc=/usr/bin/"${CHOOSE_COMPILER}" + newcxx=/usr/bin/"${CHOOSE_COMPILER}"++ + ;; + gcc-*) + use_gcc_version=$(echo ${CHOOSE_COMPILER} | sed -e s/gcc-//) + gxx_package=g++-"${use_gcc_version}" + newcc=/usr/bin/"${CHOOSE_COMPILER}" + newcxx=/usr/bin/g++-"${use_gcc_version}" + ;; + tcc) + newcc=/usr/bin/"${CHOOSE_COMPILER}" + newcxx=/bin/false + not_gcc_compat=1 + ;; + pcc) + newcc=/usr/bin/"${CHOOSE_COMPILER}" + newcxx=/bin/false + not_gcc_compat=1 + ;; + asn1c) + newcc=/usr/bin/"${CHOOSE_COMPILER}" + newcxx=/bin/false + not_gcc_compat=1 + ;; + *) + exit 0 + ;; +esac + +apt-get -y install "${CHOOSE_COMPILER}" ${gxx_package} + +if [ ! -x /usr/bin/"${CHOOSE_COMPILER}" ]; then + echo >&2 "E: Package ${CHOOSE_COMPILER} does not contain compiler driver?" + exit 1 +fi + +ln -sf "${newcc}" /usr/bin/cc +ln -sf "${newcxx}" /usr/bin/c++ + +if [ -z "${not_gcc_compat}" ]; then + ( + cd /usr/bin + ln -sf "$newcc" gcc + ln -sf "$newcxx" g++ + ) +else + rm -f /usr/bin/gcc /usr/bin/g++ +fi + +exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbuilder-0.214/pbuilder-modules new/pbuilder-0.215/pbuilder-modules --- old/pbuilder-0.214/pbuilder-modules 2013-02-27 23:09:09.000000000 +0100 +++ new/pbuilder-0.215/pbuilder-modules 2013-03-26 09:49:36.000000000 +0100 @@ -221,8 +221,8 @@ if [ "$USEDEVFS" = "yes" ]; then umount_one "dev" fi - if [ "$USEDEVSHM" = "yes" ]; then - umount_one "$SHM_PATH" + if [ "$USERUNSHM" = "yes" ]; then + umount_one "run/shm" fi if [ "$USEPROC" = "yes" ]; then if [ "$DEB_BUILD_ARCH_OS" = "linux" ] && [ -e $BUILDPLACE/proc/sys/fs/binfmt_misc/status ]; then @@ -245,7 +245,9 @@ log "I: mounting /proc filesystem" mkdir -p $BUILDPLACE/proc PROCFS="proc" - [ "$DEB_BUILD_ARCH_OS" = "kfreebsd" ] && PROCFS="linprocfs" + if [ "$DEB_BUILD_ARCH_OS" = "kfreebsd" ]; then + PROCFS="linprocfs" + fi mount -t $PROCFS /proc "$BUILDPLACE/proc" ln -s ../proc/mounts $BUILDPLACE/etc/mtab 2> /dev/null || true mounted[${#mounted[@]}]="$BUILDPLACE/proc" @@ -256,13 +258,11 @@ mount -t devfs /dev "$BUILDPLACE/dev" mounted[${#mounted[@]}]="$BUILDPLACE/dev" fi - if [ "$DEB_BUILD_ARCH_OS" = "linux" ] && [ "$USEDEVSHM" = "yes" ]; then - SHM_PATH="run/shm" - [ ! -d "/$SHM_PATH" ] && SHM_PATH="dev/shm" - log "I: mounting /$SHM_PATH filesystem" - mkdir -p $BUILDPLACE/$SHM_PATH || true - mount -t tmpfs tmpfs "$BUILDPLACE/$SHM_PATH" - mounted[${#mounted[@]}]="$BUILDPLACE/$SHM_PATH" + if [ "$DEB_BUILD_ARCH_OS" = "linux" ] && [ "$USERUNSHM" = "yes" ]; then + log "I: mounting /run/shm filesystem" + mkdir -p $BUILDPLACE/run/shm || true + mount -t tmpfs tmpfs "$BUILDPLACE/run/shm" + mounted[${#mounted[@]}]="$BUILDPLACE/run/shm" fi if [ "$DEB_BUILD_ARCH_OS" = "linux" ] && [ "$USEDEVPTS" = "yes" ]; then log "I: mounting /dev/pts filesystem" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbuilder-0.214/pbuilderrc new/pbuilder-0.215/pbuilderrc --- old/pbuilder-0.214/pbuilderrc 2013-02-27 23:09:09.000000000 +0100 +++ new/pbuilder-0.215/pbuilderrc 2013-03-26 09:49:45.000000000 +0100 @@ -10,7 +10,7 @@ #export http_proxy=http://your-proxy:8080/ USEPROC=yes USEDEVPTS=yes -USEDEVSHM=yes +USERUNSHM=yes USEDEVFS=no BUILDRESULT=/var/cache/pbuilder/result/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbuilder-0.214/pbuilderrc.5 new/pbuilder-0.215/pbuilderrc.5 --- old/pbuilder-0.214/pbuilderrc.5 2012-03-13 09:11:43.000000000 +0100 +++ new/pbuilder-0.215/pbuilderrc.5 2013-03-26 10:04:06.000000000 +0100 @@ -380,6 +380,13 @@ .B /dev/pts being mounted. .TP +.BI "USERUNSHM=" "yes" +Specify +.B yes +when it is desired to mount +.B /run/shm +mount point. It is usually a good idea in order to work with software that expect shm to work. +.TP .BI "USE_PDEBUILD_INTERNAL=" "yes" When this option is set to .I yes -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org