commit f1c6b14197480d0e8758df816096fc81bcb3be60

OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7776

kernel-debug.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 16:08:01 CEST 2014 - mmarek@suse.cz
+
+- Generate kernel-obs-*.spec from templates
+- commit b2e5f7c
+
 -------------------------------------------------------------------
 Wed Apr  9 10:33:35 CEST 2014 - jdelvare@suse.de
 
@@ -58,6 +64,17 @@ Fri Apr  4 09:39:59 CEST 2014 - jdelvare@suse.de
   so it's useless on x86-64.
 - commit 47efdd9
 
+-------------------------------------------------------------------
+Fri Apr  4 09:13:48 CEST 2014 - adrian@suse.de
+
+- fix building initrd for SLE 12
+  It does provided and load the critical kernel modules
+  for building some kiwi images and cross architecture
+  builds like used for aarch64.
+  The kernel-obs-build.spec still contains the bits to allow
+  to use it also for SLE 11.
+- commit e9868b7
+
 -------------------------------------------------------------------
 Thu Apr  3 18:43:52 CEST 2014 - guillaume.gardet@oliseo.fr
 

kernel-debug.spec

@@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.14.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g043a9a9
+Release:        <RELEASE>.gf1c6b14
 %else
 Release:        0
 %endif
@@ -195,6 +195,8 @@ Source66:       configtool.pl
 Source67:       log.sh
 Source68:       host-memcpy-hack.h
 Source69:       try-disable-staging-driver
+Source70:       kernel-obs-build.spec.in
+Source71:       kernel-obs-qa.spec.in
 Source100:      config.tar.bz2
 Source101:      config.addon.tar.bz2
 Source102:      patches.arch.tar.bz2
@@ -270,6 +272,8 @@ NoSource:       66
 NoSource:       67
 NoSource:       68
 NoSource:       69
+NoSource:       70
+NoSource:       71
 NoSource:       100
 NoSource:       101
 NoSource:       102

kernel-default.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 16:08:01 CEST 2014 - mmarek@suse.cz
+
+- Generate kernel-obs-*.spec from templates
+- commit b2e5f7c
+
 -------------------------------------------------------------------
 Wed Apr  9 10:33:35 CEST 2014 - jdelvare@suse.de
 
@@ -58,6 +64,17 @@ Fri Apr  4 09:39:59 CEST 2014 - jdelvare@suse.de
   so it's useless on x86-64.
 - commit 47efdd9
 
+-------------------------------------------------------------------
+Fri Apr  4 09:13:48 CEST 2014 - adrian@suse.de
+
+- fix building initrd for SLE 12
+  It does provided and load the critical kernel modules
+  for building some kiwi images and cross architecture
+  builds like used for aarch64.
+  The kernel-obs-build.spec still contains the bits to allow
+  to use it also for SLE 11.
+- commit e9868b7
+
 -------------------------------------------------------------------
 Thu Apr  3 18:43:52 CEST 2014 - guillaume.gardet@oliseo.fr
 

kernel-default.spec

@@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.14.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g043a9a9
+Release:        <RELEASE>.gf1c6b14
 %else
 Release:        0
 %endif
@@ -203,6 +203,8 @@ Source66:       configtool.pl
 Source67:       log.sh
 Source68:       host-memcpy-hack.h
 Source69:       try-disable-staging-driver
+Source70:       kernel-obs-build.spec.in
+Source71:       kernel-obs-qa.spec.in
 Source100:      config.tar.bz2
 Source101:      config.addon.tar.bz2
 Source102:      patches.arch.tar.bz2
@@ -278,6 +280,8 @@ NoSource:       66
 NoSource:       67
 NoSource:       68
 NoSource:       69
+NoSource:       70
+NoSource:       71
 NoSource:       100
 NoSource:       101
 NoSource:       102

kernel-desktop.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 16:08:01 CEST 2014 - mmarek@suse.cz
+
+- Generate kernel-obs-*.spec from templates
+- commit b2e5f7c
+
 -------------------------------------------------------------------
 Wed Apr  9 10:33:35 CEST 2014 - jdelvare@suse.de
 
@@ -58,6 +64,17 @@ Fri Apr  4 09:39:59 CEST 2014 - jdelvare@suse.de
   so it's useless on x86-64.
 - commit 47efdd9
 
+-------------------------------------------------------------------
+Fri Apr  4 09:13:48 CEST 2014 - adrian@suse.de
+
+- fix building initrd for SLE 12
+  It does provided and load the critical kernel modules
+  for building some kiwi images and cross architecture
+  builds like used for aarch64.
+  The kernel-obs-build.spec still contains the bits to allow
+  to use it also for SLE 11.
+- commit e9868b7
+
 -------------------------------------------------------------------
 Thu Apr  3 18:43:52 CEST 2014 - guillaume.gardet@oliseo.fr
 

