I have made the following changes intended for : CE:Adaptation:N900 / kernel-adaptation-n900
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/5390 Thank You, Marko Saukko [This message was auto-generated] --- Request # 5390: Messages from BOSS: WARNING check_package_is_complete_sources (kernel-adaptation-n900) 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-n900) failed: Could not parse spec in kernel-adaptation-n900: can't parse specfile State: review at 2012-08-03T04:19:23 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:N900 / kernel-adaptation-n900 -> CE:Adaptation:N900 / kernel-adaptation-n900 changes files: -------------- --- kernel.changes +++ kernel.changes @@ -0,0 +1,6 @@ +* Tue Jul 24 2012 Marko Saukko <[email protected]> - 2.6.37 +- Enabled CONFIG_RTC_DRV_CMOS, CONFIG_AUDIT and CONFIG_TUN options. +- Enabled CONFIG_IPV6 +- Use wildcard to include modules.* to support new kmod +- Change CONFIG_VFAT_FS from m to y, to fix mount with systemd 187 during bootup. + spec files: ----------- --- kernel-adaptation-n900.spec +++ kernel-adaptation-n900.spec @@ -1468,71 +1468,9 @@ ### -### clean -### - -%clean -rm -rf $RPM_BUILD_ROOT - -### ### scripts ### -# Disabled for now as we don't need to call new-kernel-pkg -%if 0 -# -# This macro defines a %%post script for a kernel*-devel package. -# %%kernel_devel_post <subpackage> -# -%define kernel_devel_post() \ -%{expand:%%post -n kernel-%{?1:%{1}-}devel}\ -if [ -x /usr/sbin/hardlink ]\ -then\ - (cd /usr/src/kernels/%{KVERREL}%{?1:-%{1}} &&\ - /usr/bin/find . -type f | while read f; do\ - hardlink -c /usr/src/kernels/*/$f $f\ - done)\ -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> -# More text can follow to go at the end of this variant's %%post. -# -%define kernel_variant_post(s:r:v:) \ -%{expand:%%kernel_devel_post %{?-v*}}\ -%{expand:%%kernel_variant_posttrans %{?-v*}}\ -%{expand:%%post -n kernel-%{?-v*}}\ -/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_arm} - -%kernel_variant_preun adaptation-n900 -%kernel_variant_post -v adaptation-n900 - -%endif -%endif ### ### file lists @@ -1552,7 +1490,6 @@ /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2:-%{2}}\ /%{image_install_path}/%another_make_image_target\ /boot/System.map-%{KVERREL}%{?2:-%{2}}\ -#/boot/symvers-%{KVERREL}%{?2:-%{2}}.gz\ /boot/config-%{KVERREL}%{?2:-%{2}}\ %{?-a:%{-a*}}\ %dir /lib/modules/%{KVERREL}%{?2:-%{2}}\ @@ -1562,13 +1499,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.builtin*\ +/lib/modules/%{KVERREL}%{?2:-%{2}}/modules.*\ %ghost /boot/initrd-%{KVERREL}%{?2:-%{2}}.img\ %{?-e:%{-e*}}\ %{expand:%%files -n kernel-%{?2:%{2}-}devel}\ @@ -1585,3 +1516,8 @@ %kernel_variant_files %{all_arm} adaptation-n900 + +# No need for this as it is done during packaging already. +#%post +#/sbin/depmod -a %{version}-%{release}-adaptation-n900 + other changes: -------------- ++++++ config-adaptation-n900 --- config-adaptation-n900 +++ config-adaptation-n900 @@ -295,10 +295,6 @@ CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=m -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set # CONFIG_INET6_AH is not set # CONFIG_INET6_ESP is not set # CONFIG_INET6_IPCOMP is not set @@ -464,7 +460,6 @@ # CONFIG_ATA is not set # CONFIG_MD is not set # CONFIG_MACVLAN is not set -# CONFIG_TUN is not set CONFIG_MII=m # CONFIG_MARVELL_PHY is not set # CONFIG_DAVICOM_PHY is not set @@ -924,7 +919,6 @@ CONFIG_RTC_HCTOSYS=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" CONFIG_RTC_DRV_TWL4030=m -# CONFIG_RTC_DRV_CMOS is not set # CONFIG_PRISM2_USB is not set # CONFIG_BRCM80211 is not set # CONFIG_RT2870 is not set @@ -989,7 +983,7 @@ # CONFIG_ISO9660_FS is not set CONFIG_FAT_FS=m CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m +CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_CONFIGFS_FS is not set # CONFIG_ECRYPT_FS is not set ++++++ config-generic --- config-generic +++ config-generic @@ -70,7 +70,7 @@ CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y -# CONFIG_AUDIT is not set +CONFIG_AUDIT=y # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=17 CONFIG_CGROUPS=y ++++++ kernel-adaptation-n900.config --- kernel-adaptation-n900.config +++ kernel-adaptation-n900.config @@ -70,7 +70,7 @@ CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y -# CONFIG_AUDIT is not set +CONFIG_AUDIT=y # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=16 CONFIG_CGROUPS=y @@ -536,11 +536,11 @@ # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=m -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set +CONFIG_IPV6=y +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y -# CONFIG_IPV6_OPTIMISTIC_DAD is not set +CONFIG_IPV6_OPTIMISTIC_DAD=y # CONFIG_INET6_AH is not set # CONFIG_INET6_ESP is not set # CONFIG_INET6_IPCOMP is not set @@ -1083,7 +1083,7 @@ # CONFIG_BONDING is not set # CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set +CONFIG_TUN=y # CONFIG_VETH is not set # CONFIG_NET_SB1000 is not set # CONFIG_ARCNET is not set @@ -2394,7 +2394,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 @@ -2507,7 +2507,7 @@ # CONFIG_FAT_FS=m CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m +CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_NTFS_FS is not set ++++++ kernel.spec.in --- kernel.spec.in +++ kernel.spec.in @@ -93,7 +93,7 @@ # 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, mkinitrd >= 6.0.39-1 +%define kernel_prereq fileutils, module-init-tools, /sbin/init, mkinitrd >= 6.0.39-1 # # This macro does requires, provides, conflicts, obsoletes for a kernel package. @@ -557,71 +557,9 @@ ### -### clean -### - -%clean -rm -rf $RPM_BUILD_ROOT - -### ### scripts ### -# Disabled for now as we don't need to call new-kernel-pkg -%if 0 -# -# This macro defines a %%post script for a kernel*-devel package. -# %%kernel_devel_post <subpackage> -# -%define kernel_devel_post() \ -%{expand:%%post -n kernel-%{?1:%{1}-}devel}\ -if [ -x /usr/sbin/hardlink ]\ -then\ - (cd /usr/src/kernels/%{KVERREL}%{?1:-%{1}} &&\ - /usr/bin/find . -type f | while read f; do\ - hardlink -c /usr/src/kernels/*/$f $f\ - done)\ -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> -# More text can follow to go at the end of this variant's %%post. -# -%define kernel_variant_post(s:r:v:) \ -%{expand:%%kernel_devel_post %{?-v*}}\ -%{expand:%%kernel_variant_posttrans %{?-v*}}\ -%{expand:%%post -n kernel-%{?-v*}}\ -/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_arm} - -%kernel_variant_preun adaptation-n900 -%kernel_variant_post -v adaptation-n900 - -%endif -%endif ### ### file lists @@ -641,7 +579,6 @@ /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2:-%{2}}\ /%{image_install_path}/%another_make_image_target\ /boot/System.map-%{KVERREL}%{?2:-%{2}}\ -#/boot/symvers-%{KVERREL}%{?2:-%{2}}.gz\ /boot/config-%{KVERREL}%{?2:-%{2}}\ %{?-a:%{-a*}}\ %dir /lib/modules/%{KVERREL}%{?2:-%{2}}\ @@ -651,13 +588,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.builtin*\ +/lib/modules/%{KVERREL}%{?2:-%{2}}/modules.*\ %ghost /boot/initrd-%{KVERREL}%{?2:-%{2}}.img\ %{?-e:%{-e*}}\ %{expand:%%files -n kernel-%{?2:%{2}-}devel}\ @@ -674,3 +605,8 @@ %kernel_variant_files %{all_arm} adaptation-n900 + +# No need for this as it is done during packaging already. +#%post +#/sbin/depmod -a %{version}-%{release}-adaptation-n900 +
