[Erp5-report] r11105 - in /spec/mandriva/2006.0/kernel-2.6.12-mdv-2006.0: ./ 2.6.12-q24/ 2....
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Nov 6 11:02:29 CET 2006
Author: kevin
Date: Mon Nov 6 11:02:26 2006
New Revision: 11105
URL: http://svn.erp5.org?rev=11105&view=rev
Log:
Replace customisation of kernel 2.6.12-24 by original config of 2.6.12-27 kernel
Added:
spec/mandriva/2006.0/kernel-2.6.12-mdv-2006.0/2.6.12-q27/
spec/mandriva/2006.0/kernel-2.6.12-mdv-2006.0/2.6.12-q27/configs/
Removed:
spec/mandriva/2006.0/kernel-2.6.12-mdv-2006.0/2.6.12-q24/
Modified:
spec/mandriva/2006.0/kernel-2.6.12-mdv-2006.0/kernel-2.6.spec
Modified: spec/mandriva/2006.0/kernel-2.6.12-mdv-2006.0/kernel-2.6.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/kernel-2.6.12-mdv-2006.0/kernel-2.6.spec?rev=11105&r1=11104&r2=11105&view=diff
==============================================================================
--- spec/mandriva/2006.0/kernel-2.6.12-mdv-2006.0/kernel-2.6.spec (original)
+++ spec/mandriva/2006.0/kernel-2.6.12-mdv-2006.0/kernel-2.6.spec Mon Nov 6 11:02:26 2006
@@ -5,7 +5,7 @@
# if you try to understand kernel numbering, read docs/kernel_naming
%define sublevel 12
-%define mdkrelease 24
+%define mdkrelease 27
%define use_patch 0
#define patchlevel uc1
%define devel_notice %{?patchlevel:NOTE: This is work-in-progress (WIP) development kernel.}
@@ -21,16 +21,16 @@
%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}}nxd
+%define realrelease 0.%{use_patch}.%{mdkrelease}%{?patchlevel:.%{patchlevel}}mdk
%else
%define tar_version 2.%{major}.%{sublevel}
%define patchversion q%{mdkrelease}
-%define realrelease %{mdkrelease}%{?patchlevel:.%{patchlevel}}nxd
+%define realrelease %{mdkrelease}%{?patchlevel:.%{patchlevel}}mdk
%endif
# never touch the folowing two fields
%define rpmversion 1
-%define rpmrelease 1nxd
+%define rpmrelease 1mdk
%define realversion 2.%{major}.%{sublevel}
%define mdkversion %{realversion}.%{realrelease}
%define patches_ver 2.%{major}.%{sublevel}-%{patchversion}
@@ -38,6 +38,10 @@
# 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
+%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
@@ -52,8 +56,8 @@
%define build_doc 1
%define build_source 1
-%ifarch %{ix86}
-%define build_xen 0
+%ifarch %{ix86} x86_64
+%define build_xen 1
%else
%define build_xen 0
%endif
@@ -64,7 +68,7 @@
%define build_92 %(if [ `awk '{print $4}' /etc/mandrake-release` = 9.2 ];then echo 1; else echo 0; fi)
%define build_up 1
-%define build_smp 0
+%define build_smp 1
# this flag build kernels for:
# i686-up-4GB
@@ -83,8 +87,8 @@
%ifarch %{ix86}
%define build_i586_up_1GB 1
-%define build_i686_up_4GB 0
-%define build_xbox 0
+%define build_i686_up_4GB 1
+%define build_xbox 1
%else
%define build_i586_up_1GB 0
%define build_i686_up_4GB 0
@@ -146,14 +150,14 @@
%if %(if [ -z "$CC" ] ; then echo 0; else echo 1; fi)
%define kmake %make CC="$CC"
%else
-%define kmake %make
+%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/")
+%define target_cpu %(echo %{_target_cpu} | sed -e "s/amd64/x86_64/")
+%define target_arch %(echo %{_arch} | sed -e "s/amd64/x86_64/")
Summary: The Linux kernel (the core of the Linux operating system).
Name: %{kname}-%{mdkversion}
@@ -203,7 +207,7 @@
%if %{build_100}
%define requires2 mkinitrd >= 3.4.43-10mdk
%define requires3 bootloader-utils >= 1.6
-%define conflicts bootsplash < 2.1.5
+%define specific_conflicts bootsplash < 2.1.5
%else
# Force installation of the new bootsplash (>= 3.1.12) package. This
# yields the following upgrade order: mkinitrd, kernel, bootsplash.
@@ -216,9 +220,11 @@
# So, we are left with %posttrans for the /sbin/installkernel call.
%define requires2 mkinitrd >= 4.2.17-16.1.20060
%define requires3 bootloader-utils >= 1.9
-%define conflicts bootsplash < 3.1.12
+%define specific_conflicts bootsplash < 3.1.12
%endif
%define requires4 sysfsutils module-init-tools >= 0.9.15
+%define conflicts %{specific_conflicts}, rsbac-admin < 1.2.4-2.1.20060mdk
+%define xen_conflicts xen < 3.0.1-2mdk
%define kprovides kernel = %{realversion}, alsa, drbd-api = 78
@@ -308,7 +314,7 @@
%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
+for multiple processor machines (or Hyper-Threading), support for large
memory configurations and other appropriate items.
For instructions for update, see:
@@ -337,7 +343,7 @@
#
# kernel-xbox: XBox kernel
-#
+#
%package -n %{kname}-xbox-%{mdkversion}
Summary: The version of the Linux kernel used on XBox machines.
@@ -390,8 +396,8 @@
Conflicts: %conflicts
%description -n %{kname}-i686-up-4GB-%{mdkversion}
-This package includes a kernel that has appropriate configuration
-options enabled for the typical single processor machine with memory
+This package includes a kernel that has appropriate configuration
+options enabled for the typical single processor machine with memory
between 1GB and 4GB.
For instructions for update, see:
@@ -410,8 +416,8 @@
Conflicts: %conflicts
%description -n %{kname}-i686-up-1GB-%{mdkversion}
-This package includes a kernel that has appropriate configuration
-options enabled for the typical single processor machine with less
+This package includes a kernel that has appropriate configuration
+options enabled for the typical single processor machine with less
than 1GB of memory.
For instructions for update, see:
@@ -430,8 +436,8 @@
Conflicts: %conflicts
%description -n %{kname}-i686-smp-1GB-%{mdkversion}
-This package includes a kernel that has appropriate configuration
-options enabled for the typical multi processor (or Hyper-Threading)
+This package includes a kernel that has appropriate configuration
+options enabled for the typical multi processor (or Hyper-Threading)
machines with less than 1GB of memory.
For instructions for update, see:
@@ -467,6 +473,7 @@
Summary: The XEN hypervisor kernel
Group: Development/Kernel
Autoreqprov: no
+Conflicts: %{xen_conflicts}
%description -n %{kname}-xen0-%{mdkversion}
The kernel-xen0 package contains XEN hypervisor kernel which provides
@@ -478,6 +485,7 @@
Summary: The XEN guests kernel
Group: Development/Kernel
Autoreqprov: no
+Conflicts: %{xen_conflicts}
%description -n %{kname}-xenU-%{mdkversion}
The kernel-xenU package contains XEN guests kernel which runs in
@@ -492,7 +500,8 @@
%package -n %{kname}-source-%{mdkversion}
Version: %{rpmversion}
Release: %{rpmrelease}
-Provides: %{kname}-source
+Provides: %{kname}-source = %{realversion}-%{realrelease}
+Provides: %{kname}-source-2.%{major} = %{realversion}-%{realrelease}
Requires: glibc-devel, ncurses-devel, make, gcc, perl
Summary: The source code for the Linux kernel.
Group: Development/Kernel
@@ -514,8 +523,8 @@
%package -n %{kname}-source-stripped-%{mdkversion}
Version: %{rpmversion}
Release: %{rpmrelease}
-Provides: %{kname}-source
-Provides: %{kname}-source-2.%{major}
+Provides: %{kname}-source = %{realversion}-%{realrelease}
+Provides: %{kname}-source-2.%{major} = %{realversion}-%{realrelease}
Requires: glibc-devel, ncurses-devel, make, gcc, perl
Summary: The source code of the Linux kernel stripped for post build.
Group: Development/Kernel
@@ -630,159 +639,159 @@
%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 [ "$name" == "xen0" -o "$name" == "xenU" ]; then
- %smake -s ARCH=xen mrproper
- cp arch/xen/$config_name .config
- %smake ARCH=xen oldconfig
- else
- %smake -s mrproper
- cp arch/%{target_arch}/$config_name .config
- %smake oldconfig
- fi
+ 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 [ "$name" == "xen0" -o "$name" == "xenU" ]; then
+ %smake -s ARCH=xen mrproper
+ cp arch/xen/%{target_arch}/$config_name .config
+ %smake ARCH=xen oldconfig
+ else
+ %smake -s mrproper
+ cp arch/%{target_arch}/$config_name .config
+ %smake oldconfig
+ fi
}
BuildKernel() {
- KernelVer=$1
- echo "Building kernel $KernelVer"
-
- if [ "$KernelVer" == "%{KVERREL}xen0" -o "$KernelVer" == "%{KVERREL}xenU" ]; then
- HOSTCC="$HOSTCC -fno-strict-aliasing" CFLAGS="$CFLAGS -fno-strict-aliasing" %kmake ARCH=xen all
- else
- %kmake all
- fi
-
- ## 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
- gzip -9c vmlinux > %{temp_boot}/vmlinuz-$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 ppc64
- cp -f vmlinux %{temp_boot}/vmlinuz-$KernelVer
- %endif
-
- # modules
- install -d %{temp_modules}/$KernelVer
- %smake INSTALL_MOD_PATH=%{temp_root} KERNELRELEASE=$KernelVer modules_install
+ KernelVer=$1
+ echo "Building kernel $KernelVer"
+
+ if [ "$KernelVer" == "%{KVERREL}xen0" -o "$KernelVer" == "%{KVERREL}xenU" ]; then
+ HOSTCC="$HOSTCC -fno-strict-aliasing" CFLAGS="$CFLAGS -fno-strict-aliasing" %kmake ARCH=xen all
+ else
+ %kmake all
+ fi
+
+ ## 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
+ gzip -9c vmlinux > %{temp_boot}/vmlinuz-$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 ppc64
+ 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'`"
+ 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
+ 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
- echo "%{_bootdir}/vmlinuz-${kversion}" >> $output
+ kversion=$1
+ output=../kernel_files.$kversion
+
+ echo "%defattr(-,root,root)" > $output
+ echo "%{_bootdir}/config-${kversion}" >> $output
+ echo "%{_bootdir}/vmlinuz-${kversion}" >> $output
%ifarch ia64
- echo "%{_efidir}/vmlinuz-${kversion}" >> $output
+ 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
+ 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" = "up" ]; 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
+ flavour=$1
+
+ if [ "$flavour" = "up" ]; 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
+ 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
+ extension="%realrelease-$name"
+
+ KernelVer="%{KVERREL}-$arch-$nprocs-$memory"
+ PrepareKernel $name $extension
+ BuildKernel $KernelVer
+ SaveHeaders $name
CreateFiles $KernelVer
}
@@ -863,7 +872,7 @@
# Create directories infastructure
%if %build_source
-install -d %{target_source}
+install -d %{target_source}
tar cf - . | tar xf - -C %{target_source}
chmod -R a+rX %{target_source}
@@ -872,8 +881,8 @@
# first architecture files
for i in arm cris mips mips64 parisc s390 s390x sh sh64 arm26 h8300 m68knommu v850 m32r frv; do
- rm -rf %{target_source}/arch/$i
- rm -rf %{target_source}/include/asm-$i
+ rm -rf %{target_source}/arch/$i
+ rm -rf %{target_source}/include/asm-$i
done
# ppc needs m68k headers
rm -rf %{target_source}/arch/m68k
@@ -900,23 +909,23 @@
echo "#include <linux/rhconfig.h>" > version.h
loop_cnt=0
for i in BOOT up smp enterprise secure i686-up-4GB i686-up-1GB i686-smp-1GB i586-up-1GB 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
+ 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;
+ echo "You need to build at least one kernel"
+ exit 1;
fi
echo "#else" >> version.h
echo '#define UTS_RELEASE "'%{KVERREL}custom'"' >> version.h
@@ -944,17 +953,17 @@
pushd %{target_modules}
for i in *; do
- /sbin/depmod-25 -u -ae -b %{buildroot} -r -F %{target_boot}/System.map-$i $i
- echo $?
+ /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
+ 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
@@ -966,10 +975,10 @@
%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
+# 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}
+#rm -rf %{temp_root}
###
### scripts
@@ -1125,23 +1134,23 @@
# 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
+ 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 ]; 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
+ [ $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
+ if [ -L $i ]; then
+ rm -f $i
+ fi
done
exit 0
@@ -1153,23 +1162,23 @@
# 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
+ 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 ]; 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
+ [ $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
+ if [ -L $i ]; then
+ rm -f $i
+ fi
done
exit 0
@@ -1270,7 +1279,6 @@
%{_kerneldir}/include/asm-generic
%{_kerneldir}/include/asm-i386
%{_kerneldir}/include/asm-xen
-%{_kerneldir}/include/xenstore/xenstored.h
%{_kerneldir}/include/asm-ia64
# This is needed by ppc
%{_kerneldir}/include/asm-m68k
@@ -1347,7 +1355,6 @@
%{_kerneldir}/include/media
%{_kerneldir}/include/rxrpc
%{_kerneldir}/include/asm-xen
-%{_kerneldir}/include/xenstore/xenstored.h
%doc README.kernel-sources
%doc README.MandrivaLinux
#endif %build_source
@@ -1361,11 +1368,82 @@
%changelog
### REMOVE THE PATCHLEVEL DEFINITION ABOVE ###
-* Sat Jul 29 2006 Kevin Deldycke <kevin at nexedi.com> 2.6.12-24nxd
- o Kevin Deldycke <kevin at nexedi.com>
- - Modify the linux-2.6.12-q24.tar.bz2 file to add "CONFIG_NTFS_RW=y"
- option to configs/i386.config file.
- - Don't build smp, i686, xbox or xen kernel flavour.
+* Mon Sep 25 2006 Luiz Capitulino <lcapitulino at mandriva.com> 2.6.12-27mdk
+ o Luiz Capitulino <lcapitulino at mandriva.com>
+ - Security fixes:
+ * ZZC0_CVE-2006-4145_udf_deadlock_and_memory_corruption.patch (#24450)
+ * ZZC1_CVE-2006-4535_sctp_primitive_regression_fix.patch (#25063)
+ * ZZC2_CVE-2006-3741_perfmon_refcount_fix.patch (#25651)
+ * ZZC3_CVE-2006-4623_dvb_core_fix_ule_sndu_handling.patch (#25654)
+ - Enables CISS driver (CONFIG_BLK_CPQ_CISS_DA) for Xen kernels
+
+ o Samir Bellabes <sbellabes at mandriva.com>
+ - Add support for NetXtreme BCM5715 Gigabit Ethernet
+ - Add support for NetXtreme II BCM5708 Gigabit Ethernet
+
+* Mon Sep 04 2006 Samir Bellabes <sbellabes at mandriva.com> 2.6.12-26mdk
+ o Arnaud Patard <apatard at mandriva.com>
+ - Update ich8 support in ata_piix
+
+ o Gwenole Beauchesne <gbeauchesne at mandriva.com>
+ - Fix kernel-source packaging
+ - RSBAC updates:
+ * Make it work with initramfs (rtp)
+ * Rework rsbac=on patch to cope with recent updates
+ * Revert bugfix #2: upstream 1.2.5+ is quite different and
+ current version exposes other problems
+ * Merge bugfix #3: various fixes (RC, user management)
+ * Merge bugfix #4: memory leak in logging code
+ * Merge bugfix #6: fix rare dereference oopses in inheritance code
+ * Merge bugfix #7: fix rare file lookup failureswith symlink redirection
+
+ o Samir Bellabes <sbellabes at mandriva.com>
+ - megaraid_sas: support for 1078 type controller
+
+* Thu Aug 18 2006 Luiz Capitulino <lcapitulino at mandriva.com> 2.6.12-25mdk
+ o Luiz Capitulino <lcapitulino at mandriva.com>
+ - Adds support for Testo products in usb-serial
+ (patch from Colin Leroy <colin at colino.net> #23666)
+ - Fixes ip_gre module unload OOPS
+ - Rediffed ZZB4 patch to make it quilt friendly
+ - Patches from Thomas Backlund <tmb at mandriva.org>
+ * ATI SB600 IDE support
+ * ULI M-1573 south Bridge support
+ * Adds PATA and SATA support for nVidia MCP55, MCP61, MCP65 and AMD CS5536
+ * Adds support in snd-hda-intel driver for Asus W6A motherboard (#19962)
+ - Enables opti621 driver for i386 and x86_64 (#23821)
+ - Don't allow chmod() on the /proc/<pid>/ files
+ - Completely initialize hw_regs_t in ide_setup_ports
+ (patch from Thiago Galesi (tabgal at mandriva.com)
+ - Fixed a local DoS found by Robert Riches <rm.riches at verizon.net>. This
+ bug was introduced by an incomplete version of the fix for CVE-2006-2445
+ (#24145)
+ - Security fixes:
+ * ZZBA_CVE-2006-2934_sctp_packet_without_chuncks_fix.patch (#23511)
+ * ZZBB_CVE-2006-2935_fix_bad_cbcbufflen_assigment.patch (#23529)
+ * ZZBC_CVE-2006-2936_usbserial_ftdi_sio_prevent_dos.patch (#23715)
+ * ZZBD_CVE-2006-1066_avoid_ptrace_singlestep_oops.patch (#21752)
+ * ZZBE_CVE-2006-3468_avoid_ext3_error_on_bad_nfs_file_handle.patch (#23825)
+ * ZZBF_CVE-2006-3745_sctp_overflow_fix.patch (#24747)
+
+ o Flavio Bruno Leitner <fbl at mandriva.com>
+ - Security fixes:
+ * ZZB8_CVE-2006-1863_cifs_backslash_bug.patch (#22138)
+ * ZZB9_CVE-2006-1864_smbfs_backslash_bug.patch (#22233)
+
+ o Gwenole Beauchesne <gbeauchesne at mandriva.com>
+ - Update Xen to 3.0.1 + selected fixes
+ - Enable hugetlbfs
+ - Fix 8core patch wrt. CONFIG_HOTPLUG_CPU
+ - Add support for bcm 5780
+ - Xen updates:
+ * Fix 32-bit chroot in 64-bit xen0
+ * Fix networking on Napa platforms in dom0
+ - Merge local patches to Xen sub-tree:
+ * Avoid wasting IRQs on x86-64
+ * Add security fixes from 2.6.12.4
+ * Add workaround for K8 errata #122
+ * Add support for more than 8 cores on AMD64 systems
* Mon Jul 17 2006 Luiz Capitulino <lcapitulino at mandriva.com> 2.6.12-24mdk
o Luiz Capitulino <lcapitulino at mandriva.com>
@@ -1526,7 +1604,7 @@
* ZZ95_CVE-2006-0554_xfs_ftruncate_could_expose_stale_data.patch
* ZZ96_CVE-2006-0555_nfs_local_dos_fix.patch
* ZZ97_CVE-2006-0741_x86_64_check_bad_elf_entry_addr.patch
- * ZZ98_CVE-2006-0742_ia64_noreturn_attr_fix.patch
+ * ZZ98_CVE-2006-0742_ia64_noreturn_attr_fix.patch
* ZZ99_CVE-2006-0557_sys_mbind_sanity_checking.patch
* ZZA0_CAN-2005-3044_x86_64_lost_fput_in32bit_ioctl.patch (NOTE: this
patch is the part '(1)' of the mentioned CAN entry)
@@ -1579,7 +1657,7 @@
* Add support for the Nvidia chipsets
* Add model information for the Gigabyte K8N51
* Fixes for the AD1986a codec
- - MCP51 forcedeth support
+ - MCP51 forcedeth support
* Mon Dec 20 2005 Luiz Capitulino <lcapitulino at mandriva.com> 2.6.12-14mdk
o Arnaud Patard <apatard at mandriva.com>
@@ -1633,7 +1711,7 @@
* Thu Sep 8 2005 Gwenole Beauchesne <gbeauchesne at mandriva.com> 2.6.12-12mdk
o Arnaud Patard <apatard at mandriva.com>
- 2.6.12.6
- - Removed lpfc from 3rdparty as it exists in drivers/scsi/ (Thanks Svetljo
+ - Removed lpfc from 3rdparty as it exists in drivers/scsi/ (Thanks Svetljo
for pointing out this).
- Added sata_sil24 module
- Added SiS182 minimal support.
@@ -1648,7 +1726,7 @@
- Via unichrome support update (Danny)
o Samir Bellabes
- - Add DN34_nf_rsh-conntrack_timeout.patch :
+ - 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
@@ -1660,12 +1738,12 @@
* delete reference conntrack in ipmr
* fix ECN tcp marking
* fix byteorder in icmp NAT
- * fix ip6t_LOG sit tunnel logging
+ * 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 at mandriva.com>
- XEN updated to 2005-08-23
@@ -1689,7 +1767,7 @@
* Mon Aug 15 2005 <flavio at mandriva.com> 2.6.12-10mdk
o Flavio Bruno Leitner <flavio at mandriva.com>
- WARNING: Security
- Hyper-Threading enabled by default.
+ 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
@@ -1710,7 +1788,7 @@
- 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
+ - 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.
@@ -1742,12 +1820,12 @@
- 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 at mandriva.com>
+ o Gwenole Beauchesne <gbeauchesne at mandriva.com>
- merge and fix drm ioctl32 compat code (x86_64)
* Mon Jul 07 2005 Flavio Bruno Leitner <flavio at mandriva.com> 2.6.12-7mdk
o Flavio Bruno Leitner <flavio at mandriva.com>
- - WARNING: removed patch to rename kernel modules
+ - 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)
@@ -1766,14 +1844,14 @@
- Fixed and enable the ppscsi driver.
* Mon Jul 07 2005 Flavio Bruno Leitner <flavio at mandriva.com> 2.6.12-6mdk
- o Arnaud Patard <apatard at mandriva.com>
+ o Arnaud Patard <apatard at 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 at mandriva.com>
- - updated orinoco to 0.15rc2.
+ - updated orinoco to 0.15rc2.
- updated to 2.6.12.2
- enabled advansys, qlogicisp, eata_pio as module
@@ -1782,7 +1860,7 @@
(added AB02_2.6.12.2.patch)
* Fri Jul 1 2005 Arnaud Patard <apatard at mandriva.com> 2.6.12-4mdk
-- Ensure that stallion and istallion modules return an error code instead of 0
+- 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 at mandriva.com> 2.6.12-3mdk
@@ -1826,7 +1904,7 @@
* Mon May 23 2005 Arnaud Patard <apatard at mandriva.com> 2.6.11-9mdk
-- Updates:
+- Updates:
- 2.6.11.10
- Fixed ndiswrapper Makefile
@@ -1874,7 +1952,7 @@
* Sun Mar 20 2005 Juan Quintela <quintela at 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
+- 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.
@@ -1966,7 +2044,7 @@
* Mon Jan 10 2005 Arnaud Patard <apatard at mandrakesoft.com> 2.6.10-1mdk
- New upstream version
- Updated alsa with alsa CVS and added drivers from the multimedia kernels
-- Updated 3rdparty :
+- Updated 3rdparty :
* hostap
* ipw2200
* fuse
@@ -1974,16 +2052,16 @@
* 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/
+ * 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
+- 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
+- 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
@@ -2063,14 +2141,14 @@
* Thu Sep 30 2004 Juan Quintela <quintela at 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
+- 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 at mandrakesoft.com> 2.6.8.1-11mdk
- cpufreq update.
- cpuid update.
-- tcp_default_win_scale fix.
+- tcp_default_win_scale fix.
- fix rsbac printk.
- ipw2200 0.8.
- msdos/vfat sync.
@@ -2115,7 +2193,7 @@
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
+ 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.
@@ -2143,7 +2221,7 @@
* 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
+ * 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).
@@ -2155,7 +2233,7 @@
- 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
+ and secure (if options can be integrated without too much fuss in the
others).
* Wed Aug 18 2004 Olivier Blin <blino at mandrake.org> 2.6.8.1-2mdk
@@ -2217,7 +2295,7 @@
* Fri Jul 16 2004 Nicolas Planel <nplanel at mandrakesoft.com> 2.6.8-0.rc1.2mdk
- dazuko 2.0.2.
- codepage 437 module in BOOT kernel.
-- kexec is back.
+- kexec is back.
* Mon Jul 12 2004 Nicolas Planel <nplanel at mandrakesoft.com> 2.6.8-0.rc1.1mdk
- 2.6.8-rc1.
@@ -2279,7 +2357,7 @@
* Fri May 10 2004 Nicolas Planel <nplanel at mandrakesoft.com> 2.6.6-1mdk
- 2.6.6.
-- DI01 is back, not merged in upstream
+- DI01 is back, not merged in upstream
(ide generic no via8237 sata basic support)
* Fri May 7 2004 Thomas Backlund <tmb at mandrake.org> 2.6.6-0.rc3.1mdk
@@ -2301,7 +2379,7 @@
* Mon Apr 19 2004 Nicolas Planel <nplanel at 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.
+- oss cmpci driver update to 6.64.
- BIG isdn update.
- set max symlink to 10.
- gzloop (pixel).
More information about the Erp5-report
mailing list