kernel-desktop.spec

@@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.14.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g043a9a9
+Release:        <RELEASE>.gf1c6b14
 %else
 Release:        0
 %endif
@@ -192,6 +192,8 @@ Source66:       configtool.pl
 Source67:       log.sh
 Source68:       host-memcpy-hack.h
 Source69:       try-disable-staging-driver
+Source70:       kernel-obs-build.spec.in
+Source71:       kernel-obs-qa.spec.in
 Source100:      config.tar.bz2
 Source101:      config.addon.tar.bz2
 Source102:      patches.arch.tar.bz2
@@ -267,6 +269,8 @@ NoSource:       66
 NoSource:       67
 NoSource:       68
 NoSource:       69
+NoSource:       70
+NoSource:       71
 NoSource:       100
 NoSource:       101
 NoSource:       102

kernel-docs.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 16:08:01 CEST 2014 - mmarek@suse.cz
+
+- Generate kernel-obs-*.spec from templates
+- commit b2e5f7c
+
 -------------------------------------------------------------------
 Wed Apr  9 10:33:35 CEST 2014 - jdelvare@suse.de
 
@@ -58,6 +64,17 @@ Fri Apr  4 09:39:59 CEST 2014 - jdelvare@suse.de
   so it's useless on x86-64.
 - commit 47efdd9
 
+-------------------------------------------------------------------
+Fri Apr  4 09:13:48 CEST 2014 - adrian@suse.de
+
+- fix building initrd for SLE 12
+  It does provided and load the critical kernel modules
+  for building some kiwi images and cross architecture
+  builds like used for aarch64.
+  The kernel-obs-build.spec still contains the bits to allow
+  to use it also for SLE 11.
+- commit e9868b7
+
 -------------------------------------------------------------------
 Thu Apr  3 18:43:52 CEST 2014 - guillaume.gardet@oliseo.fr
 

kernel-docs.spec

@@ -27,7 +27,7 @@ License:        GPL-2.0
 Group:          Documentation/Man
 Version:        3.14.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g043a9a9
+Release:        <RELEASE>.gf1c6b14
 %else
 Release:        0
 %endif

kernel-ec2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 16:08:01 CEST 2014 - mmarek@suse.cz
+
+- Generate kernel-obs-*.spec from templates
+- commit b2e5f7c
+
 -------------------------------------------------------------------
 Wed Apr  9 10:33:35 CEST 2014 - jdelvare@suse.de
 
@@ -58,6 +64,17 @@ Fri Apr  4 09:39:59 CEST 2014 - jdelvare@suse.de
   so it's useless on x86-64.
 - commit 47efdd9
 
+-------------------------------------------------------------------
+Fri Apr  4 09:13:48 CEST 2014 - adrian@suse.de
+
+- fix building initrd for SLE 12
+  It does provided and load the critical kernel modules
+  for building some kiwi images and cross architecture
+  builds like used for aarch64.
+  The kernel-obs-build.spec still contains the bits to allow
+  to use it also for SLE 11.
+- commit e9868b7
+
 -------------------------------------------------------------------
 Thu Apr  3 18:43:52 CEST 2014 - guillaume.gardet@oliseo.fr
 

kernel-ec2.spec

@@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.14.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g043a9a9
+Release:        <RELEASE>.gf1c6b14
 %else
 Release:        0
 %endif
@@ -192,6 +192,8 @@ Source66:       configtool.pl
 Source67:       log.sh
 Source68:       host-memcpy-hack.h
 Source69:       try-disable-staging-driver
+Source70:       kernel-obs-build.spec.in
+Source71:       kernel-obs-qa.spec.in
 Source100:      config.tar.bz2
 Source101:      config.addon.tar.bz2
 Source102:      patches.arch.tar.bz2
@@ -267,6 +269,8 @@ NoSource:       66
 NoSource:       67
 NoSource:       68
 NoSource:       69
+NoSource:       70
+NoSource:       71
 NoSource:       100
 NoSource:       101
 NoSource:       102

kernel-exynos.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 16:08:01 CEST 2014 - mmarek@suse.cz
+
+- Generate kernel-obs-*.spec from templates
+- commit b2e5f7c
+
 -------------------------------------------------------------------
 Wed Apr  9 10:33:35 CEST 2014 - jdelvare@suse.de
 
@@ -58,6 +64,17 @@ Fri Apr  4 09:39:59 CEST 2014 - jdelvare@suse.de
   so it's useless on x86-64.
 - commit 47efdd9
 
+-------------------------------------------------------------------
+Fri Apr  4 09:13:48 CEST 2014 - adrian@suse.de
+
+- fix building initrd for SLE 12
+  It does provided and load the critical kernel modules
+  for building some kiwi images and cross architecture
+  builds like used for aarch64.
+  The kernel-obs-build.spec still contains the bits to allow
+  to use it also for SLE 11.
+- commit e9868b7
+
 -------------------------------------------------------------------
 Thu Apr  3 18:43:52 CEST 2014 - guillaume.gardet@oliseo.fr
 

