/[packages]/cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec

Diff of /cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec

Parent Directory | Revision Log | View Patch Patch

-revision 110087 by tmb,
Sun Jun 19 20:28:48 2011 UTC
+revision 179823 by tmb,
Fri Dec  9 22:25:06 2011 UTC
 Line 1
  #
  # *tmb* series kernels now use kernel.org versioning
  #
- %define kernelversion   2
+ %define kernelversion   3
- %define patchlevel      6
+ %define patchlevel      1
- %define sublevel        38
+ # sublevel is now used for -stable patches
+ %define sublevel        5
+ # Package release
+ %define mgarel          1
  # kernel Makefile extraversion is substituted by
- # kpatch/kgit/kstable wich are either 0 (empty), rc (kpatch),
+ # kpatch/kgit wich are either 0 (empty), rc (kpatch), git (kgit)
- # git (kgit, only the number after "git"), or stable release (kstable)
  %define kpatch          0
+ # kernel.org -gitX patch (only the number after "git")
  %define kgit            0
- %define kstable         8
- # this is the releaseversion
- %define kbuild          1
- %define ktag            tmb
+ # Patch tarball tag
- %define kname           kernel-%{ktag}
+ %define ktag            tmb
+ # kernel base name (also name of srpm)
+ %define kname           kernel-%{ktag}
+ # release defines
  %define rpmtag          %{distsuffix}%{mgaver}
  %if %kpatch
  %if %kgit
- %define rpmrel          %mkrel 0.%{kpatch}.%{kgit}.%{kbuild}
+ %define rpmrel          %mkrel 0.%{kpatch}.%{kgit}.%{mgarel}
  %else
- %define rpmrel          %mkrel 0.%{kpatch}.%{kbuild}
+ %define rpmrel          %mkrel 0.%{kpatch}.%{mgarel}
  %endif
  %else
- %define rpmrel          %mkrel %{kbuild}
+ %define rpmrel          %mkrel %{mgarel}
  %endif
- # theese two never change, they are used to fool rpm/urpmi/smart
+ # fakerel and fakever never change, they are used to fool
+ # rpm/urpmi/smart
  %define fakever         1
  %define fakerel         %mkrel 1
+ # version defines
+ %define kversion        %{kernelversion}.%{patchlevel}.%{sublevel}
+ %define kverrel         %{kversion}-%{rpmrel}
  # When we are using a pre/rc patch, the tarball is a sublevel -1
  %if %kpatch
- %define kversion        %{kernelversion}.%{patchlevel}.%{sublevel}
+ %if %sublevel
- %define tar_ver         %{kernelversion}.%{patchlevel}.%(expr %{sublevel} - 1)
+ %define tar_ver         %{kernelversion}.%{patchlevel}
- %define patch_ver       %{kversion}-%{kpatch}-%{ktag}%{kbuild}
  %else
- %if %kstable
+ %define tar_ver         %{kernelversion}.%(expr %{patchlevel} - 1)
- %define kversion        %{kernelversion}.%{patchlevel}.%{sublevel}.%{kstable}
- %define tar_ver         %{kernelversion}.%{patchlevel}.%{sublevel}
- %else
- %define kversion        %{kernelversion}.%{patchlevel}.%{sublevel}
- %define tar_ver         %{kversion}
  %endif
- %define patch_ver       %{kversion}-%{ktag}%{kbuild}
+ %define patch_ver       %{kversion}-%{kpatch}-%{ktag}%{mgarel}
+ %else
+ %define tar_ver         %{kernelversion}.%{patchlevel}
+ %define patch_ver       %{kversion}-%{ktag}%{mgarel}
  %endif
- %define kverrel         %{kversion}-%{rpmrel}
- # used for not making too long names for rpms or search paths
+ # Used for not making too long names for rpms or search paths
  %if %kpatch
  %if %kgit
- %define buildrpmrel     0.%{kpatch}.%{kgit}.%{kbuild}%{rpmtag}
+ %define buildrpmrel     0.%{kpatch}.%{kgit}.%{mgarel}%{rpmtag}
  %else
- %define buildrpmrel     0.%{kpatch}.%{kbuild}%{rpmtag}
+ %define buildrpmrel     0.%{kpatch}.%{mgarel}%{rpmtag}
  %endif
  %else
