Revisited the set of kernel flavours and the generation of config files

Until now, the build system for the kernel supported a number of
flavours: nrj and non-nrj ones, desktop-, laptop-, server- and
netbook-oriented, etc.

It turned out over the years, however, that our users mostly need the
following:

* a kernel to use on the desktops (home and office use) with reasonable
  default settings for performance and responsiveness;
* a kernel for laptops, with a bit more emphasis on power consumption.

Other variants were rarely used. We also did not have enough time to
properly support all these.

Besides, the kernels for ARM and other architectures need a somewhat
different build process than for x86. So, they are better off to be in
separate ABF projects, even if they are needed. No signs of ROSA on ARM
yet, btw.

So, I kept only nrj-desktop and nrj-laptop flavours and only x86.

Non-PAE systems also seem to be rare now, so I enabled PAE by default
for the 32-bit kernels. Non-PAE kernels are no longer built. If they are
needed, we may use a separate git branch or an ABF project for that.

To simplify debugging, maintenance and experimentation with the kernel
builds further, I revisited the process of preparing the kernel
configuration files. The goal is to get rid of a separate git repo with
the default configs (kernel-patches-and-configs) and keep everything in
this project.

The default config files are now kept here. For x86_64:
* kernel-x86_64.config contains the options for both nrj-desktop and
  nrn-laptop flavours;
* kernel-{nrj_desktop|nrj_laptop}-x86_64.config files contain the
  flavour-specific options.

This way, it is easier to track which config options changed when,
easier to experiment with the custom configs and so on.

The kernel will be built with debug info if rpmbuild is called with
"--with debug".

kernel-nrj-desktop-i586.config

@@ -0,0 +1,137 @@
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_RDS_RDMA=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_NET_9P_RDMA=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+CONFIG_FUSION_LOGGING=y
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_ISA=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=y
+CONFIG_ATM_NICSTAR_USE_IDT77105=y
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+CONFIG_ATM_FORE200E_USE_TASKLET=y
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+CONFIG_WAN=y
+CONFIG_HOSTESS_SV11=m
+CONFIG_COSA=m
+CONFIG_LANMEDIA=m
+CONFIG_SEALEVEL_4021=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+CONFIG_HDLC_X25=m
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+CONFIG_PC300TOO=m
+CONFIG_N2=m
+CONFIG_C101=m
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+CONFIG_DSCC4_PCISYNC=y
+# CONFIG_DSCC4_PCI_RST is not set
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_SDLA=m
+CONFIG_LAPBETHER=m
+CONFIG_X25_ASY=m
+CONFIG_SBNI=m
+CONFIG_SBNI_MULTILINE=y
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+# CONFIG_ISDN_DRV_AVMB1_B1PCIV4 is not set
+CONFIG_ISDN_DRV_AVMB1_T1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_I40IW=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_INFINIBAND_NES=m
+# CONFIG_INFINIBAND_NES_DEBUG is not set
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_USNIC=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_STAGING_RDMA=m
+CONFIG_LNET_XPRT_IB=m
+CONFIG_SUNRPC_XPRT_RDMA=m

kernel-nrj-desktop-x86_64.config

@@ -0,0 +1,131 @@
+CONFIG_NR_CPUS=64
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
+CONFIG_INFINIBAND_QIB=m
+CONFIG_INFINIBAND_QIB_DCA=y
+CONFIG_INFINIBAND_CXGB3=m
+# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_I40IW=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_INFINIBAND_NES=m
+# CONFIG_INFINIBAND_NES_DEBUG is not set
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_USNIC=m
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_INFINIBAND_RDMAVT=m
+CONFIG_RDS_RDMA=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_NET_9P_RDMA=m
+CONFIG_STAGING_RDMA=m
+CONFIG_INFINIBAND_HFI1=m
+# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
+CONFIG_HFI1_VERBS_31BIT_PSN=y
+# CONFIG_SDMA_VERBOSITY is not set
+CONFIG_LNET_XPRT_IB=m
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+# CONFIG_ATM_NICSTAR is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+CONFIG_ATM_FORE200E_USE_TASKLET=y
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+CONFIG_FUSION_LOGGING=y
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+CONFIG_HDLC_X25=m
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+CONFIG_PC300TOO=m
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+# CONFIG_DSCC4_PCISYNC is not set
+# CONFIG_DSCC4_PCI_RST is not set
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_LAPBETHER=m
+CONFIG_X25_ASY=m
+CONFIG_SBNI=m
+CONFIG_SBNI_MULTILINE=y
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+# CONFIG_ISDN_DRV_AVMB1_B1PCIV4 is not set
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m

kernel-nrj-laptop-i586.config

@@ -0,0 +1,13 @@
+CONFIG_HZ_300=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
+# CONFIG_BLK_DEV_DRBD is not set
+# CONFIG_FUSION is not set
+# CONFIG_ARCNET is not set
+# CONFIG_ATM_DRIVERS is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_WAN is not set
+# CONFIG_CAPI_AVM is not set
+# CONFIG_CAPI_EICON is not set
+# CONFIG_INFINIBAND is not set

kernel-nrj-laptop-x86_64.config

@@ -0,0 +1,13 @@
+CONFIG_NR_CPUS=32
+CONFIG_HZ_300=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
+# CONFIG_INFINIBAND is not set
+# CONFIG_ARCNET is not set
+# CONFIG_ATM_DRIVERS is not set
+# CONFIG_BLK_DEV_DRBD is not set
+# CONFIG_FUSION is not set
+# CONFIG_FDDI is not set
+# CONFIG_WAN is not set
+# CONFIG_CAPI_AVM is not set
+# CONFIG_CAPI_EICON is not set

kernel.spec

