I have made the following changes intended for : CE:Adaptation:N950-N9 / kernel-adaptation-n950
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/5389 Thank You, Marko Saukko [This message was auto-generated] --- Request # 5389: Messages from BOSS: WARNING check_package_is_complete_sources (kernel-adaptation-n950) failed: Failed to get source file list from spec or dsc: Failed to parse spec file: can't parse specfile No dsc file found WARNING check_valid_changes (kernel-adaptation-n950) failed: Could not parse spec in kernel-adaptation-n950: can't parse specfile State: review at 2012-08-03T04:24:27 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:CE:Adaptation:N950-N9 / kernel-adaptation-n950 -> CE:Adaptation:N950-N9 / kernel-adaptation-n950 changes files: -------------- --- kernel-adaptation-n950.changes +++ kernel-adaptation-n950.changes @@ -0,0 +1,7 @@ +* Mon Jul 30 2012 Marko Saukko <[email protected]> - 2.6.32.20112201 +- Cleanup the packaging a bit. +- Enabled some options based on mer_verify_kernel_config + - CONFIG_TMPFS_POSIX_ACL=y, CONFIG_RTC_DRV_CMOS=y, CONFIG_DEVTMPFS_MOUNT=y, + CONFIG_AUDIT=y +- Include modules.* files with wildcard to support old and new kmod. + old: ---- Makefile.config spec files: ----------- --- kernel-adaptation-n950.spec +++ kernel-adaptation-n950.spec @@ -69,17 +69,6 @@ # Per-arch tweaks -%ifarch %{all_x86} -%define image_install_path boot -%define hdrarch i386 -%define kernel_image arch/x86/boot/bzImage -%endif - -%ifarch x86_64 -%define image_install_path boot -%define kernel_image arch/x86/boot/bzImage -%endif - %ifarch %{all_arm} %define image_install_path boot %define kernel_image arch/arm/boot/zImage @@ -90,6 +79,7 @@ %define oldconfig_target oldconfig ExclusiveArch: %{all_arm} armv8el + # # Packages that need to be installed before the kernel is, because the %post # scripts use them. @@ -131,8 +121,6 @@ BuildRequires: module-init-tools, bash >= 2.03, sh-utils BuildRequires: findutils, make >= 3.78 BuildRequires: elfutils-libelf-devel binutils-devel -%ifarch %{all_arm} -%endif # HARMATTAN: different sources than in MeeGo #Source0: kernel_2.6.32.orig.tar.gz @@ -142,7 +130,6 @@ Source10: COPYING.modules Source15: merge.pl -Source20: Makefile.config # HARMATTAN: cmdline for dual-boot Source40: kernel-adaptation-n950.cmdline @@ -288,8 +275,6 @@ Patch97: linux-2.6.38-tty-add-active-sysfs-attribute-to-tty0-and-console-d.patch -BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root - # @@ -333,24 +318,12 @@ # Now, each variant package. - -%ifarch %all_x86 - - - - -%endif - %ifarch %{all_arm} - - %kernel_devel_package adaptation-n950 %description -n kernel-adaptation-n950 This package contains Harmattan kernel, optimized for N950 -#Put other ARM variants here - %endif @@ -901,13 +874,6 @@ ### -### clean -### - -%clean -rm -rf $RPM_BUILD_ROOT - -### ### scripts ### @@ -926,15 +892,6 @@ fi\ %{nil} -# This macro defines a %%posttrans script for a kernel package. -# %%kernel_variant_posttrans [-v <subpackage>] [-s <s> -r <r>] <mkinitrd-args> -# More text can follow to go at the end of this variant's %%post. -# -%define kernel_variant_posttrans(s:r:v:) \ -%{expand:%%posttrans -n kernel-%{?-v*}}\ -# /sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --rpmposttrans %{KVERREL}%{?-v:-%{-v*}} || exit $?\ -%{nil} - # # This macro defines a %%post script for a kernel package and its devel package. # %%kernel_variant_post [-v <subpackage>] [-s <s> -r <r>] <mkinitrd-args> @@ -944,46 +901,19 @@ # %define kernel_variant_post(s:r:v:) \ %{expand:%%kernel_devel_post %{?-v*}}\ -%{expand:%%kernel_variant_posttrans %{?-v*}}\ %post -n kernel-%{?-v*}\ ln -s -f vmlinuz-%{KVERREL}%{?-v:-%{-v*}} /boot/bzImage\ ln -s -f cmdline-%{KVERREL}%{?-v:-%{-v*}} /boot/cmdline\ -# /sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{*} %{KVERREL}%{?-v:-%{-v*}} || exit $?\ %{nil} -# -# This macro defines a %%preun script for a kernel package. -# %%kernel_variant_preun <subpackage> -# -%define kernel_variant_preun() \ -%{expand:%%preun -n kernel-%{?1}}\ -# /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}%{?1:-%{1}} || exit $?\ -%{nil} - - -%ifarch %all_x86 - - - - - -%endif - %ifarch %{all_arm} - - - -%kernel_variant_preun adaptation-n950 %kernel_variant_post -v adaptation-n950 - %endif ### ### file lists ### - - # # This macro defines the %%files sections for a kernel package # and its devel packages. @@ -1006,12 +936,7 @@ %ifnarch %{all_arm}\ /lib/modules/%{KVERREL}%{?2:-%{2}}/vdso\ %endif\ -/lib/modules/%{KVERREL}%{?2:-%{2}}/modules.block\ -/lib/modules/%{KVERREL}%{?2:-%{2}}/modules.dep.bin\ -/lib/modules/%{KVERREL}%{?2:-%{2}}/modules.alias.bin\ -/lib/modules/%{KVERREL}%{?2:-%{2}}/modules.symbols.bin\ -/lib/modules/%{KVERREL}%{?2:-%{2}}/modules.networking\ -/lib/modules/%{KVERREL}%{?2:-%{2}}/modules.order\ +/lib/modules/%{KVERREL}%{?2:-%{2}}/modules.*\ %ghost /boot/initrd-%{KVERREL}%{?2:-%{2}}.img\ %{?-e:%{-e*}}\ %{expand:%%files -n kernel-%{?2:%{2}-}devel}\ @@ -1021,11 +946,5 @@ %endif\ %{nil} -# HARMATTAN: no modules.builtin was removed from the list above -#/lib/modules/%{KVERREL}%{?2:-%{2}}/modules.builtin*\ -#/boot/symvers-%{KVERREL}%{?2:-%{2}}.gz\ - - %kernel_variant_files %{all_arm} adaptation-n950 - other changes: -------------- ++++++ kernel-adaptation-n950.config --- kernel-adaptation-n950.config +++ kernel-adaptation-n950.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.20112201-6-adaptation-n950 -# Thu Jul 19 09:43:59 2012 +# Mon Jul 30 12:19:55 2012 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -49,7 +49,7 @@ CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set # CONFIG_TASKSTATS is not set -# CONFIG_AUDIT is not set +CONFIG_AUDIT=y # # RCU Subsystem @@ -711,7 +711,7 @@ # CONFIG_UEVENT_HELPER_PATH="" CONFIG_DEVTMPFS=y -# CONFIG_DEVTMPFS_MOUNT is not set +CONFIG_DEVTMPFS_MOUNT=y CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y @@ -1724,7 +1724,7 @@ # # Platform RTC drivers # -# CONFIG_RTC_DRV_CMOS is not set +CONFIG_RTC_DRV_CMOS=y # CONFIG_RTC_DRV_DS1286 is not set # CONFIG_RTC_DRV_DS1511 is not set # CONFIG_RTC_DRV_DS1553 is not set @@ -1836,7 +1836,7 @@ CONFIG_PROC_PAGE_MONITOR=y CONFIG_SYSFS=y CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set +CONFIG_TMPFS_POSIX_ACL=y # CONFIG_HUGETLB_PAGE is not set # CONFIG_CONFIGFS_FS is not set CONFIG_MISC_FILESYSTEMS=y @@ -2157,6 +2157,7 @@ CONFIG_CRC32=y CONFIG_CRC7=y CONFIG_LIBCRC32C=y +CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y ++++++ kernel.spec.in --- kernel.spec.in +++ kernel.spec.in @@ -69,44 +69,22 @@ # Per-arch tweaks -%ifarch %{all_x86} -%define image_install_path boot -%define hdrarch i386 -%define kernel_image arch/x86/boot/bzImage -%endif - -%ifarch x86_64 -%define image_install_path boot -%define kernel_image arch/x86/boot/bzImage -%endif - %ifarch %{all_arm} %define image_install_path boot -@@N900 %define kernel_image arch/arm/boot/zImage -@@U8500 %define kernel_image arch/arm/boot/uImage @@HARMATTAN %define kernel_image arch/arm/boot/zImage -@@N900 %define make_target zImage -@@U8500 %define make_target uImage @@HARMATTAN %define make_target zImage %endif # HARMATTAN: use normal oldconfig %define oldconfig_target oldconfig -@@U8500 ExclusiveArch: %{all_arm} -@@N900 ExclusiveArch: %{all_arm} @@HARMATTAN ExclusiveArch: %{all_arm} armv8el -@@N ExclusiveArch: %{all_x86} -@@M ExclusiveArch: %{all_x86} -@@M ExclusiveArch: %{all_x86} -@@A ExclusiveArch: %{all_x86} -@@I ExclusiveArch: %{all_x86} -@@S ExclusiveArch: %{all_x86} %{all_arm} + # # Packages that need to be installed before the kernel is, because the %post # scripts use them. # -%define kernel_prereq fileutils, module-init-tools, /sbin/init +%define kernel_prereq fileutils, module-init-tools, /sbin/init # # This macro does requires, provides, conflicts, obsoletes for a kernel package. @@ -130,11 +108,6 @@ @@S %if 1 @@S Name: kernel @@S %else -@@N Name: kernel-netbook -@@M Name: kernel-mid -@@I Name: kernel-ivi -@@N900 Name: kernel-n900 -@@U8500 Name: kernel-u8500 @@HARMATTAN Name: kernel-adaptation-n950 @@S %endif @@ -152,9 +125,6 @@ BuildRequires: module-init-tools, bash >= 2.03, sh-utils BuildRequires: findutils, make >= 3.78 BuildRequires: elfutils-libelf-devel binutils-devel -%ifarch %{all_arm} -@@U8500 BuildRequires: u-boot-tools -%endif # HARMATTAN: different sources than in MeeGo #Source0: kernel_2.6.32.orig.tar.gz @@ -164,7 +134,6 @@ Source10: COPYING.modules Source15: merge.pl -Source20: Makefile.config # HARMATTAN: cmdline for dual-boot Source40: kernel-adaptation-n950.cmdline @@ -185,8 +154,6 @@ @@P -BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root - @@S %description -n kernel @@S The kernel package contains the Linux kernel (vmlinuz), the core of any @@S Linux operating system. The kernel handles the basic functions @@ -242,45 +209,8 @@ # Now, each variant package. - -%ifarch %all_x86 - -@@@N %define variant_summary Kernel for Netbooks -@@@N %kernel_variant_package netbook -@@N %kernel_devel_package netbook -@@N %description -n kernel-netbook -@@N This package contains the kernel optimized for the various popular netbooks. - -@@@M %define variant_summary Kernel for Mooresetown and Medfield -@@@M %kernel_variant_package mid -@@M %kernel_devel_package mid -@@M %description -n kernel-mid -@@M This package contains the kernel optimized for the Moorsetown platform for CDK - -@@@I %define variant_summary Kernel for IVI -@@@I %kernel_variant_package ivi -@@I %kernel_devel_package ivi -@@I %description -n kernel-ivi -@@I This package contains the kernel optimized for In Vehicle Infotainment segments - -%endif - %ifarch %{all_arm} -@@@N900 #N900 ARM variant -@@@N900 %define variant_summary Kernel for the Nokia N900 -@@@N900 %kernel_variant_package n900 -@@N900 %kernel_devel_package n900 -@@N900 %description -n kernel-n900 -@@N900 This package contains the kernel optimized for the Nokia N900 device - -@@@U8500 #u8500 ARM variant -@@@U8500 %define variant_summary Kernel for the ST-Ericsson u8500 -@@@U8500 %kernel_variant_package u8500 -@@U8500 %kernel_devel_package u8500 -@@U8500 %description -n kernel-u8500 -@@U8500 This package contains the kernel optimized for the ST-Ericsson u8500 device - @@@HARMATTAN #u8500 ARM variant @@@HARMATTAN %define variant_summary Kernel from Harmattan for N950 @@@HARMATTAN %kernel_variant_package adaptation-n950 @@ -288,8 +218,6 @@ @@HARMATTAN %description -n kernel-adaptation-n950 @@HARMATTAN This package contains Harmattan kernel, optimized for N950 -#Put other ARM variants here - %endif @@ -589,11 +517,6 @@ @@S %if !0%{?running_in_obs} -@@M BuildKernel %make_target %kernel_image x86 mid -@@N BuildKernel %make_target %kernel_image x86 netbook -@@I BuildKernel %make_target %kernel_image x86 ivi -@@N900 BuildKernel %make_target %kernel_image arm n900 -@@U8500 BuildKernel %make_target %kernel_image arm u8500 %make_target @@HARMATTAN BuildKernel %make_target %kernel_image arm adaptation-n950 @@S %endif @@ -640,13 +563,6 @@ ### -### clean -### - -%clean -rm -rf $RPM_BUILD_ROOT - -### ### scripts ### @@ -665,15 +581,6 @@ fi\ %{nil} -# This macro defines a %%posttrans script for a kernel package. -# %%kernel_variant_posttrans [-v <subpackage>] [-s <s> -r <r>] <mkinitrd-args> -# More text can follow to go at the end of this variant's %%post. -# -%define kernel_variant_posttrans(s:r:v:) \ -%{expand:%%posttrans -n kernel-%{?-v*}}\ -# /sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --rpmposttrans %{KVERREL}%{?-v:-%{-v*}} || exit $?\ -%{nil} - # # This macro defines a %%post script for a kernel package and its devel package. # %%kernel_variant_post [-v <subpackage>] [-s <s> -r <r>] <mkinitrd-args> @@ -683,56 +590,19 @@ # %define kernel_variant_post(s:r:v:) \ %{expand:%%kernel_devel_post %{?-v*}}\ -%{expand:%%kernel_variant_posttrans %{?-v*}}\ %post -n kernel-%{?-v*}\ ln -s -f vmlinuz-%{KVERREL}%{?-v:-%{-v*}} /boot/bzImage\ ln -s -f cmdline-%{KVERREL}%{?-v:-%{-v*}} /boot/cmdline\ -# /sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{*} %{KVERREL}%{?-v:-%{-v*}} || exit $?\ -%{nil} - -# -# This macro defines a %%preun script for a kernel package. -# %%kernel_variant_preun <subpackage> -# -%define kernel_variant_preun() \ -%{expand:%%preun -n kernel-%{?1}}\ (76 more lines skipped) ++++++ deleted files: --- Makefile.config