kernel-exynos.spec

@@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.14.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g043a9a9
+Release:        <RELEASE>.gf1c6b14
 %else
 Release:        0
 %endif
@@ -192,6 +192,8 @@ Source66:       configtool.pl
 Source67:       log.sh
 Source68:       host-memcpy-hack.h
 Source69:       try-disable-staging-driver
+Source70:       kernel-obs-build.spec.in
+Source71:       kernel-obs-qa.spec.in
 Source100:      config.tar.bz2
 Source101:      config.addon.tar.bz2
 Source102:      patches.arch.tar.bz2
@@ -267,6 +269,8 @@ NoSource:       66
 NoSource:       67
 NoSource:       68
 NoSource:       69
+NoSource:       70
+NoSource:       71
 NoSource:       100
 NoSource:       101
 NoSource:       102

kernel-lpae.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 16:08:01 CEST 2014 - mmarek@suse.cz
+
+- Generate kernel-obs-*.spec from templates
+- commit b2e5f7c
+
 -------------------------------------------------------------------
 Wed Apr  9 10:33:35 CEST 2014 - jdelvare@suse.de
 
@@ -58,6 +64,17 @@ Fri Apr  4 09:39:59 CEST 2014 - jdelvare@suse.de
   so it's useless on x86-64.
 - commit 47efdd9
 
+-------------------------------------------------------------------
+Fri Apr  4 09:13:48 CEST 2014 - adrian@suse.de
+
+- fix building initrd for SLE 12
+  It does provided and load the critical kernel modules
+  for building some kiwi images and cross architecture
+  builds like used for aarch64.
+  The kernel-obs-build.spec still contains the bits to allow
+  to use it also for SLE 11.
+- commit e9868b7
+
 -------------------------------------------------------------------
 Thu Apr  3 18:43:52 CEST 2014 - guillaume.gardet@oliseo.fr
 

kernel-lpae.spec

@@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.14.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g043a9a9
+Release:        <RELEASE>.gf1c6b14
 %else
 Release:        0
 %endif
@@ -192,6 +192,8 @@ Source66:       configtool.pl
 Source67:       log.sh
 Source68:       host-memcpy-hack.h
 Source69:       try-disable-staging-driver
+Source70:       kernel-obs-build.spec.in
+Source71:       kernel-obs-qa.spec.in
 Source100:      config.tar.bz2
 Source101:      config.addon.tar.bz2
 Source102:      patches.arch.tar.bz2
@@ -267,6 +269,8 @@ NoSource:       66
 NoSource:       67
 NoSource:       68
 NoSource:       69
+NoSource:       70
+NoSource:       71
 NoSource:       100
 NoSource:       101
 NoSource:       102

kernel-obs-build.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 16:08:01 CEST 2014 - mmarek@suse.cz
+
+- Generate kernel-obs-*.spec from templates
+- commit b2e5f7c
+
 -------------------------------------------------------------------
 Wed Apr  9 10:33:35 CEST 2014 - jdelvare@suse.de
 
@@ -58,6 +64,17 @@ Fri Apr  4 09:39:59 CEST 2014 - jdelvare@suse.de
   so it's useless on x86-64.
 - commit 47efdd9
 
+-------------------------------------------------------------------
+Fri Apr  4 09:13:48 CEST 2014 - adrian@suse.de
+
+- fix building initrd for SLE 12
+  It does provided and load the critical kernel modules
+  for building some kiwi images and cross architecture
+  builds like used for aarch64.
+  The kernel-obs-build.spec still contains the bits to allow
+  to use it also for SLE 11.
+- commit e9868b7
+
 -------------------------------------------------------------------
 Thu Apr  3 18:43:52 CEST 2014 - guillaume.gardet@oliseo.fr
 

kernel-obs-build.spec

@@ -19,26 +19,38 @@
 
 #!BuildIgnore: post-build-checks
 
+%define patchversion 3.14.0
+%define variant %{nil}
+
+%include %_sourcedir/kernel-spec-macros
+
 Name:           kernel-obs-build
 BuildRequires:  coreutils
 BuildRequires:  device-mapper
-BuildRequires:  mkinitrd
 BuildRequires:  util-linux
 
 BuildRequires:  kernel-default
 %ifarch %ix86 x86_64
 BuildRequires:  kernel-xen
 %endif
-%if 0%{?suse_version} < 1200
+ExclusiveArch:  %ix86 aarch64 armv6hl armv7hl ppc ppc64 ppc64le s390x x86_64
+%if 0%{?suse_version} < 1320
 # For SLE 11 
 BuildRequires:  yast2-bootloader