@@ -1,5 +1,3 @@
-%{?build_selinux}%{?!build_selinux:%bcond_with selinux}
-
 %define kernelversion	4
 %define patchlevel	6
 # sublevel is now used for -stable patches
@@ -29,7 +27,7 @@
 %define rpmrel		%mkrel 0.%{kpatch}.%{mibrel}
 %endif
 %else
-%define rpmrel		1
+%define rpmrel		2
 %endif
 
 # fakerel and fakever never change, they are used to fool
@@ -95,157 +93,28 @@
 %define build_doc 		1
 %define build_source 		1
 %define build_devel 		1
+%define build_debug		0
 
-%define build_debug 		0
+# Build nrj desktop kernels
-
-#
-# Old Mandriva kernel flavours plus new two PAE flavours
-#
-
-# Build desktop i586 / 4GB
-%ifarch %{ix86}
-%define build_desktop586		0
-%endif
-
-# Build desktop (i686 / 4GB) / x86_64 / sparc64 sets
-%define build_desktop			0
-
-# Build netbook (i686 / 4GB) / x86_64
-%define build_netbook			0
-
-# Build server (i686 / 64GB)/x86_64 / sparc64 sets
-%define build_server			0
-
-# Build desktop686 pae (i686 / 64GB)
-%ifarch %{ix86}
-%define build_desktop_pae		0
-%endif
-
-# Build netbook686 pae (i686 / 64GB)
-%ifarch %{ix86}
-%define build_netbook_pae		0
-%endif
-
-#
-# MIB low latency optimized flavours called "nrj"
-#
-
-# Build nrj desktop586 (i586 / 4GB)
-%ifarch %{ix86}
-%define build_nrj_desktop586	0
-%endif
-
-# Build nrj desktop (i686 / 4GB) / x86_64 / sparc64 sets
 %define build_nrj_desktop		1
 
-# Build nrj realtime (i686 / 4GB) / x86_64
+# Build nrj laptop kernels
-%define build_nrj_realtime		0
-
-# Build nrj server (i686 / 4GB) / x86_64
-%define build_nrj_server		0
-
-# Build nrj laptop (i686 / 4GB) / x86_64
 %define build_nrj_laptop		1
 
-# Build nrj netbook (i686 / 4GB) / x86_64
-%define build_nrj_netbook		0
-
-# Build nrj desktop pae (i686 / 64GB)
-%ifarch %{ix86}
-%define build_nrj_desktop_pae		1
-%endif
-
-# Build nrj realtime pae (i686 / 64GB)
-%ifarch %{ix86}
-%define build_nrj_realtime_pae		0
-%endif
-
-# Build nrj laptop pae (i686 / 64GB)
-%ifarch %{ix86}
-%define build_nrj_laptop_pae		1
-%endif
-
-# Build nrj netbook686 pae (i686 / 64GB)
-%ifarch %{ix86}
-%define build_nrj_netbook_pae		0
-%endif
-
-#
-# experimental "cpu level" optimized "nrj" flavours
-#
-
-# Build nrj netbook Intel Atom (matom / 4GB)
-%ifarch %{ix86}
-%define build_nrj_netbook_atom		0
-%endif
-
-# Build nrj netbook Intel Atom pae (matom / 64GB)
-%ifarch %{ix86}
-%define build_nrj_netbook_atom_pae	0
-%endif
-
-# Build nrj desktop Intel Core2 (mcore2 / 4GB)
-%ifarch %{ix86}
-%define build_nrj_desktop_core2   	0
-%endif
-
-# Build nrj desktop Intel Core2 pae (mcore2 / 64GB)
-%ifarch %{ix86}
-%define build_nrj_desktop_core2_pae   	0
-%endif
-
-#
-# end of experimental "cpu level" optimized "nrj" flavours
-#
-
-
 # build perf and cpupower tools
 %define build_perf		1
 %define build_cpupower		1
 
 # compress modules with xz
 %define build_modxz		1
-
-# ARM builds
-%ifarch %{arm}
-%define build_desktop		0
-%define build_netbook		0
-%define build_server		0
-%define build_iop32x		0
-%define build_kirkwood		1
-%define build_versatile		1
-# no cpupower tools on arm yet
-%define build_cpupower		0
-# arm is currently not using xz
-%define build_modxz		0
-%endif
 # End of user definitions
 
 # buildtime flags
-%{?_without_desktop586: %global build_desktop586 0}
-%{?_without_desktop: %global build_desktop 0}
-%{?_without_netbook: %global build_netbook 0}
-%{?_without_server: %global build_server 0}
-
-%{?_without_desktop_pae: %global build_desktop_pae 0}
-%{?_without_netbook_pae: %global build_netbook_pae 0}
-
-%{?_without_nrj_desktop586: %global build_nrj_desktop586 0}
 %{?_without_nrj_desktop: %global build_nrj_desktop 0}
-%{?_without_nrj_realtime: %global build_nrj_realtime 0}
-%{?_without_nrj_server: %global build_nrj_server 0}
 %{?_without_nrj_laptop: %global build_nrj_laptop 0}
-%{?_without_nrj_netbook: %global build_nrj_netbook 0}
 
-%{?_without_nrj_desktop_pae: %global build_nrj_desktop_pae 0}
+%{?_with_nrj_desktop: %global build_nrj_desktop 1}
-%{?_without_nrj_realtime_pae: %global build_nrj_realtime_pae 0}
+%{?_with_nrj_laptop: %global build_nrj_laptop 1}
-%{?_without_nrj_laptop_pae: %global build_nrj_laptop_pae 0}
-%{?_without_nrj_netbook_pae: %global build_nrj_netbook_pae 0}
-
-%{?_without_nrj_netbook_atom: %global build_nrj_netbook_atom 0}
-%{?_without_nrj_netbook_atom_pae: %global build_nrj_netbook_atom_pae 0}
-%{?_without_nrj_desktop_core2: %global build_nrj_desktop_core2 0}
-%{?_without_nrj_desktop_core2_pae: %global build_nrj_desktop_core2_pae 0}
 
 %{?_without_doc: %global build_doc 0}
 %{?_without_source: %global build_source 0}
