Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.898
diff -c -p -r1.898 kernel.spec
*** kernel.spec	27 Jan 2009 03:53:33 -0000	1.898
--- kernel.spec	27 Feb 2009 10:50:32 -0000
*************** Summary: The Linux kernel
*** 12,18 ****
  # that the kernel isn't the stock distribution kernel, for example,
  # by setting the define to ".local" or ".bz123456"
  #
! #% define buildid .local
  
  # fedora_build defines which build revision of this kernel version we're
  # building. Rather than incrementing forever, as with the prior versioning
--- 12,18 ----
  # that the kernel isn't the stock distribution kernel, for example,
  # by setting the define to ".local" or ".bz123456"
  #
! %define buildid .1axp
  
  # fedora_build defines which build revision of this kernel version we're
  # building. Rather than incrementing forever, as with the prior versioning
*************** Summary: The Linux kernel
*** 224,230 ****
  # Overrides for generic default options
  
  # only ppc and sparc64 need separate smp kernels
! %ifnarch ppc sparc64 alphaev56
  %define with_smp 0
  %endif
  
--- 224,230 ----
  # Overrides for generic default options
  
  # only ppc and sparc64 need separate smp kernels
! %ifnarch ppc sparc64
  %define with_smp 0
  %endif
  
*************** Summary: The Linux kernel
*** 274,279 ****
--- 274,289 ----
  %define with_sparse 0
  %endif
  
+ %ifarch alpha
+ %define with_smp 1
+ %define with_up 1
+ %define with_pae 0
+ %define with_xen 0
+ %define with_kdump 0
+ %define usesparse 0
+ %define with_modsign 1
+ %endif
+ 
  # Per-arch tweaks
  
  %ifarch %{all_x86}
*************** Summary: The Linux kernel
*** 339,349 ****
  %define kernel_image vmlinux.gz
  %endif
  
! %ifarch alpha alphaev56
  %define all_arch_configs kernel-%{version}-alpha*.config
  %define image_install_path boot
- %define make_target vmlinux
  %define kernel_image vmlinux
  %endif
  
  %if %{nopatches}
--- 349,361 ----
  %define kernel_image vmlinux.gz
  %endif
  
! %ifarch alpha
  %define all_arch_configs kernel-%{version}-alpha*.config
  %define image_install_path boot
  %define kernel_image vmlinux
+ %define make_target boot
+ %define kernel_image arch/alpha/boot/vmlinux.gz
+ %define kernel_image_elf 1
  %endif
  
  %if %{nopatches}
*************** Version: %{rpmversion}
*** 462,468 ****
  Release: %{pkg_release}
  # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
  # SET %%nobuildarches (ABOVE) INSTEAD
! ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390x alpha alphaev56
  ExclusiveOS: Linux
  
  %kernel_reqprovconf
--- 474,480 ----
  Release: %{pkg_release}
  # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
  # SET %%nobuildarches (ABOVE) INSTEAD
! ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 s390x alpha
  ExclusiveOS: Linux
  
  %kernel_reqprovconf
*************** Source70: config-s390x
*** 531,536 ****
--- 543,551 ----
  Source90: config-sparc64-generic
  Source91: config-sparc64-smp
  
+ Source100: config-alpha-generic
+ Source101: config-alpha-smp
+ 
  # Here should be only the patches up to the upstream canonical Linus tree.
  
  # For a stable release kernel
*************** Patch3130: disable-p4-cpufreq-ui.patch
*** 679,684 ****
--- 694,708 ----
  
  Patch9000: skip-sanity-check-of-busy-resources.patch
  
+ # Alpha-specific patches
+ Patch2701: linux-2.6.28-alpha-exec_range.patch
+ Patch2702: linux-2.6-alpha-pci_get_bus_and_slot.patch
+ Patch2703: linux-2.6-alpha-eepro100-cleanup.patch
+ #Patch2704: linux-2.6-alpha-marvel-rtc_time.patch
+ Patch2705: linux-2.6.28-alpha-pci.h.patch
+ Patch2706: linux-2.6-alpha-pci.c.patch
+ #Patch2707: kernel.org-bugid10893.patch
+ 
  %endif
  
  BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
*************** ApplyPatch disable-p4-cpufreq-ui.patch
*** 1200,1205 ****
--- 1224,1240 ----
  # fix #480700, acpi ec ioremap WARN_ON
  ApplyPatch skip-sanity-check-of-busy-resources.patch
  
+ # ALPHA
+ #
+ ApplyPatch linux-2.6.28-alpha-exec_range.patch
+ ApplyPatch linux-2.6-alpha-pci_get_bus_and_slot.patch
+ ApplyPatch linux-2.6-alpha-eepro100-cleanup.patch
+ #ApplyPatch linux-2.6-alpha-marvel-rtc_time.patch
+ ApplyPatch linux-2.6.28-alpha-pci.h.patch
+ ApplyPatch linux-2.6-alpha-pci.c.patch
+ #ApplyPatch kernel.org-bugid10893.patch
+ #
+ 
  # END OF PATCH APPLICATIONS
  
  %endif
*************** fi
*** 1775,1780 ****
--- 1810,1832 ----
  %kernel_variant_files -k vmlinux %{with_kdump} kdump
  
  %changelog
+ * Thu Feb 12 2009 Oliver Falk <oliver@linux-kernel.at> 2.6.28.2-6.4axp
+ - alpha: Can't access PCI device resources through sysfs FIX (hopefully)
+ - bring forward needed patches for Alpha:
+   - linux-2.6-alpha-exec_range.patch
+     - add execshield dummy functions for alpha
+   - linux-2.6-alpha-pci_get_bus_and_slot.patch
+     - include pci_get_bus_and_slot for Alpha
+   - linux-2.6-alpha-eepro100-cleanup.patch
+     - cleanup extraneous "freeing mc frame" messages from driver
+   - linux-2.6-alpha-marvel-rtc_time.patch
+     - make get/set_rtc_time execute only on CPU #0
+ - modify config-alpha-generic:
+   - disable atl1e driver (compile problem)
+   - build in NF_CONNTRACK module for reloc problems
+   - enable build of ES18XX sound module esp. for MIATA and MONET
+   - enable build of EEPRO100 driver (problems with e100)
+ 
  * Mon Jan 26 2009 Kyle McMartin <kyle@redhat.com> - 2.6.28.2-6
  - add skip-sanity-check-of-busy-resources.patch, fixes #480700, ioremap
    sanity check WARN_ON due to acpi ec.