+BuildRequires:  mkinitrd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%else
+BuildRequires:  dracut
 %endif
 Summary:        package kernel and initrd for OBS VM builds
 License:        GPL-2.0
 Group:          SLES
-Version:        1
+Version:        3.14.0
+%if 0%{?is_kotd}
+Release:        <RELEASE>.gf1c6b14
+%else
 Release:        0
+%endif
 
 %description
 This package is repackaging already compiled kernels to make them usable
@@ -49,9 +61,39 @@ loaded during build when installing the kernel package.
 %prep
 
 %build
+mkdir -p /usr/lib/dracut/modules.d/80obs
+cat > /usr/lib/dracut/modules.d/80obs/module-setup.sh <<EOF
+#!/bin/bash
+
+# called by dracut
+check() {
+    return 0
+}
+
+# called by dracut
+installkernel() {
+    hostonly='' instmods obs
+}
+
+# called by dracut
+install() {
+    inst_hook pre-udev 10 "\$moddir"/setup_obs.sh
+}
+EOF
+chmod a+rx /usr/lib/dracut/modules.d/80obs/module-setup.sh
+cat > /usr/lib/dracut/modules.d/80obs/setup_obs.sh <<EOF
+#!/bin/sh
+info "Loading kernel modules for OBS"
+info "  Loop..."
+modprobe loop max_loop=64 lbs=0 || modprobe loop max_loop=64
+info "  binfmt misc..."
+modprobe binfmt_misc
+EOF
+chmod a+rx /usr/lib/dracut/modules.d/80obs/setup_obs.sh
+
 # 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 ibmvscsi"
+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 ibmvscsi ibmvscsic"
 ROOT=""
 [ -e "/dev/vda" ] && ROOT="-d /dev/vda"
 [ -e /dev/hda1 ] && ROOT="-d /dev/hda1" # for xen builds
@@ -59,23 +101,34 @@ ROOT=""
 %ifarch s390 s390x
 %define kernel_name image
 %endif
-ls /boot
+
+%if 0%{?suse_version} < 1320
+# For SLE 11 
 /sbin/mkinitrd $ROOT \
                -m "$KERNEL_MODULES" \
                -k /boot/%{kernel_name}-*-default -M /boot/System.map-*-default -i /tmp/initrd.kvm -B
-
 %ifarch %ix86 x86_64
 /sbin/mkinitrd $ROOT \
                -m "$KERNEL_MODULES" \
                -k /boot/vmlinuz-xen -M /boot/System.map-*-xen -i /tmp/initrd.xen
 %endif
+%else
+dracut --host-only --drivers="$KERNEL_MODULES" --force /tmp/initrd.kvm `echo /boot/%{kernel_name}-*-default | sed -n -e 's,[^-]*-\(.*-default\),\1,p'`
+%ifarch %ix86 x86_64
+dracut --host-only --drivers="$KERNEL_MODULES" --force /tmp/initrd.xen `echo /boot/%{kernel_name}-*-xen | sed -n -e 's,[^-]*-\(.*-xen\),\1,p'`
+%endif
+%endif
+
+
+#cleanup
+rm -rf /usr/lib/dracut/modules.d/80obs
 
 %install
 install -d -m 0755 $RPM_BUILD_ROOT
 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
+cp -v /boot/%{kernel_name}-*-xen $RPM_BUILD_ROOT/.build.kernel.xen
 cp -v /tmp/initrd.xen $RPM_BUILD_ROOT/.build.initrd.xen
 %endif
 

kernel-obs-build.spec.in