@@ -255,32 +124,6 @@
 %{?_without_cpupower: %global build_cpupower 0}
 %{?_without_modxz: %global build_modxz 0}
 
-
-%{?_with_desktop586: %global build_desktop586 1}
-%{?_with_desktop: %global build_desktop 1}
-%{?_with_netbook: %global build_netbook 1}
-%{?_with_server: %global build_server 1}
-
-%{?_with_desktop_pae: %global build_desktop_pae 1}
-%{?_with_netbook_pae: %global build_netbook_pae 1}
-
-%{?_with_nrj_desktop586: %global build_nrj_desktop586 1}
-%{?_with_nrj_desktop: %global build_nrj_desktop 1}
-%{?_with_nrj_realtime: %global build_nrj_realtime 1}
-%{?_with_nrj_server: %global build_nrj_server 1}
-%{?_with_nrj_laptop: %global build_nrj_laptop 1}
-%{?_with_nrj_netbook: %global build_nrj_netbook 1}
-
-%{?_with_nrj_desktop_pae: %global build_nrj_desktop_pae 1}
-%{?_with_nrj_realtime_pae: %global build_nrj_realtime_pae 1}
-%{?_with_nrj_laptop_pae: %global build_nrj_laptop_pae 1}
-%{?_with_nrj_netbook_pae: %global build_nrj_netbook_pae 1}
-
-%{?_with_nrj_netbook_atom: %global build_nrj_netbook_atom 1}
-%{?_with_nrj_netbook_atom_pae: %global build_nrj_netbook_atom_pae 1}
-%{?_with_nrj_desktop_core2: %global build_nrj_desktop_core2 1}
-%{?_with_nrj_desktop_core2_pae: %global build_nrj_desktop_core2_pae 1}
-
 %{?_with_doc: %global build_doc 1}
 %{?_with_source: %global build_source 1}
 %{?_with_devel: %global build_devel 1}
@@ -289,19 +132,6 @@
 %{?_with_cpupower: %global build_cpupower 1}
 %{?_with_modxz: %global build_modxz 1}
 
-
-# ARM builds
-%{?_with_iop32x: %global build_iop32x 1}
-%{?_with_kirkwood: %global build_kirkwood 1}
-%{?_with_versatile: %global build_versatile 1}
-%{?_without_iop32x: %global build_iop32x 0}
-%{?_without_kirkwood: %global build_kirkwood 0}
-%{?_without_versatile: %global build_versatile 0}
-
-# For the .nosrc.rpm
-%define build_nosrc 	0
-%{?_with_nosrc: %global build_nosrc 1}
-
 ############################################################
 ### Linker start1 > Check point to build for omv or rosa ###
 ############################################################
