I have made the following changes intended for : CE:Adaptation:x86-generic / kernel-adaptation-pc
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7396 Thank You, yunta [This message was auto-generated] --- Request # 7396: Messages from BOSS: State: superseded at 2013-01-07T18:00:17 by yunta Reviews: accepted by bossbot : Prechecks succeeded. declined by CE-maintainers (sage) : can't accept this as such yet as it doesn't provide initrd and image creation fails without that. We need to check how this affect to image builds. Changes: submit: home:yunta / kernel-adaptation-pc -> CE:Adaptation:x86-generic / kernel-adaptation-pc changes files: -------------- --- kernel-adaptation-pc.changes +++ kernel-adaptation-pc.changes @@ -1,9 +1 @@ -* Mon Jan 28 2013 Marko Saukko <[email protected]> - 3.6.11 -- Enable Atheros network modules: CONFIG_NET_VENDOR_ATHEROS, CONFIG_ATL2, CONFIG_ATL1, CONFIG_ATL1E, CONFIG_ATL1C -- Build Intel network modules: CONFIG_E100, CONFIG_E1000, CONFIG_E1000E, CONFIG_IGB -- Build broadcom network modules: CONFIG_BCMA, CONFIG_BRCMSMAC, CONFIG_BRCMFMAC_SDIO - -* Mon Dec 07 2012 Maciej Blomberg <[email protected]> - 3.6.11 -- updated kernel version to 3.6.11 - thanks to Islam Amer - -* Mon Nov 05 2012 Maciej Blomberg <[email protected]> - 3.6.1 +* Mon Nov 05 2012 Maciej Blomberg <[email protected]> - 3.6.1 @@ -12 +4 @@ -* Wed Oct 03 2012 David Greaves <[email protected]> - 3.0.0 +* Wed Oct 03 2012 David Greaves <[email protected]> - 3.0.0 @@ -16 +8 @@ -* Fri Sep 21 2012 Amjad Syed <[email protected]> - 3.0.0 +* Fri Sep 21 2012 Amjad Syed <[email protected]> - 3.0.0 old: ---- linux-3.6.11.tar.bz2 new: ---- linux-3.6.1.tar.bz2 spec files: ----------- --- kernel-adaptation-pc.spec +++ kernel-adaptation-pc.spec @@ -7,20 +7,19 @@ # >> macros %define kernel_version_build %{version}-%{release} -%define kernel_devel_dir %{_prefix}/src/kernels/%{kernel_version_build} +%define kernel_devel_dir %{_prefix}/src/kernels/%{kernel_version} %define kernel_version %{version} # << macros Summary: Kernel Adaptation %{kernel_target_hw} -Version: 3.6.11 -Release: 6 +Version: 3.6.1 +Release: 4 Group: Kernel/Linux Kernel License: GPLv2 Source0: linux-%{version}.tar.bz2 Source1: %{name}.config Source100: kernel-adaptation-pc.yaml -Requires(pre): kmod -Requires(pre): mkinitrd >= 6.0.39-1 +Requires: kmod BuildRequires: pkgconfig(ncurses) Provides: kernel = %{kernel_version} @@ -80,7 +79,6 @@ %build # >> build pre -perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}/" Makefile %if 0%{?builds_uImage} # << build pre @@ -89,11 +87,9 @@ # >> build post %endif %if 0%{?builds_vmlinuz} -#make %{?jobs:-j%jobs} %{?_smp_mflags} bzImage -make %{?_smp_mflags} bzImage +make %{?jobs:-j%jobs} bzImage %endif -#make %{?jobs:-j%jobs} %{?_smp_mflags} modules -make %{?_smp_mflags} modules +make %{?jobs:-j%jobs} modules # << build post %install @@ -105,9 +101,8 @@ # Modules make INSTALL_MOD_PATH=%{buildroot} modules_install -mkdir -p %{buildroot}/lib/modules/%{kernel_version_build}/ -touch %{buildroot}/lib/modules/%{kernel_version_build}/modules.dep -find %{buildroot}/lib/modules/%{kernel_version_build} -name "*.ko" -type f -exec chmod u+x {} \; +mkdir -p %{buildroot}/lib/modules/%{kernel_version}/ +touch %{buildroot}/lib/modules/%{kernel_version}/modules.dep # /boot mkdir -p %{buildroot}/boot/ @@ -118,12 +113,12 @@ %endif %if 0%{?builds_vmlinuz} -install -m 755 arch/%{kernel_arch}/boot/bzImage %{buildroot}/boot/vmlinuz-%{kernel_version_build} +install -m 755 arch/%{kernel_arch}/boot/bzImage %{buildroot}/boot/vmlinuz-%{kernel_version} %endif -install -m 755 .config %{buildroot}/boot/config-%{kernel_version_build} +install -m 755 .config %{buildroot}/boot/config-%{kernel_version} install -m 755 System.map %{buildroot}/boot/ -install -m 755 System.map %{buildroot}/boot/System.map-%{kernel_version_build} +install -m 755 System.map %{buildroot}/boot/System.map-%{kernel_version} # And save the headers/makefiles etc for building modules against # @@ -188,23 +183,20 @@ %post # >> post -depmod -a %{kernel_version_build} -/sbin/new-kernel-pkg --package kernel-adaptation-pc --mkinitrd --depmod --install %{kernel_version_build} || exit $?\ +depmod -a %{version} # << post %files %defattr(-,root,root,-) # >> files -/lib/modules/%{kernel_version_build}/* -/boot/System.map-%{kernel_version_build} -#/boot/System.map-%{kernel_version} -/boot/config-%{kernel_version_build} +/lib/modules/%{kernel_version}/* +/boot/System.map-%{kernel_version} +/boot/config-%{kernel_version} # do we need this? should it be versioned only for x86 /boot/System.map %if 0%{?builds_vmlinuz} -/boot/vmlinuz-%{kernel_version_build} -#/boot/vmlinuz-%{kernel_version} -#/boot/vmlinuz +/boot/vmlinuz-%{kernel_version} +/boot/vmlinuz %endif %if 0%{?builds_uImage} /boot/uImage @@ -217,6 +209,6 @@ %files devel %defattr(-,root,root,-) # >> files devel -/%{_prefix}/src/kernels/%{kernel_version_build}/* -/%{_prefix}/src/kernels/%{kernel_version_build}/.config +/%{_prefix}/src/kernels/%{kernel_version}/* +/%{_prefix}/src/kernels/%{kernel_version}/.config # << files devel other changes: -------------- ++++++ kernel-adaptation-pc.config --- kernel-adaptation-pc.config +++ kernel-adaptation-pc.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.6.11 Kernel Configuration +# Linux/i386 3.6.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -933,7 +933,7 @@ # CONFIG_IEEE802154 is not set # CONFIG_NET_SCHED is not set # CONFIG_DCB is not set -CONFIG_DNS_RESOLVER=m +# CONFIG_DNS_RESOLVER is not set # CONFIG_BATMAN_ADV is not set # CONFIG_OPENVSWITCH is not set CONFIG_RPS=y @@ -950,18 +950,18 @@ # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set # CONFIG_IRDA is not set -CONFIG_BT=m -CONFIG_BT_RFCOMM=m +CONFIG_BT=y +CONFIG_BT_RFCOMM=y CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m +CONFIG_BT_BNEP=y CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m +CONFIG_BT_HIDP=y # # Bluetooth device drivers # -CONFIG_BT_HCIBTUSB=m +CONFIG_BT_HCIBTUSB=y CONFIG_BT_HCIBTSDIO=m CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y @@ -983,7 +983,7 @@ CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=m +CONFIG_CFG80211=y # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set @@ -997,7 +997,7 @@ CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=m +CONFIG_MAC80211=y CONFIG_MAC80211_HAS_RC=y CONFIG_MAC80211_RC_PID=y CONFIG_MAC80211_RC_MINSTREL=y @@ -1012,13 +1012,13 @@ # CONFIG_MAC80211_DEBUG_MENU is not set CONFIG_WIMAX=m CONFIG_WIMAX_DEBUG_LEVEL=8 -CONFIG_RFKILL=m +CONFIG_RFKILL=y CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y # CONFIG_NET_9P is not set -CONFIG_CAIF=m +CONFIG_CAIF=y # CONFIG_CAIF_DEBUG is not set -CONFIG_CAIF_NETDEV=m +CONFIG_CAIF_NETDEV=y # CONFIG_CAIF_USB is not set # CONFIG_CEPH_LIB is not set # CONFIG_NFC is not set @@ -1350,7 +1350,7 @@ # CONFIG_BLK_DEV_MD is not set CONFIG_BLK_DEV_DM=m CONFIG_DM_DEBUG=y -CONFIG_DM_CRYPT=m +# CONFIG_DM_CRYPT is not set CONFIG_DM_SNAPSHOT=m # CONFIG_DM_THIN_PROVISIONING is not set CONFIG_DM_MIRROR=m @@ -1361,7 +1361,7 @@ # CONFIG_DM_MULTIPATH_QL is not set # CONFIG_DM_MULTIPATH_ST is not set CONFIG_DM_DELAY=m -CONFIG_DM_UEVENT=y +# CONFIG_DM_UEVENT is not set # CONFIG_DM_FLAKEY is not set # CONFIG_DM_VERITY is not set # CONFIG_TARGET_CORE is not set @@ -1401,8 +1401,8 @@ # # CAIF transport drivers # -CONFIG_CAIF_TTY=m -CONFIG_CAIF_SPI_SLAVE=m +CONFIG_CAIF_TTY=y +CONFIG_CAIF_SPI_SLAVE=y CONFIG_CAIF_SPI_SYNC=y # CONFIG_CAIF_HSI is not set CONFIG_ETHERNET=y @@ -1411,11 +1411,7 @@ # CONFIG_NET_VENDOR_ADAPTEC is not set # CONFIG_NET_VENDOR_ALTEON is not set # CONFIG_NET_VENDOR_AMD is not set -CONFIG_NET_VENDOR_ATHEROS=y -CONFIG_ATL2=m -CONFIG_ATL1=m -CONFIG_ATL1E=m -CONFIG_ATL1C=m +# CONFIG_NET_VENDOR_ATHEROS is not set CONFIG_NET_VENDOR_BROADCOM=y CONFIG_B44=m CONFIG_B44_PCI_AUTOSELECT=y @@ -1438,12 +1434,10 @@ # CONFIG_NET_VENDOR_FUJITSU is not set # CONFIG_NET_VENDOR_HP is not set CONFIG_NET_VENDOR_INTEL=y -CONFIG_E100=m +# CONFIG_E100 is not set CONFIG_E1000=m -CONFIG_E1000E=m -CONFIG_IGB=m -CONFIG_IGB_DCA=y -# CONFIG_IGB_PTP is not set +# CONFIG_E1000E is not set +# CONFIG_IGB is not set # CONFIG_IGBVF is not set # CONFIG_IXGB is not set # CONFIG_IXGBE is not set @@ -1572,9 +1566,9 @@ # CONFIG_ADM8211 is not set # CONFIG_MAC80211_HWSIM is not set # CONFIG_MWL8K is not set -CONFIG_ATH_COMMON=m +CONFIG_ATH_COMMON=y # CONFIG_ATH_DEBUG is not set -CONFIG_ATH5K=m +CONFIG_ATH5K=y # CONFIG_ATH5K_DEBUG is not set # CONFIG_ATH5K_TRACER is not set CONFIG_ATH5K_PCI=y @@ -1594,13 +1588,10 @@ CONFIG_ATH6KL_USB=m # CONFIG_ATH6KL_DEBUG is not set CONFIG_B43=m -CONFIG_B43_BCMA=y -CONFIG_B43_BCMA_EXTRA=y CONFIG_B43_SSB=y CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y # CONFIG_B43_SDIO is not set -CONFIG_B43_BCMA_PIO=y CONFIG_B43_PIO=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y @@ -1620,10 +1611,8 @@ # CONFIG_B43LEGACY_DMA_MODE is not set # CONFIG_B43LEGACY_PIO_MODE is not set CONFIG_BRCMUTIL=m -CONFIG_BRCMSMAC=m CONFIG_BRCMFMAC=m -CONFIG_BRCMFMAC_SDIO=y -# CONFIG_BRCMFMAC_SDIO_OOB is not set +# CONFIG_BRCMFMAC_SDIO is not set # CONFIG_BRCMFMAC_USB is not set CONFIG_BRCMDBG=y # CONFIG_HOSTAP is not set @@ -1647,8 +1636,8 @@ # CONFIG_IWLWIFI_DEVICE_TRACING is not set CONFIG_IWLWIFI_P2P=y # CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set -CONFIG_IWLEGACY=m -CONFIG_IWL4965=m +CONFIG_IWLEGACY=y +CONFIG_IWL4965=y CONFIG_IWL3945=m # @@ -2271,12 +2260,7 @@ # # Broadcom specific AMBA # -CONFIG_BCMA=y -CONFIG_BCMA_BLOCKIO=y -CONFIG_BCMA_HOST_PCI_POSSIBLE=y -# CONFIG_BCMA_HOST_PCI is not set -CONFIG_BCMA_DRIVER_GMAC_CMN=y -# CONFIG_BCMA_DEBUG is not set +# CONFIG_BCMA is not set # # Multifunction device drivers @@ -2894,7 +2878,6 @@ # CONFIG_USB_R8A66597_HCD is not set CONFIG_USB_WHCI_HCD=m (49 more lines skipped) ++++++ kernel-adaptation-pc.yaml --- kernel-adaptation-pc.yaml +++ kernel-adaptation-pc.yaml @@ -1,7 +1,7 @@ Name: kernel-adaptation-pc Summary: Kernel Adaptation %{kernel_target_hw} -Version: 3.6.11 -Release: 6 +Version: 3.6.1 +Release: 4 Group: Kernel/Linux Kernel License: GPLv2 Sources: @@ -9,9 +9,8 @@ - "%{name}.config" Description: Kernel for %{kernel_target_hw}. -RequiresPre: +Requires: - kmod - - mkinitrd >= 6.0.39-1 PkgConfigBR: - ncurses Provides: ++++++ linux-3.6.11.tar.bz2 -> linux-3.6.1.tar.bz2 (25344 lines skipped)