- %define buildrpmrel     %{kbuild}%{rpmtag}
+ %define buildrpmrel     %{mgarel}%{rpmtag}
  %endif
  %define buildrel        %{kversion}-%{buildrpmrel}
  # having different top level names for packges means that you have to remove them by hard :(
  %define top_dir_name    %{kname}-%{_arch}
  %define build_dir       ${RPM_BUILD_DIR}/%{top_dir_name}
  %define src_dir         %{build_dir}/linux-%{tar_ver}
  # disable useless debug rpms...
  %define _enable_debug_packages  %{nil}
  %define debug_package           %{nil}
  # Build defines
  %define build_doc               0
  %define build_source            1
  %define build_devel             1
  %define build_debug             0
- # Build desktop i586 / 4GB
+ # Build desktop586 (i586 / 4GB)
  %ifarch %{ix86}
  %define build_desktop586        1
  %endif
- # Build mm (i686 / 4GB) / x86_64
+ # Build desktop (i686 / 4GB) / x86_64
  %define build_desktop           1
  # Build laptop (i686 / 4GB)/ x86_64
-Line 124
+Line 128
  %{?_with_modxz: %global build_modxz 1}
  # For the .nosrc.rpm
  %define build_nosrc     0
  %{?_with_nosrc: %global build_nosrc 1}
  %define kmake %make
-Line 154 
 URL:           http://www.kernel.org
+Line 158 
 URL:           http://www.kernel.org
  # Sources
  #
  ### This is for full SRC RPM
- Source0:        ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/linux-%{tar_ver}.tar.bz2
+ Source0:        ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/linux-%{tar_ver}.tar.xz
- Source1:        ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/linux-%{tar_ver}.tar.bz2.sign
+ Source1:        ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/linux-%{tar_ver}.tar.sign
  ### This is for stripped SRC RPM
  %if %build_nosrc
  NoSource: 0
-Line 177 
 Source102:     %{kname}.patchlist
+Line 181 
 Source102:     %{kname}.patchlist
  # Patch0 to Patch100 are for core kernel upgrades.
  #
- # Pre linus patch: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing
+ # Pre linus patch: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/testing
  %if %kpatch
- Patch1:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}.%{sublevel}-%{kpatch}.bz2
+ %if %sublevel
- Source10:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}.%{sublevel}-%{kpatch}.bz2.sign
+ Patch2:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/stable-review/patch-%{kversion}-%{kpatch}.xz
+ Source11:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/stable-review/patch-%{kversion}-%{kpatch}.sign
+ %else
+ Patch1:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.xz
+ Source10:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.sign
+ %endif
  %endif
  %if %kgit
- Patch2:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}.%{sublevel}-%{kpatch}-git%{kgit}.bz2
+ Patch2:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}-%{kpatch}-git%{kgit}.xz
- Source11:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}.%{sublevel}-%{kpatch}-git%{kgit}.bz2.sign
+ Source11:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}-%{kpatch}-git%{kgit}.sign
+ %endif
+ %if %sublevel
+ %if %kpatch
+ %define prev_sublevel %(expr %{sublevel} - 1)
+ %if %prev_sublevel
+ Patch1:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kernelversion}.%{patchlevel}.%{prev_sublevel}.xz
+ Source10:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kernelversion}.%{patchlevel}.%{prev_sublevel}.sign
+ %endif
+ %else
+ Patch1:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kversion}.xz
+ Source10:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kversion}.sign
  %endif
- %if %kstable
- Patch1:         ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kversion}.bz2
- Source10:       ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kversion}.bz2.sign
  %endif
  #END
-Line 206 
 input and output, etc.
+Line 223 
 input and output, etc.
  %define requires1       mkinitrd >= 6.0.92-12
  %define requires2       bootloader-utils >= 1.12-1
  %define requires3       sysfsutils >= 1.3.0-1 module-init-tools >= 3.6-10
- %define requires4       kernel-firmware >= 20100217-1
+ %define requires4       kernel-firmware >= 20110703-2
  %define kprovides       %{kname} = %{kverrel}, kernel = %{tar_ver}, drbd-api = 88