@@ -322,9 +152,6 @@
 	&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
 	[ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-P $RPM_BUILD_NCPUS")
 
-# Sparc arch wants sparc64 kernels
-%define target_arch    %(echo %{_arch} | sed -e 's/mips.*/mips/' -e 's/arm.*/arm/' -e 's/aarch64/arm64/')
-
 #
 # SRC RPM description
 #
@@ -334,25 +161,27 @@ Version: 	%{kversion}
 Release: 	%{rpmrel}
 License: 	GPLv2
 Group: 	 	System/Kernel and hardware
-ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
+ExclusiveArch: %{ix86} x86_64
-ExclusiveOS: 	Linux
 URL:            http://www.kernel.org
 
 ####################################################################
 #
 # Sources
 #
-### This is for full SRC RPM
 Source0: 	ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.x/linux-%{tar_ver}.tar.xz
 Source1: 	ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.x/linux-%{tar_ver}.tar.sign
-### This is for stripped SRC RPM
+
-%if %build_nosrc
-NoSource: 0
-%endif
 # This is for disabling *config, mrproper, prepare, scripts on -devel rpms
+# TODO: is it needed?
 Source2: 	disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
 
-Source5:	kernel.rpmlintrc
+# Kernel configuration files.
+# kernel-<arch>.config is the common part. kernel-<flavour>-<arch>.config is
+# what should be added to it to get the initial configuration file for
+# the particular kernel flavour.
+Source110:	kernel-%{arch_suffix}.config
+Source111:	kernel-nrj-desktop-%{arch_suffix}.config
+Source112:	kernel-nrj-laptop-%{arch_suffix}.config
 
 # Cpupower: the service, the config, etc.
 Source50:	cpupower.service
@@ -360,6 +189,8 @@ Source51:	cpupower.config
 Source52:	cpupower-start.sh
 Source53:	cpupower.path
 
+Source80:	kernel.rpmlintrc
+
 # Our patch tarball,
 # see https://abf.rosalinux.ru/soft/kernel-patches-and-configs/
 Source100: 	https://abf.io/soft/kernel-patches-and-configs/archive/kernel-patches-and-configs-%{revision}.tar.gz
@@ -477,19 +308,13 @@ BuildRequires:		xmlto
 BuildRequires:		zlib-devel
 %endif
 
-%ifarch %{arm}
-BuildRequires:		uboot-mkimage
-%endif
-
 # might be useful too:
 Suggests:		microcode
 
 
 %description
 %common_desc_kernel
-%ifnarch %{arm}
 %common_desc_kernel_smp
-%endif
 
 # Define obsolete/provides to help automatic upgrades of old kernel-xen-pvops
 %define latest_obsoletes_server kernel-xen-pvops-latest < 3.2.1-1
@@ -528,9 +353,7 @@ Summary:	%{expand:%{summary_%(echo %{1} | sed -e "s/-/_/g")}} \
 Group:		System/Kernel and hardware		\
 %description -n %{kname}-%{1}-%{buildrel}		\
 %common_desc_kernel %{expand:%{info_%(echo %{1} | sed -e "s/-/_/g")}} \
-%ifnarch %{arm}						\
 %common_desc_kernel_smp					\
-%endif							\
 							\
 %if %build_devel					\
 %package -n	%{kname}-%{1}-devel-%{buildrel}		\
@@ -628,336 +451,20 @@ latest %{kname}-%{1}-devel %{kernelversion}.%{patchlevel}.x installed... \
 %files -n %{kname}-%{1}-%{buildrel}-debuginfo -f kernel_debug_files.%{1} \
 %endif
 
-%ifarch %{ix86}
-#
-# kernel-desktop586: i586, smp-alternatives, 4GB
-#
-%if %build_desktop586
-%define summary_desktop586 Linux kernel for desktop use with i586 & 4GB RAM
-%define info_desktop586 This kernel is compiled for desktop use, single or \
-multiple i586 processor(s)/core(s) and less than 4GB RAM, using HZ_1000, \
-voluntary preempt, CFS cpu scheduler and BFQ i/o scheduler.
-%mkflavour desktop586
-%endif
-%endif
-
-#
-# kernel-desktop: i686, smp-alternatives, 4 GB / x86_64
-#
-%if %build_desktop
-%ifarch %{ix86}
-%define summary_desktop Linux Kernel for desktop use with i686 & 4GB RAM
-%define info_desktop This kernel is compiled for desktop use, single or \
-multiple i686 processor(s)/core(s) and less than 4GB RAM, using HZ_1000, \
-voluntary preempt, CFS cpu scheduler and BFQ i/o scheduler.
-%else
-%define summary_desktop Linux Kernel for desktop use with %{_arch}
-%define info_desktop This kernel is compiled for desktop use, single or \
-multiple %{_arch} processor(s)/core(s), using HZ_1000, \
-voluntary preempt, CFS cpu scheduler and BFQ i/o scheduler.
-%endif
-%mkflavour desktop
-%endif
-
-#
-# kernel-netbook: i686, smp-alternatives, 4 GB / x86_64
-#
-%if %build_netbook
-%ifarch %{ix86}
-%define summary_netbook Linux Kernel for netbook use with i686 & 4GB RAM
-%define info_netbook This kernel is compiled for netbook use, single or \
-multiple i686 processor(s)/core(s) and less than 4GB RAM, using HZ_250, \
-voluntary preempt, CFS cpu scheduler and BFQ i/o scheduler.
-%else
-%define summary_netbook Linux Kernel for netbook use with %{_arch}
-%define info_netbook This kernel is compiled for netbook use, single or \
-multiple %{_arch} processor(s)/core(s), using HZ_250, \
-voluntary preempt, CFS cpu scheduler and BFQ i/o scheduler.
-%endif
-%mkflavour netbook
-%endif
-
-#
-# kernel-server: i686, smp-alternatives, 64 GB / x86_64
-#
-%if %build_server
-%ifarch %{ix86}
-%define summary_server Linux Kernel for server use with i686 & 64GB RAM
-%define info_server This kernel is compiled for server use, single or \
-multiple i686 processor(s)/core(s) and up to 64GB RAM using PAE, using \
-no preempt, HZ_100, CFS cpu scheduler and CFQ i/o scheduler.
-%else
-%define summary_server Linux Kernel for server use with %{_arch}
-%define info_server This kernel is compiled for server use, single or \
-multiple %{_arch} processor(s)/core(s), using no preempt, HZ_100, \
-CFS cpu scheduler and CFQ i/o scheduler.
-%endif
-%mkflavour server
-%endif
-
-%ifarch %{ix86}
-#
-# kernel-desktop-pae: i686, smp-alternatives, 64GB
-#
-%if %build_desktop_pae
-%define summary_desktop_pae Linux kernel for desktop use with i686 & upto 64GB RAM
-%define info_desktop_pae This kernel is compiled for desktop use, single or \
-multiple i686 processor(s)/core(s) and up to 64GB RAM using PAE, using HZ_1000, \
-voluntary preempt, CFS cpu scheduler and BFQ i/o scheduler.
-%mkflavour desktop-pae
-%endif
-%endif
-
-%ifarch %{ix86}
-#
-# kernel-netbook-pae: i686, smp-alternatives, 64 GB
-#
-%if %build_netbook_pae
-%define summary_netbook_pae Linux Kernel for for netbook use with i686 & upto 64GB RAM
-%define info_netbook_pae This kernel is compiled for netbook use, single or \
-multiple i686 processor(s)/core(s) and up to 64GB RAM using PAE, using HZ_250, \
-voluntary preempt, CFS cpu scheduler and BFQ i/o scheduler.
-%mkflavour netbook-pae
-%endif
-%endif
-
-%ifarch %{ix86}
-#
-# kernel-nrj-desktop586: nrj, i586, smp-alternatives, 4GB
-#
-%if %build_nrj_desktop586
-%define summary_nrj_desktop586 Linux kernel for desktop use with i586 & 4GB RAM
-%define info_nrj_desktop586 This kernel is compiled for desktop use, single or \
-multiple i586 processor(s)/core(s) and less than 4GB RAM, using HZ_1000, \
-full preempt, rcu boost, CFS cpu scheduler and BFQ i/o scheduler.
-%mkflavour nrj-desktop586
-%endif
-%endif
-
-#
-# kernel-nrj-desktop: nrj, i686, smp-alternatives, 4 GB / x86_64
-#
 %if %build_nrj_desktop
-%ifarch %{ix86}
+%define summary_nrj_desktop Linux Kernel for desktop machines
-%define summary_nrj_desktop Linux Kernel for desktop use with i686 & 4GB RAM
+%define info_nrj_desktop This kernel is compiled for desktops.
-%define info_nrj_desktop This kernel is compiled for desktop use, single or \
-multiple i686 processor(s)/core(s) and less than 4GB RAM, using HZ_1000, \
-full preempt, rcu boost, RIFS cpu scheduler and BFQ I/O scheduler.
-%else
-%define summary_nrj_desktop Linux Kernel for desktop use with %{_arch}
-%define info_nrj_desktop This kernel is compiled for desktop use, single or \
-multiple %{_arch} processor(s)/core(s), using HZ_1000, \
-full preempt, rcu boost, RIFS cpu scheduler and BFQ I/O scheduler.
-%endif
 %mkflavour nrj-desktop
 %endif
-
-#
-# kernel-nrj-realtime: nrj, i686, smp-alternatives, 4 GB / x86_64
-#
-%if %build_nrj_realtime
-%ifarch %{ix86}
-%define summary_nrj_realtime Linux Kernel for low latency use with i686 & 4GB RAM
-%define info_nrj_realtime This kernel is compiled for low latency use, single or \
-multiple i686 processor(s)/core(s) and less than 4GB RAM, using HZ_1000, \
-full preempt, rcu boost, CFS cpu scheduler and new BFQ I/O scheduler.
-%else
-%define summary_nrj_realtime Linux Kernel for low latency use with %{_arch}
-%define info_nrj_realtime This kernel is compiled for low latency use, single or \
-multiple %{_arch} processor(s)/core(s), using HZ_1000, \
-full preempt, rcu boost, CFS cpu scheduler and new BFQ I/O scheduler.
-%endif
-%mkflavour nrj-realtime
-%endif
-
-#
-# kernel-nrj-server: i686, smp-alternatives, 64 GB / x86_64
-#
-%if %build_nrj_server
-%ifarch %{ix86}
-%define summary_nrj_server Linux Kernel for server use with i686 & 64GB RAM
-%define info_nrj_server This kernel is compiled for server use, single or \
-multiple i686 processor(s)/core(s) and up to 64GB RAM using PAE, using \
-no preempt, HZ_100, CFS cpu scheduler and BFQ i/o scheduler.
-%else
-%define summary_nrj_server Linux Kernel for server use with %{_arch}
-%define info_nrj_server This kernel is compiled for server use, single or \
-multiple %{_arch} processor(s)/core(s), using no preempt, HZ_100, \
-CFS cpu scheduler and BFQ i/o scheduler.
-%endif
-%mkflavour nrj-server
-%endif
-
 #
 # kernel-nrj-laptop: nrj, i686, smp-alternatives, 4 GB / x86_64
 #
 %if %build_nrj_laptop
-%ifarch %{ix86}
+%define summary_nrj_laptop Linux Kernel for laptops
-%define summary_nrj_laptop Linux Kernel for laptop use with i686 & 4GB RAM
+%define info_nrj_laptop This kernel is compiled for laptops.
-%define info_nrj_laptop This kernel is compiled for laptop use, single or \
-multiple i686 processor(s)/core(s) and less than 4GB RAM, using HZ_300, \
-full preempt, rcu boost, CFS cpu scheduler and BFQ i/o scheduler.
-%else
-%define summary_nrj_laptop Linux Kernel for laptop use with %{_arch}
-%define info_nrj_laptop This kernel is compiled for laptop use, single or \
-multiple %{_arch} processor(s)/core(s), using HZ_300, \
-full preempt, rcu boost, CFS cpu scheduler and BFQ i/o scheduler.
-%endif
 %mkflavour nrj-laptop
 %endif
 
-#
-# kernel-nrj-netbook: nrj, i686, smp-alternatives, 4 GB / x86_64
-#
-%if %build_nrj_netbook
-%ifarch %{ix86}
-%define summary_nrj_netbook Linux Kernel for netbook use with i686 & 4GB RAM
-%define info_nrj_netbook This kernel is compiled for netbook use, single or \
-multiple i686 processor(s)/core(s) and less than 4GB RAM, using HZ_250, \
-full preempt, rcu boost, CFS cpu scheduler and BFQ i/o scheduler.
-%else
-%define summary_nrj_netbook Linux Kernel for netbook use with %{_arch}
-%define info_nrj_netbook This kernel is compiled for netbook use, single or \
-multiple %{_arch} processor(s)/core(s), using HZ_250, \
-full preempt, rcu boost, CFS cpu scheduler and BFQ i/o scheduler.
-%endif
-%mkflavour nrj-netbook
-%endif
-
-#
-%ifarch %{ix86}
-#
-# kernel-nrj-desktop-pae: nrj, i686, smp-alternatives, 64GB
-#
-%if %build_nrj_desktop_pae
-%define summary_nrj_desktop_pae Linux kernel for desktop use with i686 & upto 64GB RAM
-%define info_nrj_desktop_pae This kernel is compiled for desktop use, single or \
-multiple i686 processor(s)/core(s) and up to 64GB RAM using PAE, using HZ_1000, \
-full preempt, rcu boost, CFS cpu scheduler and BFQ i/o scheduler.
-%mkflavour nrj-desktop-pae
-%endif
-%endif
-
-#
-%ifarch %{ix86}
-#
-# kernel-nrj-realtime-pae: nrj, i686, smp-alternatives, 64GB
-#
-%if %build_nrj_realtime_pae
-%define summary_nrj_realtime_pae Linux kernel for low latency use with i686 & upto 64GB RAM
-%define info_nrj_realtime_pae This kernel is compiled for low latency use, single or \
-multiple i686 processor(s)/core(s) and up to 64GB RAM using PAE, using HZ_1000, \
-full preempt, rcu boost, CFS cpu scheduler and new BFQ I/O scheduler.
-%mkflavour nrj-realtime-pae
-%endif
-%endif
-
-#
-%ifarch %{ix86}
-#
-# kernel-nrj-laptop-pae: nrj, i686, smp-alternatives, 64 GB
-#
-%if %build_nrj_laptop_pae
-%define summary_nrj_laptop_pae Linux Kernel for for laptop use with i686 & upto 64GB RAM
-%define info_nrj_laptop_pae This kernel is compiled for laptop use, single or \
-multiple i686 processor(s)/core(s) and up to 64GB RAM using PAE, using HZ_300, \
-full preempt, rcu boost, CFS cpu scheduler and BFQ i/o scheduler.
-%mkflavour nrj-laptop-pae
-%endif
-%endif
-
-#
-%ifarch %{ix86}
-#
-# kernel-nrj-netbook-pae: nrj, i686, smp-alternatives, 64 GB
-#
-%if %build_nrj_netbook_pae
-%define summary_nrj_netbook_pae Linux Kernel for for netbook use with i686 & upto 64GB RAM
-%define info_nrj_netbook_pae This kernel is compiled for netbook use, single or \
-multiple i686 processor(s)/core(s) and up to 64GB RAM using PAE, using HZ_250, \
-full preempt, rcu boost, CFS cpu scheduler and BFQ i/o scheduler.
-%mkflavour nrj-netbook-pae
-%endif
-%endif
-
-#
-%ifarch %{ix86}
-#
-# kernel-nrj-netbook-atom: nrj, for Intel Atom cpu, smp-alternatives, 4 GB
-#
-%if %build_nrj_netbook_atom
-%define summary_nrj_netbook_atom Linux Kernel for netbook use with Intel Atom cpu, less than 4GB RAM
-%define info_nrj_netbook_atom This kernel is compiled for netbook use, single or \
-multiple Intel Atom cpu processor(s)/core(s) and less than 4GB RAM, using HZ_250, \
-full preempt, rcu boost, CFS cpu scheduler and BFQ i/o scheduler.
-%mkflavour nrj-netbook-atom
-%endif
-%endif
-
-#
-%ifarch %{ix86}
-#
-# kernel-nrj-netbook-atom-pae: nrj, for Intel Atom cpu, smp-alternatives, 64 GB
-#
-%if %build_nrj_netbook_atom_pae
-%define summary_nrj_netbook_atom_pae Linux Kernel for netbook use with Intel Atom cpu & upto 64GB RAM
-%define info_nrj_netbook_atom_pae This kernel is compiled for netbook use, single or \
-multiple Intel Atom cpu processor(s)/core(s) and up to 64GB RAM using PAE, using HZ_250, \
-full preempt, rcu boost, CFS cpu scheduler and BFQ i/o scheduler.
-%mkflavour nrj-netbook-atom-pae
-%endif
-%endif
-
-#
-%ifarch %{ix86}
-#
-# kernel-nrj-desktop-core2: nrj, Intel Core 2 and newer, smp-alternatives, 4 GB
-#
-%if %build_nrj_desktop_core2
-%define summary_nrj_desktop_core2 Linux Kernel for desktop use with i686 & 4GB RAM
-%define info_nrj_desktop_core2 This kernel is compiled for desktop use, single or \
-multiple Intel Core 2 and newer processor(s)/core(s) and less than 4GB RAM, using HZ_1000, \
-full preempt, rcu boost, CFS cpu scheduler and BFQ i/o scheduler.
-%mkflavour nrj-desktop-core2
-%endif
-%endif
-
-#
-%ifarch %{ix86}
-#
-# kernel-nrj-desktop-core2-pae: nrj, Intel Core 2 and newer, smp-alternatives, 64 GB
-#
-%if %build_nrj_desktop_core2_pae
-%define summary_nrj_desktop_core2_pae Linux Kernel for desktop use with i686 & upto 64GB RAM
-%define info_nrj_desktop_core2_pae This kernel is compiled for desktop use, single or \
-multiple Intel Core 2 and newer processor(s)/core(s) and up to 64GB RAM using PAE, using HZ_1000, \
-full preempt, rcu boost, CFS cpu scheduler and BFQ i/o scheduler.
-%mkflavour nrj-desktop-core2-pae
-%endif
-%endif
-
-#
-# ARM kernels
-#
-%ifarch %{arm}
-%if %build_iop32x
-%define summary_iop32x Linux Kernel for Arm machines based on Xscale IOP32X
-%define info_iop32x This kernel is compiled for iop32x boxes. It will run on n2100 \
-or ss4000e or sanmina boards.
-%mkflavour iop32x
-%endif
-%if %build_kirkwood
-%define summary_kirkwood Linux Kernel for Arm machines based on Kirkwood
-%define info_kirkwood This kernel is compiled for kirkwood boxes. It will run on openrd boards.
-%mkflavour kirkwood
-%endif
-%if %build_versatile
-%define summary_versatile Linux Kernel for Versatile arm machines
-%define info_versatile This kernel is compiled for Versatile boxes. It will run on Qemu for instance.
-%mkflavour versatile
-%endif
-%endif
-
 #
 # kernel-source
 #
@@ -1128,22 +635,38 @@ cd %src_dir
 # Setup Begin
 #
 
-# Prepare all the variables for calling create_configs
+# Configs
-
+cp %{SOURCE110} .
 %if %build_debug
-%define debug --debug
+sed -i	's/# CONFIG_DEBUG_INFO is not set/CONFIG_DEBUG_INFO=y\nCONFIG_DEBUG_INFO_REDUCED=y/' \
-%else
+	./kernel-%{arch_suffix}.config
-%define debug --no-debug
 %endif
 
-%if %{with selinux}
+FLAVOURS=""
-# Enable SELinux, memory sanitization, etc.
+
-%define enhanced_security --with-enhanced-security
+%if %{build_nrj_laptop}
-%else
+cp %{SOURCE112} .
-%define enhanced_security %{nil}
+FLAVOURS="nrj-laptop ${FLAVOURS}"
 %endif
 
-%{patches_dir}/scripts/create_configs-withBFQ %debug %enhanced_security --user_cpu="%{target_arch}"
+%if %{build_nrj_desktop}
+cp %{SOURCE111} .
+FLAVOURS="nrj-desktop ${FLAVOURS}"
+%endif
+
+CONFIG_DIR=arch/x86/configs
+mkdir -p "${CONFIG_DIR}"
+
+for flav in ${FLAVOURS}; do
+	echo "Creating configuration file for \"$flav\" kernel."
+	cp ./kernel-%{arch_suffix}.config .config
+# Make sure a newline is at the end of the basic part of the config.
+	echo >> .config
+	cat ./kernel-${flav}-%{arch_suffix}.config >> .config
+	make ARCH=%{_arch} oldconfig && \
+	mv .config arch/x86/configs/%{arch_suffix}_defconfig-${flav} && \
+	echo "Created arch/x86/configs/%{arch_suffix}_defconfig-${flav}."
+done
 
 # make sure the kernel has the sublevel we know it has...
 LC_ALL=C perl -p -i -e "s/^SUBLEVEL.*/SUBLEVEL = %{sublevel}/" Makefile
@@ -1182,18 +705,10 @@ PrepareKernel() {
 
 	%smake -s mrproper
 
-	if [ "%{target_arch}" == "i386" -o "%{target_arch}" == "x86_64" ]; then
+	if [ -z "$name" ]; then
-	    if [ -z "$name" ]; then
+		cp ${config_dir}/%{arch_suffix}_defconfig-desktop .config
-		cp ${config_dir}/%{target_arch}_defconfig-desktop .config
-	    else
-		cp ${config_dir}/%{target_arch}_defconfig-$name .config
-	    fi
 	else
-	    if [ -z "$name" ]; then
+		cp ${config_dir}/%{arch_suffix}_defconfig-$name .config
-		cp arch/%{target_arch}/defconfig-desktop .config
-	    else
-		cp arch/%{target_arch}/defconfig-$name .config
-	    fi
 	fi
 
 	# make sure EXTRAVERSION says what we want it to say
@@ -1220,15 +735,7 @@ BuildKernel() {
 	install -m 644 .config %{temp_boot}/config-$KernelVer
 	xz -c Module.symvers > %{temp_boot}/symvers-$KernelVer.xz
 
-	%ifarch %{arm}
+	cp -f arch/%{arch_suffix}/boot/bzImage %{temp_boot}/vmlinuz-$KernelVer
-		if [ -f arch/arm/boot/uImage ]; then
-			cp -f arch/arm/boot/uImage %{temp_boot}/uImage-$KernelVer
-		else
-			cp -f arch/arm/boot/zImage %{temp_boot}/vmlinuz-$KernelVer
-		fi
-	%else
-		cp -f arch/%{target_arch}/boot/bzImage %{temp_boot}/vmlinuz-$KernelVer
-	%endif
 
 	# modules
 	install -d %{temp_modules}/$KernelVer
@@ -1259,20 +766,12 @@ SaveDevel() {
 	cp -fR kernel/bounds.c $TempDevelRoot/kernel
 	cp -fR kernel/time/timeconst.bc $TempDevelRoot/kernel/time
 	cp -fR tools/include $TempDevelRoot/tools/
-	%ifarch %{arm}
+	cp -fR arch/x86/kernel/asm-offsets.{c,s} $TempDevelRoot/arch/x86/kernel/
-		cp -fR arch/%{target_arch}/tools $TempDevelRoot/arch/%{target_arch}/
+	cp -fR arch/x86/kernel/asm-offsets_{32,64}.c $TempDevelRoot/arch/x86/kernel/
-	%endif
+	cp -fR arch/x86/purgatory/* $TempDevelRoot/arch/x86/purgatory/
-	%ifarch %{ix86} x86_64
+	cp -fR arch/x86/entry/syscalls/syscall* $TempDevelRoot/arch/x86/entry/syscalls/
-		cp -fR arch/x86/kernel/asm-offsets.{c,s} $TempDevelRoot/arch/x86/kernel/
+	cp -fR arch/x86/include $TempDevelRoot/arch/x86/
-		cp -fR arch/x86/kernel/asm-offsets_{32,64}.c $TempDevelRoot/arch/x86/kernel/
+	cp -fR arch/x86/tools $TempDevelRoot/arch/x86/
-		cp -fR arch/x86/purgatory/* $TempDevelRoot/arch/x86/purgatory/
-		cp -fR arch/x86/entry/syscalls/syscall* $TempDevelRoot/arch/x86/entry/syscalls/
-		cp -fR arch/x86/include $TempDevelRoot/arch/x86/
-		cp -fR arch/x86/tools $TempDevelRoot/arch/x86/
-	%else
-		cp -fR arch/%{target_arch}/kernel/asm-offsets.{c,s} $TempDevelRoot/arch/%{target_arch}/kernel/
-		for f in $(find arch/%{target_arch} -name include); do cp -fR --parents $f $TempDevelRoot; done
-	%endif
 	cp -fR .config Module.symvers $TempDevelRoot
 
 	# Needed for truecrypt build (Danny)
@@ -1306,14 +805,9 @@ SaveDevel() {
 		rm -rf $TempDevelRoot/arch/$i
 	done
 
-	%ifnarch %{arm}
+	rm -rf $TempDevelRoot/arch/arm*
-		rm -rf $TempDevelRoot/arch/arm*
+	rm -rf $TempDevelRoot/include/kvm/arm*
-		rm -rf $TempDevelRoot/include/kvm/arm*
+	rm -rf $TempDevelRoot/include/soc
-		rm -rf $TempDevelRoot/include/soc
-	%endif
-	%ifnarch %{ix86} x86_64
-		rm -rf $TempDevelRoot/arch/x86
-	%endif
 
 	# Clean the scripts tree, and make sure everything is ok (sanity check)
 	# running prepare+scripts (tree was already "prepared" in build)
@@ -1341,14 +835,8 @@ cat > $kernel_devel_files <<EOF
 %dir $DevelRoot/arch
 %dir $DevelRoot/include
 $DevelRoot/Documentation
-%ifarch %{arm}
-$DevelRoot/arch/arm
-$DevelRoot/arch/arm64
-%endif
 $DevelRoot/arch/um
-%ifarch %{ix86} x86_64
 $DevelRoot/arch/x86
-%endif
 $DevelRoot/block
 $DevelRoot/certs
 $DevelRoot/crypto
@@ -1377,9 +865,7 @@ $DevelRoot/include/ras
 $DevelRoot/include/rdma
 $DevelRoot/include/rxrpc
 $DevelRoot/include/scsi
-%ifarch %{arm}
 $DevelRoot/include/soc
-%endif
 $DevelRoot/include/sound
 $DevelRoot/include/target
 $DevelRoot/include/trace
@@ -1594,122 +1080,14 @@ install -d %{temp_root}
 # make sure we are in the directory
 cd %src_dir
 
-%ifarch %{ix86}
-%if %build_desktop586
-CreateKernel desktop586
-%endif
-%endif
-
-%if %build_desktop
-CreateKernel desktop
-%endif
-
-%if %build_netbook
-CreateKernel netbook
-%endif
-
-%if %build_server
-CreateKernel server
-%endif
-
-%ifarch %{ix86}
-%if %build_desktop_pae
-CreateKernel desktop-pae
-%endif
-%endif
-
-%ifarch %{ix86}
-%if %build_netbook_pae
-CreateKernel netbook-pae
-%endif
-%endif
-
-%ifarch %{ix86}
-%if %build_nrj_desktop586
-CreateKernel nrj-desktop586
-%endif
-%endif
-
 %if %build_nrj_desktop
 CreateKernel nrj-desktop
 %endif
 
-%if %build_nrj_realtime
-CreateKernel nrj-realtime
-%endif
-
-%if %build_nrj_server
-CreateKernel nrj-server
-%endif
-
 %if %build_nrj_laptop
 CreateKernel nrj-laptop
 %endif
 
-%if %build_nrj_netbook
-CreateKernel nrj-netbook
-%endif
-
-%ifarch %{ix86}
-%if %build_nrj_desktop_pae
-CreateKernel nrj-desktop-pae
-%endif
-%endif
-
-%ifarch %{ix86}
-%if %build_nrj_realtime_pae
-CreateKernel nrj-realtime-pae
-%endif
-%endif
-
-%ifarch %{ix86}
-%if %build_nrj_laptop_pae
-CreateKernel nrj-laptop-pae
-%endif
-%endif
-
-%ifarch %{ix86}
-%if %build_nrj_netbook_pae
-CreateKernel nrj-netbook-pae
-%endif
-%endif
-
-%ifarch %{ix86}
-%if %build_nrj_netbook_atom
-CreateKernel nrj-netbook-atom
-%endif
-%endif
-
-%ifarch %{ix86}
-%if %build_nrj_netbook_atom_pae
-CreateKernel nrj-netbook-atom-pae
-%endif
-%endif
-
-%ifarch %{ix86}
-%if %build_nrj_desktop_core2
-CreateKernel nrj-desktop-core2
-%endif
-%endif
-
-%ifarch %{ix86}
-%if %build_nrj_desktop_core2_pae
-CreateKernel nrj-desktop-core2-pae
-%endif
-%endif
-
-%ifarch %{arm}
-%if %build_iop32x
-CreateKernel iop32x
-%endif
-%if %build_kirkwood
-CreateKernel kirkwood
-%endif
-%if %build_versatile
-CreateKernel versatile
-%endif
-%endif
-
 # set extraversion to match srpm to get nice version reported by the tools
 LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{rpmrel}/" Makefile
 
@@ -1740,15 +1118,10 @@ chmod +x tools/power/cpupower/utils/version-gen.sh
 
 # We don't make to repeat the depend code at the install phase
 %if %build_source
-%ifarch %{arm}
+PrepareKernel "" %{buildrpmrel}custom
-    PrepareKernel "kirkwood" %{buildrpmrel}custom
-%else
-    PrepareKernel "" %{buildrpmrel}custom
-%endif
 %smake -s mrproper
 %endif
 
-
 ###
 ### install
 ###
@@ -1777,9 +1150,7 @@ for i in alpha arc avr32 blackfin c6x cris frv h8300 hexagon ia64 m32r m68k m68k
 	 mips nios2 openrisc parisc powerpc s390 score sh sh64 sparc tile unicore32 v850 xtensa mn10300; do
 	rm -rf %{target_source}/arch/$i
 done
-%ifnarch %{arm}
+rm -rf %{target_source}/include/kvm/arm*
-	rm -rf %{target_source}/include/kvm/arm*
-%endif
 
 # other misc files
 rm -f %{target_source}/{.config.old,.config.cmd,.gitignore,.lst,.mailmap}