Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2014-04-13 08:28:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes 2014-04-06 07:10:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 2014-04-13 08:28:15.000000000 +0200 @@ -1,0 +2,58 @@ +Fri Apr 11 11:18:16 CEST 2014 - [email protected] + +- rpm/kernel-binary.spec.in: Only sign the kernel on x86_64 +- commit e0d4304 + +------------------------------------------------------------------- +Thu Apr 10 16:08:01 CEST 2014 - [email protected] + +- Generate kernel-obs-*.spec from templates +- commit b2e5f7c + +------------------------------------------------------------------- +Wed Apr 9 10:33:35 CEST 2014 - [email protected] + +- Update debug config files: enable TTY_PRINTK + Enabled only in debug kernels for now, as it can't be modular yet. + Once it can be built as a module, we can enable it in other flavors + as well. +- commit 043a9a9 + +------------------------------------------------------------------- +Tue Apr 8 15:40:52 CEST 2014 - [email protected] + +- Update arm64 config file: disable CONFIG_USB_DWC3_KEYSTONE + This driver is only needed on Texas Instruments Keystone2 platforms. +- commit 4e4e502 + +------------------------------------------------------------------- +Tue Apr 8 15:39:57 CEST 2014 - [email protected] + +- Update ppc config files: disble HW_RANDOM_ATMEL + This driver is only needed on Atmel AT91 systems. +- commit 2cac896 + +------------------------------------------------------------------- +Tue Apr 8 15:38:28 CEST 2014 - [email protected] + +- Update arm/exynos config file: disable AHCI_IMX + This driver is only used on Freescale i.MX systems so it isn't needed + on Exynos. +- commit 45d6387 + +------------------------------------------------------------------- +Tue Apr 8 15:16:36 CEST 2014 - [email protected] + +- Update arm config files: Disable exynos support + Disable exynos support in all non-exynos configuration files, as we + have a dedicated kernel flavor for exynos. +- commit c65cb20 + +------------------------------------------------------------------- +Fri Apr 4 16:59:35 CEST 2014 - [email protected] + +- rpm/kernel-module-subpackage: Regenerated the initrd in %posttrans + (fate#313506) +- commit c0b6219 + +------------------------------------------------------------------- @@ -15,0 +74,18 @@ +Fri Apr 4 09:13:48 CEST 2014 - [email protected] + +- 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 - [email protected] + +- Refresh patches.rpmify/chipidea-clean-up-dependencies + Replace OF_DEVICE by OF (OF_DEVICE does not exist anymore.) +- commit 299b9cd + +------------------------------------------------------------------- @@ -49,0 +126,6 @@ + +------------------------------------------------------------------- +Wed Apr 2 09:24:16 CEST 2014 - [email protected] + +- rpm/kernel-syms.spec.in: Require pesign-obs-integration for signing KMPs +- commit e68d5fc kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-exynos.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change New: ---- kernel-obs-build.spec.in kernel-obs-qa.spec.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.KuPeAG/_old 2014-04-13 08:50:41.000000000 +0200 +++ /var/tmp/diff_new_pack.KuPeAG/_new 2014-04-13 08:50:41.000000000 +0200 @@ -63,7 +63,7 @@ Group: System/Kernel Version: 3.14.0 %if 0%{?is_kotd} -Release: <RELEASE>.g00dd4e3 +Release: <RELEASE>.ge0d4304 %else Release: 0 %endif @@ -195,6 +195,8 @@ 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: 67 NoSource: 68 NoSource: 69 +NoSource: 70 +NoSource: 71 NoSource: 100 NoSource: 101 NoSource: 102 @@ -506,6 +510,8 @@ # XXX: only do it on x86_64, as the repackaging changes kernel-pae # from i686 to i586 export BRP_PESIGN_FILES="/boot/vmlinuz-%kernelrelease-%build_flavor" +%else +export BRP_PESIGN_FILES="" %endif %endif kernel-default.spec: same change kernel-desktop.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.KuPeAG/_old 2014-04-13 08:50:41.000000000 +0200 +++ /var/tmp/diff_new_pack.KuPeAG/_new 2014-04-13 08:50:41.000000000 +0200 @@ -27,7 +27,7 @@ Group: Documentation/Man Version: 3.14.0 %if 0%{?is_kotd} -Release: <RELEASE>.g00dd4e3 +Release: <RELEASE>.ge0d4304 %else Release: 0 %endif ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.KuPeAG/_old 2014-04-13 08:50:41.000000000 +0200 +++ /var/tmp/diff_new_pack.KuPeAG/_new 2014-04-13 08:50:41.000000000 +0200 @@ -63,7 +63,7 @@ Group: System/Kernel Version: 3.14.0 %if 0%{?is_kotd} -Release: <RELEASE>.g00dd4e3 +Release: <RELEASE>.ge0d4304 %else Release: 0 %endif @@ -192,6 +192,8 @@ 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: 67 NoSource: 68 NoSource: 69 +NoSource: 70 +NoSource: 71 NoSource: 100 NoSource: 101 NoSource: 102 @@ -505,6 +509,8 @@ # XXX: only do it on x86_64, as the repackaging changes kernel-pae # from i686 to i586 export BRP_PESIGN_FILES="/boot/vmlinuz-%kernelrelease-%build_flavor" +%else +export BRP_PESIGN_FILES="" %endif %endif kernel-exynos.spec: same change kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.KuPeAG/_old 2014-04-13 08:50:41.000000000 +0200 +++ /var/tmp/diff_new_pack.KuPeAG/_new 2014-04-13 08:50:41.000000000 +0200 @@ -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>.ge0d4304 +%else Release: 0 +%endif %description This package is repackaging already compiled kernels to make them usable @@ -49,9 +61,39 @@ %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 @@ %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-qa.spec ++++++ --- /var/tmp/diff_new_pack.KuPeAG/_old 2014-04-13 08:50:41.000000000 +0200 +++ /var/tmp/diff_new_pack.KuPeAG/_new 2014-04-13 08:50:41.000000000 +0200 @@ -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 @@ 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>.ge0d4304 +%else Release: 0 +%endif %description This package is using the kernel compiled within Open Build Service(OBS) ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.KuPeAG/_old 2014-04-13 08:50:41.000000000 +0200 +++ /var/tmp/diff_new_pack.KuPeAG/_new 2014-04-13 08:50:41.000000000 +0200 @@ -63,7 +63,7 @@ Group: System/Kernel Version: 3.14.0 %if 0%{?is_kotd} -Release: <RELEASE>.g00dd4e3 +Release: <RELEASE>.ge0d4304 %else Release: 0 %endif @@ -197,6 +197,8 @@ 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: 67 NoSource: 68 NoSource: 69 +NoSource: 70 +NoSource: 71 NoSource: 100 NoSource: 101 NoSource: 102 @@ -514,6 +518,8 @@ # XXX: only do it on x86_64, as the repackaging changes kernel-pae # from i686 to i586 export BRP_PESIGN_FILES="/boot/vmlinuz-%kernelrelease-%build_flavor" +%else +export BRP_PESIGN_FILES="" %endif %endif ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.KuPeAG/_old 2014-04-13 08:50:41.000000000 +0200 +++ /var/tmp/diff_new_pack.KuPeAG/_new 2014-04-13 08:50:41.000000000 +0200 @@ -32,7 +32,7 @@ Group: Development/Sources Version: 3.14.0 %if 0%{?is_kotd} -Release: <RELEASE>.g00dd4e3 +Release: <RELEASE>.ge0d4304 %else Release: 0 %endif @@ -89,6 +89,8 @@ 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.spec ++++++ --- /var/tmp/diff_new_pack.KuPeAG/_old 2014-04-13 08:50:41.000000000 +0200 +++ /var/tmp/diff_new_pack.KuPeAG/_new 2014-04-13 08:50:41.000000000 +0200 @@ -27,7 +27,7 @@ Version: 3.14.0 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g00dd4e3 +Release: <RELEASE>.ge0d4304 %else Release: 0 %endif @@ -56,6 +56,7 @@ %ifarch %ix86 x86_64 Requires: kernel-xen-devel = %version-%source_rel %endif +Requires: pesign-obs-integration Provides: %name = %version-%source_rel Provides: multiversion(kernel) Source: README.KSYMS ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.KuPeAG/_old 2014-04-13 08:50:41.000000000 +0200 +++ /var/tmp/diff_new_pack.KuPeAG/_new 2014-04-13 08:50:41.000000000 +0200 @@ -63,7 +63,7 @@ Group: System/Kernel Version: 3.14.0 %if 0%{?is_kotd} -Release: <RELEASE>.g00dd4e3 +Release: <RELEASE>.ge0d4304 %else Release: 0 %endif @@ -195,6 +195,8 @@ 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: 67 NoSource: 68 NoSource: 69 +NoSource: 70 +NoSource: 71 NoSource: 100 NoSource: 101 NoSource: 102 @@ -505,6 +509,8 @@ # XXX: only do it on x86_64, as the repackaging changes kernel-pae # from i686 to i586 export BRP_PESIGN_FILES="/boot/vmlinuz-%kernelrelease-%build_flavor" +%else +export BRP_PESIGN_FILES="" %endif %endif kernel-vanilla.spec: same change kernel-xen.spec: same change ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/arm64/default new/config/arm64/default --- old/config/arm64/default 2014-04-04 09:39:59.000000000 +0200 +++ new/config/arm64/default 2014-04-09 10:33:35.000000000 +0200 @@ -3156,8 +3156,8 @@ # # Platform Glue Driver Support # -CONFIG_USB_DWC3_EXYNOS=m -CONFIG_USB_DWC3_KEYSTONE=m +# CONFIG_USB_DWC3_EXYNOS is not set +# CONFIG_USB_DWC3_KEYSTONE is not set # # Debugging features @@ -3701,7 +3701,7 @@ # # Analog to digital converters # -CONFIG_EXYNOS_ADC=y +# CONFIG_EXYNOS_ADC is not set # CONFIG_MAX1363 is not set # CONFIG_MCP3422 is not set # CONFIG_NAU7802 is not set @@ -3813,8 +3813,8 @@ # PHY Subsystem # CONFIG_GENERIC_PHY=y -CONFIG_PHY_EXYNOS_MIPI_VIDEO=m -CONFIG_PHY_EXYNOS_DP_VIDEO=m +# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set +# CONFIG_PHY_EXYNOS_DP_VIDEO is not set # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_POWERCAP is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv6hl/default new/config/armv6hl/default --- old/config/armv6hl/default 2014-04-04 09:39:59.000000000 +0200 +++ new/config/armv6hl/default 2014-04-09 10:33:35.000000000 +0200 @@ -2643,7 +2643,7 @@ CONFIG_HW_RANDOM_OMAP=y CONFIG_HW_RANDOM_VIRTIO=m # CONFIG_HW_RANDOM_MXC_RNGA is not set -CONFIG_HW_RANDOM_EXYNOS=m +# CONFIG_HW_RANDOM_EXYNOS is not set CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=y CONFIG_R3964=m @@ -5042,9 +5042,9 @@ # PHY Subsystem # CONFIG_GENERIC_PHY=y -CONFIG_PHY_EXYNOS_MIPI_VIDEO=m +# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set CONFIG_OMAP_USB2=m -CONFIG_PHY_EXYNOS_DP_VIDEO=m +# CONFIG_PHY_EXYNOS_DP_VIDEO is not set # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_POWERCAP is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/default new/config/armv7hl/default --- old/config/armv7hl/default 2014-04-04 09:39:59.000000000 +0200 +++ new/config/armv7hl/default 2014-04-09 10:33:35.000000000 +0200 @@ -2853,7 +2853,7 @@ CONFIG_HW_RANDOM_OMAP=m CONFIG_HW_RANDOM_OMAP3_ROM=m CONFIG_HW_RANDOM_VIRTIO=m -CONFIG_HW_RANDOM_EXYNOS=m +# CONFIG_HW_RANDOM_EXYNOS is not set CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=y CONFIG_R3964=m @@ -5547,10 +5547,10 @@ # PHY Subsystem # CONFIG_GENERIC_PHY=y -CONFIG_PHY_EXYNOS_MIPI_VIDEO=m +# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set CONFIG_OMAP_USB2=m CONFIG_TWL4030_USB=m -CONFIG_PHY_EXYNOS_DP_VIDEO=m +# CONFIG_PHY_EXYNOS_DP_VIDEO is not set # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_POWERCAP is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/exynos new/config/armv7hl/exynos --- old/config/armv7hl/exynos 2014-04-04 09:39:59.000000000 +0200 +++ new/config/armv7hl/exynos 2014-04-09 10:33:35.000000000 +0200 @@ -1806,7 +1806,7 @@ # Controllers with non-SFF native interface # CONFIG_SATA_AHCI_PLATFORM=m -CONFIG_AHCI_IMX=m +# CONFIG_AHCI_IMX is not set CONFIG_ATA_SFF=y # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/lpae new/config/armv7hl/lpae --- old/config/armv7hl/lpae 2014-04-04 09:39:59.000000000 +0200 +++ new/config/armv7hl/lpae 2014-04-09 10:33:35.000000000 +0200 @@ -2712,7 +2712,7 @@ # CONFIG_HW_RANDOM_ATMEL is not set CONFIG_HW_RANDOM_OMAP=m CONFIG_HW_RANDOM_VIRTIO=m -CONFIG_HW_RANDOM_EXYNOS=m +# CONFIG_HW_RANDOM_EXYNOS is not set CONFIG_HW_RANDOM_TPM=m CONFIG_NVRAM=y CONFIG_R3964=m @@ -5226,10 +5226,10 @@ # PHY Subsystem # CONFIG_GENERIC_PHY=y -CONFIG_PHY_EXYNOS_MIPI_VIDEO=m +# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set CONFIG_OMAP_USB2=m CONFIG_TWL4030_USB=m -CONFIG_PHY_EXYNOS_DP_VIDEO=m +# CONFIG_PHY_EXYNOS_DP_VIDEO is not set # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_POWERCAP is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/debug new/config/i386/debug --- old/config/i386/debug 2014-04-04 09:39:59.000000000 +0200 +++ new/config/i386/debug 2014-04-09 10:33:35.000000000 +0200 @@ -3343,7 +3343,7 @@ CONFIG_SERIAL_RP2=m CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_SERIAL_FSL_LPUART=m -# CONFIG_TTY_PRINTK is not set +CONFIG_TTY_PRINTK=y CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/default new/config/ppc/default --- old/config/ppc/default 2014-04-04 09:39:59.000000000 +0200 +++ new/config/ppc/default 2014-04-09 10:33:35.000000000 +0200 @@ -2732,7 +2732,7 @@ # CONFIG_IPMI_HANDLER is not set CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m -CONFIG_HW_RANDOM_ATMEL=m +# CONFIG_HW_RANDOM_ATMEL is not set CONFIG_HW_RANDOM_VIRTIO=m # CONFIG_HW_RANDOM_EXYNOS is not set CONFIG_NVRAM=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/vanilla new/config/ppc/vanilla --- old/config/ppc/vanilla 2014-04-04 09:39:59.000000000 +0200 +++ new/config/ppc/vanilla 2014-04-09 10:33:35.000000000 +0200 @@ -2729,7 +2729,7 @@ # CONFIG_IPMI_HANDLER is not set CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m -CONFIG_HW_RANDOM_ATMEL=m +# CONFIG_HW_RANDOM_ATMEL is not set CONFIG_HW_RANDOM_VIRTIO=m # CONFIG_HW_RANDOM_EXYNOS is not set CONFIG_NVRAM=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/debug new/config/ppc64/debug --- old/config/ppc64/debug 2014-04-04 09:39:59.000000000 +0200 +++ new/config/ppc64/debug 2014-04-09 10:33:35.000000000 +0200 @@ -2859,7 +2859,7 @@ CONFIG_SERIAL_RP2=m CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_SERIAL_FSL_LPUART=m -# CONFIG_TTY_PRINTK is not set +CONFIG_TTY_PRINTK=y CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set # CONFIG_PPDEV is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64le/debug new/config/ppc64le/debug --- old/config/ppc64le/debug 2014-04-04 09:39:59.000000000 +0200 +++ new/config/ppc64le/debug 2014-04-09 10:33:35.000000000 +0200 @@ -2850,7 +2850,7 @@ CONFIG_SERIAL_RP2=m CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_SERIAL_FSL_LPUART=m -# CONFIG_TTY_PRINTK is not set +CONFIG_TTY_PRINTK=y CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set # CONFIG_PPDEV is not set diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/debug new/config/x86_64/debug --- old/config/x86_64/debug 2014-04-04 09:39:59.000000000 +0200 +++ new/config/x86_64/debug 2014-04-09 10:33:35.000000000 +0200 @@ -3230,7 +3230,7 @@ CONFIG_SERIAL_RP2=m CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_SERIAL_FSL_LPUART=m -# CONFIG_TTY_PRINTK is not set +CONFIG_TTY_PRINTK=y CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.KuPeAG/_old 2014-04-13 08:50:42.000000000 +0200 +++ /var/tmp/diff_new_pack.KuPeAG/_new 2014-04-13 08:50:42.000000000 +0200 @@ -384,6 +384,8 @@ # XXX: only do it on x86_64, as the repackaging changes kernel-pae # from i686 to i586 export BRP_PESIGN_FILES="/boot/vmlinuz-%kernelrelease-%build_flavor" +%else +export BRP_PESIGN_FILES="" %endif %endif ++++++ kernel-module-subpackage ++++++ --- /var/tmp/diff_new_pack.KuPeAG/_old 2014-04-13 08:50:42.000000000 +0200 +++ /var/tmp/diff_new_pack.KuPeAG/_new 2014-04-13 08:50:42.000000000 +0200 @@ -59,8 +59,10 @@ nvr=%{-n*}-kmp-%1-%_this_kmp_version-%{-r*} wm2=/usr/lib/module-init-tools/weak-modules2 if [ -x $wm2 ]; then - %{-b:KMP_NEEDS_MKINITRD=1} /bin/bash -${-/e/} $wm2 --add-kmp $nvr + %{-b:KMP_NEEDS_MKINITRD=1} INITRD_IN_POSTTRANS=1 /bin/bash -${-/e/} $wm2 --add-kmp $nvr fi +%posttrans -n %{-n*}-kmp-%1 +%{?regenerate_initrd_posttrans} %preun -n %{-n*}-kmp-%1 nvr=%{-n*}-kmp-%1-%_this_kmp_version-%{-r*} rpm -ql $nvr | sed -n '/\.ko$/p' > /var/run/rpm-$nvr-modules ++++++ kernel-obs-build.spec.in ++++++ # # 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.spec.in ++++++ # # 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-source.spec.in ++++++ --- /var/tmp/diff_new_pack.KuPeAG/_old 2014-04-13 08:50:42.000000000 +0200 +++ /var/tmp/diff_new_pack.KuPeAG/_new 2014-04-13 08:50:42.000000000 +0200 @@ -89,6 +89,8 @@ 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.spec.in ++++++ --- /var/tmp/diff_new_pack.KuPeAG/_old 2014-04-13 08:50:42.000000000 +0200 +++ /var/tmp/diff_new_pack.KuPeAG/_new 2014-04-13 08:50:42.000000000 +0200 @@ -39,6 +39,7 @@ AutoReqProv: off BuildRequires: coreutils @REQUIRES@ +Requires: pesign-obs-integration Provides: %name = %version-%source_rel Provides: multiversion(kernel) Source: README.KSYMS ++++++ mkspec ++++++ --- /var/tmp/diff_new_pack.KuPeAG/_old 2014-04-13 08:50:42.000000000 +0200 +++ /var/tmp/diff_new_pack.KuPeAG/_new 2014-04-13 08:50:42.000000000 +0200 @@ -120,6 +120,7 @@ { 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 @@ $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 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>; ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/chipidea-clean-up-dependencies new/patches.rpmify/chipidea-clean-up-dependencies --- old/patches.rpmify/chipidea-clean-up-dependencies 2014-02-17 07:46:14.000000000 +0100 +++ new/patches.rpmify/chipidea-clean-up-dependencies 2014-04-08 11:15:33.000000000 +0200 @@ -4,7 +4,7 @@ The chipidea driver currently has needless ifneq rules in the makefile for things that should be config options. This can be problematic, -especially in the IMX case, since the OF_DEVICE dependency will be met +especially in the IMX case, since the OF dependency will be met on powerpc systems - which don't actually support the hardware via that method. @@ -31,7 +31,7 @@ + +config USB_CHIPIDEA_IMX + bool "ChipIdea IMX support" -+ depends on OF_DEVICE ++ depends on OF + help + This option enables ChipIdea support on IMX. endif ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.KuPeAG/_old 2014-04-13 08:50:43.000000000 +0200 +++ /var/tmp/diff_new_pack.KuPeAG/_new 2014-04-13 08:50:43.000000000 +0200 @@ -1,3 +1,3 @@ -2014-04-04 16:42:45 +0200 -GIT Revision: 00dd4e32de8d54e20f5c2732c5255c09b58c524d +2014-04-11 11:18:16 +0200 +GIT Revision: e0d430410e91cf3b2a14c5a80157e37d1b18d4d4 GIT Branch: master -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
