Hi Cody,
Am 07.06.2011 um 23:15 schrieb Cody Jackson:
After getting the packages playing nice, I'll see about getting a build script together. It'd be nice to be able to automate these builds this without messing with the original srpm, although to pass things to mock it looks like the srpm has to be extracted, two files munged, the srpm repacked and then handed to mock.
...
i consolidated the steps mentioned on the wiki. Here a patch file against the rpmbuild tree. Following will help you to automate the process:
rpm -iv k.src.rpm patch < file.diff rpmbuild -bs k.spec
this builds a k.src.rpm for e.g. mock ...
Cheers Leon
--
diff -u -r rpmbuild.dist/SOURCES/kernel-2.6.18-i586.config rpmbuild.i586/SOURCES/kernel-2.6.18-i586.config --- rpmbuild.dist/SOURCES/kernel-2.6.18-i586.config 2011-05-08 02:06:22.000000000 +0200 +++ rpmbuild.i586/SOURCES/kernel-2.6.18-i586.config 2011-06-06 17:32:17.000000000 +0200 @@ -67,7 +67,7 @@ CONFIG_PCI_STUB=y CONFIG_PCIEPORTBUS=y # FIXME: Was borked in .17git11 for non-acpi machines. -# CONFIG_HOTPLUG_PCI_PCIE is not set +CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_HOTPLUG_PCI_FAKE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set CONFIG_ISA=y @@ -96,7 +96,7 @@ CONFIG_MMC_WBSD=y CONFIG_MMC_SDHCI=m
-# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_ADDR_TRANS=y @@ -1001,7 +1001,7 @@ # # Network testing # -# CONFIG_NET_PKTGEN is not set +CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set CONFIG_NET_DROP_MONITOR=y CONFIG_NETDEVICES=y @@ -1619,7 +1619,7 @@ CONFIG_N_HDLC=m # CONFIG_STALDRV is not set # CONFIG_FTAPE is not set -# CONFIG_IBM_ASM is not set +CONFIG_IBM_ASM=m CONFIG_TCG_TPM=m CONFIG_TCG_TIS=m CONFIG_TCG_NSC=m @@ -1737,7 +1737,7 @@ CONFIG_SENSORS_F71805F=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m -# CONFIG_SENSORS_HDAPS is not set +CONFIG_SENSORS_HDAPS=m CONFIG_SENSORS_IT87=m CONFIG_SENSORS_LM63=m CONFIG_SENSORS_LM75=m @@ -1810,7 +1810,7 @@ # # IPMI # -# CONFIG_IPMI_HANDLER is not set +CONFIG_IPMI_HANDLER=m CONFIG_IPMI_PANIC_EVENT=y CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_WATCHDOG=m @@ -1878,23 +1878,23 @@ CONFIG_RTC_DRV_PCF8583=m CONFIG_RTC_DRV_V3020=m
-# CONFIG_DTLK is not set -# CONFIG_R3964 is not set +CONFIG_DTLK=m +CONFIG_R3964=m # CONFIG_APPLICOM is not set -# CONFIG_SONYPI is not set +CONFIG_SONYPI=m
# # Ftape, the floppy tape device driver # CONFIG_AGP=y CONFIG_AGP_ALI=y -# CONFIG_AGP_ATI is not set -# CONFIG_AGP_AMD is not set -# CONFIG_AGP_AMD64 is not set +CONFIG_AGP_ATI=y +CONFIG_AGP_AMD=y +CONFIG_AGP_AMD64=y CONFIG_AGP_INTEL=y -# CONFIG_AGP_NVIDIA is not set +CONFIG_AGP_NVIDIA=y CONFIG_AGP_SIS=y -# CONFIG_AGP_SWORKS is not set +CONFIG_AGP_SWORKS=y CONFIG_AGP_VIA=y CONFIG_AGP_EFFICEON=y CONFIG_DRM=m @@ -2874,11 +2874,11 @@ CONFIG_INITRAMFS_SOURCE="" CONFIG_KEYS=y CONFIG_KEYS_DEBUG_PROC_KEYS=y -# CONFIG_CDROM_PKTCDVD is not set +CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
-# CONFIG_ATA_OVER_ETH is not set +CONFIG_ATA_OVER_ETH=m CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=m CONFIG_BACKLIGHT_DEVICE=y @@ -3091,7 +3091,7 @@ CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_DMA_ENGINE=y +CONFIG_DMA_ENGINE=m CONFIG_NET_DMA=y CONFIG_INTEL_IOATDMA=m
@@ -3201,10 +3201,10 @@ CONFIG_X86_TSC=y CONFIG_X86_MCE=y # CONFIG_X86_MCE_NONFATAL is not set -# CONFIG_X86_MCE_P4THERMAL is not set -# CONFIG_TOSHIBA is not set -# CONFIG_I8K is not set -# CONFIG_MICROCODE is not set +CONFIG_X86_MCE_P4THERMAL=y +CONFIG_TOSHIBA=m +CONFIG_I8K=m +CONFIG_MICROCODE=m CONFIG_X86_MSR=m CONFIG_X86_CPUID=m CONFIG_EDD=m @@ -3250,8 +3250,8 @@ CONFIG_ACPI_FAN=y CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_THERMAL=y -# CONFIG_ACPI_ASUS is not set -# CONFIG_ACPI_TOSHIBA is not set +CONFIG_ACPI_ASUS=m +CONFIG_ACPI_TOSHIBA=m # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_EC=y CONFIG_ACPI_POWER=y @@ -3286,18 +3286,18 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_X86_ACPI_CPUFREQ=m # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set -CONFIG_X86_POWERNOW_K6=m -# CONFIG_X86_POWERNOW_K7 is not set -# CONFIG_X86_POWERNOW_K8 is not set +# CONFIG_X86_POWERNOW_K6 is not set +CONFIG_X86_POWERNOW_K7=y +CONFIG_X86_POWERNOW_K8=m # CONFIG_X86_GX_SUSPMOD is not set -# CONFIG_X86_SPEEDSTEP_CENTRINO is not set -# CONFIG_X86_SPEEDSTEP_ICH is not set -# CONFIG_X86_SPEEDSTEP_SMI is not set +CONFIG_X86_SPEEDSTEP_CENTRINO=m +CONFIG_X86_SPEEDSTEP_ICH=y +CONFIG_X86_SPEEDSTEP_SMI=y CONFIG_X86_SPEEDSTEP_LIB=y CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y # CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set -# CONFIG_X86_P4_CLOCKMOD is not set +CONFIG_X86_P4_CLOCKMOD=m CONFIG_X86_LONGRUN=y # CONFIG_X86_LONGHAUL is not set # CONFIG_X86_CPUFREQ_NFORCE2 is not set @@ -3321,7 +3321,7 @@ CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_BIOS=y -# CONFIG_HOTPLUG_PCI is not set +CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_COMPAQ=m # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set CONFIG_HOTPLUG_PCI_IBM=m @@ -3336,8 +3336,8 @@ CONFIG_IPW2200_QOS=y CONFIG_I2C_ISA=m # CONFIG_X86_REBOOTFIXUPS is not set -# CONFIG_DELL_RBU is not set -# CONFIG_DCDBAS is not set +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m CONFIG_PC8736x_GPIO=m # CONFIG_NSC_GPIO is not set CONFIG_CS5535_GPIO=m @@ -3377,3 +3377,6 @@ # CONFIG_NOHIGHMEM is not set CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set +CONFIG_DCA=m +CONFIG_INTEL_IOATDMA_V3=m +CONFIG_DMA_ENGINE_V3=y diff -u -r rpmbuild.dist/SPECS/kernel-2.6.spec rpmbuild.i586/SPECS/kernel-2.6.spec --- rpmbuild.dist/SPECS/kernel-2.6.spec 2011-05-31 18:46:14.000000000 +0200 +++ rpmbuild.i586/SPECS/kernel-2.6.spec 2011-06-06 19:33:50.000000000 +0200 @@ -70,7 +70,7 @@ # that the kernel isn't the stock distribution kernel, for example, # by setting the define to ".local" or ".bz123456" # -#% define buildid +%define buildid .EL # %define sublevel 18 %define kversion 2.6.%{sublevel} @@ -147,9 +147,9 @@ %endif # Don't build 586 kernels for RHEL builds. %if 0%{?rhel} -%define all_x86 i386 i686 +%define all_x86 i386 i586 i686 # we differ here b/c of the reloc patches -%ifarch i686 x86_64 +%ifarch i586 i686 x86_64 %define with_kdump 0 %endif %else @@ -12536,7 +12536,7 @@ # don't need these for relocatable kernels rm -f kernel-%{kversion}-{i686,x86_64}-kdump.config # don't need these in general -rm -f kernel-%{kversion}-i586.config +#rm -f kernel-%{kversion}-i586.config %endif
%if 0%{?olpc}