@@ -0,0 +1,140 @@
+#
+# spec file for package kernel-obs-build
+#
+# Copyright (c) @YEAR@ SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+# needsrootforbuild
+
+
+#!BuildIgnore: post-build-checks
+
+%define patchversion @PATCHVERSION@
+%define variant @VARIANT@%{nil}
+
+%include %_sourcedir/kernel-spec-macros
+
+Name:           kernel-obs-build
+BuildRequires:  coreutils
+BuildRequires:  device-mapper
+BuildRequires:  util-linux
+
+BuildRequires:  kernel-default
+%ifarch %ix86 x86_64
+BuildRequires:  kernel-xen
+%endif
+ExclusiveArch:  @ARCHS@
+%if 0%{?suse_version} < 1320
+# For SLE 11 
+BuildRequires:  yast2-bootloader
+BuildRequires:  mkinitrd
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%else
+BuildRequires:  dracut
+%endif
+Summary:        package kernel and initrd for OBS VM builds
+License:        GPL-2.0
+Group:          SLES
+Version:        @RPMVERSION@
+%if 0%{?is_kotd}
+Release:        <RELEASE>.g@COMMIT@
+%else
+Release:        @RELEASE@
+%endif
+
+%description
+This package is repackaging already compiled kernels to make them usable
+inside of Open Build Service (OBS) VM builds. An initrd with some basic
+kernel modules is generated as well, but further kernel modules can be 
+loaded during build when installing the kernel package.
+
+%prep
+
+%build
+mkdir -p /usr/lib/dracut/modules.d/80obs
+cat > /usr/lib/dracut/modules.d/80obs/module-setup.sh <<EOF
+#!/bin/bash
+
+# called by dracut
+check() {
+    return 0
+}
+
+# called by dracut
+installkernel() {
+    hostonly='' instmods obs
+}
+
+# called by dracut
+install() {
+    inst_hook pre-udev 10 "\$moddir"/setup_obs.sh
+}
+EOF
+chmod a+rx /usr/lib/dracut/modules.d/80obs/module-setup.sh
+cat > /usr/lib/dracut/modules.d/80obs/setup_obs.sh <<EOF
+#!/bin/sh
+info "Loading kernel modules for OBS"
+info "  Loop..."
+modprobe loop max_loop=64 lbs=0 || modprobe loop max_loop=64
+info "  binfmt misc..."
+modprobe binfmt_misc
+EOF
+chmod a+rx /usr/lib/dracut/modules.d/80obs/setup_obs.sh
+
+# 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 ibmvscsi ibmvscsic"
+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
+
+%if 0%{?suse_version} < 1320
+# For SLE 11 
+/sbin/mkinitrd $ROOT \
+               -m "$KERNEL_MODULES" \
+               -k /boot/%{kernel_name}-*-default -M /boot/System.map-*-default -i /tmp/initrd.kvm -B
+%ifarch %ix86 x86_64
+/sbin/mkinitrd $ROOT \
+               -m "$KERNEL_MODULES" \
+               -k /boot/vmlinuz-xen -M /boot/System.map-*-xen -i /tmp/initrd.xen
+%endif
+%else
+dracut --host-only --drivers="$KERNEL_MODULES" --force /tmp/initrd.kvm `echo /boot/%{kernel_name}-*-default | sed -n -e 's,[^-]*-\(.*-default\),\1,p'`
+%ifarch %ix86 x86_64
+dracut --host-only --drivers="$KERNEL_MODULES" --force /tmp/initrd.xen `echo /boot/%{kernel_name}-*-xen | sed -n -e 's,[^-]*-\(.*-xen\),\1,p'`
+%endif
+%endif
+
+
+#cleanup
+rm -rf /usr/lib/dracut/modules.d/80obs
+
+%install
+install -d -m 0755 $RPM_BUILD_ROOT
+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/%{kernel_name}-*-xen $RPM_BUILD_ROOT/.build.kernel.xen
+cp -v /tmp/initrd.xen $RPM_BUILD_ROOT/.build.initrd.xen
+%endif
+
+%files
+%defattr(-,root,root)
+/.build.kernel.*
+/.build.initrd.*
+
+%changelog

kernel-obs-qa.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 16:08:01 CEST 2014 - mmarek@suse.cz
+
+- Generate kernel-obs-*.spec from templates
+- commit b2e5f7c
+
 -------------------------------------------------------------------
 Wed Apr  9 10:33:35 CEST 2014 - jdelvare@suse.de
 
@@ -58,6 +64,17 @@ Fri Apr  4 09:39:59 CEST 2014 - jdelvare@suse.de
   so it's useless on x86-64.
 - commit 47efdd9
 
+-------------------------------------------------------------------
+Fri Apr  4 09:13:48 CEST 2014 - adrian@suse.de
+
+- fix building initrd for SLE 12
+  It does provided and load the critical kernel modules
+  for building some kiwi images and cross architecture
+  builds like used for aarch64.
+  The kernel-obs-build.spec still contains the bits to allow
+  to use it also for SLE 11.
+- commit e9868b7
+
 -------------------------------------------------------------------
 Thu Apr  3 18:43:52 CEST 2014 - guillaume.gardet@oliseo.fr
 

kernel-obs-qa.spec

@@ -17,12 +17,18 @@
 # needsrootforbuild
 
 
+%define patchversion 3.14.0
+%define variant %{nil}
+
+%include %_sourcedir/kernel-spec-macros
+
 Name:           kernel-obs-qa
 BuildRequires:  kernel-default
 BuildRequires:  modutils
 %ifarch %ix86 x86_64
 BuildRequires:  kernel-xen
 %endif
+ExclusiveArch:  %ix86 aarch64 armv6hl armv7hl ppc ppc64 ppc64le s390x x86_64
 %if 0%{?suse_version} < 1200
 # for SLE 11
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -30,8 +36,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Basic QA tests for the kernel
 License:        GPL-2.0
 Group:          SLES
-Version:        1
+Version:        3.14.0
+%if 0%{?is_kotd}
+Release:        <RELEASE>.gf1c6b14
+%else
 Release:        0
+%endif
 
 %description
 This package is using the kernel compiled within Open Build Service(OBS)

kernel-obs-qa.spec.in

