commit 8b75c19c7c731985ce6ca8a49f5f3f0a4cf564c3

OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7718
2014-02-01 07:01:46 +00:00 · 2014-02-01 07:01:46 +00:00 · 97d6236541
commit 97d6236541
parent 0e6af74438
30 changed files with 113 additions and 19 deletions
--- a/kernel-debug.changes
+++ b/kernel-debug.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 31 09:00:26 CET 2014 - adrian@suse.de
+
+- avoid double /sys mounts for kernel-obs-build, OBS is doing this meanwhile
+- commit 3ea39a4
+
 -------------------------------------------------------------------
 Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz

--- a/kernel-debug.spec
+++ b/kernel-debug.spec
@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.13.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g62e9557
+Release:        <RELEASE>.g8b75c19
 %else
 Release:        0
 %endif
--- a/kernel-default.changes
+++ b/kernel-default.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 31 09:00:26 CET 2014 - adrian@suse.de
+
+- avoid double /sys mounts for kernel-obs-build, OBS is doing this meanwhile
+- commit 3ea39a4
+
 -------------------------------------------------------------------
 Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz

--- a/kernel-default.spec
+++ b/kernel-default.spec
@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.13.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g62e9557
+Release:        <RELEASE>.g8b75c19
 %else
 Release:        0
 %endif
--- a/kernel-desktop.changes
+++ b/kernel-desktop.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 31 09:00:26 CET 2014 - adrian@suse.de
+
+- avoid double /sys mounts for kernel-obs-build, OBS is doing this meanwhile
+- commit 3ea39a4
+
 -------------------------------------------------------------------
 Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz

--- a/kernel-desktop.spec
+++ b/kernel-desktop.spec
@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.13.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g62e9557
+Release:        <RELEASE>.g8b75c19
 %else
 Release:        0
 %endif
--- a/kernel-docs.changes
+++ b/kernel-docs.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 31 09:00:26 CET 2014 - adrian@suse.de
+
+- avoid double /sys mounts for kernel-obs-build, OBS is doing this meanwhile
+- commit 3ea39a4
+
 -------------------------------------------------------------------
 Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz

--- a/kernel-docs.spec
+++ b/kernel-docs.spec
@ -27,7 +27,7 @@ License:        GPL-2.0
 Group:          Documentation/Man
 Version:        3.13.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g62e9557
+Release:        <RELEASE>.g8b75c19
 %else
 Release:        0
 %endif
--- a/kernel-ec2.changes
+++ b/kernel-ec2.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 31 09:00:26 CET 2014 - adrian@suse.de
+
+- avoid double /sys mounts for kernel-obs-build, OBS is doing this meanwhile
+- commit 3ea39a4
+
 -------------------------------------------------------------------
 Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz

--- a/kernel-ec2.spec
+++ b/kernel-ec2.spec
@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.13.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g62e9557
+Release:        <RELEASE>.g8b75c19
 %else
 Release:        0
 %endif
--- a/kernel-exynos.changes
+++ b/kernel-exynos.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 31 09:00:26 CET 2014 - adrian@suse.de
+
+- avoid double /sys mounts for kernel-obs-build, OBS is doing this meanwhile
+- commit 3ea39a4
+
 -------------------------------------------------------------------
 Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz

--- a/kernel-exynos.spec
+++ b/kernel-exynos.spec
@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.13.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g62e9557
+Release:        <RELEASE>.g8b75c19
 %else
 Release:        0
 %endif
--- a/kernel-lpae.changes
+++ b/kernel-lpae.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 31 09:00:26 CET 2014 - adrian@suse.de
+
+- avoid double /sys mounts for kernel-obs-build, OBS is doing this meanwhile
+- commit 3ea39a4
+
 -------------------------------------------------------------------
 Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz

--- a/kernel-lpae.spec
+++ b/kernel-lpae.spec
@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.13.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g62e9557
+Release:        <RELEASE>.g8b75c19
 %else
 Release:        0
 %endif
--- a/kernel-obs-build.changes
+++ b/kernel-obs-build.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 31 09:00:26 CET 2014 - adrian@suse.de
+
+- avoid double /sys mounts for kernel-obs-build, OBS is doing this meanwhile
+- commit 3ea39a4
+
 -------------------------------------------------------------------
 Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz

--- a/kernel-obs-build.spec
+++ b/kernel-obs-build.spec
@ -39,6 +39,7 @@ License:        GPL-2.0
 Group:          SLES
 Version:        1
 Release:        0
+ExclusiveArch:  %ix86 x86_64 s390x ppc64le

 %description
 This package is repackaging already compiled kernels to make them usable
@ -52,14 +53,17 @@ loaded during build when installing the kernel package.
 # a longer list to have them also available for qemu cross builds where x86_64 kernel runs in eg. arm env.
 # this list of modules where available on build workers of build.opensuse.org, so we stay compatible.
 export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_blk fat vfat nls_cp437 nls_iso8859-1"
-mkdir -p /sys
-mount /sys /sys -t sysfs
 ROOT=""
 [ -e "/dev/vda" ] && ROOT="-d /dev/vda"
 [ -e /dev/hda1 ] && ROOT="-d /dev/hda1" # for xen builds
