%my_builddir/kernel-devel.files
@@ -560,15 +624,18 @@
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
%my_builddir/kernel-devel.files
@@ -575,15 +639,18 @@
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
%my_builddir/kernel-devel.files
@@ -566,15 +632,18 @@
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
%my_builddir/kernel-devel.files
@@ -558,15 +622,18 @@
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
%my_builddir/kernel-devel.files
@@ -566,15 +630,18 @@
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
%my_builddir/kernel-devel.files
@@ -570,15 +634,18 @@
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
%my_builddir/kernel-devel.files
@@ -558,15 +622,18 @@
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
%my_builddir/kernel-devel.files
@@ -559,15 +623,18 @@
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
%my_builddir/kernel-devel.files
@@ -567,15 +631,18 @@
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
%my_builddir/kernel-devel.files
@@ -563,15 +627,18 @@
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
%my_builddir/kernel-devel.files
@@ -556,15 +620,18 @@
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
%my_builddir/kernel-devel.files
@@ -558,15 +622,18 @@
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
done
Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at Thu Feb 25 11:22:41 CET 2010.
--------
--- kernel-source/kernel-debug.changes 2010-02-12 20:55:29.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2010-02-25 07:01:46.000000000 +0100
@@ -1,0 +2,62 @@
+Thu Feb 25 06:04:24 CET 2010 - jeffm@suse.com
+
+- patches.xen/xen3-patch-2.6.33-rc8-final: Build fix for the
+ 2.6.33-final update.
+
+-------------------------------------------------------------------
+Wed Feb 24 21:00:52 CET 2010 - jeffm@suse.de
+
+- Updated to 2.6.33-final.
+ - Eliminated 4 patches.
+
+-------------------------------------------------------------------
+Wed Feb 24 20:02:26 CET 2010 - jeffm@suse.de
+
+- patches.rpmify/ftrace-fix-ftrace_event_call-alignment-for-use-with-gcc-4-5:
+ ftrace: fix ftrace_event_call alignment for use with gcc 4.5
+ (bnc#582222).
+
+-------------------------------------------------------------------
+Wed Feb 24 14:46:28 CET 2010 - jbeulich@novell.com
+
+- Update Xen patches to 2.6.33-rc8 and c/s 997.
+- patches.xen/xen-x86-time-per-cpu: fold per-CPU accounting data
+ into a structure.
+- patches.xen/xen-x86-xtime-lock: reduce contention on xtime_lock
+ (bnc#569014, bnc#571041, bnc#571769, bnc#572146).
+
+-------------------------------------------------------------------
+Tue Feb 23 00:34:32 CET 2010 - jack@suse.de
+
+- patches.fixes/novfs-fix-inode-uid: novfs: Get proper UID when
+ looking up inode (bnc#486997).
+- patches.fixes/novfs-incorrect-filesize-fix: novfs: novfs
+ reports incorrect file size (bnc#426536).
+- patches.fixes/novfs-truncate-fix: novfs: Fixes corruption of
+ OO documents on NSS Volumes (bnc#508259).
+
+-------------------------------------------------------------------
+Wed Feb 17 04:07:36 CET 2010 - nfbrown@suse.de
+
+- patches.fixes/nfs-find-crash: Fix potential oops when running
+ find on an NFS mount. (bnc#573107).
+
+-------------------------------------------------------------------
+Tue Feb 16 21:21:22 CET 2010 - jeffm@suse.com
+
+- Set CONFIG_LSM_MMAP_MIN_ADDR=4096 to allow qemu to emulate
+ other architectures properly (bnc#574654).
+
+-------------------------------------------------------------------
+Tue Feb 16 18:10:01 CET 2010 - jeffm@suse.com
+
+- Update to 2.6.33-rc8.
+ - Eliminated 1 patch.
+
+-------------------------------------------------------------------
+Mon Feb 15 19:15:43 CET 2010 - rgoldwyn@suse.de
+
+- patches.fixes/novfs-err_ptr-fix.diff: Oops in novfs:unlink_local
+ (bnc#569071).
+
+-------------------------------------------------------------------
@@ -1847,0 +1910,5 @@
+
+-------------------------------------------------------------------
+Mon Dec 14 16:41:36 CET 2009 - mmarek@suse.cz
+
+- rpm/kabi.pl: Do not print harmless kabi changes by default.
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-docs.changes: same change
kernel-ec2.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-ps3.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-trace.changes: same change
kernel-vanilla.changes: same change
kernel-vmi.changes: same change
kernel-xen.changes: same change
calling whatdependson for head-i586
Old:
----
linux-2.6.32.tar.bz2
New:
----
linux-2.6.33.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:39.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:39.000000000 +0100
@@ -17,29 +17,36 @@
# norootforbuild
-%define srcversion 2.6.32
-%define patchversion 2.6.33-rc7
+%define srcversion 2.6.33
+%define patchversion 2.6.33
%define variant %{nil}
+
%include %_sourcedir/kernel-spec-macros
+
%define build_flavor debug
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
+
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
+
%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
+
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
+
%ifarch %ix86 x86_64
%define install_vdso 1
%else
@@ -49,7 +56,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 2.6.33
-Release: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -78,6 +85,7 @@
Requires(post): perl-Bootloader >= 0.4.15
Requires(post): mkinitrd
#!BuildIgnore: perl-Bootloader mkinitrd
+
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
@@ -96,6 +104,7 @@
%endif
#!BuildIgnore: xen
%endif
+
Provides: %name-nongpl
Obsoletes: %name-nongpl
%if %build_vanilla
@@ -119,6 +128,7 @@
Provides: kernel-kdump
Obsoletes: kernel-kdump
%endif
+
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source10: preun.sh
Source11: postun.sh
@@ -152,6 +162,7 @@
Source120: kabi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 ppc64 x86_64
+
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
@@ -166,6 +177,7 @@
NoSource: 110
NoSource: 111
NoSource: 120
+
# The following KMPs have been integrated into the kernel package.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
@@ -194,8 +206,10 @@
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
+
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
+
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@@ -211,33 +225,43 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
+
SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
SYMBOLS=$(cat %_sourcedir/extra-symbols)
echo "extra symbol(s):" $SYMBOLS
fi
+
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+
mkdir -p %kernel_build_dir
+
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
+
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
+
cd linux-%srcversion
+
%_sourcedir/apply-patches \
%if %{build_vanilla}
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
+
cd %kernel_build_dir
+
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
+
cp ../config/%cpu_arch_flavor .config
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
@@ -247,6 +271,7 @@
%else
--disable CONFIG_DEBUG_INFO
%endif
+
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -256,27 +281,34 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
+
make prepare $MAKE_ARGS
make scripts $MAKE_ARGS
krel=$(make -s kernelrelease $MAKE_ARGS)
+
if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
exit 1
fi
+
make clean $MAKE_ARGS
+
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
+
cat > .kernel-binary.spec.buildenv < %my_builddir/$script$sub.sh
done
done
+
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
+
cp .config %buildroot/boot/config-%kernelrelease-%build_flavor
+
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
%endif
+
# Create a dummy initrd with roughly the size the real one will have.
# That way, YaST will know that this package requires some additional
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
+
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
+
gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
+
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
@@ -451,6 +503,7 @@
%endif
echo "Consistency check error: please update supported.conf."
fi
+
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@@ -460,11 +513,13 @@
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
%endif
+
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
# so that kernel-source + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
+
# Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
@@ -472,6 +527,7 @@
else
rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
fi
+
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
@@ -479,6 +535,7 @@
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
fi
+
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
@@ -487,12 +544,14 @@
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
+
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then
exit 1
fi
+
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
@@ -501,11 +560,13 @@
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
+
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
+
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
@@ -522,6 +583,7 @@
exit 1
fi
fi
+
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -536,6 +598,7 @@
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
fi
+
add_dirs_to_filelist() {
sed -rn '
# print file name
@@ -552,6 +615,7 @@
ta
' "$@" | sort -u
}
+
# Collect the file lists.
shopt -s nullglob
+
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
+
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
+
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
@@ -588,6 +655,7 @@
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
+
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -595,6 +663,7 @@
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
+
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
@@ -606,6 +675,7 @@
%pre -f pre.sh
%post -f post.sh
+
%if %split_base
%files -f kernel-main.files
@@ -646,6 +716,7 @@
%pre base -f pre-base.sh
%post base -f post-base.sh
+
%if %split_base
%files base -f kernel-base.files
@@ -686,11 +757,13 @@
%pre extra -f pre-extra.sh
%post extra -f post-extra.sh
+
%if %split_extra
%files extra -f kernel-extra.files
%defattr(-, root, root)
%endif
+
%if %CONFIG_KMSG_IDS == "y"
%package man
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:39.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:39.000000000 +0100
@@ -17,29 +17,36 @@
# norootforbuild
-%define srcversion 2.6.32
-%define patchversion 2.6.33-rc7
+%define srcversion 2.6.33
+%define patchversion 2.6.33
%define variant %{nil}
+
%include %_sourcedir/kernel-spec-macros
+
%define build_flavor default
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
+
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
+
%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
+
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
+
%ifarch %ix86 x86_64
%define install_vdso 1
%else
@@ -49,7 +56,7 @@
Name: kernel-default
Summary: The Standard Kernel
Version: 2.6.33
-Release: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -78,6 +85,7 @@
Requires(post): perl-Bootloader >= 0.4.15
Requires(post): mkinitrd
#!BuildIgnore: perl-Bootloader mkinitrd
+
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
@@ -96,6 +104,7 @@
%endif
#!BuildIgnore: xen
%endif
+
Provides: %name-nongpl
Obsoletes: %name-nongpl
%if %build_vanilla
@@ -135,6 +144,7 @@
Provides: smp kernel-smp
Obsoletes: smp kernel-smp
%endif
+
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source10: preun.sh
Source11: postun.sh
@@ -168,6 +178,7 @@
Source120: kabi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 ppc ppc64 s390x x86_64
+
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
@@ -182,6 +193,7 @@
NoSource: 110
NoSource: 111
NoSource: 120
+
# The following KMPs have been integrated into the kernel package.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
@@ -210,8 +222,10 @@
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
+
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
+
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@@ -226,33 +240,43 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
+
SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
SYMBOLS=$(cat %_sourcedir/extra-symbols)
echo "extra symbol(s):" $SYMBOLS
fi
+
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+
mkdir -p %kernel_build_dir
+
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
+
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
+
cd linux-%srcversion
+
%_sourcedir/apply-patches \
%if %{build_vanilla}
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
+
cd %kernel_build_dir
+
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
+
cp ../config/%cpu_arch_flavor .config
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
@@ -262,6 +286,7 @@
%else
--disable CONFIG_DEBUG_INFO
%endif
+
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -271,27 +296,34 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
+
make prepare $MAKE_ARGS
make scripts $MAKE_ARGS
krel=$(make -s kernelrelease $MAKE_ARGS)
+
if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
exit 1
fi
+
make clean $MAKE_ARGS
+
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
+
cat > .kernel-binary.spec.buildenv < %my_builddir/$script$sub.sh
done
done
+
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
+
cp .config %buildroot/boot/config-%kernelrelease-%build_flavor
+
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
%endif
+
# Create a dummy initrd with roughly the size the real one will have.
# That way, YaST will know that this package requires some additional
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
+
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
+
gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
+
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
@@ -466,6 +518,7 @@
%endif
echo "Consistency check error: please update supported.conf."
fi
+
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@@ -475,11 +528,13 @@
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
%endif
+
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
# so that kernel-source + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
+
# Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
@@ -487,6 +542,7 @@
else
rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
fi
+
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
@@ -494,6 +550,7 @@
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
fi
+
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
@@ -502,12 +559,14 @@
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
+
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then
exit 1
fi
+
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
@@ -516,11 +575,13 @@
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
+
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
+
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
@@ -537,6 +598,7 @@
exit 1
fi
fi
+
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -551,6 +613,7 @@
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
fi
+
add_dirs_to_filelist() {
sed -rn '
# print file name
@@ -567,6 +630,7 @@
ta
' "$@" | sort -u
}
+
# Collect the file lists.
shopt -s nullglob
+
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
+
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
+
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
@@ -603,6 +670,7 @@
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
+
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -610,6 +678,7 @@
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
+
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
@@ -621,6 +690,7 @@
%pre -f pre.sh
%post -f post.sh
+
%if %split_base
%files -f kernel-main.files
@@ -660,6 +730,7 @@
%pre base -f pre-base.sh
%post base -f post-base.sh
+
%if %split_base
%files base -f kernel-base.files
@@ -699,11 +770,13 @@
%pre extra -f pre-extra.sh
%post extra -f post-extra.sh
+
%if %split_extra
%files extra -f kernel-extra.files
%defattr(-, root, root)
%endif
+
%if %CONFIG_KMSG_IDS == "y"
%package man
++++++ kernel-desktop.spec ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:39.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:39.000000000 +0100
@@ -17,29 +17,36 @@
# norootforbuild
-%define srcversion 2.6.32
-%define patchversion 2.6.33-rc7
+%define srcversion 2.6.33
+%define patchversion 2.6.33
%define variant %{nil}
+
%include %_sourcedir/kernel-spec-macros
+
%define build_flavor desktop
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
+
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
+
%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
+
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
+
%ifarch %ix86 x86_64
%define install_vdso 1
%else
@@ -49,7 +56,7 @@
Name: kernel-desktop
Summary: Kernel optimized for the desktop
Version: 2.6.33
-Release: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -78,6 +85,7 @@
Requires(post): perl-Bootloader >= 0.4.15
Requires(post): mkinitrd
#!BuildIgnore: perl-Bootloader mkinitrd
+
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
@@ -96,6 +104,7 @@
%endif
#!BuildIgnore: xen
%endif
+
Provides: %name-nongpl
Obsoletes: %name-nongpl
%if %build_vanilla
@@ -115,6 +124,7 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
+
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source10: preun.sh
Source11: postun.sh
@@ -148,6 +158,7 @@
Source120: kabi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
+
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
@@ -162,6 +173,7 @@
NoSource: 110
NoSource: 111
NoSource: 120
+
# The following KMPs have been integrated into the kernel package.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
@@ -190,8 +202,10 @@
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
+
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
+
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@@ -204,11 +218,13 @@
This kernel supports up to 64GB of main memory. It requires Physical
Addressing Extensions (PAE), which were introduced with the Pentium Pro
processor.
+
PAE is not only more physical address space but also important for the
"no execute" feature which disables execution of code that is marked as
non-executable. Therefore, the PAE kernel should be used on any systems
that support it, regardless of the amount of main memory.
%endif
+
%source_timestamp
%prep
@@ -217,33 +233,43 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
+
SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
SYMBOLS=$(cat %_sourcedir/extra-symbols)
echo "extra symbol(s):" $SYMBOLS
fi
+
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+
mkdir -p %kernel_build_dir
+
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
+
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
+
cd linux-%srcversion
+
%_sourcedir/apply-patches \
%if %{build_vanilla}
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
+
cd %kernel_build_dir
+
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
+
cp ../config/%cpu_arch_flavor .config
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
@@ -253,6 +279,7 @@
%else
--disable CONFIG_DEBUG_INFO
%endif
+
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -262,27 +289,34 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
+
make prepare $MAKE_ARGS
make scripts $MAKE_ARGS
krel=$(make -s kernelrelease $MAKE_ARGS)
+
if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
exit 1
fi
+
make clean $MAKE_ARGS
+
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
+
cat > .kernel-binary.spec.buildenv < %my_builddir/$script$sub.sh
done
done
+
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
+
cp .config %buildroot/boot/config-%kernelrelease-%build_flavor
+
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
%endif
+
# Create a dummy initrd with roughly the size the real one will have.
# That way, YaST will know that this package requires some additional
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
+
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
+
gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
+
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
@@ -457,6 +511,7 @@
%endif
echo "Consistency check error: please update supported.conf."
fi
+
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@@ -466,11 +521,13 @@
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
%endif
+
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
# so that kernel-source + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
+
# Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
@@ -478,6 +535,7 @@
else
rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
fi
+
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
@@ -485,6 +543,7 @@
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
fi
+
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
@@ -493,12 +552,14 @@
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
+
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then
exit 1
fi
+
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
@@ -507,11 +568,13 @@
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
+
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
+
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
@@ -528,6 +591,7 @@
exit 1
fi
fi
+
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -542,6 +606,7 @@
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
fi
+
add_dirs_to_filelist() {
sed -rn '
# print file name
@@ -558,6 +623,7 @@
ta
' "$@" | sort -u
}
+
# Collect the file lists.
shopt -s nullglob
+
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
+
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
+
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
@@ -594,6 +663,7 @@
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
+
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -601,6 +671,7 @@
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
+
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
@@ -612,6 +683,7 @@
%pre -f pre.sh
%post -f post.sh
+
%if %split_base
%files -f kernel-main.files
@@ -646,12 +718,15 @@
This kernel supports up to 64GB of main memory. It requires Physical
Addressing Extensions (PAE), which were introduced with the Pentium Pro
processor.
+
PAE is not only more physical address space but also important for the
"no execute" feature which disables execution of code that is marked as
non-executable. Therefore, the PAE kernel should be used on any systems
that support it, regardless of the amount of main memory.
%endif
+
This package contains only the base modules, required in all installs.
+
%source_timestamp
%preun base -f preun-base.sh
@@ -661,6 +736,7 @@
%pre base -f pre-base.sh
%post base -f post-base.sh
+
%if %split_base
%files base -f kernel-base.files
@@ -695,12 +771,15 @@
This kernel supports up to 64GB of main memory. It requires Physical
Addressing Extensions (PAE), which were introduced with the Pentium Pro
processor.
+
PAE is not only more physical address space but also important for the
"no execute" feature which disables execution of code that is marked as
non-executable. Therefore, the PAE kernel should be used on any systems
that support it, regardless of the amount of main memory.
%endif
+
This package contains additional modules not supported by Novell.
+
%source_timestamp
%preun extra -f preun-extra.sh
@@ -710,11 +789,13 @@
%pre extra -f pre-extra.sh
%post extra -f post-extra.sh
+
%if %split_extra
%files extra -f kernel-extra.files
%defattr(-, root, root)
%endif
+
%if %CONFIG_KMSG_IDS == "y"
%package man
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:39.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:39.000000000 +0100
@@ -27,7 +27,7 @@
Group: Documentation/Man
AutoReqProv: on
Version: 2.6.33
-Release: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -78,7 +78,9 @@
cp $i $RPM_BUILD_ROOT/%{_mandir}/man9/$k
done
fi
+
ln -s /usr/share/man/man9/request_threaded_irq.9.gz $RPM_BUILD_ROOT/usr/share/man/man9/request_irq.9.gz
+
cp -a /usr/src/linux-%{version}-%{release_major}/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} .
%clean
++++++ kernel-ec2.spec ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:39.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:39.000000000 +0100
@@ -17,29 +17,36 @@
# norootforbuild
-%define srcversion 2.6.32
-%define patchversion 2.6.33-rc7
+%define srcversion 2.6.33
+%define patchversion 2.6.33
%define variant %{nil}
+
%include %_sourcedir/kernel-spec-macros
+
%define build_flavor ec2
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
+
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
+
%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
+
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
+
%ifarch %ix86 x86_64
%define install_vdso 1
%else
@@ -49,7 +56,7 @@
Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
Version: 2.6.33
-Release: 2
+Release: 3
%if %using_buildservice
%else
%endif
@@ -78,6 +85,7 @@
Requires(post): perl-Bootloader >= 0.4.15
Requires(post): mkinitrd
#!BuildIgnore: perl-Bootloader mkinitrd
+
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
@@ -96,6 +104,7 @@
%endif
#!BuildIgnore: xen
%endif
+
Provides: %name-nongpl
Obsoletes: %name-nongpl
%if %build_vanilla
@@ -115,6 +124,7 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
+
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source10: preun.sh
Source11: postun.sh
@@ -148,6 +158,7 @@
Source120: kabi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
+
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
@@ -162,6 +173,7 @@
NoSource: 110
NoSource: 111
NoSource: 120
+
# The following KMPs have been integrated into the kernel package.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
@@ -190,8 +202,10 @@
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
+
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
+
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@@ -209,33 +223,43 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
+
SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
SYMBOLS=$(cat %_sourcedir/extra-symbols)
echo "extra symbol(s):" $SYMBOLS
fi
+
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+
mkdir -p %kernel_build_dir
+
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
+
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
+
cd linux-%srcversion
+
%_sourcedir/apply-patches \
%if %{build_vanilla}
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
+
cd %kernel_build_dir
+
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
+
cp ../config/%cpu_arch_flavor .config
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
@@ -245,6 +269,7 @@
%else
--disable CONFIG_DEBUG_INFO
%endif
+
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -254,27 +279,34 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
+
make prepare $MAKE_ARGS
make scripts $MAKE_ARGS
krel=$(make -s kernelrelease $MAKE_ARGS)
+
if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
exit 1
fi
+
make clean $MAKE_ARGS
+
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
+
cat > .kernel-binary.spec.buildenv < %my_builddir/$script$sub.sh
done
done
+
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
+
cp .config %buildroot/boot/config-%kernelrelease-%build_flavor
+
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
%endif
+
# Create a dummy initrd with roughly the size the real one will have.
# That way, YaST will know that this package requires some additional
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
+
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
+
gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
+
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
@@ -449,6 +501,7 @@
%endif
echo "Consistency check error: please update supported.conf."
fi
+
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@@ -458,11 +511,13 @@
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
%endif
+
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
# so that kernel-source + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
+
# Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
@@ -470,6 +525,7 @@
else
rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
fi
+
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
@@ -477,6 +533,7 @@
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
fi
+
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
@@ -485,12 +542,14 @@
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
+
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then
exit 1
fi
+
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
@@ -499,11 +558,13 @@
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
+
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
+
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
@@ -520,6 +581,7 @@
exit 1
fi
fi
+
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -534,6 +596,7 @@
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
fi
+
add_dirs_to_filelist() {
sed -rn '
# print file name
@@ -550,6 +613,7 @@
ta
' "$@" | sort -u
}
+
# Collect the file lists.
shopt -s nullglob
+
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
+
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
+
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
@@ -586,6 +653,7 @@
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
+
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -593,6 +661,7 @@
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
+
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
@@ -604,6 +673,7 @@
%pre -f pre.sh
%post -f post.sh
+
%if %split_base
%files -f kernel-main.files
@@ -646,6 +716,7 @@
%pre base -f pre-base.sh
%post base -f post-base.sh
+
%if %split_base
%files base -f kernel-base.files
@@ -688,11 +759,13 @@
%pre extra -f pre-extra.sh
%post extra -f post-extra.sh
+
%if %split_extra
%files extra -f kernel-extra.files
%defattr(-, root, root)
%endif
+
%if %CONFIG_KMSG_IDS == "y"
%package man
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:39.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:39.000000000 +0100
@@ -17,29 +17,36 @@
# norootforbuild
-%define srcversion 2.6.32
-%define patchversion 2.6.33-rc7
+%define srcversion 2.6.33
+%define patchversion 2.6.33
%define variant %{nil}
+
%include %_sourcedir/kernel-spec-macros
+
%define build_flavor pae
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
+
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
+
%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
+
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
+
%ifarch %ix86 x86_64
%define install_vdso 1
%else
@@ -49,7 +56,7 @@
Name: kernel-pae
Summary: Kernel with PAE Support
Version: 2.6.33
-Release: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -78,6 +85,7 @@
Requires(post): perl-Bootloader >= 0.4.15
Requires(post): mkinitrd
#!BuildIgnore: perl-Bootloader mkinitrd
+
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
@@ -96,6 +104,7 @@
%endif
#!BuildIgnore: xen
%endif
+
Provides: %name-nongpl
Obsoletes: %name-nongpl
%if %build_vanilla
@@ -119,6 +128,7 @@
Provides: kernel-bigsmp
Obsoletes: kernel-bigsmp
%endif
+
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source10: preun.sh
Source11: postun.sh
@@ -152,6 +162,7 @@
Source120: kabi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86
+
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
@@ -166,6 +177,7 @@
NoSource: 110
NoSource: 111
NoSource: 120
+
# The following KMPs have been integrated into the kernel package.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
@@ -194,8 +206,10 @@
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
+
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
+
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@@ -217,33 +231,43 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
+
SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
SYMBOLS=$(cat %_sourcedir/extra-symbols)
echo "extra symbol(s):" $SYMBOLS
fi
+
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+
mkdir -p %kernel_build_dir
+
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
+
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
+
cd linux-%srcversion
+
%_sourcedir/apply-patches \
%if %{build_vanilla}
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
+
cd %kernel_build_dir
+
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
+
cp ../config/%cpu_arch_flavor .config
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
@@ -253,6 +277,7 @@
%else
--disable CONFIG_DEBUG_INFO
%endif
+
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -262,27 +287,34 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
+
make prepare $MAKE_ARGS
make scripts $MAKE_ARGS
krel=$(make -s kernelrelease $MAKE_ARGS)
+
if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
exit 1
fi
+
make clean $MAKE_ARGS
+
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
+
cat > .kernel-binary.spec.buildenv < %my_builddir/$script$sub.sh
done
done
+
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
+
cp .config %buildroot/boot/config-%kernelrelease-%build_flavor
+
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
%endif
+
# Create a dummy initrd with roughly the size the real one will have.
# That way, YaST will know that this package requires some additional
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
+
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
+
gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
+
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
@@ -457,6 +509,7 @@
%endif
echo "Consistency check error: please update supported.conf."
fi
+
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@@ -466,11 +519,13 @@
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
%endif
+
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
# so that kernel-source + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
+
# Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
@@ -478,6 +533,7 @@
else
rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
fi
+
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
@@ -485,6 +541,7 @@
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
fi
+
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
@@ -493,12 +550,14 @@
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
+
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then
exit 1
fi
+
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
@@ -507,11 +566,13 @@
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
+
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
+
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
@@ -528,6 +589,7 @@
exit 1
fi
fi
+
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -542,6 +604,7 @@
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
fi
+
add_dirs_to_filelist() {
sed -rn '
# print file name
@@ -558,6 +621,7 @@
ta
' "$@" | sort -u
}
+
# Collect the file lists.
shopt -s nullglob
+
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
+
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
+
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
@@ -594,6 +661,7 @@
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
+
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -601,6 +669,7 @@
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
+
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
@@ -612,6 +681,7 @@
%pre -f pre.sh
%post -f post.sh
+
%if %split_base
%files -f kernel-main.files
@@ -658,6 +728,7 @@
%pre base -f pre-base.sh
%post base -f post-base.sh
+
%if %split_base
%files base -f kernel-base.files
@@ -704,11 +775,13 @@
%pre extra -f pre-extra.sh
%post extra -f post-extra.sh
+
%if %split_extra
%files extra -f kernel-extra.files
%defattr(-, root, root)
%endif
+
%if %CONFIG_KMSG_IDS == "y"
%package man
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:39.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:39.000000000 +0100
@@ -17,29 +17,36 @@
# norootforbuild
-%define srcversion 2.6.32
-%define patchversion 2.6.33-rc7
+%define srcversion 2.6.33
+%define patchversion 2.6.33
%define variant %{nil}
+
%include %_sourcedir/kernel-spec-macros
+
%define build_flavor ppc64
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
+
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
+
%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
+
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
+
%ifarch %ix86 x86_64
%define install_vdso 1
%else
@@ -49,7 +56,7 @@
Name: kernel-ppc64
Summary: Kernel for ppc64 Systems
Version: 2.6.33
-Release: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -78,6 +85,7 @@
Requires(post): perl-Bootloader >= 0.4.15
Requires(post): mkinitrd
#!BuildIgnore: perl-Bootloader mkinitrd
+
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
@@ -96,6 +104,7 @@
%endif
#!BuildIgnore: xen
%endif
+
Provides: %name-nongpl
Obsoletes: %name-nongpl
%if %build_vanilla
@@ -123,6 +132,7 @@
Provides: kernel-kdump
Obsoletes: kernel-kdump
%endif
+
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source10: preun.sh
Source11: postun.sh
@@ -156,6 +166,7 @@
Source120: kabi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: ppc ppc64
+
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
@@ -170,6 +181,7 @@
NoSource: 110
NoSource: 111
NoSource: 120
+
# The following KMPs have been integrated into the kernel package.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
@@ -198,8 +210,10 @@
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
+
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
+
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@@ -221,33 +235,43 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
+
SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
SYMBOLS=$(cat %_sourcedir/extra-symbols)
echo "extra symbol(s):" $SYMBOLS
fi
+
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+
mkdir -p %kernel_build_dir
+
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
+
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
+
cd linux-%srcversion
+
%_sourcedir/apply-patches \
%if %{build_vanilla}
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
+
cd %kernel_build_dir
+
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
+
cp ../config/%cpu_arch_flavor .config
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
@@ -257,6 +281,7 @@
%else
--disable CONFIG_DEBUG_INFO
%endif
+
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -266,27 +291,34 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
+
make prepare $MAKE_ARGS
make scripts $MAKE_ARGS
krel=$(make -s kernelrelease $MAKE_ARGS)
+
if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
exit 1
fi
+
make clean $MAKE_ARGS
+
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
+
cat > .kernel-binary.spec.buildenv < %my_builddir/$script$sub.sh
done
done
+
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
+
cp .config %buildroot/boot/config-%kernelrelease-%build_flavor
+
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
%endif
+
# Create a dummy initrd with roughly the size the real one will have.
# That way, YaST will know that this package requires some additional
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
+
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
+
gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
+
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
@@ -461,6 +513,7 @@
%endif
echo "Consistency check error: please update supported.conf."
fi
+
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@@ -470,11 +523,13 @@
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
%endif
+
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
# so that kernel-source + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
+
# Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
@@ -482,6 +537,7 @@
else
rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
fi
+
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
@@ -489,6 +545,7 @@
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
fi
+
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
@@ -497,12 +554,14 @@
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
+
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then
exit 1
fi
+
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
@@ -511,11 +570,13 @@
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
+
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
+
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
@@ -532,6 +593,7 @@
exit 1
fi
fi
+
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -546,6 +608,7 @@
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
fi
+
add_dirs_to_filelist() {
sed -rn '
# print file name
@@ -562,6 +625,7 @@
ta
' "$@" | sort -u
}
+
# Collect the file lists.
shopt -s nullglob
+
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
+
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
+
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
@@ -598,6 +665,7 @@
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
+
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -605,6 +673,7 @@
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
+
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
@@ -616,6 +685,7 @@
%pre -f pre.sh
%post -f post.sh
+
%if %split_base
%files -f kernel-main.files
@@ -662,6 +732,7 @@
%pre base -f pre-base.sh
%post base -f post-base.sh
+
%if %split_base
%files base -f kernel-base.files
@@ -708,11 +779,13 @@
%pre extra -f pre-extra.sh
%post extra -f post-extra.sh
+
%if %split_extra
%files extra -f kernel-extra.files
%defattr(-, root, root)
%endif
+
%if %CONFIG_KMSG_IDS == "y"
%package man
++++++ kernel-ps3.spec ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100
@@ -17,29 +17,36 @@
# norootforbuild
-%define srcversion 2.6.32
-%define patchversion 2.6.33-rc7
+%define srcversion 2.6.33
+%define patchversion 2.6.33
%define variant %{nil}
+
%include %_sourcedir/kernel-spec-macros
+
%define build_flavor ps3
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
+
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
+
%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
+
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
+
%ifarch %ix86 x86_64
%define install_vdso 1
%else
@@ -49,7 +56,7 @@
Name: kernel-ps3
Summary: kernel for ps3 bootloader
Version: 2.6.33
-Release: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -78,6 +85,7 @@
Requires(post): perl-Bootloader >= 0.4.15
Requires(post): mkinitrd
#!BuildIgnore: perl-Bootloader mkinitrd
+
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
@@ -96,6 +104,7 @@
%endif
#!BuildIgnore: xen
%endif
+
Provides: %name-nongpl
Obsoletes: %name-nongpl
%if %build_vanilla
@@ -115,6 +124,7 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
+
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source10: preun.sh
Source11: postun.sh
@@ -148,6 +158,7 @@
Source120: kabi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: ppc
+
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
@@ -162,6 +173,7 @@
NoSource: 110
NoSource: 111
NoSource: 120
+
# The following KMPs have been integrated into the kernel package.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
@@ -190,8 +202,10 @@
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
+
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
+
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@@ -209,33 +223,43 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
+
SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
SYMBOLS=$(cat %_sourcedir/extra-symbols)
echo "extra symbol(s):" $SYMBOLS
fi
+
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+
mkdir -p %kernel_build_dir
+
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
+
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
+
cd linux-%srcversion
+
%_sourcedir/apply-patches \
%if %{build_vanilla}
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
+
cd %kernel_build_dir
+
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
+
cp ../config/%cpu_arch_flavor .config
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
@@ -245,6 +269,7 @@
%else
--disable CONFIG_DEBUG_INFO
%endif
+
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -254,27 +279,34 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
+
make prepare $MAKE_ARGS
make scripts $MAKE_ARGS
krel=$(make -s kernelrelease $MAKE_ARGS)
+
if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
exit 1
fi
+
make clean $MAKE_ARGS
+
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
+
cat > .kernel-binary.spec.buildenv < %my_builddir/$script$sub.sh
done
done
+
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
+
cp .config %buildroot/boot/config-%kernelrelease-%build_flavor
+
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
%endif
+
# Create a dummy initrd with roughly the size the real one will have.
# That way, YaST will know that this package requires some additional
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
+
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
+
gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
+
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
@@ -449,6 +501,7 @@
%endif
echo "Consistency check error: please update supported.conf."
fi
+
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@@ -458,11 +511,13 @@
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
%endif
+
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
# so that kernel-source + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
+
# Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
@@ -470,6 +525,7 @@
else
rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
fi
+
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
@@ -477,6 +533,7 @@
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
fi
+
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
@@ -485,12 +542,14 @@
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
+
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then
exit 1
fi
+
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
@@ -499,11 +558,13 @@
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
+
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
+
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
@@ -520,6 +581,7 @@
exit 1
fi
fi
+
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -534,6 +596,7 @@
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
fi
+
add_dirs_to_filelist() {
sed -rn '
# print file name
@@ -550,6 +613,7 @@
ta
' "$@" | sort -u
}
+
# Collect the file lists.
shopt -s nullglob
+
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
+
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
+
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
@@ -586,6 +653,7 @@
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
+
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -593,6 +661,7 @@
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
+
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
@@ -604,6 +673,7 @@
%pre -f pre.sh
%post -f post.sh
+
%if %split_base
%files -f kernel-main.files
@@ -646,6 +716,7 @@
%pre base -f pre-base.sh
%post base -f post-base.sh
+
%if %split_base
%files base -f kernel-base.files
@@ -688,11 +759,13 @@
%pre extra -f pre-extra.sh
%post extra -f post-extra.sh
+
%if %split_extra
%files extra -f kernel-extra.files
%defattr(-, root, root)
%endif
+
%if %CONFIG_KMSG_IDS == "y"
%package man
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100
@@ -17,29 +17,36 @@
# norootforbuild
-%define srcversion 2.6.32
-%define patchversion 2.6.33-rc7
+%define srcversion 2.6.33
+%define patchversion 2.6.33
%define variant %{nil}
+
%include %_sourcedir/kernel-spec-macros
+
%define build_flavor s390
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
+
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
+
%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
+
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
+
%ifarch %ix86 x86_64
%define install_vdso 1
%else
@@ -49,7 +56,7 @@
Name: kernel-s390
Summary: The Standard Kernel
Version: 2.6.33
-Release: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -78,6 +85,7 @@
Requires(post): perl-Bootloader >= 0.4.15
Requires(post): mkinitrd
#!BuildIgnore: perl-Bootloader mkinitrd
+
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
@@ -96,6 +104,7 @@
%endif
#!BuildIgnore: xen
%endif
+
Provides: %name-nongpl
Obsoletes: %name-nongpl
%if %build_vanilla
@@ -119,6 +128,7 @@
Provides: kernel-32bit
Obsoletes: kernel-32bit
%endif
+
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source10: preun.sh
Source11: postun.sh
@@ -152,6 +162,7 @@
Source120: kabi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: s390
+
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
@@ -166,6 +177,7 @@
NoSource: 110
NoSource: 111
NoSource: 120
+
# The following KMPs have been integrated into the kernel package.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
@@ -194,8 +206,10 @@
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
+
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
+
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@@ -210,33 +224,43 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
+
SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
SYMBOLS=$(cat %_sourcedir/extra-symbols)
echo "extra symbol(s):" $SYMBOLS
fi
+
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+
mkdir -p %kernel_build_dir
+
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
+
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
+
cd linux-%srcversion
+
%_sourcedir/apply-patches \
%if %{build_vanilla}
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
+
cd %kernel_build_dir
+
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
+
cp ../config/%cpu_arch_flavor .config
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
@@ -246,6 +270,7 @@
%else
--disable CONFIG_DEBUG_INFO
%endif
+
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -255,27 +280,34 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
+
make prepare $MAKE_ARGS
make scripts $MAKE_ARGS
krel=$(make -s kernelrelease $MAKE_ARGS)
+
if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
exit 1
fi
+
make clean $MAKE_ARGS
+
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
+
cat > .kernel-binary.spec.buildenv < %my_builddir/$script$sub.sh
done
done
+
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
+
cp .config %buildroot/boot/config-%kernelrelease-%build_flavor
+
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
%endif
+
# Create a dummy initrd with roughly the size the real one will have.
# That way, YaST will know that this package requires some additional
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
+
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
+
gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
+
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
@@ -450,6 +502,7 @@
%endif
echo "Consistency check error: please update supported.conf."
fi
+
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@@ -459,11 +512,13 @@
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
%endif
+
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
# so that kernel-source + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
+
# Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
@@ -471,6 +526,7 @@
else
rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
fi
+
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
@@ -478,6 +534,7 @@
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
fi
+
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
@@ -486,12 +543,14 @@
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
+
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then
exit 1
fi
+
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
@@ -500,11 +559,13 @@
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
+
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
+
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
@@ -521,6 +582,7 @@
exit 1
fi
fi
+
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -535,6 +597,7 @@
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
fi
+
add_dirs_to_filelist() {
sed -rn '
# print file name
@@ -551,6 +614,7 @@
ta
' "$@" | sort -u
}
+
# Collect the file lists.
shopt -s nullglob
+
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
+
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
+
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
@@ -587,6 +654,7 @@
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
+
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -594,6 +662,7 @@
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
+
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
@@ -605,6 +674,7 @@
%pre -f pre.sh
%post -f post.sh
+
%if %split_base
%files -f kernel-main.files
@@ -644,6 +714,7 @@
%pre base -f pre-base.sh
%post base -f post-base.sh
+
%if %split_base
%files base -f kernel-base.files
@@ -683,11 +754,13 @@
%pre extra -f pre-extra.sh
%post extra -f post-extra.sh
+
%if %split_extra
%files extra -f kernel-extra.files
%defattr(-, root, root)
%endif
+
%if %CONFIG_KMSG_IDS == "y"
%package man
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100
@@ -18,10 +18,12 @@
# norootforbuild
# icecream 0
-%define srcversion 2.6.32
-%define patchversion 2.6.33-rc7
+%define srcversion 2.6.33
+%define patchversion 2.6.33
%define variant %{nil}
+
%include %_sourcedir/kernel-spec-macros
+
%define src_install_dir usr/src/linux-%kernelrelease%variant
%define obj_install_dir /%src_install_dir-obj
%define rpm_install_dir %buildroot%real_install_dir
@@ -29,7 +31,7 @@
Name: kernel-source
Summary: The Linux Kernel Sources
Version: 2.6.33
-Release: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -98,9 +100,12 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Prefix: /usr/src
+
%(chmod +x %_sourcedir/{apply-patches,guards,check-for-config-changes,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
+
%define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac)
+
%define do_vanilla "%variant" == ""
%description
@@ -125,7 +130,9 @@
echo "Please get a copy of linux-%srcversion.tar.bz2 from" \
"ftp://ftp.kernel.org/pub/linux/kernel/v2.6/."
fi
+
echo "Symbol(s): %symbols"
+
# Unpack all sources and patches
%setup -q -c -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113
@@ -135,12 +142,16 @@
while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do
RELEASE=${RELEASE#[^0-9]*.}
done
+
mkdir -p $RPM_BUILD_ROOT/usr/src
cd $RPM_BUILD_ROOT/usr/src
+
ln -sf linux%variant linux%variant # dummy symlink
+
# Unpack the vanilla kernel sources
tar xjf %_sourcedir/linux-%srcversion.tar.bz2
mv linux-%srcversion linux-%kernelrelease%variant
+
%if %do_vanilla
cp -al linux-%kernelrelease%variant linux-%kernelrelease-vanilla
cd linux-%kernelrelease-vanilla
@@ -148,12 +159,15 @@
rm -f $(find . -name ".gitignore")
cd ..
%endif
+
cd linux-%kernelrelease%variant
%_sourcedir/apply-patches %_sourcedir/series.conf %my_builddir %symbols
rm -f $(find . -name ".gitignore")
+
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
+
# Hardlink duplicate files automatically (from package fdupes).
%fdupes $RPM_BUILD_ROOT
@@ -163,11 +177,13 @@
mkdir -p $DOC
cp %_sourcedir/README.SUSE $DOC
ln -s /usr/share/doc/packages/%name/README.SUSE %buildroot/%src_install_dir/
+
install -m 755 -d $RPM_BUILD_ROOT/etc/rpm
install -m 644 %_sourcedir/macros.kernel-source $RPM_BUILD_ROOT/etc/rpm/
install -m 755 -d $RPM_BUILD_ROOT/usr/lib/rpm
install -m 644 %_sourcedir/kernel-module-subpackage \
$RPM_BUILD_ROOT/usr/lib/rpm/
+
for script in post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@SRCVARIANT@:%variant:g" \
@@ -183,6 +199,7 @@
/etc/rpm/macros.kernel-source
/usr/lib/rpm/kernel-module-subpackage
/%src_install_dir
+
%if %do_vanilla
%files vanilla
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100
@@ -18,12 +18,13 @@
# norootforbuild
%define variant %{nil}
+
%include %_sourcedir/kernel-spec-macros
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
Version: 2.6.33
-Release: 3
+Release: 4
%if %using_buildservice
%else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
++++++ kernel-trace.spec ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100
@@ -17,29 +17,36 @@
# norootforbuild
-%define srcversion 2.6.32
-%define patchversion 2.6.33-rc7
+%define srcversion 2.6.33
+%define patchversion 2.6.33
%define variant %{nil}
+
%include %_sourcedir/kernel-spec-macros
+
%define build_flavor trace
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
+
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
+
%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
+
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
+
%ifarch %ix86 x86_64
%define install_vdso 1
%else
@@ -49,7 +56,7 @@
Name: kernel-trace
Summary: The Realtime Linux Kernel
Version: 2.6.33
-Release: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -78,6 +85,7 @@
Requires(post): perl-Bootloader >= 0.4.15
Requires(post): mkinitrd
#!BuildIgnore: perl-Bootloader mkinitrd
+
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
@@ -96,6 +104,7 @@
%endif
#!BuildIgnore: xen
%endif
+
Provides: %name-nongpl
Obsoletes: %name-nongpl
%if %build_vanilla
@@ -127,6 +136,7 @@
Provides: kernel-64bit
Obsoletes: kernel-64bit
%endif
+
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source10: preun.sh
Source11: postun.sh
@@ -160,6 +170,7 @@
Source120: kabi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 ppc64 s390 s390x x86_64
+
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
@@ -174,6 +185,7 @@
NoSource: 110
NoSource: 111
NoSource: 120
+
# The following KMPs have been integrated into the kernel package.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
@@ -202,8 +214,10 @@
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
+
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
+
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@@ -218,33 +232,43 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
+
SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
SYMBOLS=$(cat %_sourcedir/extra-symbols)
echo "extra symbol(s):" $SYMBOLS
fi
+
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+
mkdir -p %kernel_build_dir
+
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
+
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
+
cd linux-%srcversion
+
%_sourcedir/apply-patches \
%if %{build_vanilla}
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
+
cd %kernel_build_dir
+
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
+
cp ../config/%cpu_arch_flavor .config
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
@@ -254,6 +278,7 @@
%else
--disable CONFIG_DEBUG_INFO
%endif
+
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -263,27 +288,34 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
+
make prepare $MAKE_ARGS
make scripts $MAKE_ARGS
krel=$(make -s kernelrelease $MAKE_ARGS)
+
if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
exit 1
fi
+
make clean $MAKE_ARGS
+
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
+
cat > .kernel-binary.spec.buildenv < %my_builddir/$script$sub.sh
done
done
+
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
+
cp .config %buildroot/boot/config-%kernelrelease-%build_flavor
+
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
%endif
+
# Create a dummy initrd with roughly the size the real one will have.
# That way, YaST will know that this package requires some additional
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
+
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
+
gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
+
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
@@ -458,6 +510,7 @@
%endif
echo "Consistency check error: please update supported.conf."
fi
+
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@@ -467,11 +520,13 @@
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
%endif
+
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
# so that kernel-source + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
+
# Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
@@ -479,6 +534,7 @@
else
rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
fi
+
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
@@ -486,6 +542,7 @@
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
fi
+
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
@@ -494,12 +551,14 @@
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
+
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then
exit 1
fi
+
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
@@ -508,11 +567,13 @@
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
+
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
+
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
@@ -529,6 +590,7 @@
exit 1
fi
fi
+
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -543,6 +605,7 @@
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
fi
+
add_dirs_to_filelist() {
sed -rn '
# print file name
@@ -559,6 +622,7 @@
ta
' "$@" | sort -u
}
+
# Collect the file lists.
shopt -s nullglob
+
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
+
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
+
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
@@ -595,6 +662,7 @@
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
+
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -602,6 +670,7 @@
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
+
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
@@ -613,6 +682,7 @@
%pre -f pre.sh
%post -f post.sh
+
%if %split_base
%files -f kernel-main.files
@@ -652,6 +722,7 @@
%pre base -f pre-base.sh
%post base -f post-base.sh
+
%if %split_base
%files base -f kernel-base.files
@@ -691,11 +762,13 @@
%pre extra -f pre-extra.sh
%post extra -f post-extra.sh
+
%if %split_extra
%files extra -f kernel-extra.files
%defattr(-, root, root)
%endif
+
%if %CONFIG_KMSG_IDS == "y"
%package man
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100
@@ -17,29 +17,36 @@
# norootforbuild
-%define srcversion 2.6.32
-%define patchversion 2.6.33-rc7
+%define srcversion 2.6.33
+%define patchversion 2.6.33
%define variant %{nil}
+
%include %_sourcedir/kernel-spec-macros
+
%define build_flavor vanilla
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
+
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
+
%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
+
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
+
%ifarch %ix86 x86_64
%define install_vdso 1
%else
@@ -49,7 +56,7 @@
Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
Version: 2.6.33
-Release: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -78,6 +85,7 @@
Requires(post): perl-Bootloader >= 0.4.15
Requires(post): mkinitrd
#!BuildIgnore: perl-Bootloader mkinitrd
+
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
@@ -96,6 +104,7 @@
%endif
#!BuildIgnore: xen
%endif
+
Provides: %name-nongpl
Obsoletes: %name-nongpl
%if %build_vanilla
@@ -123,6 +132,7 @@
Provides: kernel-64bit
Obsoletes: kernel-64bit
%endif
+
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source10: preun.sh
Source11: postun.sh
@@ -156,6 +166,7 @@
Source120: kabi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 ppc ppc64 s390 s390x x86_64
+
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
@@ -170,6 +181,7 @@
NoSource: 110
NoSource: 111
NoSource: 120
+
# The following KMPs have been integrated into the kernel package.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
@@ -198,8 +210,10 @@
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
+
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
+
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@@ -214,33 +228,43 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
+
SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
SYMBOLS=$(cat %_sourcedir/extra-symbols)
echo "extra symbol(s):" $SYMBOLS
fi
+
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+
mkdir -p %kernel_build_dir
+
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
+
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
+
cd linux-%srcversion
+
%_sourcedir/apply-patches \
%if %{build_vanilla}
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
+
cd %kernel_build_dir
+
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
+
cp ../config/%cpu_arch_flavor .config
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
@@ -250,6 +274,7 @@
%else
--disable CONFIG_DEBUG_INFO
%endif
+
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -259,27 +284,34 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
+
make prepare $MAKE_ARGS
make scripts $MAKE_ARGS
krel=$(make -s kernelrelease $MAKE_ARGS)
+
if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
exit 1
fi
+
make clean $MAKE_ARGS
+
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
+
cat > .kernel-binary.spec.buildenv < %my_builddir/$script$sub.sh
done
done
+
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
+
cp .config %buildroot/boot/config-%kernelrelease-%build_flavor
+
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
%endif
+
# Create a dummy initrd with roughly the size the real one will have.
# That way, YaST will know that this package requires some additional
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
+
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
+
gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
+
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
@@ -454,6 +506,7 @@
%endif
echo "Consistency check error: please update supported.conf."
fi
+
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@@ -463,11 +516,13 @@
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
%endif
+
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
# so that kernel-source + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
+
# Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
@@ -475,6 +530,7 @@
else
rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
fi
+
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
@@ -482,6 +538,7 @@
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
fi
+
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
@@ -490,12 +547,14 @@
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
+
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then
exit 1
fi
+
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
@@ -504,11 +563,13 @@
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
+
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
+
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
@@ -525,6 +586,7 @@
exit 1
fi
fi
+
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -539,6 +601,7 @@
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
fi
+
add_dirs_to_filelist() {
sed -rn '
# print file name
@@ -555,6 +618,7 @@
ta
' "$@" | sort -u
}
+
# Collect the file lists.
shopt -s nullglob
+
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
+
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
+
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
@@ -591,6 +658,7 @@
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
+
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -598,6 +666,7 @@
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
+
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
@@ -609,6 +678,7 @@
%pre -f pre.sh
%post -f post.sh
+
%if %split_base
%files -f kernel-main.files
@@ -648,6 +718,7 @@
%pre base -f pre-base.sh
%post base -f post-base.sh
+
%if %split_base
%files base -f kernel-base.files
@@ -687,11 +758,13 @@
%pre extra -f pre-extra.sh
%post extra -f post-extra.sh
+
%if %split_extra
%files extra -f kernel-extra.files
%defattr(-, root, root)
%endif
+
%if %CONFIG_KMSG_IDS == "y"
%package man
++++++ kernel-vmi.spec ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100
@@ -17,29 +17,36 @@
# norootforbuild
-%define srcversion 2.6.32
-%define patchversion 2.6.33-rc7
+%define srcversion 2.6.33
+%define patchversion 2.6.33
%define variant %{nil}
+
%include %_sourcedir/kernel-spec-macros
+
%define build_flavor vmi
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
+
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
+
%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
+
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
+
%ifarch %ix86 x86_64
%define install_vdso 1
%else
@@ -49,7 +56,7 @@
Name: kernel-vmi
Summary: VMI-enabled kernel
Version: 2.6.33
-Release: 3
+Release: 4
%if %using_buildservice
%else
%endif
@@ -78,6 +85,7 @@
Requires(post): perl-Bootloader >= 0.4.15
Requires(post): mkinitrd
#!BuildIgnore: perl-Bootloader mkinitrd
+
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
@@ -96,6 +104,7 @@
%endif
#!BuildIgnore: xen
%endif
+
Provides: %name-nongpl
Obsoletes: %name-nongpl
%if %build_vanilla
@@ -115,6 +124,7 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
+
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source10: preun.sh
Source11: postun.sh
@@ -148,6 +158,7 @@
Source120: kabi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86
+
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
@@ -162,6 +173,7 @@
NoSource: 110
NoSource: 111
NoSource: 120
+
# The following KMPs have been integrated into the kernel package.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
@@ -190,8 +202,10 @@
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
+
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
+
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@@ -207,33 +221,43 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
+
SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
SYMBOLS=$(cat %_sourcedir/extra-symbols)
echo "extra symbol(s):" $SYMBOLS
fi
+
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+
mkdir -p %kernel_build_dir
+
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
+
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
+
cd linux-%srcversion
+
%_sourcedir/apply-patches \
%if %{build_vanilla}
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
+
cd %kernel_build_dir
+
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
+
cp ../config/%cpu_arch_flavor .config
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
@@ -243,6 +267,7 @@
%else
--disable CONFIG_DEBUG_INFO
%endif
+
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -252,27 +277,34 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
+
make prepare $MAKE_ARGS
make scripts $MAKE_ARGS
krel=$(make -s kernelrelease $MAKE_ARGS)
+
if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
exit 1
fi
+
make clean $MAKE_ARGS
+
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
+
cat > .kernel-binary.spec.buildenv < %my_builddir/$script$sub.sh
done
done
+
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
+
cp .config %buildroot/boot/config-%kernelrelease-%build_flavor
+
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
%endif
+
# Create a dummy initrd with roughly the size the real one will have.
# That way, YaST will know that this package requires some additional
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
+
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
+
gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
+
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
@@ -447,6 +499,7 @@
%endif
echo "Consistency check error: please update supported.conf."
fi
+
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@@ -456,11 +509,13 @@
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
%endif
+
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
# so that kernel-source + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
+
# Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
@@ -468,6 +523,7 @@
else
rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
fi
+
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
@@ -475,6 +531,7 @@
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
fi
+
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
@@ -483,12 +540,14 @@
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
+
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then
exit 1
fi
+
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
@@ -497,11 +556,13 @@
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
+
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
+
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
@@ -518,6 +579,7 @@
exit 1
fi
fi
+
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -532,6 +594,7 @@
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
fi
+
add_dirs_to_filelist() {
sed -rn '
# print file name
@@ -548,6 +611,7 @@
ta
' "$@" | sort -u
}
+
# Collect the file lists.
shopt -s nullglob
+
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
+
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
+
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
@@ -584,6 +651,7 @@
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
+
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -591,6 +659,7 @@
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
+
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
@@ -602,6 +671,7 @@
%pre -f pre.sh
%post -f post.sh
+
%if %split_base
%files -f kernel-main.files
@@ -642,6 +712,7 @@
%pre base -f pre-base.sh
%post base -f post-base.sh
+
%if %split_base
%files base -f kernel-base.files
@@ -682,11 +753,13 @@
%pre extra -f pre-extra.sh
%post extra -f post-extra.sh
+
%if %split_extra
%files extra -f kernel-extra.files
%defattr(-, root, root)
%endif
+
%if %CONFIG_KMSG_IDS == "y"
%package man
++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100
@@ -17,29 +17,36 @@
# norootforbuild
-%define srcversion 2.6.32
-%define patchversion 2.6.33-rc7
+%define srcversion 2.6.33
+%define patchversion 2.6.33
%define variant %{nil}
+
%include %_sourcedir/kernel-spec-macros
+
%define build_flavor xen
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
+
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
+
%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules})
+
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
+
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar xfj %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
+
%ifarch %ix86 x86_64
%define install_vdso 1
%else
@@ -49,7 +56,7 @@
Name: kernel-xen
Summary: The Xen Kernel
Version: 2.6.33
-Release: 2
+Release: 3
%if %using_buildservice
%else
%endif
@@ -78,6 +85,7 @@
Requires(post): perl-Bootloader >= 0.4.15
Requires(post): mkinitrd
#!BuildIgnore: perl-Bootloader mkinitrd
+
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
@@ -96,6 +104,7 @@
%endif
#!BuildIgnore: xen
%endif
+
Provides: %name-nongpl
Obsoletes: %name-nongpl
%if %build_vanilla
@@ -115,6 +124,7 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
+
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source10: preun.sh
Source11: postun.sh
@@ -148,6 +158,7 @@
Source120: kabi.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
+
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
@@ -162,6 +173,7 @@
NoSource: 110
NoSource: 111
NoSource: 120
+
# The following KMPs have been integrated into the kernel package.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
@@ -190,8 +202,10 @@
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
+
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
+
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@@ -209,33 +223,43 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
+
SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
SYMBOLS=$(cat %_sourcedir/extra-symbols)
echo "extra symbol(s):" $SYMBOLS
fi
+
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
+
mkdir -p %kernel_build_dir
+
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
+
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
+
cd linux-%srcversion
+
%_sourcedir/apply-patches \
%if %{build_vanilla}
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
+
cd %kernel_build_dir
+
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
+
cp ../config/%cpu_arch_flavor .config
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
@@ -245,6 +269,7 @@
%else
--disable CONFIG_DEBUG_INFO
%endif
+
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -254,27 +279,34 @@
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
+
make prepare $MAKE_ARGS
make scripts $MAKE_ARGS
krel=$(make -s kernelrelease $MAKE_ARGS)
+
if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
exit 1
fi
+
make clean $MAKE_ARGS
+
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
+
cat > .kernel-binary.spec.buildenv < %my_builddir/$script$sub.sh
done
done
+
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
+
cp .config %buildroot/boot/config-%kernelrelease-%build_flavor
+
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
%endif
+
# Create a dummy initrd with roughly the size the real one will have.
# That way, YaST will know that this package requires some additional
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
+
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
+
gzip -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
+
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
+
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
@@ -449,6 +501,7 @@
%endif
echo "Consistency check error: please update supported.conf."
fi
+
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
@@ -458,11 +511,13 @@
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
%endif
+
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
# so that kernel-source + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
+
# Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
@@ -470,6 +525,7 @@
else
rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
fi
+
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
@@ -477,6 +533,7 @@
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
fi
+
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
@@ -485,12 +542,14 @@
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
+
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then
exit 1
fi
+
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
@@ -499,11 +558,13 @@
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
+
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
+
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
@@ -520,6 +581,7 @@
exit 1
fi
fi
+
tar cf - -T %my_builddir/obj-files | \
tar xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
@@ -534,6 +596,7 @@
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
fi
+
add_dirs_to_filelist() {
sed -rn '
# print file name
@@ -550,6 +613,7 @@
ta
' "$@" | sort -u
}
+
# Collect the file lists.
shopt -s nullglob
+
{ cd %buildroot
find boot \
\( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
-type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
-type f -printf '/%%p\n'
+
# Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
# the file gets removed when uninstalling the kernel.
echo '%%ghost /boot/initrd-%kernelrelease-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
+
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
@@ -586,6 +653,7 @@
cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
add_dirs_to_filelist >%my_builddir/kernel-base.files
rm %my_builddir/tmp
+
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
@@ -593,6 +661,7 @@
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
+
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build.
%fdupes $RPM_BUILD_ROOT
@@ -604,6 +673,7 @@
%pre -f pre.sh
%post -f post.sh
+
%if %split_base
%files -f kernel-main.files
@@ -646,6 +716,7 @@
%pre base -f pre-base.sh
%post base -f post-base.sh
+
%if %split_base
%files base -f kernel-base.files
@@ -688,11 +759,13 @@
%pre extra -f pre-extra.sh
%post extra -f post-extra.sh
+
%if %split_extra
%files extra -f kernel-extra.files
%defattr(-, root, root)
%endif
+
%if %CONFIG_KMSG_IDS == "y"
%package man
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=2.6.32
+SRCVERSION=2.6.33
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against
++++++ config.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/debug new/config/i386/debug
--- old/config/i386/debug 2010-02-12 17:37:20.000000000 +0100
+++ new/config/i386/debug 2010-02-24 21:01:18.000000000 +0100
@@ -3258,6 +3258,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -3616,7 +3617,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -5111,7 +5113,7 @@
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
# CONFIG_INTEL_TXT is not set
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/default new/config/i386/default
--- old/config/i386/default 2010-02-12 17:37:20.000000000 +0100
+++ new/config/i386/default 2010-02-24 21:01:18.000000000 +0100
@@ -3227,6 +3227,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -3585,7 +3586,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -5069,7 +5071,7 @@
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
# CONFIG_INTEL_TXT is not set
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/desktop new/config/i386/desktop
--- old/config/i386/desktop 2010-02-12 17:37:20.000000000 +0100
+++ new/config/i386/desktop 2010-02-24 21:01:18.000000000 +0100
@@ -3112,6 +3112,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -3457,7 +3458,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -4898,7 +4900,7 @@
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
# CONFIG_INTEL_TXT is not set
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/ec2 new/config/i386/ec2
--- old/config/i386/ec2 2010-02-12 17:37:20.000000000 +0100
+++ new/config/i386/ec2 2010-02-24 21:01:18.000000000 +0100
@@ -1626,7 +1626,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae
--- old/config/i386/pae 2010-02-12 17:37:20.000000000 +0100
+++ new/config/i386/pae 2010-02-24 21:01:18.000000000 +0100
@@ -3132,6 +3132,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -3477,7 +3478,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -4921,7 +4923,7 @@
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
# CONFIG_INTEL_TXT is not set
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/trace new/config/i386/trace
--- old/config/i386/trace 2010-02-12 17:37:20.000000000 +0100
+++ new/config/i386/trace 2010-02-24 21:01:18.000000000 +0100
@@ -3132,6 +3132,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -3477,7 +3478,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -4931,7 +4933,7 @@
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
# CONFIG_INTEL_TXT is not set
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/vanilla new/config/i386/vanilla
--- old/config/i386/vanilla 2010-02-12 17:37:20.000000000 +0100
+++ new/config/i386/vanilla 2010-02-24 21:01:18.000000000 +0100
@@ -3199,6 +3199,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -3557,7 +3558,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -5026,7 +5028,7 @@
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
# CONFIG_INTEL_TXT is not set
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/vmi new/config/i386/vmi
--- old/config/i386/vmi 2010-02-12 17:37:20.000000000 +0100
+++ new/config/i386/vmi 2010-02-24 21:01:18.000000000 +0100
@@ -3132,6 +3132,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -3477,7 +3478,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -4921,7 +4923,7 @@
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
# CONFIG_INTEL_TXT is not set
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/xen new/config/i386/xen
--- old/config/i386/xen 2010-02-12 17:37:20.000000000 +0100
+++ new/config/i386/xen 2010-02-24 21:01:18.000000000 +0100
@@ -2964,6 +2964,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -3309,7 +3310,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -4782,7 +4784,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/debug new/config/ia64/debug
--- old/config/ia64/debug 2010-02-12 17:37:20.000000000 +0100
+++ new/config/ia64/debug 2010-02-24 21:01:18.000000000 +0100
@@ -2637,6 +2637,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -2980,7 +2981,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -4083,7 +4085,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/default new/config/ia64/default
--- old/config/ia64/default 2010-02-12 17:37:20.000000000 +0100
+++ new/config/ia64/default 2010-02-24 21:01:18.000000000 +0100
@@ -2619,6 +2619,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -2962,7 +2963,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -4063,7 +4065,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/trace new/config/ia64/trace
--- old/config/ia64/trace 2010-02-12 17:37:20.000000000 +0100
+++ new/config/ia64/trace 2010-02-24 21:01:18.000000000 +0100
@@ -2625,6 +2625,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -2968,7 +2969,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -4069,7 +4071,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ia64/vanilla new/config/ia64/vanilla
--- old/config/ia64/vanilla 2010-02-12 17:37:20.000000000 +0100
+++ new/config/ia64/vanilla 2010-02-24 21:01:18.000000000 +0100
@@ -2605,6 +2605,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -2948,7 +2949,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -4035,7 +4037,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/default new/config/ppc/default
--- old/config/ppc/default 2010-02-12 17:37:20.000000000 +0100
+++ new/config/ppc/default 2010-02-24 21:01:18.000000000 +0100
@@ -2528,6 +2528,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -2842,7 +2843,8 @@
CONFIG_DVB_TUNER_DIB0070=m
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -3998,7 +4000,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/ppc64 new/config/ppc/ppc64
--- old/config/ppc/ppc64 2010-02-12 17:37:20.000000000 +0100
+++ new/config/ppc/ppc64 2010-02-24 21:01:18.000000000 +0100
@@ -2501,6 +2501,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -2811,7 +2812,8 @@
CONFIG_DVB_TUNER_DIB0070=m
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -3956,7 +3958,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc/vanilla new/config/ppc/vanilla
--- old/config/ppc/vanilla 2010-02-12 17:37:20.000000000 +0100
+++ new/config/ppc/vanilla 2010-02-24 21:01:18.000000000 +0100
@@ -2516,6 +2516,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -2830,7 +2831,8 @@
CONFIG_DVB_TUNER_DIB0070=m
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -3983,7 +3985,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/debug new/config/ppc64/debug
--- old/config/ppc64/debug 2010-02-12 17:37:20.000000000 +0100
+++ new/config/ppc64/debug 2010-02-24 21:01:18.000000000 +0100
@@ -2458,6 +2458,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -2768,7 +2769,8 @@
CONFIG_DVB_TUNER_DIB0070=m
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -3920,7 +3922,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/default new/config/ppc64/default
--- old/config/ppc64/default 2010-02-12 17:37:20.000000000 +0100
+++ new/config/ppc64/default 2010-02-24 21:01:18.000000000 +0100
@@ -2446,6 +2446,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -2756,7 +2757,8 @@
CONFIG_DVB_TUNER_DIB0070=m
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -3904,7 +3906,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/ppc64 new/config/ppc64/ppc64
--- old/config/ppc64/ppc64 2010-02-12 17:37:20.000000000 +0100
+++ new/config/ppc64/ppc64 2010-02-24 21:01:18.000000000 +0100
@@ -2501,6 +2501,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -2811,7 +2812,8 @@
CONFIG_DVB_TUNER_DIB0070=m
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -3962,7 +3964,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/trace new/config/ppc64/trace
--- old/config/ppc64/trace 2010-02-12 17:37:20.000000000 +0100
+++ new/config/ppc64/trace 2010-02-24 21:01:18.000000000 +0100
@@ -2501,6 +2501,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -2811,7 +2812,8 @@
CONFIG_DVB_TUNER_DIB0070=m
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -3971,7 +3973,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/vanilla new/config/ppc64/vanilla
--- old/config/ppc64/vanilla 2010-02-12 17:37:20.000000000 +0100
+++ new/config/ppc64/vanilla 2010-02-24 21:01:18.000000000 +0100
@@ -2433,6 +2433,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -2743,7 +2744,8 @@
CONFIG_DVB_TUNER_DIB0070=m
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -3881,7 +3883,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390/s390 new/config/s390/s390
--- old/config/s390/s390 2010-02-12 17:37:20.000000000 +0100
+++ new/config/s390/s390 2010-02-24 21:01:18.000000000 +0100
@@ -1410,7 +1410,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390/trace new/config/s390/trace
--- old/config/s390/trace 2010-02-12 17:37:20.000000000 +0100
+++ new/config/s390/trace 2010-02-24 21:01:18.000000000 +0100
@@ -1419,7 +1419,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/default new/config/s390x/default
--- old/config/s390x/default 2010-02-12 17:37:20.000000000 +0100
+++ new/config/s390x/default 2010-02-24 21:01:18.000000000 +0100
@@ -1431,7 +1431,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/trace new/config/s390x/trace
--- old/config/s390x/trace 2010-02-12 17:37:20.000000000 +0100
+++ new/config/s390x/trace 2010-02-24 21:01:18.000000000 +0100
@@ -1440,7 +1440,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/vanilla new/config/s390x/vanilla
--- old/config/s390x/vanilla 2010-02-12 17:37:20.000000000 +0100
+++ new/config/s390x/vanilla 2010-02-24 21:01:18.000000000 +0100
@@ -1417,7 +1417,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
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 2010-02-12 17:37:20.000000000 +0100
+++ new/config/x86_64/debug 2010-02-24 21:01:18.000000000 +0100
@@ -3070,6 +3070,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -3415,7 +3416,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -4847,7 +4849,7 @@
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
# CONFIG_INTEL_TXT is not set
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/default new/config/x86_64/default
--- old/config/x86_64/default 2010-02-12 17:37:20.000000000 +0100
+++ new/config/x86_64/default 2010-02-24 21:01:18.000000000 +0100
@@ -3067,6 +3067,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -3412,7 +3413,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -4839,7 +4841,7 @@
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
# CONFIG_INTEL_TXT is not set
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/desktop new/config/x86_64/desktop
--- old/config/x86_64/desktop 2010-02-12 17:37:20.000000000 +0100
+++ new/config/x86_64/desktop 2010-02-24 21:01:18.000000000 +0100
@@ -3047,6 +3047,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -3392,7 +3393,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -4816,7 +4818,7 @@
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
# CONFIG_INTEL_TXT is not set
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/ec2 new/config/x86_64/ec2
--- old/config/x86_64/ec2 2010-02-12 17:37:20.000000000 +0100
+++ new/config/x86_64/ec2 2010-02-24 21:01:18.000000000 +0100
@@ -1607,7 +1607,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/trace new/config/x86_64/trace
--- old/config/x86_64/trace 2010-02-12 17:37:20.000000000 +0100
+++ new/config/x86_64/trace 2010-02-24 21:01:18.000000000 +0100
@@ -3067,6 +3067,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -3412,7 +3413,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -4849,7 +4851,7 @@
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
# CONFIG_INTEL_TXT is not set
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/vanilla new/config/x86_64/vanilla
--- old/config/x86_64/vanilla 2010-02-12 17:37:20.000000000 +0100
+++ new/config/x86_64/vanilla 2010-02-24 21:01:18.000000000 +0100
@@ -3038,6 +3038,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -3383,7 +3384,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -4795,7 +4797,7 @@
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
# CONFIG_INTEL_TXT is not set
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/xen new/config/x86_64/xen
--- old/config/x86_64/xen 2010-02-12 17:37:20.000000000 +0100
+++ new/config/x86_64/xen 2010-02-24 21:01:18.000000000 +0100
@@ -2918,6 +2918,7 @@
CONFIG_MEDIA_TUNER_MXL5005S=m
CONFIG_MEDIA_TUNER_MXL5007T=m
CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
@@ -3263,7 +3264,8 @@
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
@@ -4718,7 +4720,7 @@
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_LSM_MMAP_MIN_ADDR=4096
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
++++++ kabi.pl ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100
@@ -7,6 +7,7 @@
# ( { sym => regexp, mod => regexp, fail => 0/1 }, ... )
my @rules;
+my ($opt_verbose, $opt_rules);
sub load_rules {
my $file = shift;
@@ -82,6 +83,7 @@
last;
}
}
+ return unless $fail or $opt_verbose;
print STDERR "KABI: symbol $sym($mod) ";
if ($newcrc) {
print STDERR "changed crc from $oldcrc to $newcrc"
@@ -100,7 +102,6 @@
open($_[0], $_[1], @_[2..$#_]) or die "$_[2]: $!\n";
}
-my ($opt_verbose, $opt_rules);
my $res = GetOptions(
'verbose|v' => \$opt_verbose,
'rules|r=s' => \$opt_rules,
++++++ linux-2.6.32.tar.bz2 -> linux-2.6.33.tar.bz2 ++++++
kernel-source/linux-2.6.32.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/linux-2.6.33.tar.bz2 differ: char 11, line 1
++++++ minmem ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:40.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:40.000000000 +0100
@@ -1 +1 @@
-2096000
+1048576
++++++ needed_space_in_mb ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:41.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:41.000000000 +0100
@@ -1 +1 @@
-6000
+6144
++++++ patches.drivers.tar.bz2 ++++++
++++ 4543 lines of diff (skipped)
++++++ patches.fixes.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/acpi_pci_hot_plug_sanity_checks.patch new/patches.fixes/acpi_pci_hot_plug_sanity_checks.patch
--- old/patches.fixes/acpi_pci_hot_plug_sanity_checks.patch 2010-02-12 17:10:51.000000000 +0100
+++ new/patches.fixes/acpi_pci_hot_plug_sanity_checks.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,95 +0,0 @@
-From: Thomas Renninger
-Subject: ACPI: acpi_bus_{scan,bus,add}: return -ENODEV if no device was found
-Patch-Mainline: queued for 2.6.34
-References: bnc#531547
-
-Callers (acpi_memhotplug.c, dock.c and others) check for the return
-value of acpi_bus_add() and assume a valid device was returned in
-case zero was returned.
-
-Thus return -ENODEV if no device was found in acpi_bus_scan and
-propagate this through acpi_bus_add and acpi_bus_start.
-
-Also remove a confusing comment in acpiphp_glue.c, acpi_bus_scan
-will and cannot invoke if acpi_bus_add returns no valid device.
-
-
-Signed-off-by: Thomas Renninger
-CC: bjorn.helgaas@hp.com
-CC: lenb@kernel.org
-CC: linux-acpi@vger.kernel.org
-CC: kristen.c.accardi@intel.com
-
----
- drivers/acpi/scan.c | 24 +++++++++++++++++++-----
- drivers/pci/hotplug/acpiphp_glue.c | 6 ------
- 2 files changed, 19 insertions(+), 11 deletions(-)
-
-Index: linux-2.6.32-SLE11-SP1/drivers/acpi/scan.c
-===================================================================
---- linux-2.6.32-SLE11-SP1.orig/drivers/acpi/scan.c
-+++ linux-2.6.32-SLE11-SP1/drivers/acpi/scan.c
-@@ -1361,9 +1361,25 @@ static int acpi_bus_scan(acpi_handle han
-
- if (child)
- *child = device;
-- return 0;
-+
-+ if (device)
-+ return 0;
-+ else
-+ return -ENODEV;
- }
-
-+/*
-+ * acpi_bus_add and acpi_bus_start
-+ *
-+ * scan a given ACPI tree and (probably recently hot-plugged)
-+ * create and add or starts found devices.
-+ *
-+ * If no devices were found -ENODEV is returned which does not
-+ * mean that this is a real error, there just have been no suitable
-+ * ACPI objects in the table trunk from which the kernel could create
-+ * a device and add/start an appropriate driver.
-+ */
-+
- int
- acpi_bus_add(struct acpi_device **child,
- struct acpi_device *parent, acpi_handle handle, int type)
-@@ -1373,8 +1389,7 @@ acpi_bus_add(struct acpi_device **child,
- memset(&ops, 0, sizeof(ops));
- ops.acpi_op_add = 1;
-
-- acpi_bus_scan(handle, &ops, child);
-- return 0;
-+ return acpi_bus_scan(handle, &ops, child);
- }
- EXPORT_SYMBOL(acpi_bus_add);
-
-@@ -1388,8 +1403,7 @@ int acpi_bus_start(struct acpi_device *d
- memset(&ops, 0, sizeof(ops));
- ops.acpi_op_start = 1;
-
-- acpi_bus_scan(device->handle, &ops, NULL);
-- return 0;
-+ return acpi_bus_scan(device->handle, &ops, NULL);
- }
- EXPORT_SYMBOL(acpi_bus_start);
-
-Index: linux-2.6.32-SLE11-SP1/drivers/pci/hotplug/acpiphp_glue.c
-===================================================================
---- linux-2.6.32-SLE11-SP1.orig/drivers/pci/hotplug/acpiphp_glue.c
-+++ linux-2.6.32-SLE11-SP1/drivers/pci/hotplug/acpiphp_glue.c
-@@ -920,12 +920,6 @@ static int acpiphp_bus_add(struct acpiph
- -ret_val);
- goto acpiphp_bus_add_out;
- }
-- /*
-- * try to start anyway. We could have failed to add
-- * simply because this bus had previously been added
-- * on another add. Don't bother with the return value
-- * we just keep going.
-- */
- ret_val = acpi_bus_start(device);
-
- acpiphp_bus_add_out:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/dm-stripe-zero-stripes new/patches.fixes/dm-stripe-zero-stripes
--- old/patches.fixes/dm-stripe-zero-stripes 2010-02-12 17:10:51.000000000 +0100
+++ new/patches.fixes/dm-stripe-zero-stripes 1970-01-01 01:00:00.000000000 +0100
@@ -1,76 +0,0 @@
-From: Nikanth Karthikesan
-Subject: dm-stripe: return -EINVAL if stripe count is zero
-References: bnc#576312
-Patch-mainline: Not yet. https://www.redhat.com/archives/dm-devel/2010-February/msg00041.html
-
-If zero is passed as stripe count to the stripe_ctr, it segfaults with
-a divide by zero error.
-
-divide error: 0000 [#1] PREEMPT SMP
-last sysfs file: /sys/kernel/uevent_seqnum
-CPU 1
-Pid: 3252, comm: dmsetup Not tainted 2.6.33-rc5-9-default #3 /
-RIP: 0010:[<ffffffffa00e6ad7>] [<ffffffffa00e6ad7>] stripe_ctr+0xd5/0x28d [dm_mod]
-RSP: 0018:ffff88003cb7dce8 EFLAGS: 00010246
-RAX: 0000000000000400 RBX: 0000000000000200 RCX: 0000000000000000
-RDX: 0000000000000000 RSI: ffff88003cb7dd08 RDI: ffffc900008fb165
-RBP: ffff88003cb7dd38 R08: 0000000000000200 R09: 000000000000000a
-R10: ffffffffa00ec630 R11: ffffffffa00ec638 R12: 0000000000000004
-R13: 0000000000000200 R14: ffffc900008f0040 R15: 0000000000000000
-FS: 00007f9551621780(0000) GS:ffff880003600000(0000) knlGS:0000000000000000
-CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
-CR2: 00007f95514f7000 CR3: 00000000343c9000 CR4: 00000000000006e0
-DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
-DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
-Process dmsetup (pid: 3252, threadinfo ffff88003cb7c000, task ffff880034004f40)
-Stack:
- ffff88003cb7dd38 ffff88003d8d0400 ffff88003cb7dd60 ffffc900008f0040
-<0> ffffc900008fb165 0000000000000400 ffffc900008f0040 0000000000000000
-<0> ffff88003d8d0200 ffffc900008fb150 ffff88003cb7dd98 ffffffffa00e5dec
-Call Trace:
- [<ffffffffa00e5dec>] dm_table_add_target+0x152/0x1cf [dm_mod]
- [<ffffffffa00e7cca>] table_load+0x257/0x266 [dm_mod]
- [<ffffffffa00e7a73>] ? table_load+0x0/0x266 [dm_mod]
- [<ffffffffa00e89c6>] ctl_ioctl+0x1ce/0x226 [dm_mod]
- [<ffffffff8106a218>] ? sched_clock_cpu+0xe3/0xeb
- [<ffffffffa00e8a2c>] dm_ctl_ioctl+0xe/0x12 [dm_mod]
- [<ffffffff81117c08>] vfs_ioctl+0x2a/0x9e
- [<ffffffff811181bd>] do_vfs_ioctl+0x4b7/0x4f4
- [<ffffffff81306b3a>] ? _raw_spin_unlock_irqrestore+0x76/0x92
- [<ffffffff811bbe57>] ? __up_write+0x12d/0x13c
- [<ffffffff81306f39>] ? retint_swapgs+0x13/0x1b
- [<ffffffff8111824f>] sys_ioctl+0x55/0x77
- [<ffffffff81002d82>] system_call_fastpath+0x16/0x1b
-Code: 07 77 0a 49 c7 46 38 14 b2 0e a0 eb 9f 49 8b 56 18 8d 43 ff 48 85 d0 74 0a 49 c7 46 38 27 b2 0e a0 eb 89 48 89 d0 44 89 f9 31 d2 <48> f7 f1 44 89 7d c4 48 85 d2 48
-89 45 b0 74 0d 49 c7 46 38 51
-RIP [<ffffffffa00e6ad7>] stripe_ctr+0xd5/0x28d [dm_mod]
- RSP <ffff88003cb7dce8>
----[ end trace fa87918cd9541274 ]---
-
-This patch returns -EINVAL, if zero is passed as stripe count.
-
-With this patch we get the following error message.
-device-mapper: table: 253:0: striped: Invalid stripe count
-device-mapper: ioctl: error adding target to table
-
-And dmsetup exits gracefully with following error message.
-device-mapper: reload ioctl failed: Invalid argument
-Command failed
-
-Signed-off-by: Nikanth Karthikesan <knikanth suse de>
-
----
-
-Index: linux-2.6.32-master/drivers/md/dm-stripe.c
-===================================================================
---- linux-2.6.32-master.orig/drivers/md/dm-stripe.c
-+++ linux-2.6.32-master/drivers/md/dm-stripe.c
-@@ -110,7 +110,7 @@ static int stripe_ctr(struct dm_target *
- }
-
- stripes = simple_strtoul(argv[0], &end, 10);
-- if (*end) {
-+ if (!stripes || *end) {
- ti->error = "Invalid stripe count";
- return -EINVAL;
- }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/dvb-l64781.ko-broken-with-gcc-4.5.patch new/patches.fixes/dvb-l64781.ko-broken-with-gcc-4.5.patch
--- old/patches.fixes/dvb-l64781.ko-broken-with-gcc-4.5.patch 2010-02-12 17:10:51.000000000 +0100
+++ new/patches.fixes/dvb-l64781.ko-broken-with-gcc-4.5.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-From kernel-bounces+gregkh=suse.de@suse.de Tue Feb 9 08:22:58 2010
-From: Richard Guenther
-Date: Tue, 9 Feb 2010 17:22:55 +0100 (CET)
-Subject: dvb: l64781.ko broken with gcc 4.5
-Cc: Andreas Gruenbacher
-Patch-mainline: 2.6.34
-
-I'm trying to fix it on the GCC side (PR43007), but the module is
-quite stupid in using ULL constants to operate on u32 values:
-
-static int apply_frontend_param (struct dvb_frontend* fe, struct
-dvb_frontend_parameters *param)
-{
-...
- static const u32 ppm = 8000;
- u32 spi_bias;
-...
-
- spi_bias *= 1000ULL;
- spi_bias /= 1000ULL + ppm/1000;
-
-
-which causes current GCC 4.5 to emit calls to __udivdi3 for i?86 again.
-
-This patch fixes this issue.
-
-Signed-off-by: Richard Guenther
-Cc: Andreas Gruenbacher
-Signed-off-by: Greg Kroah-Hartman
-
----
- drivers/media/dvb/frontends/l64781.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/media/dvb/frontends/l64781.c
-+++ b/drivers/media/dvb/frontends/l64781.c
-@@ -192,8 +192,8 @@ static int apply_frontend_param (struct
- spi_bias *= qam_tab[p->constellation];
- spi_bias /= p->code_rate_HP + 1;
- spi_bias /= (guard_tab[p->guard_interval] + 32);
-- spi_bias *= 1000ULL;
-- spi_bias /= 1000ULL + ppm/1000;
-+ spi_bias *= 1000;
-+ spi_bias /= 1000 + ppm/1000;
- spi_bias *= p->code_rate_HP;
-
- val0x04 = (p->transmission_mode << 2) | p->guard_interval;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/novfs-err_ptr-fix.diff new/patches.fixes/novfs-err_ptr-fix.diff
--- old/patches.fixes/novfs-err_ptr-fix.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/novfs-err_ptr-fix.diff 2010-02-23 00:34:37.000000000 +0100
@@ -0,0 +1,36 @@
+From: Anders Johansson
+Subject: Oops in novfs:unlink_local
+References: bnc#569071
+Patch-mainline: no
+
+Signed-off-by: Anders Johansson
+Acked-by: Sankar P
+---
+ fs/novfs/daemon.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+Index: linux-2.6.32-SLE11-SP1/fs/novfs/daemon.c
+===================================================================
+--- linux-2.6.32-SLE11-SP1.orig/fs/novfs/daemon.c 2010-02-02 04:27:16.000000000 +0100
++++ linux-2.6.32-SLE11-SP1/fs/novfs/daemon.c 2010-02-02 05:24:30.000000000 +0100
+@@ -2046,14 +2046,14 @@ static long local_unlink(const char *pat
+ }
+ dentry = lookup_one_len(name, nd.path.dentry, strlen(name));
+ error = PTR_ERR(dentry);
+- DbgPrint("dentry %p", dentry);
+- if (!(dentry->d_inode->i_mode & S_IFLNK)) {
+- DbgPrint("%s not a link", name);
+- error=-ENOENT;
+- goto exit1;
+- }
+
+ if (!IS_ERR(dentry)) {
++ DbgPrint("dentry %p", dentry);
++ if (!(dentry->d_inode->i_mode & S_IFLNK)) {
++ DbgPrint("%s not a link", name);
++ error=-ENOENT;
++ goto exit1;
++ }
+ /* Why not before? Because we want correct error value */
+ if (nd.last.name[nd.last.len])
+ goto slashes;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/novfs-fix-inode-uid new/patches.fixes/novfs-fix-inode-uid
--- old/patches.fixes/novfs-fix-inode-uid 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/novfs-fix-inode-uid 2010-02-23 00:34:37.000000000 +0100
@@ -0,0 +1,33 @@
+From: Sankar P
+Subject: novfs: Get proper UID when looking up inode
+Patch-mainline: no
+References: bnc#486997
+
+novfs is incorrectly assigning the rights in the /var/opt/novell/nclmnt
+directory. This causes nwlogin mappings to fail.
+
+Patch below is ported for SLED 11 SP1 and it is already submitted for
+OES 2 service packs.
+
+Ported-by: Sankar P
+Signed-off-by: Pary D
+Acked-by: Jan Kara
+
+diff --git a/tmp/linux-2.6.32-kerngit-sle11-sp1/fs/novfs/inode.c b/tmp/linux-2.6.32-kerngit-sle11-sp1/fs/novfs/inode.c
+index 3045ba4..72d0a89 100644
+--- linux-2.6.32-kerngit-sle11-sp1/fs/novfs/inode.c
++++ linux-2.6.32-kerngit-sle11-sp1/fs/novfs/inode.c
+@@ -2761,7 +2761,11 @@ struct dentry *novfs_i_lookup(struct inode *dir, struct dentry *dentry,
+ }
+
+ if (!inode && ino) {
+- uid = novfs_scope_get_uid(id->Scope);
++ if (id && id->Scope) {
++ uid = novfs_scope_get_uid(id->Scope);
++ } else {
++ uid = novfs_scope_get_uid(novfs_get_scope(dentry));
++ }
+ if (novfs_lock_inode_cache(dir)) {
+ inode = novfs_get_inode (dentry->d_sb, info->mode, 0, uid, ino, &name);
+ if (inode) {
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/novfs-incorrect-filesize-fix new/patches.fixes/novfs-incorrect-filesize-fix
--- old/patches.fixes/novfs-incorrect-filesize-fix 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/novfs-incorrect-filesize-fix 2010-02-23 00:34:37.000000000 +0100
@@ -0,0 +1,37 @@
+From: Sankar P
+Subject: novfs: novfs reports incorrect file size
+Patch-mainline: no
+References: bnc#426536
+
+While updating the inode, make sure that the s_blocks member
+is updated to the number of 512 blocks units.
+
+This fixes the issue of novfs reporting invalid file sizes.
+
+Signed-off-by: Sankar P
+Acked-by: Jan Kara
+
+diff --git a/tmp/linux-2.6.32-sle11-sp1-suse/fs/novfs/inode.c b/tmp/linux-2.6.32-sle11-sp1-suse/fs/novfs/inode.c
+index 3045ba4..3f87e3e 100644
+--- linux-2.6.32-sle11-sp1-suse/fs/novfs/inode.c
++++ linux-2.6.32-sle11-sp1-suse/fs/novfs/inode.c
+@@ -2672,8 +2672,17 @@ void update_inode(struct inode *Inode, struct novfs_entry_info *Info)
+ Inode->i_mtime = Info->mtime;
+
+ if (Inode->i_size && Inode->i_sb->s_blocksize) {
+- Inode->i_blocks =
+- (unsigned long) (Info->size >> (loff_t) Inode->i_blkbits);
++
++ /*
++ * Filling number of blocks as in NSS filesystem.
++ * The s_blocksize is initialized to PAGE_CACHE_SIZE in
++ * the super block initialization.
++ *
++ * Update i_blocks to have the number of 512 blocks
++ */
++ Inode->i_blocks = (((loff_t)Info->size) + Inode->i_sb->s_blocksize - 1)
++ >> (loff_t)Inode->i_blkbits;
++ Inode->i_blocks = Inode->i_blocks << (PAGE_CACHE_SHIFT - 9);
+ Inode->i_bytes = Info->size & (Inode->i_sb->s_blocksize - 1);
+
+ DbgPrint("i_sb->s_blocksize=%d", Inode->i_sb->s_blocksize);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/novfs-truncate-fix new/patches.fixes/novfs-truncate-fix
--- old/patches.fixes/novfs-truncate-fix 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/novfs-truncate-fix 2010-02-23 00:34:37.000000000 +0100
@@ -0,0 +1,56 @@
+From: Sankar P
+Subject: novfs: Fixes corruption of OO documents on NSS Volumes
+References: bnc#508259
+Patch-mainline: no
+
+OpenOffice documents stored in NSS volumes, when accessed
+via NOVFS, get corrupted while using the ftruncate64 call.
+
+Removed stale code which unsets the size in the setattr call.
+
+Signed-off-by: Sankar P
+Acked-by: Jan Kara
+
+diff --git a/tmp/linux-2.6.32-sle11sp1/fs/novfs/inode.c b/tmp/linux-2.6.32-sle11sp1/fs/novfs/inode.c
+index 3045ba4..26e78bf 100644
+--- linux-2.6.32-sle11sp1/fs/novfs/inode.c
++++ linux-2.6.32-sle11sp1/fs/novfs/inode.c
+@@ -3171,7 +3171,6 @@ int novfs_i_setattr(struct dentry *dentry, struct iattr *attr)
+ unsigned int ia_valid = attr->ia_valid;
+ struct novfs_schandle session;
+ int retVal = 0;
+- struct iattr mattr;
+
+ if (IS_ROOT(dentry) || /* Root */
+ IS_ROOT(dentry->d_parent) || /* User */
+@@ -3229,30 +3228,6 @@ int novfs_i_setattr(struct dentry *dentry, struct iattr *attr)
+ attr->ia_size,
+ atime_buf, mtime_buf, ctime_buf);
+
+- if ((attr->ia_valid & ATTR_FILE)
+- && (attr->ia_valid & ATTR_SIZE)) {
+- memcpy(&mattr, attr, sizeof(mattr));
+- mattr.ia_valid &=
+- ~(ATTR_FILE | ATTR_SIZE);
+- attr = &mattr;
+- ia_valid = attr->ia_valid;
+-#if 0 // thanks to vfs changes in our tree...
+- retVal =
+- novfs_trunc_ex(attr->
+- ia_file->
+- private_data,
+- attr->
+- ia_size,
+- session);
+- if (!retVal) {
+- inode->i_size = attr->ia_size;
+- ((struct inode_data *) inode->
+- i_private)->Flags |=
+- UPDATE_INODE;
+- }
+-#endif
+- }
+-
+ if (ia_valid
+ && !(retVal =
+ novfs_set_attr(path, attr, session))) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/tiocgdev new/patches.fixes/tiocgdev
--- old/patches.fixes/tiocgdev 2010-02-12 17:10:51.000000000 +0100
+++ new/patches.fixes/tiocgdev 2010-02-23 00:34:37.000000000 +0100
@@ -140,8 +140,8 @@
COMPATIBLE_IOCTL(TIOCSBRK)
+COMPATIBLE_IOCTL(TIOCGDEV)
COMPATIBLE_IOCTL(TIOCCBRK)
+ COMPATIBLE_IOCTL(TIOCGSID)
COMPATIBLE_IOCTL(TIOCGICOUNT)
- /* Little t */
--- a/include/asm-generic/ioctls.h
+++ b/include/asm-generic/ioctls.h
@@ -65,6 +65,7 @@
++++++ patches.kernel.org.tar.bz2 ++++++
kernel-source/patches.kernel.org.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/patches.kernel.org.tar.bz2 differ: char 11, line 1
++++++ patches.rpmify.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/ftrace-fix-ftrace_event_call-alignment-for-use-with-gcc-4-5 new/patches.rpmify/ftrace-fix-ftrace_event_call-alignment-for-use-with-gcc-4-5
--- old/patches.rpmify/ftrace-fix-ftrace_event_call-alignment-for-use-with-gcc-4-5 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.rpmify/ftrace-fix-ftrace_event_call-alignment-for-use-with-gcc-4-5 2010-02-24 20:02:37.000000000 +0100
@@ -0,0 +1,79 @@
+From: Jeff Mahoney
+Subject: ftrace: fix ftrace_event_call alignment for use with gcc 4.5
+References: bnc#582222
+Patch-mainline: Submitted 24 Feb 2010
+
+ GCC 4.5 introduced behavior that forces the alignment of structures to
+ use the largest possible value. The default value is 32 bytes, so if
+ some structures are defined with a 4-byte alignment and others aren't
+ declared with an alignment constraint at all - it will align at 32-bytes.
+
+ For things like the ftrace events, this results in a non-standard array.
+ When initializing the ftrace subsystem, we traverse the _ftrace_events
+ section and call the initialization callback for each event. When the
+ structures are misaligned, we could be treating another part of the
+ structure (or the zeroed out space between them) as a function pointer.
+
+ This patch forces the alignment for all the ftrace_event_call structures
+ to 4 bytes.
+
+ Without this patch, the kernel fails to boot very early when built with
+ gcc 4.5.
+
+ It's trivial to check the alignment of the members of the array, so it
+ might be worthwhile to add something to the build system to do that
+ automatically.
+
+Signed-off-by: Jeff Mahoney
+---
+ include/linux/syscalls.h | 6 ++++--
+ include/trace/ftrace.h | 3 ++-
+ kernel/trace/trace.h | 3 ++-
+ 3 files changed, 8 insertions(+), 4 deletions(-)
+
+--- a/include/linux/syscalls.h
++++ b/include/linux/syscalls.h
+@@ -132,7 +132,8 @@ struct perf_event_attr;
+
+ #define SYSCALL_TRACE_ENTER_EVENT(sname) \
+ static const struct syscall_metadata __syscall_meta_##sname; \
+- static struct ftrace_event_call event_enter_##sname; \
++ static struct ftrace_event_call \
++ __attribute__((__aligned__(4))) event_enter_##sname; \
+ static struct trace_event enter_syscall_print_##sname = { \
+ .trace = print_syscall_enter, \
+ }; \
+@@ -154,7 +155,8 @@ struct perf_event_attr;
+
+ #define SYSCALL_TRACE_EXIT_EVENT(sname) \
+ static const struct syscall_metadata __syscall_meta_##sname; \
+- static struct ftrace_event_call event_exit_##sname; \
++ static struct ftrace_event_call \
++ __attribute__((__aligned__(4)))event_exit_##sname; \
+ static struct trace_event exit_syscall_print_##sname = { \
+ .trace = print_syscall_exit, \
+ }; \
+--- a/include/trace/ftrace.h
++++ b/include/trace/ftrace.h
+@@ -65,7 +65,8 @@
+ };
+ #undef DEFINE_EVENT
+ #define DEFINE_EVENT(template, name, proto, args) \
+- static struct ftrace_event_call event_##name
++ static struct ftrace_event_call \
++ __attribute__((__aligned__(4))) event_##name
+
+ #undef DEFINE_EVENT_PRINT
+ #define DEFINE_EVENT_PRINT(template, name, proto, args, print) \
+--- a/kernel/trace/trace.h
++++ b/kernel/trace/trace.h
+@@ -791,7 +791,8 @@ extern const char *__stop___trace_bprint
+
+ #undef FTRACE_ENTRY
+ #define FTRACE_ENTRY(call, struct_name, id, tstruct, print) \
+- extern struct ftrace_event_call event_##call;
++ extern struct ftrace_event_call \
++ __attribute__((__aligned__(4))) event_##call;
+ #undef FTRACE_ENTRY_DUP
+ #define FTRACE_ENTRY_DUP(call, struct_name, id, tstruct, print) \
+ FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print))
++++++ patches.xen.tar.bz2 ++++++
++++ 28590 lines of diff (skipped)
++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:42.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:42.000000000 +0100
@@ -27,11 +27,6 @@
# DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem...
########################################################
- patches.kernel.org/patch-2.6.33-rc3
- patches.kernel.org/patch-2.6.33-rc3-rc4
- patches.kernel.org/patch-2.6.33-rc4-rc5
- patches.kernel.org/patch-2.6.33-rc5-rc6
- patches.kernel.org/patch-2.6.33-rc6-rc7
########################################################
# Build fixes that apply to the vanilla kernel too.
@@ -53,6 +48,7 @@
patches.rpmify/hpsa-fix-section-mismatch
patches.rpmify/rt2860-fix-section-mismatches
patches.rpmify/ppc-crashdump-typefix
+ patches.rpmify/ftrace-fix-ftrace_event_call-alignment-for-use-with-gcc-4-5
########################################################
# kABI consistency patches
@@ -322,7 +318,6 @@
patches.fixes/acpi_fix_no_critical_tp.patch
patches.fixes/acpi_thermal_check_trip_points.patch
- patches.fixes/acpi_pci_hot_plug_sanity_checks.patch
########################################################
# CPUFREQ
@@ -341,7 +336,6 @@
patches.fixes/cpufreq_ondemand_performance_optimise_default_settings.patch
# PCC -> HP's cpufreq driver
- patches.drivers/cpufreq_ondemand_limit_fix.patch
patches.drivers/cpufreq_processor_clocking_control_pcc_driver.patch
########################################################
@@ -429,6 +423,10 @@
########################################################
patches.suse/novfs-client-module
patches.suse/novfs-fix-debug-message.patch
+ patches.fixes/novfs-err_ptr-fix.diff
+ patches.fixes/novfs-fix-inode-uid
+ patches.fixes/novfs-incorrect-filesize-fix
+ patches.fixes/novfs-truncate-fix
########################################################
# other filesystem stuff
@@ -636,8 +634,6 @@
patches.suse/raw_device_max_minors_param.diff
patches.suse/no-partition-scan
- patches.fixes/dvb-l64781.ko-broken-with-gcc-4.5.patch
-
########################################################
# Other drivers we have added to the tree
########################################################
@@ -662,7 +658,6 @@
patches.fixes/dm-release-map_lock-before-set_disk_ro
patches.suse/dm-mpath-no-activate-for-offlined-paths
patches.suse/dm-mpath-no-partitions-feature
- patches.fixes/dm-stripe-zero-stripes
########################################################
# md
@@ -906,6 +901,9 @@
patches.xen/xen3-patch-2.6.33-rc3-rc4
patches.xen/xen3-patch-2.6.33-rc4-rc5
patches.xen/xen3-patch-2.6.33-rc5-rc6
+ patches.xen/xen3-patch-2.6.33-rc6-rc7
+ patches.xen/xen3-patch-2.6.33-rc7-rc8
+ patches.xen/xen3-patch-2.6.33-rc8-final
patches.xen/xen3-seccomp-disable-tsc-option
patches.xen/xen3-x86-mcp51-no-dac
patches.xen/xen3-x86-mark_rodata_rw.patch
@@ -949,6 +947,8 @@
patches.xen/xen-x86-machphys-prediction
patches.xen/xen-x86-exit-mmap
patches.xen/xen-x86-per-cpu-vcpu-info
+ patches.xen/xen-x86-xtime-lock
+ patches.xen/xen-x86-time-per-cpu
patches.xen/xen-x86_64-pgd-pin
patches.xen/xen-x86_64-pgd-alloc-order
patches.xen/xen-x86_64-dump-user-pgt
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.LvEiy5/_old 2010-02-25 11:17:42.000000000 +0100
+++ /var/tmp/diff_new_pack.LvEiy5/_new 2010-02-25 11:17:42.000000000 +0100
@@ -1,3 +1,3 @@
-2010-02-12 17:37:20 +0100
-GIT Revision: 7a6a586d63ec8ee519b9de0f63c1bb1dd232f657
+2010-02-25 06:04:45 +0100
+GIT Revision: 598eedb84f8b4a3d43f88b9bd52d8169d3c8660b
GIT Branch: master
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org