- BuildRoot:              %{_tmppath}/%{kname}-%{kversion}-%{_arch}-build
- %define buildroot       %{_tmppath}/%{kname}-%{kversion}-%{_arch}-build
  Autoreqprov:            no
  BuildRequires:          gcc >= 4.0.1-5 module-init-tools >= 3.2-0.pre8.2
-Line 297 
 latest %{kname}-%{1}-devel installed...
+Line 312 
 latest %{kname}-%{1}-devel installed...
                                                          \
  %files -n %{kname}-%{1}-%{buildrel} -f kernel_files.%{1} \
  %files -n %{kname}-%{1}-latest                          \
- %defattr(-,root,root)                                   \
                                                          \
  %if %build_devel                                        \
  %files -n %{kname}-%{1}-devel-%{buildrel} -f kernel_devel_files.%{1} \
  %files -n %{kname}-%{1}-devel-latest                    \
- %defattr(-,root,root)                                   \
  %endif
-Line 432 
 Requires:      glibc-devel, ncurses-devel, m
+Line 445 
 Requires:      glibc-devel, ncurses-devel, m
  Summary:        The Linux source code for %{kname}-%{buildrel}
  Group:          Development/Kernel
  Autoreqprov:    no
- Provides:       kernel-source = %{kverrel}, kernel-devel = %{kverrel}
+ Provides:       kernel-source = %{kverrel}
- %ifarch %{ix86}
+ Buildarch:      noarch
- Conflicts:      arch(x86_64)
- %endif
  %description -n %{kname}-source-%{buildrel}
  The %{kname}-source package contains the source code files for the %{ktag}
-Line 475 
 Release:       %{rpmrel}
+Line 486 
 Release:       %{rpmrel}
  Summary:        Virtual rpm for latest %{kname}-source
  Group:          Development/Kernel
  Requires:       %{kname}-source-%{buildrel}
- %ifarch %{ix86}
+ Buildarch:      noarch
- Conflicts:      arch(x86_64)
- %endif
  %description -n %{kname}-source-latest
  This package is a virtual rpm that aims to make sure you always have the
-Line 514 
 Linux kernel modules at load time.
+Line 523 
 Linux kernel modules at load time.
  %define patches_dir ../%{patch_ver}/
  cd %src_dir
+ %if %sublevel
  %if %kpatch
+ %if %prev_sublevel
  %patch1 -p1
  %endif
- %if %kgit
  %patch2 -p1
+ %else
+ %patch1 -p1
  %endif
- %if %kstable
+ %else
+ %if %kpatch
  %patch1 -p1
  %endif
+ %endif
+ %if %kgit
+ %patch2 -p1
+ %endif
  %{patches_dir}/scripts/apply_patches