+%define kernel_name vmlinu?
+%ifarch s390 s390x
+%define kernel_name image
+%endif
+ls /boot
 /sbin/mkinitrd $ROOT \
               -m "$KERNEL_MODULES" \
-               -k /boot/vmlinu?-*-default -M /boot/System.map-*-default -i /tmp/initrd.kvm
+               -k /boot/%{kernel_name}-*-default -M /boot/System.map-*-default -i /tmp/initrd.kvm

 %ifarch %ix86 x86_64
 /sbin/mkinitrd $ROOT \
@ -69,7 +73,7 @@ ROOT=""

 %install
 install -d -m 0755 $RPM_BUILD_ROOT
-cp -v /boot/vmlinu?-*-default $RPM_BUILD_ROOT/.build.kernel.kvm
+cp -v /boot/%{kernel_name}-*-default $RPM_BUILD_ROOT/.build.kernel.kvm
 cp -v /tmp/initrd.kvm $RPM_BUILD_ROOT/.build.initrd.kvm
 %ifarch %ix86 x86_64
 cp -v /boot/vmlinuz-*-xen $RPM_BUILD_ROOT/.build.kernel.xen
--- a/kernel-obs-qa.changes
+++ b/kernel-obs-qa.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 31 09:00:26 CET 2014 - adrian@suse.de
+
+- avoid double /sys mounts for kernel-obs-build, OBS is doing this meanwhile
+- commit 3ea39a4
+
 -------------------------------------------------------------------
 Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz

--- a/kernel-pae.changes
+++ b/kernel-pae.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 31 09:00:26 CET 2014 - adrian@suse.de
+
+- avoid double /sys mounts for kernel-obs-build, OBS is doing this meanwhile
+- commit 3ea39a4
+
 -------------------------------------------------------------------
 Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz

--- a/kernel-pae.spec
+++ b/kernel-pae.spec
@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.13.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g62e9557
+Release:        <RELEASE>.g8b75c19
 %else
 Release:        0
 %endif
--- a/kernel-source.changes
+++ b/kernel-source.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 31 09:00:26 CET 2014 - adrian@suse.de
+
+- avoid double /sys mounts for kernel-obs-build, OBS is doing this meanwhile
+- commit 3ea39a4
+
 -------------------------------------------------------------------
 Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz

--- a/kernel-source.spec
+++ b/kernel-source.spec
@ -32,7 +32,7 @@ License:        GPL-2.0
 Group:          Development/Sources
 Version:        3.13.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g62e9557
+Release:        <RELEASE>.g8b75c19
 %else
 Release:        0
 %endif
--- a/kernel-syms.changes
+++ b/kernel-syms.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 31 09:00:26 CET 2014 - adrian@suse.de
+
+- avoid double /sys mounts for kernel-obs-build, OBS is doing this meanwhile
+- commit 3ea39a4
+
 -------------------------------------------------------------------
 Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz

--- a/kernel-syms.spec
+++ b/kernel-syms.spec
@ -27,7 +27,7 @@ Group:          Development/Sources
 Version:        3.13.1
 %if %using_buildservice
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g62e9557
+Release:        <RELEASE>.g8b75c19
 %else
 Release:        0
 %endif
--- a/kernel-trace.changes
+++ b/kernel-trace.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 31 09:00:26 CET 2014 - adrian@suse.de
+
+- avoid double /sys mounts for kernel-obs-build, OBS is doing this meanwhile
+- commit 3ea39a4
+
 -------------------------------------------------------------------
 Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz

--- a/kernel-trace.spec
+++ b/kernel-trace.spec
@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.13.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g62e9557
+Release:        <RELEASE>.g8b75c19
 %else
 Release:        0
 %endif
--- a/kernel-vanilla.changes
+++ b/kernel-vanilla.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 31 09:00:26 CET 2014 - adrian@suse.de
+
+- avoid double /sys mounts for kernel-obs-build, OBS is doing this meanwhile
+- commit 3ea39a4
+
 -------------------------------------------------------------------
 Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz

--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.13.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g62e9557
+Release:        <RELEASE>.g8b75c19
 %else
 Release:        0
 %endif
--- a/kernel-xen.changes
+++ b/kernel-xen.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 31 09:00:26 CET 2014 - adrian@suse.de
+
+- avoid double /sys mounts for kernel-obs-build, OBS is doing this meanwhile
+- commit 3ea39a4
+
 -------------------------------------------------------------------
 Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz

--- a/kernel-xen.spec
+++ b/kernel-xen.spec
@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.13.1
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g62e9557
+Release:        <RELEASE>.g8b75c19
 %else
 Release:        0
 %endif
--- a/4
+++ b/4
@ -1,3 +1,3 @@
-2014-01-30 18:23:45 +0100
-GIT Revision: 62e9557f1d156f56f847422c72bede5c198aafb7
+2014-01-31 17:01:34 +0100
+GIT Revision: 8b75c19c7c731985ce6ca8a49f5f3f0a4cf564c3
 GIT Branch: master