Hello community, here is the log from the commit of package build for openSUSE:Factory checked in at 2013-12-04 12:22:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/build (Old) and /work/SRC/openSUSE:Factory/.build.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build" Changes: -------- --- /work/SRC/openSUSE:Factory/build/build.changes 2013-10-17 17:36:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.build.new/build.changes 2013-12-04 12:22:12.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Dec 4 08:26:56 UTC 2013 - [email protected] + +- support for project side configured VM kernels +- ppc64le support +- minor fixes + +------------------------------------------------------------------- Old: ---- obs-build-20131015.tar.gz New: ---- obs-build-20131203.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.f1h93m/_old 2013-12-04 12:22:12.000000000 +0100 +++ /var/tmp/diff_new_pack.f1h93m/_new 2013-12-04 12:22:12.000000000 +0100 @@ -20,7 +20,7 @@ Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20131015 +Version: 20131203 Release: 0 #!BuildIgnore: build-mkbaselibs Source: obs-build-%{version}.tar.gz ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.f1h93m/_old 2013-12-04 12:22:13.000000000 +0100 +++ /var/tmp/diff_new_pack.f1h93m/_new 2013-12-04 12:22:13.000000000 +0100 @@ -1,5 +1,5 @@ pkgname=build -pkgver=20131015 +pkgver=20131203 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') @@ -8,7 +8,7 @@ groups=('base-devel') depends=('perl') source=(obs-build-${pkgver}.tar.gz) -md5sums=('b0c023cc1613e14e84934e0f395b3dd0') +md5sums=('68004d50578bb66c05481bedc2b8ea0c') package() { msg "Installing build ..." ++++++ build.dsc ++++++ --- /var/tmp/diff_new_pack.f1h93m/_old 2013-12-04 12:22:13.000000000 +0100 +++ /var/tmp/diff_new_pack.f1h93m/_new 2013-12-04 12:22:13.000000000 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20131015 +Version: 20131203 Binary: build Maintainer: Adrian Schroeter <[email protected]> Architecture: all ++++++ obs-build-20131015.tar.gz -> obs-build-20131203.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20131015/Build/Kiwi.pm new/obs-build-20131203/Build/Kiwi.pm --- old/obs-build-20131015/Build/Kiwi.pm 2013-10-15 11:43:49.000000000 +0200 +++ new/obs-build-20131203/Build/Kiwi.pm 2013-12-04 09:28:30.000000000 +0100 @@ -173,7 +173,7 @@ my $instsource = ($kiwi->{'instsource'} || [])->[0]; if ($instsource) { - foreach my $repository(sort {$a->{priority} <=> $b->{priority}} @{$instsource->{'instrepo'} || []}) { + for my $repository(sort {$a->{priority} <=> $b->{priority}} @{$instsource->{'instrepo'} || []}) { my $kiwisource = ($repository->{'source'} || [])->[0]; if ($kiwisource->{'path'} eq 'obsrepositories:/') { # special case, OBS will expand it. @@ -183,11 +183,17 @@ die("bad instsource path: $kiwisource->{'path'}\n") unless $kiwisource->{'path'} =~ /^obs:\/\/\/?([^\/]+)\/([^\/]+)\/?$/; push @repos, "$1/$2"; } + $ret->{'sourcemedium'} = -1; + $ret->{'debugmedium'} = -1; if ($instsource->{'productoptions'}) { my $productoptions = $instsource->{'productoptions'}->[0] || {}; for my $po (@{$productoptions->{'productvar'} || []}) { $ret->{'version'} = $po->{'_content'} if $po->{'name'} eq 'VERSION'; } + for my $po (@{$productoptions->{'productoption'} || []}) { + $ret->{'sourcemedium'} = $po->{'_content'} if $po->{'name'} eq 'SOURCEMEDIUM'; + $ret->{'debugmedium'} = $po->{'_content'} if $po->{'name'} eq 'DEBUGMEDIUM'; + } } if ($instsource->{'architectures'}) { my $a = $instsource->{'architectures'}->[0] || {}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20131015/Build.pm new/obs-build-20131203/Build.pm --- old/obs-build-20131015/Build.pm 2013-10-15 11:43:49.000000000 +0200 +++ new/obs-build-20131203/Build.pm 2013-12-04 09:28:30.000000000 +0100 @@ -101,7 +101,7 @@ $rpmdista = $arch; } $rpmdista =~ s/i[456]86/i386/; - $rpmdist = '' unless $rpmdista =~ /^(i386|x86_64|ia64|ppc|ppc64|s390|s390x)$/; + $rpmdist = '' unless $rpmdista =~ /^(i386|x86_64|ia64|ppc|ppc64|ppc64le|s390|s390x)$/; my $dist = 'default'; if ($rpmdist =~ /unitedlinux 1\.0.*/) { $dist = "ul1-$rpmdista"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20131015/build new/obs-build-20131203/build --- old/obs-build-20131015/build 2013-10-15 11:43:49.000000000 +0200 +++ new/obs-build-20131203/build 2013-12-04 09:28:30.000000000 +0100 @@ -248,6 +248,8 @@ defines the number of CPUs to use for VMs. + --threads N sets number of threads for VM + --ccache Use ccache to speed up rebuilds @@ -1030,21 +1032,24 @@ check_for_ppc() { - local uname - uname=$(uname -m) + grep -q "PowerNV" /proc/cpuinfo && export HOST_ARCH=power7 + grep -q "PPC970MP" /proc/cpuinfo && export HOST_ARCH=ppc970 - if [ "$uname" != "ppc" -a "$uname" != "ppc64" ]; then - return - fi - - grep -q "PowerNV" /proc/cpuinfo && export HOST_ARCH=power7 || export HOST_ARCH=ppc970 + case $BUILD_ARCH in + ppc|ppc64) export VM_KERNEL=/boot/vmlinux + export VM_INITRD=/boot/initrd + ;; + ppc64le) export VM_KERNEL=/boot/vmlinuxle + export VM_INITRD=/boot/initrdle + export HOST_ARCH=power7le + ;; + *) return ;; + esac export kvm_bin="/usr/bin/qemu-system-ppc64" export console=hvc0 export KVM_OPTIONS="-enable-kvm -M pseries" - export VM_KERNEL=/boot/vmlinux - export VM_INITRD=/boot/initrd if [ -z "$RUNNING_IN_VM" -a -n "$HUGETLBFSPATH" ];then if ! grep -q "$HUGETLBFSPATH" /proc/mounts; then echo "hugetlbfs is not mounted" @@ -1156,6 +1161,11 @@ BUILD_JOBS="$ARG" shift ;; + *-threads) + needarg + BUILD_THREADS="$ARG" + shift + ;; *-extra*packs|-X) needarg BUILD_EXTRA_PACKS="$BUILD_EXTRA_PACKS $ARG" @@ -1747,7 +1757,7 @@ case $HOST_ARCH in power7|armv7l) kvm_virtio=1;; - ppc970) kvm_virtio=;; + ppc970|power7le) kvm_virtio=;; esac if [ "$kvm_virtio" = 1 ]; then @@ -1911,7 +1921,7 @@ mkdir_build_root if [ "$BUILD_ROOT" = / ]; then - read dummy dummy browner dummy < <(ls -ld /) + browner="$(stat -c %u /)" fi rm -f $BUILD_ROOT/exit @@ -2143,6 +2153,7 @@ # fallback time for broken hosts date '+@%s' > $BUILD_ROOT/.build/.date if [ "$VM_TYPE" = 'emulator' ]; then + # emulator may not be able to hand over kernel parameters ln -sf /.build/build $BUILD_ROOT/sbin/init fi if [ "$VM_TYPE" = 'zvm' ]; then @@ -2154,9 +2165,9 @@ mkdir -p $BUILD_ROOT/boot cp $vm_kernel $vm_initrd $BUILD_ROOT/boot mkdir -p $BUILD_ROOT/boot/zipl - # finally, install bootloader to the worker disk - zipl -t $BUILD_ROOT/boot/zipl -i ${BUILD_ROOT}${vm_kernel} -r ${BUILD_ROOT}${vm_initrd} \ - --parameters "${zvm_param} init=$zvm_init_script rootfsopts=noatime" + # finally, install bootloader to the worker disk + zipl -t $BUILD_ROOT/boot/zipl -i ${BUILD_ROOT}${vm_kernel} -r ${BUILD_ROOT}${vm_initrd} \ + --parameters "${zvm_param} init=$zvm_init_script rootfsopts=noatime" fi umount -n $BUILD_ROOT/proc/sys/fs/binfmt_misc 2> /dev/null || true umount -n $BUILD_ROOT/proc 2> /dev/null || true @@ -2175,27 +2186,6 @@ vm_init_script="/.build/build" fi - if [ "$VM_TYPE" = 'emulator' ]; then - # generic emulator hook. an external script is needed to define - # the emulator startup - sync - pushd $BUILD_DIR/emulator - if [ -z "$EMULATOR_SCRIPT" ]; then - EMULATOR_SCRIPT="./emulator.sh" - elif [ "${EMULATOR_SCRIPT:0:1}" != "/" ]; then - EMULATOR_SCRIPT="./$EMULATOR_SCRIPT" - fi - set -- "$EMULATOR_SCRIPT" "$VM_IMAGE" - echo "$@" - if ! "$@"; then - popd - echo "ERROR: The emulator return with an failure" - cleanup_and_exit 3 - fi - popd - - fi - if [ "$VM_TYPE" = 'openstack' -o "$VM_TYPE" = 'ec2' ]; then # No way to handle this via init= parameter here.... echo "#!/bin/sh" > "$BUILD_ROOT/sbin/init" @@ -2224,9 +2214,32 @@ fi fi if [ -n "$VM_IMAGE" ]; then + # copy out kernel & initrd (if they exist) during unmounting VM image + KERNEL_TEMP_DIR= + if [ -e $BUILD_ROOT/.build.kernel."$VM_TYPE" ]; then + KERNEL_TEMP_DIR=`mktemp -d` + cp $BUILD_ROOT/.build.kernel."$VM_TYPE" "$KERNEL_TEMP_DIR/kernel" + if [ -e $BUILD_ROOT/.build.initrd."$VM_TYPE" ]; then + cp $BUILD_ROOT/.build.initrd."$VM_TYPE" "$KERNEL_TEMP_DIR/initrd" + fi + fi check_exit # needs to work otherwise we have a corrupted file system - umount $BUILD_ROOT || cleanup_and_exit 3 + if ! umount $BUILD_ROOT; then + rm -rf "$KERNEL_TEMP_DIR" + cleanup_and_exit 3 + fi + # copy back the kernel and set it for VM + if [ -n "$KERNEL_TEMP_DIR" ]; then + mkdir -p $BUILD_ROOT/boot + mv $KERNEL_TEMP_DIR/kernel $BUILD_ROOT/boot/kernel + vm_kernel=$BUILD_ROOT/boot/kernel + if [ -e $KERNEL_TEMP_DIR/initrd ]; then + mv $KERNEL_TEMP_DIR/initrd $BUILD_ROOT/boot/initrd + vm_initrd=$BUILD_ROOT/boot/initrd + fi + rmdir "$KERNEL_TEMP_DIR" + fi fi if [ "$VM_TYPE" = 'openstack' -o "$VM_TYPE" = 'ec2' ]; then @@ -2297,7 +2310,6 @@ # we do not want to have sound inside the VMs export QEMU_AUDIO_DRV=none - if [ "$kvm_virtio" = 1 ]; then qemu_args=(-drive file="$VM_IMAGE",if=virtio$CACHE -drive file="$VM_IMAGE",if=ide,index=0$CACHE) if [ -n "$VM_SWAP" ]; then @@ -2312,7 +2324,7 @@ qemu_args=("${qemu_args[@]}" "virtio-blk,transport=virtio-mmio.1,drive=swap") fi else - if [ "$HOST_ARCH" = "ppc970" ];then + if [ "$HOST_ARCH" = "ppc970" -o "$HOST_ARCH" = "power7le" ];then qemu_args=( "-drive" ) qemu_args=("${qemu_args[@]}" "file=$VM_IMAGE,if=scsi,cache=unsafe") else @@ -2320,7 +2332,7 @@ fi if [ -n "$VM_SWAP" ]; then qemu_args=("${qemu_args[@]}" "-drive") - if [ "$HOST_ARCH" = "ppc970" ];then + if [ "$HOST_ARCH" = "ppc970" -o "$HOST_ARCH" = "power7le" ];then DISK_IF=scsi else DISK_IF=ide @@ -2328,8 +2340,10 @@ qemu_args=("${qemu_args[@]}" "file=$VM_SWAP,if=$DISK_IF,index=1$CACHE") fi fi - if [ -n "$BUILD_JOBS" -a "$icecream" = 0 ]; then + if [ -n "$BUILD_JOBS" -a "$icecream" = 0 -a -z "$BUILD_THREADS" ]; then qemu_args=("${qemu_args[@]}" "-smp" "$BUILD_JOBS") + elif [ -n "$BUILD_JOBS" -a -n "$BUILD_THREADS" ]; then + qemu_args=("${qemu_args[@]}" "-smp" "$BUILD_JOBS,threads=$BUILD_THREADS") fi if [ "$VM_TYPE" = 'kvm' -a "$HOST_ARCH" != "armv7l" ]; then KVM_OPTIONS="$KVM_OPTIONS -cpu host" @@ -2457,6 +2471,24 @@ zvm_cp volume_detach $VM_WORKER $VM_VOLUME_SWAP VM_IMAGE="/dev/$(zvm_cp volume_link_local $VM_WORKER $VM_VOLUME_ROOT $zvm_mult_pass $zvm_worker_nr)" VM_SWAP="/dev/$(zvm_cp volume_link_local $VM_WORKER $VM_VOLUME_SWAP $zvm_mult_pass $zvm_worker_nr)" + elif [ "$VM_TYPE" = 'emulator' ]; then + # generic emulator hook. an external script is needed to define + # the emulator startup + pushd $BUILD_DIR/emulator + if [ -z "$EMULATOR_SCRIPT" ]; then + EMULATOR_SCRIPT="./emulator.sh" + elif [ "${EMULATOR_SCRIPT:0:1}" != "/" ]; then + EMULATOR_SCRIPT="./$EMULATOR_SCRIPT" + fi + set -- "$EMULATOR_SCRIPT" "$VM_IMAGE" + echo "$@" + if ! "$@"; then + popd + echo "ERROR: The emulator returned with a failure" + cleanup_and_exit 3 + fi + popd + fi if [ "$VM_TYPE" = 'openstack' ]; then @@ -2613,7 +2645,7 @@ cd $BUILD_ROOT || cleanup_and_exit 1 TAR="tar" if test -x /usr/bin/bsdtar; then - TAR="/usr/bin/bsdtar --chroot" + TAR="/usr/bin/bsdtar --format gnutar --chroot" fi TOPDIRS= for DIR in .* * ; do @@ -2759,6 +2791,7 @@ mount -n -tproc none $BUILD_ROOT/proc 2> /dev/null mount -n -tdevpts -omode=0620,gid=5 none $BUILD_ROOT/dev/pts 2> /dev/null # needed for POSIX semaphores + mkdir -p $BUILD_ROOT/dev/shm mount -n -ttmpfs none $BUILD_ROOT/dev/shm 2> /dev/null setupicecream diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20131015/build_kiwi.sh new/obs-build-20131203/build_kiwi.sh --- old/obs-build-20131015/build_kiwi.sh 2013-10-15 11:43:49.000000000 +0200 +++ new/obs-build-20131203/build_kiwi.sh 2013-12-04 09:28:30.000000000 +0100 @@ -215,9 +215,13 @@ cat > $BUILD_ROOT/kiwi_post.sh << EOF echo "compressing vmx images... " cd /$TOPDIR/KIWI-vmx -for suffix in "ovf" "qcow2" "ova"; do +for suffix in "ovf" "qcow2" "ova" "tar"; do if [ -e "$imageout.\$suffix" ]; then - mv "$imageout.\$suffix" "/$TOPDIR/KIWI/$imageout$buildnum.\$suffix" + if [ "\$suffix" == "ovf" ]; then + mv "$imageout.\${suffix}/$imageout.\$suffix" "/$TOPDIR/KIWI/$imageout$buildnum.\$suffix" + else + mv "$imageout.\$suffix" "/$TOPDIR/KIWI/$imageout$buildnum.\$suffix" + fi pushd /$TOPDIR/KIWI if [ -x /usr/bin/sha256sum ]; then echo "Create sha256 \$suffix file..." @@ -233,13 +237,23 @@ test -e \$i && VMXFILES="\$VMXFILES \$i" done # take raw files as fallback -# do not do that, it may overwrite files when multiple -vmx flavors are configured -#if [ -z "\$VMXFILES" ]; then -# test -e "$imageout.raw" && VMXFILES="$imageout.raw" -#fi if [ -n "\$VMXFILES" ]; then tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-vmx.tar.bz2" \$VMXFILES SHAFILES="\$SHAFILES $imageout$buildnum-vmx.tar.bz2" +elif [ -e "$imageout.raw" ]; then + compress_tool="bzip2" + compress_suffix="bz2" + if [ -x /usr/bin/xz ]; then + # take xz to get support for sparse files + compress_tool="xz -2" + compress_suffix="xz" + fi + mv "$imageout.raw" "/$TOPDIR/KIWI/$imageout$buildnum-vmx.raw" + pushd /$TOPDIR/KIWI + echo "\$compress_tool raw file..." + \$compress_tool "$imageout$buildnum-vmx.raw" + SHAFILES="\$SHAFILES $imageout$buildnum-vmx.raw.\${compress_suffix}" + popd fi if [ -e "$imageout.xenconfig" ]; then tar cvjfS "/$TOPDIR/KIWI/$imageout$buildnum-vmx.tar.bz2" $imageout.xenconfig $imageout.raw initrd-* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20131015/common_functions new/obs-build-20131203/common_functions --- old/obs-build-20131015/common_functions 2013-10-15 11:43:49.000000000 +0200 +++ new/obs-build-20131203/common_functions 2013-12-04 09:28:30.000000000 +0100 @@ -28,6 +28,7 @@ i486) BUILD_ARCH="i486:i386" ;; i386) BUILD_ARCH="i386" ;; ppc64) BUILD_ARCH="ppc64:ppc" ;; + ppc64le) BUILD_ARCH="ppc64le" ;; sparc64v) BUILD_ARCH="sparc64v:sparc64:sparcv9v:sparcv9:sparcv8:sparc" ;; sparc64) BUILD_ARCH="sparc64:sparcv9:sparcv8:sparc" ;; sparcv9v) BUILD_ARCH="sparcv9v:sparcv9:sparcv8:sparc" ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20131015/configs/sl13.1.conf new/obs-build-20131203/configs/sl13.1.conf --- old/obs-build-20131015/configs/sl13.1.conf 2013-10-15 11:43:49.000000000 +0200 +++ new/obs-build-20131203/configs/sl13.1.conf 2013-12-04 09:28:30.000000000 +0100 @@ -22,6 +22,7 @@ Conflict: libudev1:udev-mini FileProvides: /usr/sbin/groupadd pwdutils +FileProvides: /sbin/netconfig sysconfig-netconfig Preinstall: aaa_base attr bash coreutils diffutils Preinstall: filesystem fillup glibc grep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20131015/configs/sl13.2.conf new/obs-build-20131203/configs/sl13.2.conf --- old/obs-build-20131015/configs/sl13.2.conf 2013-10-15 11:43:49.000000000 +0200 +++ new/obs-build-20131203/configs/sl13.2.conf 2013-12-04 09:28:30.000000000 +0100 @@ -22,6 +22,7 @@ Conflict: libudev1:udev-mini FileProvides: /usr/sbin/groupadd pwdutils +FileProvides: /sbin/netconfig sysconfig-netconfig Preinstall: aaa_base attr bash coreutils diffutils Preinstall: filesystem fillup glibc grep @@ -43,6 +44,7 @@ ExportFilter: \.s390x\.rpm$ s390x ExportFilter: \.ppc64\.rpm$ ppc64 ExportFilter: \.ppc\.rpm$ ppc +ExportFilter: \.ppc64le\.rpm$ ppc64le ExportFilter: -ia32-.*\.rpm$ ExportFilter: -32bit-.*\.sparc64\.rpm$ ExportFilter: -64bit-.*\.sparcv9\.rpm$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20131015/init_buildsystem new/obs-build-20131203/init_buildsystem --- old/obs-build-20131015/init_buildsystem 2013-10-15 11:43:49.000000000 +0200 +++ new/obs-build-20131203/init_buildsystem 2013-12-04 09:28:30.000000000 +0100 @@ -122,6 +122,7 @@ umount -n "$BUILD_ROOT/mnt" 2> /dev/null || true rm -rf -- "$BUILD_ROOT"/* rm -rf -- "$BUILD_ROOT/.build" + rm -rf -- "$BUILD_ROOT/.build.kernel.*" rm -rf -- "$BUILD_ROOT/.root" rm -rf -- "$BUILD_ROOT/.init_b_cache" rm -rf -- "$BUILD_ROOT/.preinstall_image/*" @@ -1307,12 +1308,6 @@ chroot $BUILD_ROOT rpm -q --whatprovides rpm >/dev/null 2>&1 fi -# create modules.dep in kvm/xen -# This can not work, until we use the native repository kernel -#if [ $BUILD_ROOT = "/" -a -x /sbin/depmod ]; then -# /sbin/depmod -a -#fi - rm -f $BUILD_ROOT/.rpmmacros $BUILD_ROOT/root/.rpmmacros rm -rf "$BUILD_ROOT/.init_b_cache" rm -f $BUILD_IS_RUNNING diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20131015/mkbaselibs new/obs-build-20131203/mkbaselibs --- old/obs-build-20131015/mkbaselibs 2013-10-15 11:43:49.000000000 +0200 +++ new/obs-build-20131203/mkbaselibs 2013-12-04 09:28:30.000000000 +0100 @@ -637,6 +637,7 @@ delete $alldirs{"$prefix$fn"}; } } + delete $alldirs{$_} for keys %symlinks; $ad = $prefix; delete $alldirs{$ad}; delete $alldirs{$ad} while $ad =~ s/\/[^\/]+$//; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-build-20131015/vc new/obs-build-20131203/vc --- old/obs-build-20131015/vc 2013-10-15 11:43:49.000000000 +0200 +++ new/obs-build-20131203/vc 2013-12-04 09:28:30.000000000 +0100 @@ -133,6 +133,24 @@ elif [ ! $just_edit ]; then echo "- " echo + if [ -d .osc ] && which osc 2>/dev/null; then + OSC_STATUS="$(cd "$pkgpath" &> /dev/null; osc st)" + ADDED="$(sed -n 's/^A[[:blank:]]\+\([^[:blank:]].*\.\(patch\|diff\)\)$/ * \1/p' <<< "$OSC_STATUS")" + DELETED="$(sed -n 's/^D[[:blank:]]\+\([^[:blank:]].*\.\(patch\|diff\)\)$/ * \1/p' <<< "$OSC_STATUS")" + MODIFIED="$(sed -n 's/^M[[:blank:]]\+\([^[:blank:]].*\.\(patch\|diff\)\)$/ * \1/p' <<< "$OSC_STATUS")" + if [ -n "$ADDED" ]; then + echo "- added patches:" + echo "$ADDED" + fi + if [ -n "$DELETED" ]; then + echo "- removed patches:" + echo "$DELETED" + fi + if [ -n "$MODIFIED" ]; then + echo "- modified patches:" + echo "$MODIFIED" + fi + fi fi cat $changelog } >> "$tmpfile" @@ -148,5 +166,7 @@ fi fi mode=`stat -c "%a" "$changelog"` +user=`stat -c "%G:%U" "$changelog"` mv "$tmpfile" "$changelog" chmod $mode "$changelog" +chown $user "$changelog" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
