[meego-commits] 11103: Changes to devel:kernel/kernel-adaptation-intel-automotive
qi
no_reply at build.meego.com
Tue Dec 21 08:40:22 UTC 2010
Hi,
I have made the following changes to kernel-adaptation-intel-automotive in project devel:kernel. Please review and accept ASAP.
Thank You,
qi
[This message was auto-generated]
---
Request #11103:
submit: home:qi:branches:devel:kernel/kernel-adaptation-intel-automotive(r3)(cleanup) -> devel:kernel/kernel-adaptation-intel-automotive
Message:
Update to Linux 2.6.35.10
State: new 2010-12-21T00:40:21 qi
Comment: None
changes files:
--------------
old:
----
kernel-adaptation-ivi.spec
new:
----
kernel-adaptation-intel-automotive.spec
spec files:
-----------
++++++ new spec file:
--- kernel-adaptation-intel-automotive.spec
+++ kernel-adaptation-intel-automotive.spec
+#
+# Spec file originally created for Fedora, modified for Moblin Linux
+#
+
+Summary: The Linux kernel (the core of the Linux operating system)
+
+
+# For a stable, released kernel, released_kernel should be 1. For rawhide
+# and/or a kernel built from an rc snapshot, released_kernel should
+# be 0.
+%define released_kernel 1
+
+# Versions of various parts
+
+# base_sublevel is the kernel version we're starting with and patching
+# on top of -- for example, 2.6.22-rc7 starts with a 2.6.21 base,
+# which yields a base_sublevel of 21.
+
+%define base_sublevel 35
+
+
+## If this is a released kernel ##
+%if 0%{?released_kernel}
+# Do we have a 2.6.21.y update to apply?
+%define stable_update 10
+# Set rpm version accordingly
+%if 0%{?stable_update}
+%define stablerev .%{stable_update}
+%endif
+%define rpmversion 2.6.%{base_sublevel}%{?stablerev}
+
+## The not-released-kernel case ##
+%else
+# The next upstream release sublevel (base_sublevel+1)
+%define upstream_sublevel %(expr %{base_sublevel} + 1)
+# The rc snapshot level
+
+%define rcrev 0
+
+
+%if 0%{?rcrev}
+%define rctag ~rc%rcrev
+%endif
+
+%if !0%{?rcrev}
+%define rctag ~rc0
+%endif
+
+# Set rpm version accordingly
+%define rpmversion 2.6.%{upstream_sublevel}%{?rctag}
+%endif
+
+# The kernel tarball/base version
+%define kversion 2.6.%{base_sublevel}
+
+%define make_target bzImage
+
+%define KVERREL %{version}-%{release}
+%define hdrarch %_target_cpu
+
+%define compat_wireless_ver 2010-10-19
+
+%define all_x86 i386 i586 i686 %{ix86}
+
+%define all_arm %{arm}
+
+%define _default_patch_fuzz 0
+
+# 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
+%define make_target zImage
+%endif
+
+%define oldconfig_target nonint_oldconfig
+
+ExclusiveArch: %{all_x86}
+#
+# Packages that need to be installed before the kernel is, because the %post
+# scripts use them.
+#
+%define kernel_prereq fileutils, module-init-tools, fastinit, mkinitrd >= 6.0.39-1
+
+#
+# This macro does requires, provides, conflicts, obsoletes for a kernel package.
+# %%kernel_reqprovconf <subpackage>
+# It uses any kernel_<subpackage>_conflicts and kernel_<subpackage>_obsoletes
+# macros defined above.
+#
+%define kernel_reqprovconf \
+Provides: kernel = %{rpmversion}-%{release}\
+Provides: kernel-uname-r = %{KVERREL}%{?1:-%{1}}\
+Requires(pre): %{kernel_prereq}\
+%{?1:%{expand:%%{?kernel_%{1}_conflicts:Conflicts: %%{kernel_%{1}_conflicts}}}}\
+%{?1:%{expand:%%{?kernel_%{1}_provides:Provides: %%{kernel_%{1}_provides}}}}\
+# We can't let RPM do the dependencies automatic because it'll then pick up\
+# a correct but undesirable perl dependency from the module headers which\
+# isn't required for the kernel proper to function\
+AutoReq: no\
+AutoProv: yes\
+%{nil}
+
+Name: kernel-ivi
+
+Group: System/Kernel
+License: GPLv2
+URL: http://www.kernel.org/
+Version: %{rpmversion}
+Release: 6
+
+%kernel_reqprovconf
+
+#
+# List the packages used during the kernel build
+#
+BuildRequires: module-init-tools, bash >= 2.03, sh-utils
+BuildRequires: findutils, make >= 3.78
+BuildRequires: linux-firmware
+BuildRequires: elfutils-libelf-devel binutils-devel newt-devel
+
+Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
+Source1: compat-wireless-%{compat_wireless_ver}.tar.bz2
+Source2: series
+
+Source10: COPYING.modules
+
+Source15: merge.pl
+Source20: Makefile.config
+
+Source100: config-generic
+Source102: config-ivi
+Source103: config-netbook
+Source104: config-mid
+
+Source105: config-arm-n900
+
+# For a stable release kernel
+%if 0%{?stable_update}
+Patch00: patch-2.6.%{base_sublevel}.%{stable_update}.bz2
+%endif
+%if 0%{?rcrev}
+Patch00: patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2
+%endif
+
+# Reminder of the patch filename format:
+# linux-<version it is supposed to be upstream>-<description-separated-with-dashes>.patch
+#
+
+
+#
+# Stable patch - critical bugfixes
+#
+
+Patch1: patch-2.6.35.10.bz2
+
+
+#
+# Patch to add a "nonintconfig" option to the Makefile
+# needed for unattended builds
+#
+Patch2: linux-2.6-build-nonintconfig.patch
+
+#####################################################################
+#
+# Boot time and power patches
+# Section maintainer: Arjan van de Ven <arjan at linux.intel.com
+#
+
+#
+# Patch to try mounting / before all devices (the mouse)
+# are done probing. This saves several seconds of boot time.
+#
+Patch100: linux-2.6.35-dont-wait-for-mouse.patch
+#
+# Patch to support the old sreadahead versions
+#
+Patch101: linux-2.6.35-sreadahead.patch
+
+#
+# Patches to help PowerTOP
+#
+Patch102: linux-2.6.35-vfs-tracepoints.patch
+Patch103: linux-2.6.35-ahci-alpm-accounting.patch
+Patch104: linux-2.6.35-annotate-device-pm.patch
+
+#
+# Fix the slab timer to not be a power hog
+#
+Patch105: linux-2.6.35-slab-timer.patch
+
+#
+# Fix Linux deliberately skewing the timer for
+# historic reasons that are no longer true.
+#
+Patch106: linux-2.6.35-dont-skew-the-tick.patch
+
+#
+# Atom C state fixes
+#
+Patch107: linux-2.6.35-intel-idle.patch
+
+#
+# End of the boot time and power patches
+#
+#####################################################################
+
+#####################################################################
+#
+# All other patches
+#
+Patch108: linux-2.6.35-fatal-signals.patch
+
+
+BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
+
+
+
+#
+# This macro creates a kernel-<subpackage>-devel package.
+# %%kernel_devel_package <subpackage> <pretty-name>
+#
+%define kernel_devel_package() \
+%package -n kernel-%{?1:%{1}-}devel\
+Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\
+Group: System/Kernel\
+Provides: kernel%{?1:-%{1}}-devel = %{version}-%{release}\
+Provides: kernel-devel = %{version}-%{release}%{?1:-%{1}}\
+Provides: kernel-devel = %{version}-%{release}%{?1:-%{1}}\
+Provides: kernel-devel-uname-r = %{KVERREL}%{?1:-%{1}}\
+Requires: kernel%{?1:-%{1}} = %{version}-%{release}\
+Requires: hardlink \
+AutoReqProv: no\
+Requires(pre): /usr/bin/find\
+%description -n kernel%{?1:-%{1}}-devel\
+This package provides kernel headers and makefiles sufficient to build modules\
+against the %{?2:%{2} }kernel package.\
+%{nil}
+
+#
+# This macro creates a kernel-<subpackage> and its -devel too.
+# %%define variant_summary The Linux kernel compiled for <configuration>
+# %%kernel_variant_package [-n <pretty-name>] <subpackage>
+#
+%define kernel_variant_package(n:) \
+%package -n kernel-%1\
+Summary: %{variant_summary}\
+Group: System/Kernel\
+%kernel_reqprovconf\
+%{nil}
+
+
+# First the auxiliary packages of the main kernel package.
+%kernel_devel_package
+
+
+
+
+# Now, each variant package.
+
+%ifarch %all_x86
+
+
+
+%kernel_devel_package ivi
+%description -n kernel-ivi
+This package contains the kernel optimized for In Vehicle Infotainment segments
+
+%endif
+
+%ifarch %{all_arm}
+
+
+#Put other ARM variants here
+
+%endif
+
+
+%prep
+
+# First we unpack the kernel tarball.
+# If this isn't the first make prep, we use links to the existing clean tarball
+# which speeds things up quite a bit.
+
+# Update to latest upstream.
+%if 0%{?released_kernel}
+%define vanillaversion 2.6.%{base_sublevel}
+# released_kernel with stable_update available case
+%if 0%{?stable_update}
+%define vanillaversion 2.6.%{base_sublevel}.%{stable_update}
+%endif
+# non-released_kernel case
+%else
+%if 0%{?rcrev}
+%define vanillaversion 2.6.%{upstream_sublevel}-rc%{rcrev}
+%endif
+%else
+# pre-{base_sublevel+1}-rc1 case
+%endif
+
+
+#
+# Unpack the kernel tarbal
+#
+%setup -q -c
+cd linux-%{kversion}
+
+
+#
+# The add an -rc patch if needed
+#
+%if 0%{?rcrev}
+# patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2
+%patch00 -p1
+%endif
+
+
+#
+# Then apply all the patches
+#
+# Reminder of the patch filename format:
+# linux-<version it is supposed to be upstream>-<description-separated-with-dashes>.patch
+#
+
+
+#
+# Stable patch - critical bugfixes
+#
+
+# patch-2.6.35.10.bz2
+%patch1 -p1
+
+
+#
+# Patch to add a "nonintconfig" option to the Makefile
+# needed for unattended builds
+#
+# linux-2.6-build-nonintconfig.patch
+%patch2 -p1
+
+#####################################################################
+#
+# Boot time and power patches
+# Section maintainer: Arjan van de Ven <arjan at linux.intel.com
+#
+
+#
+# Patch to try mounting / before all devices (the mouse)
+# are done probing. This saves several seconds of boot time.
+#
+# linux-2.6.35-dont-wait-for-mouse.patch
+%patch100 -p1
+#
+# Patch to support the old sreadahead versions
+#
+# linux-2.6.35-sreadahead.patch
+%patch101 -p1
+
+#
+# Patches to help PowerTOP
+#
+# linux-2.6.35-vfs-tracepoints.patch
+%patch102 -p1
+# linux-2.6.35-ahci-alpm-accounting.patch
+%patch103 -p1
+# linux-2.6.35-annotate-device-pm.patch
+%patch104 -p1
+
+#
+# Fix the slab timer to not be a power hog
+#
+# linux-2.6.35-slab-timer.patch
+%patch105 -p1
+
+#
+# Fix Linux deliberately skewing the timer for
+# historic reasons that are no longer true.
+#
+# linux-2.6.35-dont-skew-the-tick.patch
+%patch106 -p1
+
+#
+# Atom C state fixes
+#
+# linux-2.6.35-intel-idle.patch
+%patch107 -p1
+
+#
+# End of the boot time and power patches
+#
+#####################################################################
+
+#####################################################################
+#
+# All other patches
+#
+# linux-2.6.35-fatal-signals.patch
+%patch108 -p1
+
+# Drop some necessary files from the source dir into the buildroot
+cp $RPM_SOURCE_DIR/config-* .
+cp %{SOURCE15} .
+
+#
+# Add the compat-wireless package
+#
+tar -axf %{SOURCE1}
+
+# Dynamically generate kernel .config files from config-* files
+make -f %{SOURCE20} VERSION=%{version} configs
+
+
+# Any further pre-build tree manipulations happen here.
+
+chmod +x scripts/checkpatch.pl
+
+cp %{SOURCE10} Documentation/
+
+
+mkdir configs
+
+#
+# We want to run the config checks of all configurations for all architectures always.
+# That way, developers immediately found out if they forget to enable not-their-native
+# architecture. It's cheap to run anyway.
+#
+
+# now run oldconfig over all the config files
+for i in kernel-*.config
+do
+ mv $i .config
+ Arch="x86"
+
+ #get ARCH from .config file for other platforms
+ if [ `cat .config | grep -c CONFIG_ARM=y` -eq 1 ]; then
+ Arch="arm"
+ fi
+
+ # make oldconfig > /dev/null
+ echo Doing $i
+ make ARCH=$Arch %{oldconfig_target} > /dev/null
+ echo "# $Arch" > configs/$i
+ cat .config >> configs/$i
+done
+
+#
+# get rid of unwanted files resulting from patch fuzz
+# (not that we can have any)
+#
+find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null
+
+cd ..
+
+
+###
+### build
+###
+%build
+
+
+cp_vmlinux()
+{
+ eu-strip --remove-comment -o "$2" "$1"
+}
+
+BuildKernel() {
+ MakeTarget=$1
+ KernelImage=$2
+ TargetArch=$3
+ Flavour=$4
+ InstallName=${5:-vmlinuz}
+
+ # Pick the right config file for the kernel we're building
+ Config=kernel${Flavour:+-${Flavour}}.config
+ DevelDir=/usr/src/kernels/%{KVERREL}${Flavour:+-${Flavour}}
+
+ # When the bootable image is just the ELF kernel, strip it.
+ # We already copy the unstripped file into the debuginfo package.
+ if [ "$KernelImage" = vmlinux ]; then
+ CopyKernel=cp_vmlinux
+ else
+ CopyKernel=cp
+ fi
+
+ KernelVer=%{version}-%{release}${Flavour:+-${Flavour}}
+ ExtraVer=%{?stablerev}%{?rctag}-%{release}${Flavour:+-${Flavour}}
+ Arch="x86"
+%ifarch %{all_arm}
+ Arch="arm"
+%endif
+
+
+ if [ "$Arch" = "$TargetArch" ]; then
+ echo BUILDING A KERNEL FOR ${Flavour} %{_target_cpu}... ${KernelVer}
+ echo USING ARCH=$Arch
+
+ # make sure EXTRAVERSION says what we want it to say
+ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = ${ExtraVer}/" Makefile
+
+ # and now to start the build process
+
+ make -s mrproper
+ cp configs/$Config .config
+
+ make -s ARCH=$Arch %{oldconfig_target} > /dev/null
+ make -s CONFIG_DEBUG_SECTION_MISMATCH=y ARCH=$Arch %{?_smp_mflags} $MakeTarget %{?sparse_mflags}
+ make -s CONFIG_DEBUG_SECTION_MISMATCH=y ARCH=$Arch %{?_smp_mflags} modules %{?sparse_mflags} || exit 1
+
+%ifnarch %{all_arm}
+
+ cd compat-wireless-%{compat_wireless_ver}
+ make -s CONFIG_DEBUG_SECTION_MISMATCH=y ARCH=$Arch KLIB=../ KLIB_BUILD=../ %{?_smp_mflags}
+ cd ..
+%endif
+
+ # Start installing the results
+ mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
+ install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
+ install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
+ touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img
+ if [ -f arch/$Arch/boot/zImage.stub ]; then
+ cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
+ fi
+ $CopyKernel $KernelImage \
+ $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer
+ chmod 755 $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer
+
+ mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer
+ make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer
+%ifnarch %{all_arm}
+ make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer
+
+ cd compat-wireless-%{compat_wireless_ver}
+ make -s -i ARCH=$Arch KLIB=$RPM_BUILD_ROOT/lib/modules/$KernelVer KLIB_BUILD=$RPM_BUILD_ROOT/lib/modules/$KernelVer/build KMODDIR="../../../updates" install
+ rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/lib
+ cd ..
+
+%endif
+ mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates
+
+ # And save the headers/makefiles etc for building modules against
+ #
+ # This all looks scary, but the end result is supposed to be:
+ # * all arch relevant include/ files
+ # * all Makefile/Kconfig files
+ # * all script/ files
+
+ rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+ rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/source
+ mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+ (cd $RPM_BUILD_ROOT/lib/modules/$KernelVer ; ln -s build source)
+ # dirs for additional modules per module-init-tools, kbuild/modules.txt
+ # first copy everything
+ cp --parents `find -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+ cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+ cp System.map $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+ if [ -s Module.markers ]; then
+ cp Module.markers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+ fi
+ # then drop all but the needed Makefiles/Kconfig files
+ rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Documentation
+ rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts
+ rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+ cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+ cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+ if [ -d arch/%{_arch}/scripts ]; then
+ cp -a arch/%{_arch}/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || :
+ fi
+ if [ -f arch/%{_arch}/*lds ]; then
+ cp -a arch/%{_arch}/*lds $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/ || :
+ fi
+ rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o
+ rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o
+ cp -a --parents arch/$Arch/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+%ifarch %{all_arm}
+ cp -a --parents arch/arm/mach-*/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+ cp -a --parents arch/arm/plat-*/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+%endif
+ mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+ cd include
+ cp -a acpi asm-generic config crypto drm generated keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound video trace $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+
+ # Make sure the Makefile and version.h have a matching timestamp so that
+ # external modules can be built
+ touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/version.h
+ touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/autoconf.h
+ # Copy .config to include/config/auto.conf so "make prepare" is unnecessary.
+ cp $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/config/auto.conf
+ cd ..
+
+ #
+ # save the vmlinux file for kernel debugging into the kernel-*-devel rpm
+ #
+
+ cp vmlinux $RPM_BUILD_ROOT/lib/modules/$KernelVer
+
+ find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f >modnames
+
+ # mark modules executable so that strip-to-file can strip them
+ xargs --no-run-if-empty chmod u+x < modnames
+
+ # Generate a list of modules for block and networking.
+
+ fgrep /drivers/ modnames | xargs --no-run-if-empty nm -upA |
+ sed -n 's,^.*/\([^/]*\.ko\): *U \(.*\)$,\1 \2,p' > drivers.undef
+
+ collect_modules_list()
+ {
+ sed -r -n -e "s/^([^ ]+) \\.?($2)\$/\\1/p" drivers.undef |
+ LC_ALL=C sort -u > $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$1
+ }
+
+ collect_modules_list networking \
+ 'register_netdev|ieee80211_register_hw|usbnet_probe'
+ collect_modules_list block \
+ 'ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans'
+
+ # remove files that will be auto generated by depmod at rpm -i time
+ for i in alias ccwmap dep ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols usbmap
+ do
+ rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$i
+ done
+
+ # Move the devel headers out of the root file system
+ mkdir -p $RPM_BUILD_ROOT/usr/src/kernels
+ mv $RPM_BUILD_ROOT/lib/modules/$KernelVer/build $RPM_BUILD_ROOT/$DevelDir
+ ln -sf ../../..$DevelDir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+ fi
+}
+
+###
+# DO it...
+###
+
+# prepare directories
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/boot
+
+cd linux-%{kversion}
+
+
+ BuildKernel %make_target %kernel_image x86 ivi
+
+
+
+
+###
+### install
+###
+
+%define install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
+%%install
+
+
+%install
+
+cd linux-%{kversion}
+
+#
+# the perf utility
+#
+
+rm -rf $RPM_BUILD_ROOT/lib/firmware
+
+
+###
+### clean
+###
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+###
+### scripts
+###
+
+#
+# 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_x86
+
+
+
+
+%kernel_variant_preun ivi
+%kernel_variant_post -v ivi
+
+%endif
+
+%ifarch %{all_arm}
+
+
+%endif
+
+###
+### file lists
+###
+
+
+
+#
+# This macro defines the %%files sections for a kernel package
+# and its devel packages.
+# %%kernel_variant_files [-k vmlinux] [-a <extra-files-glob>] [-e <extra-nonbinary>] <condition> <subpackage>
+#
+%define kernel_variant_files(a:e:k:) \
+%ifarch %{1}\
+%{expand:%%files -n kernel%{?2:-%{2}}}\
+%defattr(-,root,root)\
+/%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2:-%{2}}\
+/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}}\
+/lib/modules/%{KVERREL}%{?2:-%{2}}/kernel\
+/lib/modules/%{KVERREL}%{?2:-%{2}}/updates\
+/lib/modules/%{KVERREL}%{?2:-%{2}}/build\
+/lib/modules/%{KVERREL}%{?2:-%{2}}/source\
+%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*\
+%ghost /boot/initrd-%{KVERREL}%{?2:-%{2}}.img\
+%{?-e:%{-e*}}\
+%{expand:%%files -n kernel-%{?2:%{2}-}devel}\
+%defattr(-,root,root)\
+%verify(not mtime) /usr/src/kernels/%{KVERREL}%{?2:-%{2}}\
+/lib/modules/%{KVERREL}%{?2:-%{2}}/vmlinux \
+%endif\
+%{nil}
+
+
+
+
+%kernel_variant_files %all_x86 ivi
+
--- kernel.spec
+++ kernel.spec
@@ -219,6 +219,21 @@
#
Patch106: linux-2.6.35-dont-skew-the-tick.patch
+#
+# Atom C state fixes
+#
+Patch107: linux-2.6.35-intel-idle.patch
+
+#
+# End of the boot time and power patches
+#
+#####################################################################
+
+#####################################################################
+#
+# All other patches
+#
+Patch108: linux-2.6.35-fatal-signals.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -418,6 +433,23 @@
# linux-2.6.35-dont-skew-the-tick.patch
%patch106 -p1
+#
+# Atom C state fixes
+#
+# linux-2.6.35-intel-idle.patch
+%patch107 -p1
+
+#
+# End of the boot time and power patches
+#
+#####################################################################
+
+#####################################################################
+#
+# All other patches
+#
+# linux-2.6.35-fatal-signals.patch
+%patch108 -p1
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/config-* .
++++++ deleted spec files:
--- kernel-adaptation-ivi.spec
other changes:
--------------
++++++ Makefile
--- Makefile
+++ Makefile
@@ -5,10 +5,10 @@
generic: kernel.spec.in series makespec.pl
@touch MAIN IVI NETBOOK MENLOW N900 MAIN MID;
- @perl makespec.pl < kernel.spec.in > kernel.spec ;
- @rm -f MID IVI NETBOOK MENLOW N900 MAIN MID;
+ @perl makespec.pl < kernel.spec.in > kernel.spec;
+ @rm -f IVI;
ivi: kernel.spec.in series makespec.pl
@touch IVI;
- @perl makespec.pl < kernel.spec.in > kernel-adaptation-ivi.spec ;
+ @perl makespec.pl < kernel.spec.in > kernel-adaptation-intel-automotive.spec;
@rm IVI;
More information about the MeeGo-commits
mailing list