-Line 583 
 PrepareKernel() {
+Line 601 
 PrepareKernel() {
          fi
          # make sure EXTRAVERSION says what we want it to say
-         %if %kstable
+         LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -$extension/" Makefile
-                 LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = .%{kstable}-$extension/" Makefile
-         %else
-                 LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -$extension/" Makefile
-         %endif
          %smake oldconfig
  }
-Line 597 
 BuildKernel() {
+Line 611 
 BuildKernel() {
          KernelVer=$1
          echo "Building kernel $KernelVer"
-         %kmake all
+         %kmake -s all
          # Start installing stuff
          install -d %{temp_boot}
-Line 657 
 SaveDevel() {
+Line 671 
 SaveDevel() {
          cp -fR drivers/acpi/acpica/*.h $TempDevelRoot/drivers/acpi/acpica/
          for i in alpha arm arm26 avr32 blackfin cris frv h8300 ia64 microblaze mips m32r m68k \
-                  m68knommu mn10300 parisc powerpc ppc s390 sh sh64 score sparc tile v850 xtensa; do
+                  m68knommu mn10300 openrisc parisc powerpc ppc s390 sh sh64 score sparc tile \
+                  unicore32 v850 xtensa; do
                  rm -rf $TempDevelRoot/arch/$i
          done
-Line 684 
 SaveDevel() {
+Line 699 
 SaveDevel() {
  ### Create the kernel_devel_files.*
  cat > $kernel_devel_files <<EOF
- %defattr(-,root,root)
  %dir $DevelRoot
  %dir $DevelRoot/arch
  %dir $DevelRoot/include
-Line 775 
 CreateFiles() {
+Line 789 
 CreateFiles() {
  ### Create the kernel_files.*
  cat > $kernel_files <<EOF
- %defattr(-,root,root)
  %{_bootdir}/System.map-%{kversion}-%{ktag}-$kernel_flavour-%{buildrpmrel}
  %{_bootdir}/config-%{kversion}-%{ktag}-$kernel_flavour-%{buildrpmrel}
  %{_bootdir}/vmlinuz-%{kversion}-%{ktag}-$kernel_flavour-%{buildrpmrel}
-Line 928 
 cp -a %{temp_root} %{buildroot}
+Line 941 
 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}
-Line 936 
 chmod -R a+rX %{target_source}
+Line 949 
 chmod -R a+rX %{target_source}
  # we remove all the source files that we don't ship
  # first architecture files
  for i in alpha arm arm26 avr32 blackfin cris frv h8300 ia64 microblaze mips m32r m68k \
-          m68knommu mn10300 parisc powerpc ppc s390 sh sh64 score sparc tile v850 xtensa; do
+          m68knommu mn10300 openrisc parisc powerpc ppc s390 sh sh64 score sparc tile \
+          v850 xtensa unicore32; do
          rm -rf %{target_source}/arch/$i
  done
-Line 946 
 done
+Line 960 
 done
  # other misc files
  rm -f %{target_source}/{.config.old,.config.cmd,.mailmap,.missing-syscalls.d,arch/.gitignore}
+ rm -rf %{target_source}/.tmp_depmod/
  #endif %build_source
  %endif
-Line 969 
 done
+Line 984 
 done
  popd
- ###
- ### 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
-Line 986 
 rm -rf %{buildroot}
+Line 994 
 rm -rf %{buildroot}
  ###
  %if %build_source
  %files -n %{kname}-source-%{buildrel}
- %defattr(-,root,root)
  %dir %{_kerneldir}
  %dir %{_kerneldir}/arch
  %dir %{_kerneldir}/include
-Line 1047 
 rm -rf %{buildroot}
+Line 1054 
 rm -rf %{buildroot}
  %doc README.kernel-%{ktag}-sources
  %files -n %{kname}-source-latest
- %defattr(-,root,root)
  %endif
  %if %build_doc
  %files -n %{kname}-doc
- %defattr(-,root,root)
  %doc linux-%{tar_ver}/Documentation/*
  %endif
  %changelog
+ * Fri Dec  9 2011 Thomas Backlund <tmb@mandriva.org> 3.1.5-1.mga2
+ - update to 3.1.5
+ - drop merged patches:
+     * DG01-DG06, FX01-FX06
+ - add patch:
+     * DS01: ALSA: hda/realtek - Fix Oops in alc_mux_select()
+ - clean spec: drop buildroot and defattr
+ * Tue Dec  6 2011 Thomas Backlund <tmb@mandriva.org> 3.1.4-3.mga2
+ - fix patch NI12: IFWLOG: fix return value of checkentry
+   (not properly modified in 2.6.35+ patch, blino, #3594)
+ - rebuild with GCC-4.6.2
+ * Wed Nov 30 2011 Thomas Backlund <tmb@mandriva.org> 3.1.4-2.mga2
+ - update patch:
+   * CK01: upstream 3.1.0-ck2 including BFS 0.415
+ * Tue Nov 29 2011 Thomas Backlund <tmb@mandriva.org> 3.1.4-1.mga2
+ - update to 3.1.4
+   * reverts usb patch that broke isochronous devices
+     (i.e. webcam, audio, or other streaming devices)
+ * Mon Nov 28 2011 Thomas Backlund <tmb@mandriva.org> 3.1.3-1.mga2
+ - update to 3.1.3
+ - add patches:
+   * DG01: i915: Fix inconsistent backlight level during disabled
+   * DG02: drm: fix integer overflow in drm_mode_dirtyfb_ioctl()
+   * DG03: radeon/kms: fix up gpio i2c mask bits for r4xx for real
+   * DG04: i915: Ivybridge still has fences
+   * DG05: i915: Turn on a required 3D clock gating bit on Sandybridge
+   * DG06: i915: Turn on another required clock gating bit on Sandybridge
+   * DP01: pci: rework ASPM disable code (brings power usage back down
+                to 2.6.37 level)
+   * FX01: don't serialise direct IO reads on page cache checks
+           (fixes performance regression introduced in 2.6.38)
+   * FX02: avoid direct I/O write vs buffered I/O race
+   * FX03: return -EIO when xfs_vn_getattr() failed
+   * FX04: fix buffer flushing during unmount
+   * FX05: fix possible memory corruption in xfs_readlink
+   * FX06: use doalloc flag in xfs_qm_dqattach_one()
+ - update patches:
+   * FU01: unionfs 2.5.10 for 3.1.3
+   * MB02: merge 3rdparty support
+   * MB10-MB12: ndiswrapper 1.57-rc1
+ - drop patches:
+   * DS15: its replaced by SND_HDA_PREALLOC_SIZE config option
+   * MB13-MB17: ndiswrapper fixes, merged
+ - disable patches:
+   * KP01: TuxOnIce support, currently broken
+ - dont ship openrisc arch files
+ - update defconfigs
+ * Tue Oct 25 2011 Thomas Backlund <tmb@mandriva.org> 3.0.8-1.mga2
+ - update to 3.0.8
+   * drop merged patch: DM20
+ - enable PM_RUNTIME and USB_SUSPEND
+ * Tue Oct 18 2011 Thomas Backlund <tmb@mandriva.org> 3.0.7-1.mga2
+ - update to 3.0.7
+ - update patch:
+     * CK01: 3.0.7-ck1 including BFS 0.413
+ - re-enable usblp as it is needed by both usb-pp adapters and some printers
+   (mga #2240, #2264) (cups is patched to work with both usblp and libusb)
+ * Tue Oct 04 2011 Thomas Backlund <tmb@mandriva.org> 3.0.6-1.mga2
+ - update to 3.0.6
+ - add patch:
+     * DM20: fix boot hang on uvc webcam init (mga #2425)
+ * Tue Aug 30 2011 Thomas Backlund <tmb@mandriva.org> 3.0.4-1.mga2
+ - update to 3.0.4
+ - drop merged patch: AA01
+ * Fri Aug 19 2011 Thomas Backlund <tmb@mandriva.org> 3.0.3-1.mga2
+ - update to 3.0.3
+ - update patches:
+     * CK01: Con Kolivas -ck patchset including BFS
+     * FU01: unionfs 2.5.9.2
+     * KP01: TuxonIce 3.2
+ - drop merged patches:
+     * CK02, DA60-DA61, DG10-DG14, DN08, DN15-DN19, DP05-DP08
+     * DP20-DP26, DP30, DV11, FU02-FU03, MK01, NI30-NI31
+ - add patches:
+     * AA01: genirq: Fix wrong bit operation
+     * DP10-DP12: samsung-laptop: support nc110, nc210, r700, x520
+     * DP13: samsung-laptop: fix support for older N150, N210, N220
+     * FB01: btrfs: btrfs_calc_avail_data_space: cope with no read_write devices
+     * MB17: ndiswrapper buildfix for 3.0
+     * MC84: viahss buildfix for 3.0
+ - rediff patches:
+     * NI16: netfilter psd mdv/mga modifications
+ - disable patches:
+     * DV01-DV02: framebuffer oops fixes (should not be needed anymore)
+     * FR01: reiser4 support (broken)
+ - adapt spec for 3.0 series version changes
+ - change kernel-tmb-source to noarch
+ - build with -s(ilent) to only log varnings and errors
+ - update defconfigs
  * Sun Jun 19 2011 Thomas Backlund <tmb@mandriva.org> 2.6.38.8-1.mga1
  - update to 2.6.38.8 (CVE-2011-1017)
  - drop merged patches:

 Legend:



Removed from v.110087
 


changed lines


 
Added in v.179823
 Legend:



Removed from v.110087
 


changed lines


 
Added in v.179823
-Removed from v.110087
+Added in v.179823

	ViewVC Help
Powered by ViewVC 1.1.30