Index: fedora/kernel/devel/kernel-2.6.spec =================================================================== --- fedora.orig/kernel/devel/kernel-2.6.spec +++ fedora/kernel/devel/kernel-2.6.spec @@ -224,7 +224,7 @@ Summary: The Linux kernel (the core of t %endif # don't do debug builds on anything but i686 and x86_64 -%ifnarch i686 x86_64 +%ifnarch i686 x86_64 ppc64 %define with_debug 0 %endif @@ -247,7 +247,7 @@ Summary: The Linux kernel (the core of t %endif # don't sign modules on these platforms -%ifarch s390x sparc sparc64 ppc alpha +%ifarch s390x sparc sparc64 ppc alpha ppc64 %define with_modsign 0 %endif @@ -387,7 +387,7 @@ Summary: The Linux kernel (the core of t # Packages that need to be installed before the kernel is, because the %post # scripts use them. # -%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.9-7 +%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 5.1.19-1 Name: kernel%{?variant} Group: System Environment/Kernel @@ -424,7 +424,7 @@ BuildRequires: gcc >= 3.4.2, binutils >= BuildRequires: sparse >= 0.3 %endif BuildConflicts: rhbuildsys(DiskFree) < 500Mb - +BuildRequires: quilt Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 #Source1: xen-%{xen_hv_cset}.tar.bz2 @@ -448,6 +448,7 @@ Source28: kernel-%{version}-ppc.config Source29: kernel-%{version}-ppc-smp.config Source30: kernel-%{version}-ppc64.config Source31: kernel-%{version}-ppc64-kdump.config +Source32: kernel-%{version}-ppc64-debug.config Source35: kernel-%{version}-s390x.config @@ -468,6 +469,8 @@ Source39: kernel-%{version}-ia64-xen.con Source80: config-rhel-generic Source81: config-rhel-x86-generic +Source101: kernel-patches-cell.tar.gz + %if %{using_upstream_branch} ### BRANCH PATCH ### %else @@ -966,7 +969,9 @@ ApplyPatch linux-2.6-build-nonintconfig. %if !%{nopatches} # Ingo's new scheduler. -ApplyPatch linux-2.6-sched-cfs.patch +#ApplyPatch linux-2.6-sched-cfs.patch + +tar xzf %{SOURCE101} # Assorted dyntick/clock/timer fixes. #ApplyPatch linux-2.6-clockevents-fix-resume-logic.patch @@ -1116,7 +1121,7 @@ ApplyPatch linux-2.6-libata-ich8m-add-pc ApplyPatch linux-2.6-ata-quirk.patch # Add the new wireless stack and drivers from wireless-dev -ApplyPatch git-wireless-dev.patch +#ApplyPatch git-wireless-dev.patch # add patch from markmc so that e1000 supports ICH9 ApplyPatch linux-2.6-e1000-ich9.patch # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts @@ -1139,6 +1144,10 @@ ApplyPatch linux-2.6-wakeups.patch # DMI based module autoloading. ApplyPatch linux-2.6-dmi-based-module-autoloading.patch +ApplyPatch linux-2.6-utrace-ppc-revert.patch -R +quilt push -a +ApplyPatch linux-2.6-utrace-ppc-new.patch + # END OF PATCH APPLICATIONS # Any further pre-build tree manipulations happen here. @@ -1166,7 +1175,7 @@ do echo "# $Arch" > configs/$i cat .config >> configs/$i done -rm -f $RPM_SOURCE_DIR/kernel-%{version}-*.config +#rm -f $RPM_SOURCE_DIR/kernel-%{version}-*.config # get rid of unwanted files resulting from patch fuzz find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null @@ -1281,7 +1290,7 @@ BuildKernel() { mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/weak-updates # first copy everything - cp --parents `find -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + cp --parents `find * -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build # then drop all but the needed Makefiles/Kconfig files rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Documentation Index: fedora/kernel/common/Makefile.common =================================================================== --- fedora.orig/kernel/common/Makefile.common +++ fedora/kernel/common/Makefile.common @@ -75,7 +75,7 @@ RPM_DEFINES = --define "_sourcedir $(SOU --define "_builddir $(BUILDDIR)" \ --define "_srcrpmdir $(SRCRPMDIR)" \ --define "_rpmdir $(RPMDIR)" \ - $(DIST_DEFINES) + $(DIST_DEFINES) $(RPMFLAGS) endif # Initialize the variables that we need, but are not defined @@ -167,7 +167,7 @@ sources: $(SOURCEFILES) $(TARGETS) $(SOURCEFILES): #FORCE @mkdir -p $(SOURCEDIR) @echo "Downloading $@..." - @for i in `find ../ -maxdepth 2 -name "$@"`; do \ + @for i in `find ~/basesrc ../ -maxdepth 2 -name "$@"`; do \ if test "$$(md5sum $$i | awk '{print $$1}')" = "$(get_sources_md5)" ; then \ echo "Copying from $$i" ; \ ln $$i $@ ; \ @@ -175,7 +175,8 @@ $(SOURCEFILES): #FORCE fi ; \ done @if [ ! -e "$@" ] ; then $(CLIENT) $(REPOSITORY)/$(NAME)/$@/$(get_sources_md5)/$@ ; fi - @if [ ! -e "$@" ] ; then echo "Could not download source file: $@ does not exist" ; exit 1 ; fi + @if [ ! -e "$@" ] ; then echo "Could not download source file: $@ does not exist" ; \ + echo please "provide $${HOME}/basesrc/$@" ; exit 1 ; fi @if test "$$(md5sum $@ | awk '{print $$1}')" != "$(get_sources_md5)" ; then \ echo "md5sum of the downloaded $@ does not match the one from 'sources' file" ; \ echo "Local copy: $$(md5sum $@)" ; \ Index: fedora/kernel/devel/branch =================================================================== --- /dev/null +++ fedora/kernel/devel/branch @@ -0,0 +1 @@ +bsc Index: fedora/kernel/common/branches =================================================================== --- fedora.orig/kernel/common/branches +++ fedora/kernel/common/branches @@ -12,3 +12,5 @@ FC-5:fc5:.fc5:fedora:5 FC-6:fc6:.fc6:fedora:6 F-7:dist-fc7-updates-candidate:.fc7:fedora:7 devel:dist-f8:.fc8:fedora:8 +bsc:bsc:.20070706bsc+4k:fedora:8 +bsc64:bsc64:.20070706bsc:fedora:8 Index: fedora/kernel/devel/Makefile.config =================================================================== --- fedora.orig/kernel/devel/Makefile.config +++ fedora/kernel/devel/Makefile.config @@ -13,7 +13,8 @@ CONFIGFILES = \ $(CFG)-ppc.config $(CFG)-ppc-smp.config \ $(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \ $(CFG)-i686-xen.config $(CFG)-x86_64-xen.config \ - $(CFG)-ia64-xen.config + $(CFG)-ia64-xen.config \ + $(CFG)-ppc64-debug.config PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 # sparc sparc64 TEMPFILES = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS))) @@ -54,6 +55,9 @@ temp-sparc64-generic: configs/config-spa temp-powerpc-generic: configs/config-powerpc-generic temp-generic perl merge.pl $^ > $@ +temp-powerpc-debug-generic: configs/config-powerpc-generic temp-debug-generic + perl merge.pl $^ > $@ + temp-powerpc32-generic: configs/config-powerpc32-generic temp-powerpc-generic perl merge.pl $^ > $@ @@ -113,10 +117,19 @@ kernel-$(VERSION)-sparc64.config: config kernel-$(VERSION)-ppc64.config: configs/config-powerpc64 temp-powerpc-generic perl merge.pl $^ powerpc > $@ + if [ $(BRANCH) == bsc64 ] ; then \ + perl -pi -e 's/# CONFIG_PPC_64K_PAGES is not set/CONFIG_PPC_64K_PAGES=y/' $@ ; \ + fi kernel-$(VERSION)-ppc64-kdump.config: configs/config-powerpc64-kdump kernel-$(VERSION)-ppc64.config perl merge.pl $^ powerpc > $@ +kernel-$(VERSION)-ppc64-debug.config: configs/config-powerpc64 temp-powerpc-debug-generic + perl merge.pl $^ powerpc > $@ + if [ $(BRANCH) == bsc64 ] ; then \ + perl -pi -e 's/# CONFIG_PPC_64K_PAGES is not set/CONFIG_PPC_64K_PAGES=y/' $@ ; \ + fi + kernel-$(VERSION)-s390x.config: configs/config-s390x temp-s390-generic perl merge.pl $^ s390 > $@ Index: fedora/kernel/devel/configs/config-powerpc64 =================================================================== --- fedora.orig/kernel/devel/configs/config-powerpc64 +++ fedora/kernel/devel/configs/config-powerpc64 @@ -3,14 +3,14 @@ CONFIG_WINDFARM_PM91=y CONFIG_PPC_PMAC64=y CONFIG_PPC_MAPLE=y CONFIG_PPC_SYSTEMSIM=y -CONFIG_BLK_DEV_SYSTEMSIM=m +CONFIG_BLK_DEV_SYSTEMSIM=y CONFIG_SYSTEMSIM_NET=m CONFIG_PPC_CELL=y CONFIG_PPC_IBM_CELL_BLADE=y CONFIG_PPC_ISERIES=y CONFIG_PPC_PSERIES=y CONFIG_PPC_PMAC=y -CONFIG_PPC_PASEMI=y +# CONFIG_PPC_PASEMI is not set CONFIG_PPC_PS3=y CONFIG_PPC_CELLEB=y CONFIG_PS3_HTAB_SIZE=20 @@ -48,7 +48,7 @@ CONFIG_IBMVETH=m CONFIG_SCSI_IBMVSCSI=m # CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_HOTPLUG_PCI_SHPC=m -CONFIG_HOTPLUG_PCI_RPA=m +# CONFIG_HOTPLUG_PCI_RPA is not set CONFIG_HOTPLUG_PCI_RPA_DLPAR=y CONFIG_ADB_PMU_LED=y CONFIG_ADB_PMU_LED_IDE=y @@ -91,7 +91,9 @@ CONFIG_PPC_PMI=m CONFIG_PS3_SYS_MANAGER=y # CONFIG_BLK_DEV_CELLEB is not set -CONFIG_PATA_SCC=m +# CONFIG_PATA_SCC is not set + +CONFIG_ALTIVEC=y CONFIG_APM_EMULATION=m @@ -132,3 +134,27 @@ CONFIG_XMON_DISASSEMBLY=y CONFIG_SCSI_IBMVSCSIS=m # CONFIG_SECCOMP is not set + +CONFIG_PS3_DISK=m +CONFIG_PS3_ROM=m +CONFIG_PS3_FLASH=m +# CONFIG_SYSTEMSIM_IDLE is not set +# CONFIG_SYSTEMSIM_BOOT is not set +CONFIG_AXON_RAM=m +# CONFIG_PS3_STORAGE_OLD is not set +# CONFIG_HVC_FSS is not set +# CONFIG_PPC_EARLY_DEBUG_FSS is not setS +CONFIG_OPROFILE_CELL=y + +CONFIG_ICPLUS_PHY=y +CONFIG_LIBERTAS=n +CONFIG_LIBERTAS_DEBUG=n +CONFIG_EXT2_FS=y + +CONFIG_PERFMON=y +# CONFIG_PERFMON_DEBUG is not set +CONFIG_PERFMON_POWER5=m +CONFIG_PERFMON_CELL=m + +CONFIG_PERFMON_CELL_HW_SMPL=y +# CONFIG_ELECTRA_IDE is not set