# -*- Mode: rpm-spec -*-
#
# (c) Mandriva
#
# if you try to understand kernel numbering, read docs/kernel_naming
# XXX to be obsoleted
%define distsuffix mdv
%define sublevel 17
%define mdkrelease 16
%define use_patch 0
%define devel_notice %{?patchlevel:NOTE: This is work-in-progress (WIP) development kernel.}
%define build_latest 0
%if %{mdkversion} >= 200710
%define build_latest 1
%endif
# This is only to make life easier for people that creates derivated kernels
# a.k.a name it kernel-tmb :)
%define kname kernel
# You shouldn't have to change any other name/patch/version number
%define major 6
# When we are using a pre/rc patch, the tarball is a sublevel -1
%if %use_patch
%define tar_version 2.%{major}.%(expr %{sublevel} - 1)
%define patchversion %{use_patch}q%{mdkrelease}
%define realrelease 0.%{use_patch}.%{mdkrelease}%{?patchlevel:.%{patchlevel}}%{distsuffix}
%else
%define tar_version 2.%{major}.%{sublevel}
%define patchversion q%{mdkrelease}
%define realrelease %{mdkrelease}%{?patchlevel:.%{patchlevel}}%{distsuffix}
%endif
# never touch the folowing two fields
%define rpmversion 1
%define rpmrelease %mkrel 1
%define realversion 2.%{major}.%{sublevel}
%define mdkversion %{realversion}.%{realrelease}
%define patches_ver 2.%{major}.%{sublevel}-%{patchversion}
# having different top level names for packges means
# that you have to remove them by hard :(
%define top_dir_name %{kname}-2.%{major}
# don't care about debug packages
# XXX some day this might be used for kgdb'ing modules (.ko.debug?)
%define _enable_debug_packages 0
%define install %%install
%define build_dir ${RPM_BUILD_DIR}/%top_dir_name
%define src_dir %{build_dir}/linux-%tar_version
%define KVERREL %{realversion}-%{realrelease}
# this is the config that contains all the drivers for the hardware/
# things that I use (Juan Quintela).
%define build_minimal 0
%define build_kheaders 0
%define build_debug 0
%define build_doc 1
%define build_source 1
%define build_xen 0
%ifarch %{ix86} x86_64
%define build_xen 1
%endif
%define build_101 %(if [ `awk '{print $4}' /etc/mandrake-release` = 10.1 ];then echo 1; else echo 0; fi)
%define build_100 %(if [ `awk '{print $4}' /etc/mandrake-release` = 10.0 ];then echo 1; else echo 0; fi)
%define build_92 %(if [ `awk '{print $4}' /etc/mandrake-release` = 9.2 ];then echo 1; else echo 0; fi)
%define build_legacy 0
%define build_enterprise 0
%ifarch %{ix86}
%define build_legacy 1
%define build_enterprise 1
%endif
%ifarch powerpc
%define build_power5 1
%define build_ppc970 0
%if ! %{build_ppc970}
# default to build for power5 only
%endif
%else
%define build_power5 0
%endif
# End of user definitions
%{?_without_legacy: %global build_legacy 0}
%{?_without_enterprise: %global build_enterprise 0}
%{?_without_minimal: %global build_minimal 0}
%{?_without_debug: %global build_debug 0}
%{?_without_doc: %global build_doc 0}
%{?_without_source: %global build_source 0}
%{?_without_xen: %global build_xen 0}
%{?_with_legacy: %global build_legacy 1}
%{?_with_enterprise: %global build_enterprise 1}
%{?_with_minimal: %global build_minimal 1}
%{?_with_debug: %global build_debug 1}
%{?_with_doc: %global build_doc 1}
%{?_with_source: %global build_source 1}
%{?_with_xen: %global build_xen 1}
%{?_with_kheaders: %global build_kheaders 1}
%{?_with_92: %global build_92 1}
%{?_with_100: %global build_100 1}
%{?_with_101: %global build_101 1}
### THis is for the .nosrc.rpm
%define build_nosrc 0
%{?_with_nosrc: %global build_nosrc 1}
%if %(if [ -z "$CC" ] ; then echo 0; else echo 1; fi)
%define kmake %make CC="$CC"
%else
%define kmake %make
%endif
# there are places where parallel make don't work
%define smake make
# Aliases for amd64 builds (better make source links?)
%define target_cpu %(echo %{_target_cpu} | sed -e "s/amd64/x86_64/")
%define target_arch %(echo %{_arch} | sed -e "s/amd64/x86_64/" -e "s/sparc/%{_target_cpu}/")
Summary: The Linux kernel (the core of the Linux operating system)
Name: %{kname}-%{mdkversion}
Version: %{rpmversion}
Release: %{rpmrelease}
License: GPL
Group: System/Kernel and hardware
ExclusiveArch: %{ix86} alpha ppc powerpc ia64 x86_64 amd64 sparc sparc64
ExclusiveOS: Linux
URL: http://www.kernel.org/
####################################################################
#
# Sources
#
Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.%{major}/linux-%{tar_version}.tar.bz2
Source1: ftp://ftp.kernel.org/pub/linux/kernel/v2.%{major}/linux-%{tar_version}.tar.bz2.sign
Source4: README.kernel-sources
Source5: README.MandrivaLinux
Source15: linux-mdkconfig.h
Source16: linux-merge-config.awk
Source100: linux-%{patches_ver}.tar.bz2
### This is for .nosrc.rpm
%if %build_nosrc
NoSource: 0
%endif
####################################################################
#
# Patches
#
# Patch0 to Patch100 are for core kernel upgrades.
#
# Pre linus patch: ftp://ftp.kernel.org/pub/linux/kernel/v2.%{major}/testing
%if %use_patch
Patch1: patch-%realversion-%use_patch.bz2
%endif
#END
####################################################################
# Defines for the things that are needed for all the kernels
%define requires1 module-init-tools >= 3.0-7mdk
%define requires2 mkinitrd >= 3.4.43-10mdk
%if %{build_100}
%define requires3 bootloader-utils >= 1.6
%else
%define requires3 bootloader-utils >= 1.13
%endif
%define requires4 sysfsutils module-init-tools >= 0.9.15
%define kprovides kernel = %{realversion}, alsa, drbd-api = 83
BuildRoot: %{_tmppath}/%{name}-%{realversion}-build
Provides: module-info, %kprovides
Autoreqprov: no
Requires: %requires1
Requires: %requires2
Requires: %requires3
Requires: %requires4
BuildRequires: gcc module-init-tools >= 0.9.15
%description
The kernel package contains the Linux kernel (vmlinuz), the core of your
Mandriva Linux operating system. The kernel handles the basic functions
of the operating system: memory allocation, process allocation, device
input and output, etc. It supports both up and smp systems using smp
alternatives.
For instructions for update, see:
http://www.mandriva.com/security/kernelupdate
%{devel_notice}
#
# kernel-latest: Metapackage for latest kernel
#
%if %build_latest
%package -n %{kname}-latest
Summary: Metapackage for latest %{kname}
Version: %{realversion}
Release: %{realrelease}
Group: System/Kernel and hardware
Requires: %{kname}-%{mdkversion}
%description -n %{kname}-latest
This package is a metapackage that aims to make sure you always have the
latest %{kname} installed...
%{devel_notice}
%endif
#
# kernel-enterprise: Symmetric MultiProcessing kernel (PAE + 64G)
#
%package -n %{kname}-enterprise-%{mdkversion}
Summary: The Linux Kernel compiled with options for Enterprise server usage
Group: System/Kernel and hardware
Provides: %kprovides
Requires: %requires1
Requires: %requires2
Requires: %requires3
Requires: %requires4
%description -n %{kname}-enterprise-%{mdkversion}
This package includes a kernel that has appropriate configuration options
enabled for the typical large enterprise server. This includes SMP support
for multiple processor machines (or Hyper-Threading), support for large
memory configurations and other appropriate items. It supports both
up and smp systems using smp alternatives.
For instructions for update, see:
http://www.mandriva.com/security/kernelupdate
%{devel_notice}
#
# kernel-enterprise-latest: Metapackage for latest kernel-enterprise
#
%if %build_latest
%package -n %{kname}-enterprise-latest
Summary: Metapackage for latest %{kname}-enterprise
Version: %{realversion}
Release: %{realrelease}
Group: System/Kernel and hardware
Requires: %{kname}-enterprise-%{mdkversion}
%description -n %{kname}-enterprise-latest
This package is a metapackage that aims to make sure you always have the
latest %{kname}-enterprise installed...
%{devel_notice}
%endif
#
# kernel-legacy: Legacy kernel
#
%package -n %{kname}-legacy-%{mdkversion}
Summary: The Linux Kernel compiled for legacy i586 smp with less than 1GB
Group: System/Kernel and hardware
Provides: %kprovides
Requires: %requires1
Requires: %requires2
Requires: %requires3
Requires: %requires4
%description -n %{kname}-legacy-%{mdkversion}
This package includes a kernel that has appropriate configuration options
enabled for legacy i586 systems with up to 1GB of memory. It supports both
up and smp systems using smp alternatives.
For instructions for update, see:
http://www.mandriva.com/security/kernelupdate
%{devel_notice}
#
# kernel-legacy-latest: Metapackage for latest kernel-legacy
#
%if %build_latest
%package -n %{kname}-legacy-latest
Summary: Metapackage for latest %{kname}-legacy
Version: %{realversion}
Release: %{realrelease}
Group: System/Kernel and hardware
Requires: %{kname}-legacy-%{mdkversion}
%description -n %{kname}-legacy-latest
This package is a metapackage that aims to make sure you always have the
latest %{kname}-legacy installed...
%{devel_notice}
%endif
#
# kernel-xen: Xen related kernels (for dom0 & domU)
#
%package -n %{kname}-xen0-%{mdkversion}
Summary: The XEN hypervisor kernel
Group: Development/Kernel
%description -n %{kname}-xen0-%{mdkversion}
The kernel-xen0 package contains XEN hypervisor kernel which provides
device services to unprivileged guests.
%{devel_notice}
#
# kernel-xen0-latest: Metapackage for latest kernel-xen0
#
%if %build_latest
%package -n %{kname}-xen0-latest
Summary: Metapackage for latest %{kname}-xen0
Version: %{realversion}
Release: %{realrelease}
Group: Development/Kernel
Requires: %{kname}-xen0-%{mdkversion}
%description -n %{kname}-xen0-latest
This package is a metapackage that aims to make sure you always have the
latest %{kname}-xen0 installed...
%{devel_notice}
%endif
%package -n %{kname}-xenU-%{mdkversion}
Summary: The XEN guests kernel
Group: Development/Kernel
%description -n %{kname}-xenU-%{mdkversion}
The kernel-xenU package contains XEN guests kernel which runs in
XEN unprivileged guests VMs.
%{devel_notice}
#
# kernel-xenU-latest: Metapackage for latest kernel-xenU
#
%if %build_latest
%package -n %{kname}-xenU-latest
Summary: Metapackage for latest %{kname}-xenU
Version: %{realversion}
Release: %{realrelease}
Group: Development/Kernel
Requires: %{kname}-xenU-%{mdkversion}
%description -n %{kname}-xenU-latest
This package is a metapackage that aims to make sure you always have the
latest %{kname}-xenU installed...
%{devel_notice}
%endif
#
# kernel-power5: Power5 kernel
#
%package -n %{kname}-power5-%{mdkversion}
Summary: The POWER5 optimized kernel
Group: Development/Kernel
%description -n %{kname}-power5-%{mdkversion}
The kernel-power5 package contains the POWER5 optimized kernel for
IBM OpenPower series systems.
%{devel_notice}
#
# kernel-power5-latest: Metapackage for latest kernel-power5
#
%if %build_latest
%package -n %{kname}-power5-latest
Summary: Metapackage for latest %{kname}-power5
Version: %{realversion}
Release: %{realrelease}
Group: Development/Kernel
Requires: %{kname}-power5-%{mdkversion}
%description -n %{kname}-power5-latest
This package is a metapackage that aims to make sure you always have the
latest %{kname}-power5 installed...
%{devel_notice}
%endif
#
# kernel-source: kernel sources
#
%package -n %{kname}-source-%{mdkversion}
Version: %{rpmversion}
Release: %{rpmrelease}
Provides: %{kname}-source
Requires: glibc-devel, ncurses-devel, make, gcc, perl
Summary: The source code for the Linux kernel
Group: Development/Kernel
Autoreqprov: no
%description -n %{kname}-source-%{mdkversion}
The kernel-source package contains the source code files for the Linux
kernel. These source files are needed to build most C programs, since
they depend on the constants defined in the source code. The source
files can also be used to build a custom kernel that is better tuned to
your particular hardware, if you are so inclined (and you know what you're
doing).
For instructions for update, see:
http://www.mandriva.com/security/kernelupdate
%{devel_notice}
#
# kernel-source-latest: Metapackage for latest kernel-source
#
%if %build_latest
%package -n %{kname}-source-latest
Summary: Metapackage for latest %{kname}-source
Version: %{realversion}
Release: %{realrelease}
Group: Development/Kernel
Requires: %{kname}-source-%{mdkversion}
%description -n %{kname}-source-latest
This package is a metapackage that aims to make sure you always have the
latest %{kname}-source installed...
%{devel_notice}
%endif
#
# kernel-source-stripped: kernel sources
#
%package -n %{kname}-source-stripped-%{mdkversion}
Version: %{rpmversion}
Release: %{rpmrelease}
Provides: %{kname}-source
Provides: %{kname}-source-2.%{major}
Requires: glibc-devel, ncurses-devel, make, gcc, perl
Summary: The source code of the Linux kernel stripped for post build
Group: Development/Kernel
Autoreqprov: no
%description -n %{kname}-source-stripped-%{mdkversion}
The kernel-source package contains the source code files for the Linux
kernel. These source files are needed to build most C programs, since
they depend on the constants defined in the source code. The source
files can also be used to build a custom kernel that is better tuned to
your particular hardware, if you are so inclined (and you know what you're
doing).
%{devel_notice}
#
# kernel-source--stripped-latest: Metapackage for latest kernel-source-stripped
#
%if %build_latest
%package -n %{kname}-source-stripped-latest
Summary: Metapackage for latest %{kname}-source-stripped
Version: %{realversion}
Release: %{realrelease}
Group: Development/Kernel
Requires: %{kname}-source-stripped-%{mdkversion}
%description -n %{kname}-source-stripped-latest
This package is a metapackage that aims to make sure you always have the
latest %{kname}-source-stripped installed...
%{devel_notice}
%endif
#
# kernel-doc: documentation for the Linux kernel
#
%package -n %{kname}-doc-%{mdkversion}
Version: %{rpmversion}
Release: %{rpmrelease}
Summary: Various documentation bits found in the kernel source
Group: Books/Computer books
%description -n %{kname}-doc-%{mdkversion}
This package contains documentation files form the kernel source. Various
bits of information about the Linux kernel and the device drivers shipped
with it are documented in these files. You also might want install this
package if you need a reference to the options that can be passed to Linux
kernel modules at load time.
For instructions for update, see:
http://www.mandriva.com/security/kernelupdate
%{devel_notice}
#
# kernel-doc-latest: Metapackage for latest kernel-doc
#
%if %build_latest
%package -n %{kname}-doc-latest
Summary: Metapackage for latest %{kname}-doc
Version: %{realversion}
Release: %{realrelease}
Group: Books/Computer books
Requires: %{kname}-doc-%{mdkversion}
%description -n %{kname}-doc-latest
This package is a metapackage that aims to make sure you always have the
latest %{kname}-doc installed...
%{devel_notice}
%endif
#
# End packages - here begins build stage
#
%prep
%setup -q -n %top_dir_name -c
%setup -q -n %top_dir_name -D -T -a100
%define patches_dir ../%{patches_ver}/
cd %{patches_ver}
cd ..
cd %src_dir
%if %use_patch
%patch1 -p1
%endif
%{patches_dir}/scripts/apply_patches
# Put here patchlevel patches
# PATCH END
#
# Setup Begin
#
# Prepare all the variables for calling create configs
%if %build_debug
%define debug --debug
%else
%define debug --no-debug
%endif
%if %build_minimal
%define minimal --minimal
%else
%define minimal --no-minimal
%endif
%{patches_dir}/scripts/create_configs %debug %minimal --user_cpu="%{target_cpu}"
# make sure the kernel has the sublevel we know it has...
LC_ALL=C perl -p -i -e "s/^SUBLEVEL.*/SUBLEVEL = %{sublevel}/" Makefile
# get rid of unwanted files
find . -name '*~' -o -name '*.orig' -o -name '*.append' |xargs rm -f
%if %build_kheaders
kheaders_dirs=`echo $PWD/include/{asm-*,linux,sound}`
pushd %build_dir
install -d kernel-headers/
cp -a $kheaders_dirs kernel-headers/
tar cf kernel-headers-%mdkversion.tar kernel-headers/
bzip2 -9f kernel-headers-%mdkversion.tar
rm -rf kernel-headers/
# build_kheaders
%endif
%build
# Common target directories
%define _kerneldir /usr/src/linux-%{KVERREL}
%define _bootdir /boot
%ifarch ia64
%define _efidir %{_bootdir}/efi/mandrake
%endif
%define _modulesdir /lib/modules
%define _savedheaders ../../savedheaders/
# Directories definition needed for building
%define temp_root %{build_dir}/temp-root
%define temp_source %{temp_root}%{_kerneldir}
%define temp_boot %{temp_root}%{_bootdir}
%define temp_modules %{temp_root}%{_modulesdir}
PrepareKernel() {
name=$1
extension=$2
echo "Prepare compilation of kernel $extension"
# We can't use only defconfig anyore because we have the autoconf patch,
if [ -z "$name" ]; then
config_name="defconfig"
else
config_name="defconfig-$name"
fi
# make sure EXTRAVERSION says what we want it to say
LC_ALL=C perl -p -i -e "s/^EXTRAVERSION =.*/EXTRAVERSION = -$extension/" Makefile
if [ -f .gitignore ]; then
rm -f .gitignore
fi
%smake -s mrproper
cp arch/%{target_arch}/$config_name .config
%smake oldconfig
}
BuildKernel() {
KernelVer=$1
echo "Building kernel $KernelVer"
%kmake all
## Start installing stuff
install -d %{temp_boot}
install -m 644 System.map %{temp_boot}/System.map-$KernelVer
install -m 644 .config %{temp_boot}/config-$KernelVer
%ifarch alpha
cp -f arch/alpha/boot/vmlinux.gz %{temp_boot}/vmlinuz-$KernelVer
%endif
%ifarch ia64
install -d %{temp_root}%{_efidir}
cp -f vmlinux.gz %{temp_root}%{_efidir}/vmlinuz-$KernelVer
pushd %{temp_boot}
ln -s %{_efidir}/vmlinuz-$KernelVer vmlinuz-$KernelVer
popd
%endif
%ifarch sparc sparc64
cp -f vmlinux %{temp_boot}/vmlinux-$KernelVer
%endif
%ifarch ppc
cp -f vmlinux %{temp_boot}/vmlinuz-$KernelVer
cp -f arch/ppc/boot/images/zImage.chrp-rs6k %{temp_boot}/vmlinuz-rs6k-$KernelVer
%endif
%ifarch %{ix86}
if [ "$KernelVer" == "%{KVERREL}xen0" -o "$KernelVer" == "%{KVERREL}xenU" ]; then
cp -f vmlinuz %{temp_boot}/vmlinuz-$KernelVer
#cp -f vmlinux %{temp_boot}/vmlinux-syms-$KernelVer
else
cp -f arch/i386/boot/bzImage %{temp_boot}/vmlinuz-$KernelVer
fi
%endif
%ifarch x86_64
if [ "$KernelVer" == "%{KVERREL}xen0" -o "$KernelVer" == "%{KVERREL}xenU" ]; then
cp -f vmlinuz %{temp_boot}/vmlinuz-$KernelVer
else
cp -f arch/x86_64/boot/bzImage %{temp_boot}/vmlinuz-$KernelVer
fi
%endif
%ifarch powerpc
cp -f vmlinux %{temp_boot}/vmlinuz-$KernelVer
%endif
# modules
install -d %{temp_modules}/$KernelVer
%smake INSTALL_MOD_PATH=%{temp_root} KERNELRELEASE=$KernelVer modules_install
}
SaveHeaders() {
flavour=$1
flavour_name="`echo $flavour | sed 's/-/_/g'`"
%if %build_source
HeadersRoot=%{temp_source}/savedheaders
HeadersArch=$HeadersRoot/%{target_cpu}/$flavour
echo "Saving hearders for $flavour %{target_cpu}"
# deal with the kernel headers that are version specific
install -d $HeadersArch
install -m 644 include/linux/autoconf.h $HeadersArch/autoconf.h
install -m 644 include/linux/version.h $HeadersArch/version.h
echo "%{target_cpu} $flavour_name %{_savedheaders}%{target_cpu}/$flavour/" >> $HeadersRoot/list
%endif
}
CreateFiles() {
kversion=$1
output=../kernel_files.$kversion
echo "%defattr(-,root,root)" > $output
echo "%{_bootdir}/config-${kversion}" >> $output
%ifarch sparc sparc64
echo "%{_bootdir}/vmlinux-${kversion}" >> $output
%else
echo "%{_bootdir}/vmlinuz-${kversion}" >> $output
%endif
%ifarch ia64
echo "%{_efidir}/vmlinuz-${kversion}" >> $output
%endif
%ifarch ppc
echo "%{_bootdir}/vmlinuz-rs6k-${kversion}" >> $output
%endif
echo "%{_bootdir}/System.map-${kversion}" >> $output
echo "%dir %{_modulesdir}/${kversion}/" >> $output
echo "%{_modulesdir}/${kversion}/kernel" >> $output
echo "%{_modulesdir}/${kversion}/modules.*" >> $output
echo "%doc README.kernel-sources" >> $output
echo "%doc README.MandrivaLinux" >> $output
}
CreateKernel() {
flavour=$1
if [ "$flavour" = "default" ]; then
KernelVer=%{KVERREL}
PrepareKernel "" %realrelease
elif [ "$flavour" = "power5" ]; then
KernelVer=%{KVERREL}p5
PrepareKernel $flavour %{realrelease}p5
else
KernelVer=%{KVERREL}$flavour
PrepareKernel $flavour %{realrelease}$flavour
fi
BuildKernel $KernelVer
SaveHeaders $flavour
CreateFiles $KernelVer
}
CreateKernelNoName() {
arch=$1
nprocs=$2
memory=$3
name=$arch-$nprocs-$memory
extension="%realrelease-$name"
KernelVer="%{KVERREL}-$arch-$nprocs-$memory"
PrepareKernel $name $extension
BuildKernel $KernelVer
SaveHeaders $name
CreateFiles $KernelVer
}
###
# DO it...
###
# Create a simulacro of buildroot
rm -rf %{temp_root}
install -d %{temp_root}
#make sure we are in the directory
cd %src_dir
CreateKernel default
%if %build_legacy
CreateKernel legacy
%endif
%if %build_enterprise
CreateKernel enterprise
%endif
%if %build_power5
CreateKernel power5
%endif
%if %build_xen
CreateKernel xen0
CreateKernel xenU
%endif
# We don't make to repeat the depend code at the install phase
%if %build_source
PrepareKernel "" %{realrelease}custom
# From > 2.6.13 prepare-all is deprecated and relies on include/linux/autoconf
# To have modpost and others scripts, one has to use the target scripts
%smake -s prepare
%smake -s scripts
%endif
###
### install
###
%install
install -m 644 %{SOURCE4} .
install -m 644 %{SOURCE5} .
cd %src_dir
# Directories definition needed for installing
%define target_source %{buildroot}/%{_kerneldir}
%define target_boot %{buildroot}%{_bootdir}
%define target_modules %{buildroot}%{_modulesdir}
# We want to be able to test several times the install part
rm -rf %{buildroot}
cp -a %{temp_root} %{buildroot}
# Create directories infastructure
%if %build_source
install -d %{target_source}
tar cf - . | tar xf - -C %{target_source}
chmod -R a+rX %{target_source}
# we remove all the source files that we don't ship
# first architecture files
for i in arm cris mips mips64 parisc s390 s390x sh sh64 arm26 h8300 m68knommu v850 m32r frv xtensa; do
rm -rf %{target_source}/arch/$i
rm -rf %{target_source}/include/asm-$i
done
# ppc needs m68k headers
rm -rf %{target_source}/arch/m68k
# remove config split dir
rm -rf %{target_source}/include/config
# other misc files
rm -f %{target_source}/{.config.old,.config.cmd}
%if %{build_xen}
rm -f %{target_source}/include/.asm-ignore
rm -f %{target_source}/vmlinux-stripped
rm -f %{target_source}/vmlinuz
%endif
pushd %{target_source}/include/linux ; {
install -m 644 %{SOURCE15} rhconfig.h
rm -rf autoconf.h version.h
# Create autoconf.h file
echo '#include <linux/rhconfig.h>' > autoconf.h
sed 's,$,autoconf.h,' %{_savedheaders}list | awk -f %{SOURCE16} >> autoconf.h
# Create version.h
echo "#include <linux/rhconfig.h>" > version.h
loop_cnt=0
for i in default legacy xen0 enterprise power5; do
if [ -d %{_savedheaders}%{target_cpu}/$i -a \
-f %{_savedheaders}%{target_cpu}/$i/version.h ]; then
name=`echo $i | sed 's/-/_/g'`
if [ $loop_cnt = 0 ]; then
buf="#if defined(__module__$name)"
else
buf="#elif defined(__module__$name)"
fi
echo "$buf" >> version.h
grep UTS_RELEASE %{_savedheaders}%{target_cpu}/$i/version.h >> version.h
loop_cnt=$[loop_cnt + 1]
fi
done
#write last lines
if [ $loop_cnt -eq 0 ]; then
echo "You need to build at least one kernel"
exit 1;
fi
echo "#else" >> version.h
echo '#define UTS_RELEASE "'%{KVERREL}custom'"' >> version.h
echo "#endif" >> version.h
# Any of the version.h are ok, as they only differ in the first line
ls %{_savedheaders}%{target_cpu}/*/version.h | head -n 1 | xargs grep -v UTS_RELEASE >> version.h
rm -rf %{_savedheaders}
} ; popd
#endif %build_source
%endif
# gzipping modules
find %{target_modules} -name "*.ko" | xargs gzip -9
# We used to have a copy of PrepareKernel here
# Now, we make sure that the thing in the linux dir is what we want it to be
for i in %{target_modules}/*; do
rm -f $i/build $i/source $i/modules.*
done
# sniff, if we gzipped all the modules, we change the stamp :(
# we really need the depmod -ae here
pushd %{target_modules}
for i in *; do
/sbin/depmod-25 -u -ae -b %{buildroot} -r -F %{target_boot}/System.map-$i $i
echo $?
done
for i in *; do
pushd $i
echo "Creating module.description for $i"
modules=`find . -name "*.ko.gz"`
echo $modules | xargs /sbin/modinfo-25 \
| perl -lne 'print "$name\t$1" if $name && /^description:\s*(.*)/; $name = $1 if m!^filename:\s*(.*)\.k?o!; $name =~ s!.*/!!' > modules.description
popd
done
popd
export EXCLUDE_FROM_STRIP="vmlinuz-rs6k-%{KVERREL} vmlinuz-rs6k-%{KVERREL}smp vmlinuz-rs6k-%{KVERREL}enterprise vmlinuz-rs6k-%{KVERREL}BOOT"
###
### clean
###
%clean
rm -rf %{buildroot}
# We don't want to remove this, the whole reason of its existence is to be
# able to do several rpm --short-circuit -bi for testing install
# phase without repeating compilation phase
#rm -rf %{temp_root}
###
### scripts
###
%define options_preun -R
#define options_post -C
%define options_post %nil
%preun
/sbin/installkernel %options_preun %{KVERREL}
exit 0
%post
/sbin/installkernel %options_post %{KVERREL}
%postun
/sbin/kernel_remove_initrd %{KVERREL}
%preun -n %{kname}-legacy-%{mdkversion}
/sbin/installkernel %options_preun %{KVERREL}legacy
exit 0
%post -n %{kname}-legacy-%{mdkversion}
/sbin/installkernel %options_post %{KVERREL}legacy
%postun -n %{kname}-legacy-%{mdkversion}
/sbin/kernel_remove_initrd %{KVERREL}legacy
%preun -n %{kname}-enterprise-%{mdkversion}
/sbin/installkernel %options_preun %{KVERREL}enterprise
exit 0
%post -n %{kname}-enterprise-%{mdkversion}
/sbin/installkernel %options_post %{KVERREL}enterprise
%postun -n %{kname}-enterprise-%{mdkversion}
/sbin/kernel_remove_initrd %{KVERREL}enterprise
%preun -n %{kname}-power5-%{mdkversion}
/sbin/installkernel %options_preun %{KVERREL}p5
exit 0
%post -n %{kname}-power5-%{mdkversion}
/sbin/installkernel %options_post %{KVERREL}p5
%postun -n %{kname}-power5-%{mdkversion}
/sbin/kernel_remove_initrd %{KVERREL}p5
%post -n %{kname}-source-%{mdkversion}
cd /usr/src
rm -f linux
ln -snf linux-%{KVERREL} linux
/sbin/service kheader start 2>/dev/null >/dev/null || :
# we need to create /build only when there is a source tree.
for i in /lib/modules/%{KVERREL}*; do
if [ -d $i ]; then
ln -sf /usr/src/linux-%{KVERREL} $i/build
ln -sf /usr/src/linux-%{KVERREL} $i/source
fi
done
%postun -n %{kname}-source-%{mdkversion}
if [ -L /usr/src/linux ]; then
if [ -L /usr/src/linux -a `ls -l /usr/src/linux 2>/dev/null| awk '{ print $11 }'` = "linux-%{KVERREL}" ]; then
[ $1 = 0 ] && rm -f /usr/src/linux
fi
fi
# we need to delete <modules>/build at unsinstall
for i in /lib/modules/%{KVERREL}*/{build,source}; do
if [ -L $i ]; then
rm -f $i
fi
done
exit 0
%post -n %{kname}-source-stripped-%{mdkversion}
cd /usr/src
rm -f linux
ln -snf linux-%{KVERREL} linux
/sbin/service kheader start 2>/dev/null >/dev/null || :
# we need to create /build only when there is a source tree.
for i in /lib/modules/%{KVERREL}*; do
if [ -d $i ]; then
ln -sf /usr/src/linux-%{KVERREL} $i/build
ln -sf /usr/src/linux-%{KVERREL} $i/source
fi
done
%postun -n %{kname}-source-stripped-%{mdkversion}
if [ -L /usr/src/linux ]; then
if [ -L /usr/src/linux -a `ls -l /usr/src/linux 2>/dev/null| awk '{ print $11 }'` = "linux-%{KVERREL}" ]; then
[ $1 = 0 ] && rm -f /usr/src/linux
fi
fi
# we need to delete <modules>/{build,source} at unsinstall
for i in /lib/modules/%{KVERREL}*/{build,source}; do
if [ -L $i ]; then
rm -f $i
fi
done
exit 0
###
### file lists
###
%files -f kernel_files.%{KVERREL}
%if %build_latest
%files -n %{kname}-latest
%defattr(-,root,root)
%endif
%if %build_legacy
%files -n %{kname}-legacy-%{mdkversion} -f kernel_files.%{KVERREL}legacy
%if %build_latest
%files -n %{kname}-legacy-latest
%defattr(-,root,root)
%endif
%endif
%if %build_xen
%files -n %{kname}-xen0-%{mdkversion} -f kernel_files.%{KVERREL}xen0
%files -n %{kname}-xenU-%{mdkversion} -f kernel_files.%{KVERREL}xenU
%if %build_latest
%files -n %{kname}-xen0-latest
%defattr(-,root,root)
%files -n %{kname}-xenU-latest
%defattr(-,root,root)
%endif
%endif
%if %build_enterprise
%files -n %{kname}-enterprise-%{mdkversion} -f kernel_files.%{KVERREL}enterprise
%if %build_latest
%files -n %{kname}-enterprise-latest
%defattr(-,root,root)
%endif
%endif
%if %build_power5
%files -n %{kname}-power5-%{mdkversion} -f kernel_files.%{KVERREL}p5
%if %build_latest
%files -n %{kname}-power5-latest
%defattr(-,root,root)
%endif
%endif
%if %build_source
%files -n %{kname}-source-%{mdkversion}
%defattr(-,root,root)
%dir %{_kerneldir}
%dir %{_kerneldir}/arch
%dir %{_kerneldir}/include
%{_kerneldir}/.config
%{_kerneldir}/.kernelrelease
%{_kerneldir}/.kconfig.d
%{_kerneldir}/Kbuild
%{_kerneldir}/COPYING
%{_kerneldir}/CREDITS
%{_kerneldir}/Documentation
%{_kerneldir}/MAINTAINERS
%{_kerneldir}/Makefile
%{_kerneldir}/README
%{_kerneldir}/REPORTING-BUGS
%{_kerneldir}/arch/alpha
%{_kerneldir}/arch/i386
%{_kerneldir}/arch/ia64
%{_kerneldir}/arch/ppc
%{_kerneldir}/arch/powerpc
%{_kerneldir}/arch/sparc
%{_kerneldir}/arch/sparc64
%{_kerneldir}/arch/x86_64
%{_kerneldir}/arch/um
%{_kerneldir}/block
%{_kerneldir}/crypto
%{_kerneldir}/drivers
%{_kerneldir}/fs
%{_kerneldir}/init
%{_kerneldir}/ipc
%{_kerneldir}/kdb
%{_kerneldir}/kernel
%{_kerneldir}/lib
%{_kerneldir}/mm
%{_kerneldir}/net
%{_kerneldir}/rsbac
%{_kerneldir}/security
%{_kerneldir}/scripts
%{_kerneldir}/sound
%{_kerneldir}/usr
%{_kerneldir}/3rdparty
%{_kerneldir}/include/acpi
%{_kerneldir}/include/asm
%{_kerneldir}/include/asm-alpha
%{_kerneldir}/include/asm-generic
%{_kerneldir}/include/asm-i386
%{_kerneldir}/include/asm-ia64
# This is needed by ppc
%{_kerneldir}/include/asm-m68k
%{_kerneldir}/include/asm-ppc
%{_kerneldir}/include/asm-powerpc
%{_kerneldir}/include/asm-sparc
%{_kerneldir}/include/asm-sparc64
%{_kerneldir}/include/asm-x86_64
%{_kerneldir}/include/asm-um
%{_kerneldir}/include/linux
%{_kerneldir}/include/math-emu
%{_kerneldir}/include/net
%{_kerneldir}/include/pcmcia
%{_kerneldir}/include/scsi
%{_kerneldir}/include/sound
%{_kerneldir}/include/video
%{_kerneldir}/include/media
%{_kerneldir}/include/mtd
%{_kerneldir}/include/rdma
%{_kerneldir}/include/rsbac
%{_kerneldir}/include/rxrpc
%{_kerneldir}/include/xen
%{_kerneldir}/include/keys
%doc README.kernel-sources
%doc README.MandrivaLinux
%if %build_latest
%files -n %{kname}-source-latest
%defattr(-,root,root)
%endif
# source-stripped
%files -n %{kname}-source-stripped-%{mdkversion}
%defattr(-,root,root)
%dir %{_kerneldir}
%dir %{_kerneldir}/arch
%dir %{_kerneldir}/include
%{_kerneldir}/.kernelrelease
%{_kerneldir}/.kconfig.d
%{_kerneldir}/Kbuild
%{_kerneldir}/.config
%{_kerneldir}/COPYING
%{_kerneldir}/CREDITS
%{_kerneldir}/Documentation
%{_kerneldir}/MAINTAINERS
%{_kerneldir}/Makefile
%{_kerneldir}/README
%{_kerneldir}/REPORTING-BUGS
%{_kerneldir}/arch/alpha
%{_kerneldir}/arch/i386
%{_kerneldir}/arch/ia64
%{_kerneldir}/arch/ppc
%{_kerneldir}/arch/powerpc
%{_kerneldir}/arch/sparc
%{_kerneldir}/arch/sparc64
%{_kerneldir}/arch/x86_64
%{_kerneldir}/arch/um
%{_kerneldir}/drivers/char
%{_kerneldir}/drivers/scsi
%{_kerneldir}/scripts
%{_kerneldir}/usr
%{_kerneldir}/include/rsbac
%{_kerneldir}/include/acpi
%{_kerneldir}/include/asm
%{_kerneldir}/include/asm-alpha
%{_kerneldir}/include/asm-generic
%{_kerneldir}/include/asm-i386
%{_kerneldir}/include/asm-ia64
# This is needed by ppc
%{_kerneldir}/include/asm-m68k
%{_kerneldir}/include/asm-ppc
%{_kerneldir}/include/asm-powerpc
%{_kerneldir}/include/asm-sparc
%{_kerneldir}/include/asm-sparc64
%{_kerneldir}/include/asm-x86_64
%{_kerneldir}/include/asm-um
%{_kerneldir}/include/linux
%{_kerneldir}/include/math-emu
%{_kerneldir}/include/net
%{_kerneldir}/include/pcmcia
%{_kerneldir}/include/scsi
%{_kerneldir}/include/sound
%{_kerneldir}/include/video
%{_kerneldir}/include/media
%{_kerneldir}/include/rxrpc
%{_kerneldir}/include/xen
%doc README.kernel-sources
%doc README.MandrivaLinux
%if %build_latest
%files -n %{kname}-source-stripped-latest
%defattr(-,root,root)
%endif
#endif %build_source
%endif
%if %build_doc
%files -n %{kname}-doc-%{mdkversion}
%defattr(-,root,root)
%doc linux-%{tar_version}/Documentation/*
%if %build_latest
%files -n %{kname}-doc-latest
%defattr(-,root,root)
%endif
%endif
%changelog
* Tue Aug 14 2007 Bogdano Arendartchuk <bogdano@mandriva.com> 2.6.17-16mdv2007.0
o Bogdano Arendartchuk <bogdano@mandriva.com>
- DB54 DB55: added more NVidia PCI ids (ghibo)
- DB60 DB61: updated 3w-9xxx to 2.26.02.010 (ghibo)
- DI36: fix map entry for ICH8
- DN98: added TG3 5786 PCI id
- DV30: reduce log verbosity of cx88-mpeg (#26295)
- ZZ36_CVE-2007-4308_aacraid_ioctl_permissions.patch (#32542)
- ZZ37_CVE-2007-3848_reset_pdeath_signal.patch (#32736)
- ZZ38_CVE-2007-3513_usblcd_limit_memory.patch (#31735)
- ZZ39_CVE-2007-3105_random_fix_boundary_check.patch (#32188)
- ZZ40_CVE-2007-3642_nf_conntrack_h323_bounds_checking.patch (#31880)
- ZZ41_CVE-2007-4573_i32entry_ptrace.patch (#34039)
- ZZ42_CVE-2007-4571_sound_snd_page_alloc_fix.patch (#34110)
* Wed Aug 1 2007 Bogdano Arendartchuk <bogdano@mandriva.com> 2.6.17-15mdv2007.0
o Luiz Capitulino <lcapitulino@mandriva.com>
- hda-intel - New pci id for Nvidia MCP61
- forcedeth: update to 0.55
o Bogdano Arendartchuk <bogdano@mandriva.com>
- CP05: reduce the log spam from pci_set_power_state(), requested by lcapitulino
- DN96_netfilter_crash_on_bridged_packet.patch
- DN97_ipvs_msleep_interruptible.patch: requested by lcapitulino
- FS15_ext3_unlink_racing.patch
- FS16_nfs_missing_braces.patch
- FS17_xfs_umount_fix.patch
- ZZ24_CVE-2007-1497_nf_conntrack-set-nfctinfo.patch (#29723)
- ZZ25_CVE-2007-1496_netfilter_null_pointer_dereferences.patch (#29722)
- ZZ26_CVE-2007-2876_netfilter_sctp_null_ptr_fix.patch (#31376)
- ZZ27_CVE-2007-2875_cpuset_underflow.patch (#31374)
- ZZ28_CVE-2007-1861_ipv4_fib_netlink_oops.patch (#30687)
- ZZ29_CVE-2007-2525_pppoe_memleak.patch (#30722)
- ZZ30_CVE-2007-2453_seeding_devrandom_zero_entropy.patch (#31375)
- ZZ31_CVE-2006-5173_dont_leak_NT_bit.patch (#28031)
- ZZ32_CVE-2006-5173_dont_leak_NT_bit_newline.patch
- ZZ33_CVE-2007-2172_ipv4_fib_semantics.patch (#32126)
- ZZ34_CVE-2007-2242_ipv6_disallow_rh0.patch (#32127)
- ZZ35_CVE-2006-7203_skip_data_compatsys.patch (#32329)
(ZZ patches notably pointed/gathered by Giuseppe Ghibó <ghibo@mandriva.com>)
* Wed May 09 2007 Luiz Capitulino <lcapitulino@mandriva.com> 2.6.17-14mdv2007.0
o Luiz Capitulino <lcapitulino@mandriva.com>
- PCI: pcieport-driver: remove invalid warning message
o Arnaud Patard <apatard@mandriva.com>
- Fix error path in usbcore
- Don't build KVM on Xen kernels
* Fri Mar 23 2007 Luiz Capitulino <lcapitulino@mandriva.com> 2.6.17-13mdv2007.0
o Gwenole Beauchesne <gbeauchesne@mandriva.com>
- Improve keyboard handling on Apple MacBooks
o Arnaud Patard <apatard@mandriva.com>
- Add -latest patch
- Workaround a possible binutils bug in smp alternatives
o Luiz Capitulino <lcapitulino@mandriva.com>
- MCP61: Add forcedeth support
- Fix potential deadlock in driver core, this issue seems to cause USB
hangs at boot time (#24683 Thanks to Danny danny@mailmij.org)
- Security fix:
* ZZ23_CVE-2007-1592_ipv6_fl_socklist_inadvertently_shared_fix.patch
(#29821)
* Wed Mar 14 2007 Luiz Capitulino <lcapitulino@mandriva.com> 2.6.17-12mdv2007.0
o Arnaud Patard <apatard@mandriva.com>
- Suspend to disk speed improvements
- Add nmi watchdog support for core2
- Add atl1 driver
- Update KVM (rev 4486 + selective changes)
- Add acer_acpi
- Update asus_acpi
- Fix suspend on r8169, i8259A
- Fix suspend when using ondemand governor
- Add ide acpi support
- Add suspend/resume support for sata_nv chipsets.
o Luiz Capitulino <lcapitulino@mandriva.com>
- Rename ZZ65 patch to ZZ17 and ZZ99 patch to ZZ18 (just to make my
scripts' life easier)
- USB: Let USB-Serial option driver handle anydata devices (#29066)
- USB: Add PlayStation 2 Trance Vibrator driver
- Fix bogus delay loop in video/aty/mach64_ct.c (thanks to
Per Øyvind Karlsen)
- Add MCP61 support (#29398 thanks to Pacho Ramos
pacho@condmat1.ciencias.uniovi.es)
- USB: fix floppy drive SAMSUNG SFD-321U/EP detected 8 times bug
(thanks to Ednilson Miura <miura@mandriva.com>)
- Security fixes:
* ZZ14_CVE-2007-0958_unreadable_binaries_pt_interp_fix.patch (#28757)
* ZZ15_CVE-2007-0772_nfs_free_wrong_pointer_fix.patch (#28863)
* ZZ16_CVE-2006-6056_hfs_null_pointer_fix.patch (#28690)
* ZZ19_CVE-2007-0005_cm4040_cs_buffer_overflow_fix.patch (#28634)
* ZZ20_CVE-2007-1217_capi_debug_buffer_overflow_fix.patch (#29067)
* ZZ21_CVE-2007-1388_ipv6_sockglue_null_ptr_fix.patch (#29400)
* ZZ22_CVE-2007-1000_ipv6_getsockopt_sticky_null_ptr_fix.patch (#29401)
* Tue Feb 13 2007 Luiz Capitulino <lcapitulino@mandriva.com> 2.6.17-11mdv2007.0
o Arnaud Patard <apatard@mandriva.com>
- Fix SiS sata support for chips on 966/968 bridges
- Add support for SiS968 bridges to the sis190 bridge
- Add support for showing blocked tasks through sysrq
- Add nozomi driver
- Add UVC driver
- Fix JMicron cable detection
- Fix issues in squashfs by updating to 3.2 (#27008)
o Luiz Capitulino <lcapitulino@mandriva.com>
- x86_64: Add /proc/config.gz support (CONFIG_IKCONFIG)
- x86_64: Add stack overflow support. Disabled by default, but it's
something good to have at hand
- x86_64: Enable kexec
- USB: rndis_host: fix crash while probing a Nokia S60 mobile
- rt2570 should report itself as "rt2570" instead of "rtusb" (#24461)
- atiixp.c: sb600 ide only has one channel (#28505 - thanks to
Wolke <wolke.liu@amd.com>)
- PCI: ATI sb600 sata quirk (#28363 - thanks to Wolke <wolke.liu@amd.com>)
- read_zero_pagealigned() locking fix (thanks to Hugh Dickins
<hugh@veritas.com>)
- Fix umask when noACL kernel meets extN tuned for ACLs
(thanks to Hugh Dickins <hugh@veritas.com>)
- PowerPC: Make current preempt-safe (thanks to Hugh Dickins
<hugh@veritas.com>)
- Security fixes:
* ZZ12_CVE-2007-0006_key_serial_number_collision_fix.patch (#28636)
* ZZ13_CVE-2006-5823_cramfs_zlib_inflate.patch (#28688)
* Fri Feb 02 2007 Luiz Capitulino <lcapitulino@mandriva.com> 2.6.17-10mdv2007.0
o Gwenole Beauchesne <gbeauchesne@mandriva.com>
- Add Ralink RT2571W/RT2671 WLAN USB support (rt73 module)
o Luiz Capitulino <lcapitulino@mandriva.com>
- Fix sys_msync() to report -ENOMEM as before when an unmapped area falls
within its range, and not to overshoot (LSB regression)
- Avoid disk sector_t overflow for >2TB ext3 filesystem
- USB: workaround to fix HP scanners detection (#26728)
- USB: unusual_devs.h for Sony floppy (#28378)
- Dropped FS06_max-symlink-to-10.patch, this patch adds security issues
on x86_64 machines and was only needed to create Live CDs (now we
use unionfs). Thanks to Thomas Backlund, who helped to find the
patch (#27955)
- Security fixes:
* ZZ08_CVE-2006-5749_isdn_ppp_init_reset_state_timer.patch (#27802)
* ZZ09_CVE-2006-5753_fix_bad_inode_retun_values.patch (#27958)
* ZZ10_CVE-2006-6053_ext3_handle_dir_corruption.patch (#28303)
* ZZ11_CVE-2006-4814_mincore_fix_user_access_locking.patch (#28373)
o Arnaud Patard <apatard@mandriva.com>
- Add preliminary ICH9 support
- Add TI sd card reader support
- Add RT61 driver
- KVM update
- Fix bttv vbi offset
- Update RT73 and use the firmware class for RT73
* Wed Dec 27 2006 Arnaud Patard <apatard@mandriva.com> 2.6.17-9mdv2007.0
o Arnaud Patard <apatard@mandriva.com>
- ata_piix fix for some ICH8 port configurations.
- Suspend/resume fixes
- Add KVM
- Add flush option for fat filesystems
- X86_64 core2 rdtsc fix
* Fri Dec 19 2006 Luiz Capitulino <lcapitulino@mandriva.com> 2.6.17-8mdv2007.0
o Luiz Capitulino <lcapitulino@mandriva.com>
- Dropped DA16_wacom_acpi_enable_future_usage.patch, it does brake
CONFIG_ACPI=yes compilation seems non-sense and there's no description
explaining why it's needed
- Security fixes:
* ZZ03_CVE-2006-5173_eflags_reset.patch (#26535)
* ZZ04_CVE-2006-5619_ip6_flowlabel_seqfile_fix.patch (#27034)
* ZZ05_CVE-2006-5751_bridge_overflow_fix.patch (#27538)
* ZZ06_CVE-2006-6106_bluetooth_add_capi_packet_checks.patch (#27660)
* ZZ07_CVE-2006-5757_fs_grow_buffers_infinite_loop_fix.patch (#27033)
* Thu Dec 7 2006 Arnaud Patard <apatard@mandriva.com> 2.6.17-7mdv2007.0
o Arnaud Patard <apatard@mandriva.com>
- Add Marvell IDE driver
- Add a driver for Jmicron chipsets instead of using the generic one
- Update the sky2 driver to fix some network hang issues
* Tue Oct 24 2006 Luiz Capitulino <lcapitulino@mandriva.com> 2.6.17-6mdv2007.0
o Samir Bellabes <sbellabes@mandriva.com>
- backport support for network chipset related to r8169 (r8168/r8169SC)
o Luiz Capitulino <lcapitulino@mandriva.com>
- 2.6.17.14
- Dropped DB40_sd_mmc_2gb.patch (fix also in 2.6.17.14)
- pccard_store_cis: fix wrong error handling
(reported by Giuseppe Ghibó <ghibo@mandriva.com>)
- x86_64: add NX mask for PTE entry
(patch from Eduardo Habkost <ehabkost@mandriva.com>)
- Fix snd-hda-intel OOPS (patch from Eduardo Habkost <ehabkost@mandriva.com>)
- mach64: Explicit initialize some members of the drm_driver structure,
otherwise NULL init will have bad side effetcs
(patch from Couriousous <couriousous@mandriva.org>)
- Adds Missing check for CAP_NET_ADMIN in iptables compat layer
- Support for building .nosrc.rpm
(patch from Thomas Backlund <tmb@mandriva.org>)
- Security fixes
* ZZ01_CVE-2006-4997_clip_do_not_refer_freed_skbuff.patch (#26608)
* ZZ02_CVE-2006-4572_netfilter_ipv6_fragmention_attacks_fixes.patch (#26745)
o Arnaud Patard <apatard@mandriva.com>
- Fix pcmcia unplug/eject on cards with r8169 chipsets
- Fix libata resource conflicts detection (#23279)
- Fix xenU crash and reenable domU boot logs.
- Fix refcount error triggered by softwares using /proc/<pid>/auxv
* Wed Sep 6 2006 Arnaud Patard <apatard@mandriva.com> 2.6.17-5mdv2007.0
o Arnaud Patard <apatard@mandriva.com>
- 2.6.17-13
- RSBAC fixlets
- Fix JMicron SATA/PATA chipsets support (#25155)
- Update the at76c503a usb driver (now called at76_usb) (#25278)
- Fix reversed error test in netif_tx_trylock (#25249)
- Fix modalias on 64bits (#25431)
- Fix ipmi_msghandler oops on removal (#25463)
- Replace DU04 with its upstream version
- Disable MSI on azalia codecs to prevent IRQ troubles.
- Disable FN keys in the i8k driver when failing to get the dell smm bios
version. Patch from Per Oyvind Karlsen. (#21140)
o Samir Bellabes <sbellabes@mandriva.com>
- cosmetic changes from Thomas Backlund <tmb@mandriva.org>
* Mon Sep 4 2006 Arnaud Patard <apatard@mandriva.com> 2.6.17-4mdv2007.0
o Samir Bellabes <sbellabes@mandriva.com>
- netfilter fix - bug #24252
- fix netfilter IFWLOG
o Arnaud Patard <apatard@mandriva.com>
- AHCI suspend
- Squashfs 3.1r2
- Fix oops on video.ko rmmod
- SiS 966 chipsets support
- Add support for 2Gb memory cards
- Fix uhci list bug
- Revert reset changes in the e1000 driver. This should fix
the e1000 resume issues
- Fix list usage in the sis190 driver
* Mon Aug 29 2006 Arnaud Patard <apatard@mandriva.com> 2.6.17-3mdv2007.0
o Luiz Capitulino <lcapitulino@mandriva.com>
- Updates drbd to 8.0pre4
- Adds drbd-api provides (#24264)
- Adds support for partitioned loop devices (patch from Flavio
fbl@mandriva.com)
- Fix double ACPI video /proc entries (patch from Danny danny@mailmij.org
#22249)
o Arnaud Patard <apatard@mandriva.com>
- 2.6.17.11
- Alsa 1.0.12
- Enable USB_EHCI_SPLIT_ISO (#24412)
- Fix sparc build (#24646)
- Fix Xen on 32bit and workaround Xen bug on 64bit.
- Fix b44 module (#24312)
- RSBAC 1.2.8
* Thu Aug 10 2006 Arnaud Patard <apatard@mandriva.com> 2.6.17-2mdv2007.0
o Gwenole Beauchesne <gbeauchesne@mandriva.com>
- Enable HUGETLBFS
- Factor out configs
o Arnaud Patard <apatard@mandriva.com>
- 2.6.17.8
- Alsa 1.0.12rc2
- Add usb ids for the Testo usb device (bug #23666)
- Add quickcam messenger driver for 2.6.18-rcX
- ata_piix/ICH8 fixes
- ACL support for tmpfs (bug #24045)
- Add DI20_initialize_hw_regs_in_setup_ports.patch from 2006-upd
- i965 support
- Intel iAMT redirection drivers
o Samir Bellabes <sbellabes@mandriva.com>
- Add support for chipset realtek 8168. (bug #23705)
- Add netfilter ipset patch
- Add netfilter conntrack/nat sip patch
- Add netfilter psd patch
* Tue Jun 29 2006 Arnaud Patard <apatard@mandriva.com> 2.6.17-1mdk
- 2.6.17.6
- Alsa 1.0.12rc1
- Rsbac 1.2.8(pre1)
- New Xen snapshot
- New wireless-2.6 snapshot (adds zd1211rw driver)
- KGDB drop
- e100, e1000 update
- Via VT8251 sata support
- vt_ar5k drop. Considered as obselete by upstream.
- svgalib_helper drop.
- 3rdparty updates : acerhk, drbd, dxr3, ipw3945, ivtv, lirc,
mod_marvel, ndiswrapper
* Wed Jun 28 2006 Samir Bellabes <sbellabes@mandriva.com> 2.6.16-3mdk
o Samir Bellabes <sbellabes@mandriva.com>
- re-enable supermount (fix bug #23217)
- ct_sync aka 'howto replicate the firewall'
* Mon May 22 2006 Arnaud Patard <apatard@mandriva.com> 2.6.16-2mdk
o Arnaud Patard <apatard@mandriva.com>
- 2.6.16.20
- input.h : move input_device_id to mod_devicetable.h
- Reenable unintentially disabled unionfs
- RS02/RS11 cleanup
- Removed bcm4400. We have the b44 module in the kernel
- Fix usage of acpi_clear_event() in CE06
- Enable cpufreq on SMP, disable USB_BANDWIDTH
- Build smp and up kernel on sparc (Peroyvind)
- Switch to GENERIC_ARCH on x86 to suppress the false warning
about the number of cpus when using cpu hotplug
- Add xen0 support in rhconfig.h
- Fix freeze when using the 'live' mode of gi (instead of using the
clp files)
- Activate RSBAC_INIT_DELAY to get rsbac working with all kind of
initrd/initramfs
- Fix fdomain vs x86_64/isa trouble
* Thu May 11 2006 Arnaud Patard <apatard@mandriva.com> 2.6.16-1mdk
o Arnaud Patard <apatard@mandriva.com>
- 2.6.16.16
- Wireless update (Adds the bcm43xx driver)
- mmc layer update (Adds the sdhci driver)
- e1000 update
- Xbox support outdated, so (temporary ?) removed
- Alsa 1.0.11
- RSBAC 1.2.6
- New Xen snapshot
- Updated 3rdparty
- ipw3945
* Mon Mar 13 2006 Eduardo Pereira Habkost <ehabkost@mandriva.com> 2.6.14-2.1mdk
o Eduardo Pereira Habkost <ehabkost@mandriva.com>
- Change kernel-source version field to 1-1mdk, like the rest of
the versioned packages
* Fri Mar 10 2006 Eduardo Pereira Habkost <ehabkost@mandriva.com> 2.6.14-2mdk
o Eduardo Pereira Habkost <ehabkost@mandriva.com>
- Avoid automatic update of kernel-source without updating the kernel:
- Put package version on package name for kernel-source and
kernel-source-stripped
- Remove Obsoletes: kernel-source from kernel-source* packages
- Closes: #21345
o Samir Bellabes <sbellabes@mandriva.com>
- update ipt_IFWLOG (interactive firewall)
o Arnaud Patard <apatard@mandriva.com>
- Fix bad update of RS11
* Mon Feb 7 2006 Arnaud Patard <apatard@mandriva.com> 2.6.14-1mdk
o Arnaud Patard <apatard@mandriva.com>
- 2.6.14.7
- Alsa 1.0.10 and cvs update.
- Xen update from the linux-2.6 tree. Build it now as a machine and no more
as a different architecture.
- Rsbac 1.2.5
- Drbd 0.7.15
- The bcm5700 driver is no more supported by Broadcom, thus dropping it.
- Dropped the now merged ipw2100, ipw2200, ieee80211, fuse, hostap 3rdparty
tarballs.
- Changed the eagle-usb driver in favour of the to-be-merged version
- Use now the acx driver from akpm's tree.
- Update 3rdparty drivers : lirc, ndiswrapper, rt2400, rt2500
- Added rt2570 usb driver.
o Samir Bellabes <sbellabes@mandriva.com>
- netfilter update (DN30_netfilter_svn6470.patch)
- unionfs 1.1.3
* Thu Nov 24 2005 Luiz Capitulino <lcapitulino@mandriva.com> 2.6.12-13.1mdk
o Arnaud Patard <apatard@mandriva.com>
- Fix oops when reading /proc/driver/pktcdvd/pktcdvd0
o Luiz Capitulino <lcapitulino@mandriva.com>
- Added DA75_alsa_patch_realtek_fix.patch to fix a bug which makes
some sound-cards managed by snd-hda-intel useless
* Mon Nov 21 2005 Gwenole Beauchesne <gbeauchesne@mandriva.com> 2.6.12-13mdk
o Luiz Capitulino <lcapitulino@mandriva.com>
- Updated pl2303 usb-serial driver to support X75 and SX1 Siemens mobiles
o Gwenole Beauchesne <gbeauchesne@mandriva.com>
- power5 & pmac64 support
- selected fixes from 2.6.13 and beyond:
* add r300 drm support
* fix x86_64 idle=poll
* fix races in libata core
* properly fix the radeon IRQ handling code
* properly fix the errata #122 workaround on x86_64 + add it to i386
* merge new upstream ioctl32 compat code, thus supporting i915 as well
o Arnaud Patard <apatard@mandriva.com>
- Fix typo in the SiS965L support. Restore the right address for the other chipsets.
* Thu Sep 8 2005 Gwenole Beauchesne <gbeauchesne@mandriva.com> 2.6.12-12mdk
o Arnaud Patard <apatard@mandriva.com>
- 2.6.12.6
- Removed lpfc from 3rdparty as it exists in drivers/scsi/ (Thanks Svetljo
for pointing out this).
- Added sata_sil24 module
- Added SiS182 minimal support.
- Added SiS190 driver.
- Added support of the IDE chipset of the SiS965L boards.
- Added various pciids from 2.6.13
- Removed patch MD48. Now we're using udev, it breaks the prism2 module
- Inotify fixlets
- Removed the patch that disable the smm bios and use usb-handoff by default (Sveltjo)
- USS725 fixes (Sveltjo)
- execve LSB test fix (Stew)
- Via unichrome support update (Danny)
o Samir Bellabes
- Add DN34_nf_rsh-conntrack_timeout.patch :
Fix timeout for ip_conntrack_rsh (bug #17368)
- backport fixes for netfilter from 2.6.13-git8: (DN60-DN75 + DN80)
* check hardware checksum in ECN, queue, TCPMSS
* fix tcp checksum in ipt_REJECT
* ipt_CLUSTERING: deletion, ct_related, mangling arp, memcpy_typo
* ip6table_raw: missing owner
* race condition in Decnet
* optimize expected timeout
* delete reference conntrack in ipmr
* fix ECN tcp marking
* fix byteorder in icmp NAT
* fix ip6t_LOG sit tunnel logging
* fix masquerading index for slave connection
* fix sysctl_tcp_low_latency
* IFWLOG : fix bad kfree and close bug #18276 (DN33_netfilter_IFWLOG.patch)
- Fix buffer overflow with module_param (DN76_nf_bad_param_port.patch)
o Flavio Bruno Leitner <flavio@mandriva.com>
- XEN updated to 2005-08-23
o Gwenole Beauchesne <gbeauchesne@mandriva.com>
- increase number of supported CPUs to 32
- add workaround for x86_64 errata #122
- update PowerNow!K8 driver to v1.50.3 for rev.F Opteron support
* Sun Aug 28 2005 Gwenole Beauchesne <gbeauchesne@mandriva.com> 2.6.12-11mdk
- remove obsolete patches that were fixed differently
- assorted x86_64 fixes from current git tree:
* fix 32-bit thread debugging
* fix TASK_SIZE for compatibility mode processes
* fix overflow in NUMA hash function setup
* fix bug in csum_partial_copy_generic()
* fix HPET for systems that don't support legacy replacement
* add support for more than 8 cores on AMD64 systems
* tell VM about holes in nodes
* avoid wasting IRQs
* Mon Aug 15 2005 <flavio@mandriva.com> 2.6.12-10mdk
o Flavio Bruno Leitner <flavio@mandriva.com>
- WARNING: Security
Hyper-Threading enabled by default.
(at boot time use ht=off to disable)
- applied patch to cpufreq support centrino.
- updated ibm_acpi to 0.11
- fixes to NFS
- ACL support to NFS
- XEN configs updated (enabled more options)
o Samir Bellabes <sbellabes@mandriva.com>
- 2.6.12.5
o Gwenole Beauchesne <gbeauchesne@mandriva.com>
- fix inotify 0.24 patch
- fix build of ndiswrapper 1.2 on x86_64
- only build xen on x86, will enable on x86_64 later
* Thu Jul 28 2005 Arnaud Patard <apatard@mandriva.com> 2.6.12-9mdk
o Arnaud Patard <apatard@mandriva.com>
- 2.6.12-4
- Advertise the megaraid_mbox as megaraid_mbox (and not megaraid) in sysfs
- Ndiswrapper 1.2
- Updated ipw2100 to 1.1.2, ipw2200 to 1.0.6
- e100 and e1000 drivers update (e100 to 3.4.8-k2 and e1000 to 6.0.60-k2)
- inotify 0.24
- Set the pwc driver to use non compressed mode by default.
o Samir Bellabes <sbellabes@mandriva.com>
- Add MD40_rt2500_local_bh_enable_fix.patch
- Add DN33_netfilter_IFWLOG.patch (Interactive Firewall)
o Flavio Bruno Leitner <flavio@mandriva.com>
- use mkinitrd without -C to force cramfs, let mkinitrd decide it.
- add requires to module-init-tools instead of old modutils.
- added XEN support
o Gwenole Beauchesne <gbeauchesne@mandriva.com>
- resurrect legacy megaraid for { 0x9010, 0x9060, 0x1960 } (Pascal)
* Tue Jul 26 2005 Flavio Bruno Leitner <flavio@mandriva.com> 2.6.12-8mdk
o Flavio Bruno Leitner <flavio@mandriva.com>
- reverted latest standard wireless extensions update to v18
(v19 isn't compatible with previous and/or maybe incomplete)
- disabled know broken qlogicisp. (superseded by the qla1280 driver)
o Arnaud Patard <apatard@mandriva.com>
- 2.6.12.3. Removed the AC01 patch as 2.6.12.3 provide it.
o Samir Bellabes <sbellabes@mandriva.com>
- Remove DN31_netfilter-rtsp-20040302.patch (updated in DN32_netfilter_050725.patch)
- Add DN30_kill_lockhelp.patch (use lock directly)
- Add DN31_kill_nf_debug.patch (don't use NETFILTER_DEBUG anymore)
- Add DN32_netfilter_050725.patch (details in svn log)
o Gwenole Beauchesne <gbeauchesne@mandriva.com>
- merge and fix drm ioctl32 compat code (x86_64)
* Mon Jul 07 2005 Flavio Bruno Leitner <flavio@mandriva.com> 2.6.12-7mdk
o Flavio Bruno Leitner <flavio@mandriva.com>
- WARNING: removed patch to rename kernel modules
(Closes ticket #13428)
- updated standard wireless extensions to v19
(DN55_iw_we18-5.diff, DN56_iw262_we19-9.diff)
- added support for Avermedia AVerTV GO 007 FM
(DV52_avermedia.patch)
- fix TPM to use BIOS instead of hardcoded memory address.
(AC01_tpm-memory-fix.patch)
o Arnaud Patard <apatard@mandriva.com>
- updated to alsa 1.0.9b
- Removed DA54_add-to-snd-intel8x0-ac97-quirk-list.patch as it has been merged.
- inotify update to 0.23-2.6.12-15
- Reenabled software suspend.
- Bluez update (to 2.6.12-mh1). It adds a better HID support in bluez
stack
- Fixed and enable the ppscsi driver.
* Mon Jul 07 2005 Flavio Bruno Leitner <flavio@mandriva.com> 2.6.12-6mdk
o Arnaud Patard <apatard@mandriva.com>
- Add support for newer versions of wpa_supplicant
- added fixes for ipw2[12]00 drivers
- sk98lin v8.23.1.3
- added USB id of the Gigabyte GN-WLBZ101
- enabled FATX support for xbox
o Flavio Bruno Leitner <flavio@mandriva.com>
- updated orinoco to 0.15rc2.
- updated to 2.6.12.2
- enabled advansys, qlogicisp, eata_pio as module
* Mon Jul 04 2005 Flavio Bruno Leitner <flavio@mandriva.com> 2.6.12-5mdk
- updated to 2.6.12.2
(added AB02_2.6.12.2.patch)
* Fri Jul 1 2005 Arnaud Patard <apatard@mandriva.com> 2.6.12-4mdk
- Ensure that stallion and istallion modules return an error code instead of 0
when something goes wrong.
* Thu Jun 23 2005 Flávio Bruno Leitner <flavio@mandriva.com> 2.6.12-3mdk
- new kernel version: 2.6.12.1
- rollback some of removed patches in 2.6.12-1mdk.
* Wed Jun 22 2005 Flávio Bruno Leitner <flavio@mandriva.com> 2.6.12-2mdk
- added drbd 0.7.11
* Wed Jun 22 2005 Flávio Bruno Leitner <flavio@mandriva.com> 2.6.12-1mdk
- new kernel version: 2.6.12
- updated bootsplash: 3.1.6
- enabled config on /proc. (/proc/config.gz)
- enabled cpufreq conservative module.
- removed ipmi smb support until be fixed for 2.6.12.
- enabled new sensors modules.
- renamed MandrakeSoft to Mandriva. (README.Mandriva too)
- fixed/improved some descriptions.
- don't use tarball for patches and scripts. (svn repos)
- added new patches:
o MD27_tivatv-agp.patch (agp_copy_info changed)
o MD56_pci_name-renamed.patch (s/pci->slot_name/pci_name()/)
o MD55_i2c-client-unused-id.patch (drop unused i2c_client->id)
o MD54_3rdpart-scsi-legacy.patch (rollback some SCSI defines)
o JX02_reparent_public.patch (XBOX needs reparent_to_init)
o MD53_3rdpart-removed-defined-func.patch (gcc4 fix)
o DV32_via_mach64_drm_fixes.patch (minor field moved)
o RS13_rsbac-2.6.12.patch (RSBAC needs task_capability_lock)
- removed already applied patches (about 55 patches)
* Mon May 30 2005 Juan Quintela <quintela@mandrakesoft.com> 2.6.11-10mdk
- disable HT by default.
- improved xbox support (stew).
- ext3_journal_unmap_buffer_race.
- CAN-2005-0750_af_bluetooth.
- CAN-2005-0400-ext2_leak.
- CAN-2005-0749_load_elf_library_DOS.
- CAN-2005-1263 binfmt_elf.
- CAN-2005-1264 raw_ioctl.
- CAN-2005-1369 sys_rw_files.
* Mon May 23 2005 Arnaud Patard <apatard@mandriva.com> 2.6.11-9mdk
- Updates:
- 2.6.11.10
- Fixed ndiswrapper Makefile
- Fixes:
- Fix build with gcc 4.0
- Fix return codes in do_readv_writev
* Tue Apr 26 2005 Arnaud Patard <apatard@mandriva.com> 2.6.11-8mdk
- Added:
- endian patches (Sveltjo)
- Rename ovcam in 3rdparty to ovcam-alt (Sveltjo)
- Add build fix for the next binutils
- Support for sata_sil on rs480 (Gb)
- Updated:
- Updated to 2.6.11.7
- Lirc 0.7.1. Also fix some broken compile options
- ipw2X00 update. Corrected also monitor mode for ipw2100.
- saa7134 update for dvb
- Compile mkiss as module
- Ndiswrapper 1.2rc1 (NX support)
- Build saa7174hl in 3rdparty/video-rivatv
* Sun Apr 10 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 2.6.11-7mdk
- sata_sil updates to v0.9
- disable pin1 APIC timer on RS480 based motherboards (e.g. HP DX5150)
* Tue Mar 22 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 2.6.11-6mdk
- enable Intel AGP support for x86-64 again (bk)
- make drm a module on x86_64 for ati drivers to work without hacks
- bring back sheep_net module for raw access to ethernet packets
- fix build on x86_64, aka remove obsolete edid/vbe stuff partly merged
* Mon Mar 21 2005 Juan Quintela <quintela@mandrakesoft.com> 2.6.11-5mdk
- several alsa fixes (arnaud).
- ipw2[12]00 wap fix (arnaud).
- disable SELINUX (we use RSBAC).
- xbox build, update spec, JX01 patch, create_configs (stew).
* Mon Mar 21 2005 Juan Quintela <quintela@mandrakesoft.com> 2.6.11-4mdk
- disable via on amd64 (for same reason does a malloc way too big).
- really compile mach64 drm.
* Sun Mar 20 2005 Juan Quintela <quintela@mandrakesoft.com> 2.6.11-3mdk
- add 2.6.11.4 patch.
- new drm for via-unichrome & ati-match64.
- bttv should work again (it is a bad idea to have two modules with the
same name :p ).
- new Chelsio 10GB ethernet.
- new LSI megaraid sas driver.
- compile i686-up-4GB kernel (Dothan don't work with PAE enabled).
- compile BOOT kernel (needed for cdrom yet).
* Thu Mar 10 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 2.6.11-2mdk
- merge with 10.2/x86_64 branch:
* workaround build with icecream
* fix ndiswrapper build
* fix inotify compat32 code
* fix drm/ioctl32 forward port to 2.6.11
- selected fixes from bitkeeper:
* make IRDA devices are not really ISA devices not depend on CONFIG_ISA
* fix boot up SMP race in timer setup on i386/x86-64
* Wed Mar 9 2005 Arnaud Patard <apatard@mandrakesoft.com> 2.6.11-1mdk
* New kernel version
* Include rtc in the kernel and no more in module.
* Fixed the dl2k ethtool.
- Added :
* usbat2 driver
- Updated :
* Alsa 1.08 (cvs version of 20050308)
* Ndiswrapper 1.0
* Inotify 0.20-2 (still activated in the kernel but support
disabled in gamin due to stability problems)
* Bootsplash to 3.1.4-2.6.11
* RSBAC 1.2.4
* sk98lin 8.14
* acx100 0.2.0-pre8 + fixes_46
* qcusb 0.6.2
* eagle-usb 2.2.0
* Prevent building scsi_transport_iscsi module from the iscsi-mod
as it's now in the kernel
- Removed :
* AA08_isapnp_interwave.patch as it's in the BK01
patch
* old patches from BK (CA01,DI09,DI10,DI11,DI12,DI13,DI14,DI15,
DI16,FS04)
* Mon Feb 21 2005 Juan Quintela <quintela@mandrakesoft.com> 2.6.10-3mdk
- rsbac is compiled but not enabled by default.
* Sun Feb 20 2005 Juan Quintela <quintela@mandrakesoft.com> 2.6.10-3mdk
* Fix ata_piix support for ich6-r drives
* Add ICH7 support
* Add support for ICHX watchdog support
* Adding command line option for a configurable delay before mounting
root
* Add support for ULi M5288
- Updated :
* sk98lin
* inotify to 0.18-rml-2.6.10-16
* dxr3
* ivtv to 0.2.0-rc3f
* ipw2100 to 1.0.5
* ipw2200 to 1.0.1
* eagle-usb 2.1.0rc1
* wlan-ng (prism2) 0.2.1-pre26
- Removed hpusbscsi module
- Renamed old radeon framebuffer driver to radeonfb_old (Sveltjo)
- Added a missing header in the idsn driver (Sveltjo)
- Corrected linux-mdkconfig.h
- Removed some unusefull built-in modules in the boot kernel
- Fixed config for the acerhk module as it builds only on X86 arch
- Xbox support (Stew)
- Add support for a gigabit card from USRobotic.
- Try to use the old usb enumeration scheme before trying the new one
- Add some keycodes for some keyboards made by Cherry
- Added support for the Uli M5263 network card
* Wed Feb 9 2005 Juan Quintela <quintela@mandrakesoft.com> 2.6.10-2mdk
- compile kernels:
* UP: with NX support
* SMP: with NX support
* i586-up-1GB, for machines that don't support PAE.
- kernel-secure is gone, UP & SMP have rsbac as default.
- kernel-BOOT is gone, i586 should be ok for installer
- x86_64 compiles again.
- drm.biarch really integrated, no more symlinks.
- fixed lots of small problems & unused patches.
- create_configs & update_configs work again as expected.
* Mon Jan 10 2005 Arnaud Patard <apatard@mandrakesoft.com> 2.6.10-1mdk
- New upstream version
- Updated alsa with alsa CVS and added drivers from the multimedia kernels
- Updated 3rdparty :
* hostap
* ipw2200
* fuse
* ipmi_smb and af_ipmi
* dazuko
* iscsi to 4.0.1.11 with a patch to rename strdup present in iscsi-session.c
to iscsi_strdup
* opengfs with version from http://sources.redhat.com/cluster/gfs/
exported symbol (sock_getsockopt)
- Added zd1201 driver
- Added inotify
- Dropped MD34_iteraid and DI03_add-support-for-it8212-ide-controllers.patch in favour
of Alan Cox's version
- Added delkin_cb driver from Alan Cox
- Added some functions that were suppressed from i2c-core as they were not used in
vanilla kernel
- Removed all MOD_INC_USE_COUNT and MOD_DEC_USE_COUNT as now it has been
suppressed
- Added some missing linux/version.h in alsa drivers in 3rdparty
- Fixed some broken {Kconfig,Makefile} in 3rdparty
- Added a warning when trying to do some scsi command not permitted
- Removed some call to usb_unlink_urb in eagle-usb
* Tue Dec 21 2004 Arnaud Patard <apatard@mandrakesoft.com> 2.6.9-1mdk
- Updated 3rdparty/
- Removed merged upstream patches
- Added Ralink drivers
- Updated libata (ahci support added)
* Mon Nov 8 2004 Juan Quintela <quintela@mandrakesoft.com> 2.6.8.1-21mdk
- fix unitialized skbuf with tso cards.
- CAN-2004-0814 tty_fixes.
- merge again with cooker kernel.
- remove build_acpi (always acpi now).
- fix bug #11262 (alsa mixer oops) (samir).
- Updated ipw2200 (Arnaud).
- Fix Kconfig for qlogic drives (Arnaud).
- Updated libata with fixes from 2.6.10-rc1 to correct cd-rom drives
detection (arnaud).
- Added a patch to correct multipath problems with qla driver (Arnaud).
* Wed Nov 3 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 2.6.8.1-20mdk
- revert TARGET_CPUS change on x86_64
- config updates to x86_64:
* enable Intel CPU microcode support
* enable AMD 8111 (new PCI lance) support
* change enhanced real time clock support to be built-in kernel image
* enable JFS filesystem support
* enable Intersil Prism GT/Duette/Indigo PCI/Cardbus support
* Thu Oct 28 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 2.6.8.1-19mdk
- add x86_64 rsbac syscalls
- temporarily re-enable IOAPIC workaround on x86_64/VIA
- selected fixes from kernels up to 2.6.10-rc1:
* try to recover from bugous USB string descriptors (e.g. Freebox USB)
* fix off-by-one error in TSS limit on x86_64
* new megaraid v2.20.3.1 driver
* add Seagate ST3120026AS to SATA SIL mod15 quirks
* Sat Oct 23 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 2.6.8.1-18mdk
- selected fixes from 2.6.9:
* fix pointer dereference before NULL check in ACPI thermal driver
* change TARGET_CPUS on x86_64 to match x86 mach-default
* fix the Lindenhurst MSI fix on x86-64 to compile again
* swsuspend fixes to x86_64
* fix cardbus card memory assignment on x86_64
* Fri Oct 22 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 2.6.8.1-17mdk
- re-enable KALLSYMS on x86_64
- merge x86_64 cpufreq configs with i386
- 64-bit fixes to acpi/processor module (2.6.9)
- keep acpi/processor module loaded for powernow-k8 (SuSE)
* Mon Oct 11 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 2.6.8.1-16mdk
- remove devfs automount config
- revert 82801EB ICH5 IDE changes
* Thu Oct 7 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 2.6.8.1-15mdk
- enable ACPI and Centrino speedstep for Nocona systems
- selected x86-64 fixes from 2.6.9rc3 tree:
* don't panic when io apic id cannot be set
* Thu Oct 7 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 2.6.8.1-14mdk
- fix speedtouch support on 64-bit platforms
- selected x86-64 fixes from 2.6.9rc3 tree:
* add support for NUMA discovery on AMD dual core to x86-64
* fix sibling map for clustered mode
* report PNI support in recent AMD CPUs
* Wed Oct 6 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 2.6.8.1-13mdk
- fix build of ipc32 compat on x86_64
- fix sata_nv on non-CK8-04 systems (Andrew Chew)
* Thu Sep 30 2004 Juan Quintela <quintela@mandrakesoft.com> 2.6.8.1-12mdk
- Fix Oops on sched_api (fix bug #11322)>
- create i686-up-64GB kernel, idea is having PAE kernels for up & smp
(only way to have NX protection).
* Mon Sep 27 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.8.1-11mdk
- cpufreq update.
- cpuid update.
- tcp_default_win_scale fix.
- fix rsbac printk.
- ipw2200 0.8.
- msdos/vfat sync.
* Tue Sep 7 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.8.1-10mdk
- bootsplash 3.1.6.
- fix bootsplash vt0 display.
- ipw2100 0.54.
- ipw2200 0.7.
* Tue Sep 7 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 2.6.8.1-9mdk
- x86_64 2.6.8-1
* Fri Sep 3 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.8.1-8mdk
- remember install use ext2.gz initrd image file.
- don't obsoletes kernel-source-2.6.
* Fri Sep 3 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.8.1-7mdk
- drop 8139too rx fifo.
- eagle-usb 1.9.9.
- lastest scsi ioctl.
* Fri Sep 3 2004 Juan Quintela <quintela@mandrakesoft.com> 2.6.8.1-6mdk
- fix right Provides/Obsolets for kernel-source*.
- remove dir /usr/src/linux.
- really, really use cramfs for initrd.
- big config clean-up.
- acpi floppy code removal (Oops should have gone).
- orinoco update to 2.4.9-rc1.
* Fri Aug 27 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.8.1-5mdk
- drop atkbd interrupt interaction.
- drop nfs, knfsd patch suites.
* Thu Aug 26 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.8.1-4mdk
- more info on new kernels :
o BOOT (i586 up 1GB optimize for size)
o up (i586 up 4GB + selinux)
o smp (i686 smp 4GB + selinux)
o enterprise (i686 smp 64GB + selinux)
o secure (i686 smp 64GB + selinux + rsbac)
o i586-up-1GB (legacy kernel + selinux)
- selinux=0 as default.
- rename s/kernel-source/kernel-source-2.6/ provide kernel-source
s/kernel-source-stripped/kernel-source-stripped-2.6/ provide kernel-source-2.6 kernel-source
- acpi 20040715.
- ipmi v3.2 af_ipmi, smb.
- really do cramfs as static in kernel.
- cpufreq, software suspend, drm, libata updates
- add agpgart i915 support.
- usb updates.
- don't detect wacom tablet as mouse (flepied).
- lots of mm selected patches like:
o it8212 support.
o aio/bio updates.
o ext2/ext3/jffs fixes.
o software suspend fixes.
o selinux fixes.
o i810 audio fixes.
o cd/dvd packet writing updates.
o posix locking fix.
o cciss/i2o updates.
o via-rhine fixes.
o nfsd fixes.
* Thu Aug 26 2004 Juan Quintela <quintela@mandrakesoft.com> 2.6.8.1-3mdk
- used cramfs for initrd instead of ext2.
- weigth reduction program begins.
- 2.6.8.1-q3.
* unset PCI_NAMES
* unset IMSTTT
* unset all elan options (kernel will not work anywhere).
* unset IKCONFIG (you have the config file in /boot and in all mandrake
mirrors).
* unset EISA.
* NFS is now a module again (magic in mkinitrd will fix it in next release).
* now we have:
- kernel i586 up 1GB (for old machines)
- kernel up (i686 up 4GB)
- kernel smp (i686 smp 4GB)
- kernel p3 smp 64GB
- kernel secure (i586 smp 4GB)
- kernel BOOT (i386 up 1GB)
* plan is remove also BOOT (if weight reduction program has enough success)
and secure (if options can be integrated without too much fuss in the
others).
* Wed Aug 18 2004 Olivier Blin <blino@mandrake.org> 2.6.8.1-2mdk
- update bootsplash patch (from bootsplash.de)
* Mon Aug 16 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.8.1-1mdk
- 2.6.8.1.
- alsa 1.0.6.
* Thu Aug 12 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.8-0.rc4.1mdk
- rc4 bk3.
* Wed Jul 21 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.8-0.rc2.2mdk
- fix double EXTRAVERSION in Makefile (introduce by rsbac patch vs specfile)
- add tc1100-wmi/wacom_acpi driver for HP/Compaq TC1100 tabletpc. (aacton)
- add ntfs support in BOOT kernel.
- next is from mm patchset.
- lastest agpgart.
- cpufreq for nforce2.
- enable suspend/resuming of e1000.
- i810_audio mmio support.
- dvdrw/cdrw packet writing.
- update drivers net pcmcia/wireless.
- posix locking fix.
- x86-64 support singlestep into 32bit syscalls
- 3rdparty BIG update :
o acx100-0.2.0pre8.
o eagle-usb-1.9.8.
o hostap-0.2.4.
o lirc-20040406.
o qc-usb-0.6.0.
o dfg1394-1.3.
o prism25-0.2.1.
o ov511-2.28.
o iscsi-mod-4.0.1.
o bcm5700-7.1.22.
o at76c503a-cvs20072004.
o ndiswrapper-0.8.
o acecad-3.1.
o squashfs_2.0.
o ivtv-cvs21072004.
o rivatv-0.8.5.
o sn9c102-1.02_beta. (w9968cf alternative)
o fuse-1.3.
o iteraid-092005-09.
o shfs-0.35.
o ipw2100-0.50.
o ipw2200-0.2.
* Sun Jul 18 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.8-0.rc2.1mdk
- rc2.
- really enable codepage 437 in BOOT kernel.
- add rsbac security patch in secure kernel.
- modules.description fix (blino).
- no more modversioning module.
- lufs 0.9.7.
- BadRam.
* Fri Jul 16 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.8-0.rc1.2mdk
- dazuko 2.0.2.
- codepage 437 module in BOOT kernel.
- kexec is back.
* Mon Jul 12 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.8-0.rc1.1mdk
- 2.6.8-rc1.
- bootsplash is back.
- ak series amd64 patchsets (gb).
- piix is back as static.
- ide-generic as module.
* Mon Jun 21 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.7-2mdk
- bluetooth mh1.
- mppe mppc 1.0. (florin request)
* Thu Jun 17 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.7-1mdk
- 2.6.7.
* Mon Jun 14 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.7-0.rc3.1mdk
- rc3.
- bk5.
- kdb 4.4 (i386 ia64 x86_64).
- drop bootsplash for the moment.
- disable pata piix driver, enable generic ide, enable PATA ATAPI in libata.
* Wed Jun 02 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.7-0.rc2.1mdk
- rc2.
- bk3.
* Tue May 25 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.7-0.rc1.1mdk
- rc1.
- bootsplash 3.1.5 20040318.
- netfilter (CLASSIFY CONNMARK IPMARK TARPIT addrtype condition connbytes
h323-conntrack-nat owner-socketlookup pptp-conntrack-nat connlimit
dstlimit iprange mport nth osf quota random time rtsp-conntrack)
* Wed May 19 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.6-3mdk
- bk6.
- kexec (do reboot,shutdown -r obselete ;)).
- ramdisk BIG fixes.
- quirks disable usb smm bios only on X86 (svetljo).
- drop kdb.
* Fri May 14 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.6-2mdk
- raid locking fix.
- r8169 266-mm2 updates.
- nfs long symlinks fix.
- atkbd_interrupt-interaction.
- input tsdev fixes.
- scancode keycode conversion for 265 fix.
- unplug can sleep.
- sata speedup.
- logitech keyboard fix.
- shm do munmap check.
- set_page_dirty nobuffers race fix.
- revert i8042 interrupt handling.
- fealnx fixes.
- kgdb support.
- acpi procfs fix.
- shfs 0.33.
- isdn devfs support.
* Fri May 10 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.6-1mdk
- 2.6.6.
- DI01 is back, not merged in upstream
(ide generic no via8237 sata basic support)
* Fri May 7 2004 Thomas Backlund <tmb@mandrake.org> 2.6.6-0.rc3.1mdk
- 2.6.6-rc3
- rediffed CK01-5
- drop DI01, ZY60 (merged upstream)
- drop MC06 (3rdparty prism54, merged upstream)
- add DV35: add missing errno to tda1004x
- update configs (new stuff in rc3):
* CONFIG_ATM_FORE200E_USE_TASKLET=y
* CONFIG_SECURITY_SELINUX_DISABLE=y
* Fri Apr 23 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.6-0.rc2.1mdk
- 2.6.6-rc2.
- lirc devfs remove fix.
- ia64 support.
- eagle-usb 1.9.6.
* Mon Apr 19 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.3-10mdk
- acpi cardbus pci routing fix.
- yenta irq routing fix for TI chipset.
- oss cmpci driver update to 6.64.
- BIG isdn update.
- set max symlink to 10.
- gzloop (pixel).
- changeloop (pixel).
- vfat nobadchars option.
- supermount no warning when busy.
- sk98lin buggy vpd workaround. (bad eeprom on ASUS K8V)
- psmouse usb quirks fix (svetljo).
- CAN-2004-0003 r128.
- CAN-2004-0075 vicam.
- CAN-2004-0109 isofs fix.
- CAN-2004-0177 ext3.
* Fri Apr 16 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 2.6.3-9mdk
- Merge from AMD64 branch:
* smaller -BOOT kernel
* really add /proc/BOOT/{vbe,edid} interfaces
* update K8 PowerNow!
* update AMD64 subsystem to selected bits from 2.6.5rc2-1 patchkit
* workaround VIA IOMMU problems
* assorted libata fixes (SuSE)
* enable mga drm & fix 32-bit drm thunks
* support ITE it8212 RAID chip (Svetljo)
* update libata core to 2004/03/09 (libata 1.01, sata_promise 0.91)
* Fri Apr 02 2004 Stew Benedict <nplanel@mandrakesoft.com> 2.6.3-8mdk
- CAN-2004-0109 isofs rockridge issue (ZY58)
- CAN-2004-0133 xfs filesystem issue (ZY59)
- CAN-2004-0177 ext3/jbd filesystem issue (ZY60)
- CAN-2004-0178 sb_audio issue (ZY61)
- CAN-2004-0181 jfs filesystem issue (ZY62)
* Wed Mar 17 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.3-7mdk
- revert xfs updates
- x86_64 really disable IO-APIC on NVIDIA boards (gb)
- usblp updates.
- sys_alarm return value fix.
- edd get legacy parameters.
- fbcon switch fix.
- ide-scsi error handling fixes.
- tun name fix.
- ehci use dma mapping.
- scsi alignment fix.
* Tue Mar 9 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.3-6mdk
- at76c503a 0.12 Beta8 with MSI6978 Wlan PC2PC support.
- lsb loop test must be work now.
- d_alloc_root, vma corruption, ramdisk memleak fixes.
- ext2/3 no space left fix.
- ICH6 update/fix ID.
- pdc202xx_old updates.
- loop setup race fix.
- pcnet32 transmit hang fix.
- e1000 5.2.30.1-k2.
- AMD 768MPX bootmem fix.
- floppy oops fix.
- i2o bugfixes.
- netfilter ip-route forget proto fix.
- cryptoloop support in BOOT kernel (pixel request).
- from tmb kernel:
* remove qla2xxx from 3rdparty as it's already in main kernel.org
* add support for mppe (svtljo)
* pwc 9.0 Beta1.
* Thu Mar 4 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 2.6.3-5mdk
- add 32-bit DRM thunks for AMD64 (Egbert Eich).
- update AMD64 bits to 2.6.3-2 patchkit for ia32e support.
* Mon Mar 01 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.3-4mdk
- netfilter rtsp.
- dcache security fix.
- usb released wait on deregister bus.
- usb-storage update.
- ICH6 piix/libata support.
- aacraid update.
- sk98lin update.
- mtp fusion update to 3.00.03.
- ext3 fix access POSIX compiliant.
- pm runtime deadlock fix.
* Tue Feb 24 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.3-3mdk
- sg direct io allowed as default.
- bdclaim security oops fix.
- blacklist Compaq ProLiant DL360 (acpi=off).
- ipmi v30 (erwan request).
* Mon Feb 23 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.3-2mdk
- bootsplash working now.
- bootsplash compil depend fix (chmou).
- no more ide cdrom use ide-scsi.
- fix libata pci quirks (remove 0x24d1).
- parport updates.
- enable ATM in BOOT kernel (tv request).
* Fri Feb 20 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.3-1mdk
- acpi 20040211.
- nforce chipset must be working now.
- lirc create good /dev/lirc/0 now.
- alsa ac97, intel8x0, via82xx updates.
- remove udev requires.
* Thu Feb 12 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.2-3mdk
- ata_piix doesn't probe 8086:24d1 anymore for the moment.
- remove nforce bad patch.
* Wed Feb 11 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.2-2mdk
- acpi updates 20040211
- usb updates 20040211
- pnpbios=off as default.
- smb3 uid/gid permisions security fix.
- nforce irq setup fix.
- md update from mm.
- remove airo_mpi and mpi350, merged in airo module kernel.
- parallel port SCSI adapter (ppSCSI) support.
- prism54 20040210.
- hostap 0.1.3.
- at76c503 0.12Beta4.
* Thu Feb 05 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.2-1mdk
- 2.6.2 enjoy ;)
- qla2xxx updates.
- acx100 0.2.0pre7.
- alsa 1.0.2c.
- bttv, saa7134, cx88 updates.
- logitech wheel mouse must be work now.
- usb, input bk updates.
- alsa usx2y nforce3 pdplus PDAudio echoaudio drivers (tmb).
* Mon Feb 02 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.2-0.rc3.1mdk
- 2.6.2-rc3
- pnp updates.
- aureal sound cards support. (tmb)
- nForce2 apic fixies. (tmb)
- reeanble lirc. (not lirc_mceusb)
* Fri Jan 30 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.2-0.rc2.2mdk
- amd64 support (gb)
- new wireless drivers : poldhu, mpi350
- drm updates
- reiserfs in non-debug mode
* Mon Jan 26 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.2-0.rc2.1mdk
- 2.6.2-rc2.
- acpi 20040116.
- somes mm3 patches.
- alsa 1.0.2 (true verison)
- 80x25 mode selected if vesa mode is bad.
- usb gadget updates from David Brownell.
- dmi updates, pnpbios broken on Intel D865GBF and ASUS A7V8X.
- s/adiusbadsl/eagle-usb/ (new version)
- no module rename (s/[-,]/_/) pixel is a happiest man now ;)
- sync 3rd modules from tmb kernel.
* Wed Jan 21 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.2-0.rc1.1mdk
- 2.6.2. rc1
- agpgart as module now.
- remove drm cvs updates.
* Fri Jan 16 2004 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.1-1mdk
- 2.6.1. bk4
- force inline memcmp when use Os (gb)
- slim BOOT kernel.
- forcedeth v20.
- ndis wrapper 0.4.
- alsa 1.0.1.
- acpi 20031203.
- raid6 20040107.
- drm 20040108.
- nfs/nfsd updates.
* Thu Dec 18 2003 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.0-1mdk
- 2.6.0 final version ;)
- ndis wrapper 0.3.
- fix uss725.
* Wed Dec 17 2003 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.0-0.5mdk
- bk13.
- acecad 1.3.
- uss725.
- bttv videodev i2c videobuf updates 20031216.
- dvb timeout fix.
- mod_marvel (Kevin O'Connor).
- matrox_fb fixes (Kevin O'Connor).
- forcedeth v19.
- kdb build fix.
- add siimage 3114 support.
- prism25 0.2.1-pre16.
- qc-usb cvs20031216.
* Fri Dec 12 2003 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.0-0.4mdk
- bk8.
- add vt|ar5k wireless chipset support.
- dos partition table consistency.
- warly touch boot logo ;)
- ndis wrapper 0.2. (only for up kernel)
- alsa 1.0.0rc2.
- agpgart and mousedev as built-in.
* Thu Dec 04 2003 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.0-0.3mdk
- bk1:
* ide-scsi.c uninitialized variable
* x86 kernel page fault error codes
* lost wakeups problem
* missing initialization of /proc/net/tcp seq_file
- rework merge version.h (now all kernel have UTS_RELEASE defined)
- 2.6.0-test11q2 :
* libata update
* pwc 8.12
* prism54 cvs20031203
* alsa 1.0.0rc1
* Fri Nov 28 2003 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.0-0.2mdk
- re-support on the fly module building (great for properitary packages)
- 2.6.0-test11q2 :
* lots of mm patches
* import somes 3rdparty and patches : (svetoslav)
* lirc
* at76c503a
* bcm5700
* dfg1394
* dxr3
* iscsi-mod
* lufs
* ov511
* prism25
* prism54
* qc-usb
* Mon Nov 24 2003 Nicolas Planel <nplanel@mandrakesoft.com> 2.6.0-0.1mdk
- First version to move on kernel-2.6.0. (aka: ready for a new age).
- 2.6.0-test10q1 :
* only i386 config for the moment
* bootsplash 3.1.3
* mdk logo
* forcedeth v18
* adiusbadsl 1.0.4 (untested)
* acx100 0.2.0pre6
* hostap 0.1.2
# Local Variables:
# rpm-spec-insert-changelog-version-with-shell: t
# End:
distrib
>
Mandriva
>
2007.0
>
x86_64
>
media
>
main-updates-src
>
by-pkgid
>
d54ccd33b1c219980ae386c1cb32cb3e
>
files
>
3