@@ -0,0 +1,72 @@
+#
+# spec file for package kernel-obs-qa
+#
+# Copyright (c) @YEAR@ SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+# needsrootforbuild
+
+
+%define patchversion @PATCHVERSION@
+%define variant @VARIANT@%{nil}
+
+%include %_sourcedir/kernel-spec-macros
+
+Name:           kernel-obs-qa
+BuildRequires:  kernel-default
+BuildRequires:  modutils
+%ifarch %ix86 x86_64
+BuildRequires:  kernel-xen
+%endif
+ExclusiveArch:  @ARCHS@
+%if 0%{?suse_version} < 1200
+# for SLE 11
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%endif
+Summary:        Basic QA tests for the kernel
+License:        GPL-2.0
+Group:          SLES
+Version:        @RPMVERSION@
+%if 0%{?is_kotd}
+Release:        <RELEASE>.g@COMMIT@
+%else
+Release:        @RELEASE@
+%endif
+
+%description
+This package is using the kernel compiled within Open Build Service(OBS)
+projects and runs basic tests.
+
+%prep
+
+%build
+
+%check
+# More tests are comming, currently the main test is the existens of
+# this spec file. It does trigger a build within OBS VM which is using
+# the kernel of the same project.
+
+# test suites should be packaged in other packages, but build required
+# and called here.
+
+/sbin/modprobe loop || exit 1
+
+%install
+mkdir -p %{buildroot}/usr/share/kernel-qa/
+touch %{buildroot}/usr/share/kernel-qa/logfile
+
+%files
+%defattr(-,root,root)
+/usr/share/kernel-qa
+
+%changelog

kernel-pae.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 16:08:01 CEST 2014 - mmarek@suse.cz
+
+- Generate kernel-obs-*.spec from templates
+- commit b2e5f7c
+
 -------------------------------------------------------------------
 Wed Apr  9 10:33:35 CEST 2014 - jdelvare@suse.de
 
@@ -58,6 +64,17 @@ Fri Apr  4 09:39:59 CEST 2014 - jdelvare@suse.de
   so it's useless on x86-64.
 - commit 47efdd9
 
+-------------------------------------------------------------------
+Fri Apr  4 09:13:48 CEST 2014 - adrian@suse.de
+
+- fix building initrd for SLE 12
+  It does provided and load the critical kernel modules
+  for building some kiwi images and cross architecture
+  builds like used for aarch64.
+  The kernel-obs-build.spec still contains the bits to allow
+  to use it also for SLE 11.
+- commit e9868b7
+
 -------------------------------------------------------------------
 Thu Apr  3 18:43:52 CEST 2014 - guillaume.gardet@oliseo.fr
 

kernel-pae.spec

@@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.14.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g043a9a9
+Release:        <RELEASE>.gf1c6b14
 %else
 Release:        0
 %endif
@@ -197,6 +197,8 @@ Source66:       configtool.pl
 Source67:       log.sh
 Source68:       host-memcpy-hack.h
 Source69:       try-disable-staging-driver
+Source70:       kernel-obs-build.spec.in
+Source71:       kernel-obs-qa.spec.in
 Source100:      config.tar.bz2
 Source101:      config.addon.tar.bz2
 Source102:      patches.arch.tar.bz2
@@ -272,6 +274,8 @@ NoSource:       66
 NoSource:       67
 NoSource:       68
 NoSource:       69
+NoSource:       70
+NoSource:       71
 NoSource:       100
 NoSource:       101
 NoSource:       102

kernel-source.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 16:08:01 CEST 2014 - mmarek@suse.cz
+
+- Generate kernel-obs-*.spec from templates
+- commit b2e5f7c
+
 -------------------------------------------------------------------
 Wed Apr  9 10:33:35 CEST 2014 - jdelvare@suse.de
 
@@ -58,6 +64,17 @@ Fri Apr  4 09:39:59 CEST 2014 - jdelvare@suse.de
   so it's useless on x86-64.
 - commit 47efdd9
 
+-------------------------------------------------------------------
+Fri Apr  4 09:13:48 CEST 2014 - adrian@suse.de
+
+- fix building initrd for SLE 12
+  It does provided and load the critical kernel modules
+  for building some kiwi images and cross architecture
+  builds like used for aarch64.
+  The kernel-obs-build.spec still contains the bits to allow
+  to use it also for SLE 11.
+- commit e9868b7
+
 -------------------------------------------------------------------
 Thu Apr  3 18:43:52 CEST 2014 - guillaume.gardet@oliseo.fr
 

kernel-source.spec

@@ -32,7 +32,7 @@ License:        GPL-2.0
 Group:          Development/Sources
 Version:        3.14.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g043a9a9
+Release:        <RELEASE>.gf1c6b14
 %else
 Release:        0
 %endif
@@ -89,6 +89,8 @@ Source66:       configtool.pl
 Source67:       log.sh
 Source68:       host-memcpy-hack.h
 Source69:       try-disable-staging-driver
+Source70:       kernel-obs-build.spec.in
+Source71:       kernel-obs-qa.spec.in
 Source100:      config.tar.bz2
 Source101:      config.addon.tar.bz2
 Source102:      patches.arch.tar.bz2

kernel-source.spec.in

@@ -89,6 +89,8 @@ Source66:       configtool.pl
 Source67:       log.sh
 Source68:       host-memcpy-hack.h
 Source69:       try-disable-staging-driver
+Source70:       kernel-obs-build.spec.in
+Source71:       kernel-obs-qa.spec.in
 Source100:      config.tar.bz2
 Source101:      config.addon.tar.bz2
 Source102:      patches.arch.tar.bz2

kernel-syms.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 16:08:01 CEST 2014 - mmarek@suse.cz
+
+- Generate kernel-obs-*.spec from templates
+- commit b2e5f7c
+
 -------------------------------------------------------------------
 Wed Apr  9 10:33:35 CEST 2014 - jdelvare@suse.de
 
@@ -58,6 +64,17 @@ Fri Apr  4 09:39:59 CEST 2014 - jdelvare@suse.de
   so it's useless on x86-64.
 - commit 47efdd9
 
+-------------------------------------------------------------------
+Fri Apr  4 09:13:48 CEST 2014 - adrian@suse.de
+
+- fix building initrd for SLE 12
+  It does provided and load the critical kernel modules
+  for building some kiwi images and cross architecture
+  builds like used for aarch64.
+  The kernel-obs-build.spec still contains the bits to allow
+  to use it also for SLE 11.
+- commit e9868b7
+
 -------------------------------------------------------------------
 Thu Apr  3 18:43:52 CEST 2014 - guillaume.gardet@oliseo.fr
 

kernel-syms.spec

@@ -27,7 +27,7 @@ Group:          Development/Sources
 Version:        3.14.0
 %if %using_buildservice
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g043a9a9
+Release:        <RELEASE>.gf1c6b14
 %else
 Release:        0
 %endif

kernel-trace.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 16:08:01 CEST 2014 - mmarek@suse.cz
+
+- Generate kernel-obs-*.spec from templates
+- commit b2e5f7c
+
 -------------------------------------------------------------------
 Wed Apr  9 10:33:35 CEST 2014 - jdelvare@suse.de
 
@@ -58,6 +64,17 @@ Fri Apr  4 09:39:59 CEST 2014 - jdelvare@suse.de
   so it's useless on x86-64.
 - commit 47efdd9
 
+-------------------------------------------------------------------
+Fri Apr  4 09:13:48 CEST 2014 - adrian@suse.de
+
+- fix building initrd for SLE 12
+  It does provided and load the critical kernel modules
+  for building some kiwi images and cross architecture
+  builds like used for aarch64.
+  The kernel-obs-build.spec still contains the bits to allow
+  to use it also for SLE 11.
+- commit e9868b7
+
 -------------------------------------------------------------------
 Thu Apr  3 18:43:52 CEST 2014 - guillaume.gardet@oliseo.fr
 

kernel-trace.spec

@@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.14.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g043a9a9
+Release:        <RELEASE>.gf1c6b14
 %else
 Release:        0
 %endif
@@ -195,6 +195,8 @@ Source66:       configtool.pl
 Source67:       log.sh
 Source68:       host-memcpy-hack.h
 Source69:       try-disable-staging-driver
+Source70:       kernel-obs-build.spec.in
+Source71:       kernel-obs-qa.spec.in
 Source100:      config.tar.bz2
 Source101:      config.addon.tar.bz2
 Source102:      patches.arch.tar.bz2
@@ -270,6 +272,8 @@ NoSource:       66
 NoSource:       67
 NoSource:       68
 NoSource:       69
+NoSource:       70
+NoSource:       71
 NoSource:       100
 NoSource:       101
 NoSource:       102

kernel-vanilla.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 16:08:01 CEST 2014 - mmarek@suse.cz
+
+- Generate kernel-obs-*.spec from templates
+- commit b2e5f7c
+
 -------------------------------------------------------------------
 Wed Apr  9 10:33:35 CEST 2014 - jdelvare@suse.de
 
@@ -58,6 +64,17 @@ Fri Apr  4 09:39:59 CEST 2014 - jdelvare@suse.de
   so it's useless on x86-64.
 - commit 47efdd9
 
+-------------------------------------------------------------------
+Fri Apr  4 09:13:48 CEST 2014 - adrian@suse.de
+
+- fix building initrd for SLE 12
+  It does provided and load the critical kernel modules
+  for building some kiwi images and cross architecture
+  builds like used for aarch64.
+  The kernel-obs-build.spec still contains the bits to allow
+  to use it also for SLE 11.
+- commit e9868b7
+
 -------------------------------------------------------------------
 Thu Apr  3 18:43:52 CEST 2014 - guillaume.gardet@oliseo.fr
 

kernel-vanilla.spec

@@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.14.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g043a9a9
+Release:        <RELEASE>.gf1c6b14
 %else
 Release:        0
 %endif
@@ -192,6 +192,8 @@ Source66:       configtool.pl
 Source67:       log.sh
 Source68:       host-memcpy-hack.h
 Source69:       try-disable-staging-driver
+Source70:       kernel-obs-build.spec.in
+Source71:       kernel-obs-qa.spec.in
 Source100:      config.tar.bz2
 Source101:      config.addon.tar.bz2
 Source102:      patches.arch.tar.bz2
@@ -267,6 +269,8 @@ NoSource:       66
 NoSource:       67
 NoSource:       68
 NoSource:       69
+NoSource:       70
+NoSource:       71
 NoSource:       100
 NoSource:       101
 NoSource:       102

kernel-xen.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 16:08:01 CEST 2014 - mmarek@suse.cz
+
+- Generate kernel-obs-*.spec from templates
+- commit b2e5f7c
+
 -------------------------------------------------------------------
 Wed Apr  9 10:33:35 CEST 2014 - jdelvare@suse.de
 
@@ -58,6 +64,17 @@ Fri Apr  4 09:39:59 CEST 2014 - jdelvare@suse.de
   so it's useless on x86-64.
 - commit 47efdd9
 
+-------------------------------------------------------------------
+Fri Apr  4 09:13:48 CEST 2014 - adrian@suse.de
+
+- fix building initrd for SLE 12
+  It does provided and load the critical kernel modules
+  for building some kiwi images and cross architecture
+  builds like used for aarch64.
+  The kernel-obs-build.spec still contains the bits to allow
+  to use it also for SLE 11.
+- commit e9868b7
+
 -------------------------------------------------------------------
 Thu Apr  3 18:43:52 CEST 2014 - guillaume.gardet@oliseo.fr
 

kernel-xen.spec

@@ -63,7 +63,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        3.14.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g043a9a9
+Release:        <RELEASE>.gf1c6b14
 %else
 Release:        0
 %endif
@@ -195,6 +195,8 @@ Source66:       configtool.pl
 Source67:       log.sh
 Source68:       host-memcpy-hack.h
 Source69:       try-disable-staging-driver
+Source70:       kernel-obs-build.spec.in
+Source71:       kernel-obs-qa.spec.in
 Source100:      config.tar.bz2
 Source101:      config.addon.tar.bz2
 Source102:      patches.arch.tar.bz2
@@ -270,6 +272,8 @@ NoSource:       66
 NoSource:       67
 NoSource:       68
 NoSource:       69
+NoSource:       70
+NoSource:       71
 NoSource:       100
 NoSource:       101
 NoSource:       102

mkspec

@@ -120,6 +120,7 @@ do_spec('docs', "kernel-docs$variant.spec", %macros);
 {
 	my $requires = "";
 	my %all_archs;
+	my $all_archs;
 	for my $flavor (sort keys(%syms_flavor_archs)) {
 		next if $flavor eq "vanilla";
 		my @archs = arch2rpm(@{$syms_flavor_archs{$flavor}});
@@ -129,12 +130,21 @@ do_spec('docs', "kernel-docs$variant.spec", %macros);
 		$requires .= "%endif\n";
 	}
 	chomp $requires;
+	$all_archs = join(" ", sort(keys(%all_archs)));
 	if (keys(%all_archs)) {
 		do_spec('syms', "kernel-syms$variant.spec", %macros,
 			REQUIRES => $requires,
-			ARCHS => join(" ", sort(keys(%all_archs))));
+			ARCHS => $all_archs);
+	}
+	# kernel-obs-*.spec
+	if (!$variant) {
+		do_spec('obs-build', "kernel-obs-build.spec", %macros,
+			ARCHS => $all_archs); 
+		do_spec('obs-qa', "kernel-obs-qa.spec", %macros,
+			ARCHS => $all_archs);
 	}
 }
+
 copy_changes();
 
 # _constraints
@@ -173,7 +183,7 @@ sub parse_config_conf {
 sub read_spec_templates {
 	my %res;
 
-	for my $template (qw(binary source syms docs)) {
+	for my $template (qw(binary source syms docs obs-build obs-qa)) {
 		xopen(my $fh, '<', "$dir/kernel-$template.spec.in");
 		local $/ = undef;
 		$res{$template} = <$fh>;

source-timestamp

@@ -1,3 +1,3 @@
-2014-04-09 10:33:35 +0200
+2014-04-10 17:08:40 +0200
-GIT Revision: 043a9a9a6764354523a5c2038818f726bf40d810
+GIT Revision: f1c6b14197480d0e8758df816096fc81bcb3be60
 GIT Branch: master