I have made the following changes intended for : CE:Adaptation:x86-generic / kernel-adaptation-pc CE:Adaptation:x86-generic / virtualbox
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/7637 Thank You, yunta [This message was auto-generated] --- Request # 7637: Messages from BOSS: WARNING check_package_is_complete_sources (virtualbox) failed: No dsc file found Extra source files: boss.conf, virtualbox.changes_suse. State: review at 2013-01-10T14:34:14 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:yunta / kernel-adaptation-pc -> CE:Adaptation:x86-generic / kernel-adaptation-pc changes files: -------------- ++++++ new changes file: --- kernel-adaptation-pc.changes +++ kernel-adaptation-pc.changes @@ -0,0 +1,68 @@ +* Mon Dec 07 2013 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 +- updated kernel version to 3.6.1 + +* Wed Oct 03 2012 David Greaves <[email protected]> - 3.0.0 +- enable MODULE_FORCE_LOAD CONFIG_MODVERSIONS for improved module support +- hardlinks is not packaged for Mer so don't Require it + +* Fri Sep 21 2012 Amjad Syed <[email protected]> - 3.0.0 +- Fixes NEMO#181 add fix-config-xen.patch + +* Thu Aug 02 2012 Marko Saukko <[email protected]> - 3.0.0 +- Use wildcard for files to support old and new depmod version. + +* Wed Jul 27 2011 Yan Li <[email protected]> - 3.0 +- Updated kernel version to 3.0 release. + +* Tue May 24 2011 - Chris Ferron <[email protected]> - 2.6.39 +- updated kernel version to 2.6.39 release. + +* Thu May 12 2011 - Chris Ferron <[email protected]> - 2.6.39-rc6 +- enabled broadcom 80211 wireless modules BRCMSMAC and BRCMFMAC + +* Mon May 09 2011 - Chris Ferron <[email protected]> - 2.6.39-rc6 +- update kernel version to 2.6.39~rc6 + +* Mon Mar 28 2011 - Arjan van de Ven <[email protected]> - 2.6.37.2 +- updated the pegatron/exopc patches + +* Fri Mar 11 2011 - Arjan van de Ven <[email protected]> - 2.6.37.2 +- add ALS control for the ExoPC + +* Sun Feb 27 2011 - Arjan van de Ven <[email protected]> - 2.6.37.2 +- update to 2.6.37.2 stable release + +* Mon Feb 7 2011 - Arjan van de Ven <[email protected]> - 2.6.37 +- add some more KVM options for MeeGo's build infrastructure + +* Mon Jan 31 2011 - Arjan van de Ven <[email protected]> - 2.6.37 +- enable Gadgetfs since it's a required feature for MTP connectivity to work + +* Wed Jan 19 2011 - Arjan van de Ven <[email protected]> - 2.6.37 +- put back the perf subrpm that got accidentally lost in the major + spec cleanup/reshufle + +* Tue Jan 11 2011 - Arjan van de Ven <[email protected]> - 2.6.37 +- Backport some touchscreen driver patches from linus.git (BMC#11626) + in order to support Wetab devices +- blacklist the ath3k bluetooth device in the BT_USB driver (BMC#11626) + because it needs to picked up by its own driver. + +* Tue Jan 4 2011 - Arjan van de Ven <[email protected]> - 2.6.37 +- Linus released the 2.6.37 final release with i915 graphics fixes (BMC#11626) + +* Tue Jan 4 2011 - Arjan van de Ven <[email protected]> - 2.6.37-rc8 +- various config changes (BMC#8110, BMC#11479) to make the policy framework + work. + +* Wed Dec 29 2010 - Arjan van de Ven <[email protected]> - 2.6.37-rc8 +- Update to 2.6.37-rc8 to be closer to the final 1.2 kernel (2.6.37) (BMC#11626) +- Add the include/xen directory to the kernel-devel package for building moduels against (BMC#11822) + +* Tue Dec 21 2010 - Arjan van de Ven <[email protected]> - 2.6.37-rc7 +- Start fresh with the MeeGo reference kernel now that the TSG + approved the new kernel policy and the architecture team picked + 2.6.37 for MeeGo 1.2 (BMC#11626) ++++++ deleted changes files: --- kernel.changes old: ---- COPYING.modules Makefile Makefile.config config-adaptation-pc config-generic configcommon.pl configdiff.pl kernel.changes kernel.spec.in linux-2.6.35-fatal-signals.patch linux-3.0-fix-config-xen.patch linux-3.0.tar.bz2 linux-3.0.tar.bz2.sign makespec.pl merge.pl series new: ---- kernel-adaptation-pc.changes kernel-adaptation-pc.config kernel-adaptation-pc.yaml linux-3.6.11.tar.bz2 spec files: ----------- --- kernel-adaptation-pc.spec +++ kernel-adaptation-pc.spec @@ -1,720 +1,222 @@ # -# Spec file originally created for Fedora, modified for Moblin Linux +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.25 # -Summary: The Linux kernel (the core of the Linux operating system) - - -# For a stable, released kernel, released_kernel should be 1. For rawhide -# and/or a kernel built from an rc snapshot, released_kernel should -# be 0. -%define released_kernel 1 - -# Versions of various parts - -# base_sublevel is the kernel version we're starting with and patching -# on top of -- for example, 2.6.22-rc7 starts with a 2.6.21 base, -# which yields a base_sublevel of 21. - -%define base_sublevel 0 - - -## If this is a released kernel ## -%if 0%{?released_kernel} -# Do we have a 3.0.y stable update to apply? -%define stable_update 0 -# 3.x.y kernel always has the stable_update digit -%define stablerev .%{stable_update} -# Set rpm version accordingly -%define rpmversion 3.%{base_sublevel}%{?stablerev} - -## The not-released-kernel case ## -%else -# The next upstream release sublevel (base_sublevel+1) -%define upstream_sublevel %(expr %{base_sublevel} + 1) -# The rc snapshot level - -%define rcrev 7 - - -%if 0%{?rcrev} -%define rctag ~rc%rcrev -%endif - -%if !0%{?rcrev} -%define rctag ~rc0 -%endif - -# Set rpm version accordingly -%define rpmversion 3.%{upstream_sublevel}%{?rctag} -%endif - -# The kernel tarball/base version -%define kversion 3.%{base_sublevel} - -%define make_target bzImage - -%define KVERREL %{version}-%{release} -%define hdrarch %_target_cpu - -%define all_x86 i386 i586 i686 %{ix86} - -%define all_arm %{arm} - -%define _default_patch_fuzz 0 - -# Per-arch tweaks - -%ifarch %{all_x86} -%define image_install_path boot -%define hdrarch i386 -%define kernel_image arch/x86/boot/bzImage -%endif - -%ifarch x86_64 -%define image_install_path boot -%define kernel_image arch/x86/boot/bzImage -%endif - -%ifarch %{all_arm} -%define image_install_path boot -%define kernel_image arch/arm/boot/zImage -%define make_target zImage -%endif - -ExclusiveArch: %{all_x86} - -# -# Packages that need to be installed before the kernel is, because the %post -# scripts use them. -# -%define kernel_prereq fileutils, module-init-tools, /sbin/init, mkinitrd >= 6.0.39-1 - -# -# This macro does requires, provides, conflicts, obsoletes for a kernel package. -# %%kernel_reqprovconf <subpackage> -# It uses any kernel_<subpackage>_conflicts and kernel_<subpackage>_obsoletes -# macros defined above. -# -%define kernel_reqprovconf \ -Provides: kernel = %{rpmversion}-%{release}\ -Provides: kernel-uname-r = %{KVERREL}%{?1:-%{1}}\ -Requires(pre): %{kernel_prereq}\ -%{?1:%{expand:%%{?kernel_%{1}_conflicts:Conflicts: %%{kernel_%{1}_conflicts}}}}\ -%{?1:%{expand:%%{?kernel_%{1}_provides:Provides: %%{kernel_%{1}_provides}}}}\ -# We can't let RPM do the dependencies automatic because it'll then pick up\ -# a correct but undesirable perl dependency from the module headers which\ -# isn't required for the kernel proper to function\ -AutoReq: no\ -AutoProv: yes\ -%{nil} - Name: kernel-adaptation-pc -Group: System/Kernel +# >> macros +%define kernel_version_build %{version}-%{release} +%define kernel_devel_dir %{_prefix}/src/kernels/%{kernel_version_build} +%define kernel_version %{version} +# << macros + +Summary: Kernel Adaptation %{kernel_target_hw} +Version: 3.6.11 +Release: 6 +Group: Kernel/Linux Kernel License: GPLv2 -URL: http://www.kernel.org/ -Version: %{rpmversion} -Release: 1 -Obsoletes: kernel-adaptation-pinetrail < 3.0 -Obsoletes: kernel-adaptation-oaktrail < 3.0 +Source0: linux-%{version}.tar.bz2 +Source1: %{name}.config +Source100: kernel-adaptation-pc.yaml +Requires(pre): kmod +Requires(pre): mkinitrd >= 6.0.39-1 +BuildRequires: pkgconfig(ncurses) +Provides: kernel = %{kernel_version} + +%description +Kernel for %{kernel_target_hw}. + +%package devel +Summary: Devel files for %{kernel_target_hw} kernel +Group: Development/System +Requires: %{name} = %{version}-%{release} +Provides: kernel-devel = %{kernel_version} -%kernel_reqprovconf - -# -# List the packages used during the kernel build -# -BuildRequires: module-init-tools, bash >= 2.03, sh-utils -BuildRequires: findutils, make >= 3.78 -BuildRequires: linux-firmware -BuildRequires: elfutils-libelf-devel binutils-devel newt-devel - -Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 -Source1: series - -Source10: COPYING.modules - -Source15: merge.pl -Source20: Makefile.config -Source21: Makefile -Source22: configcommon.pl -Source23: configdiff.pl -Source24: kernel.spec.in -Source25: linux-3.0.tar.bz2.sign -Source26: makespec.pl - -Source100: config-generic -Source104: config-adaptation-pc - - -# For a stable release kernel -%if 0%{?stable_update} -Patch00: patch-3.%{base_sublevel}.%{stable_update}.bz2 -%endif -%if 0%{?rcrev} -Patch00: patch-3.%{upstream_sublevel}-rc%{rcrev}.bz2 -%endif - -# Reminder of the patch filename format: -# linux-<version it is supposed to be upstream>-<description-separated-with-dashes>.patch -# - - -# -# Stable patch - critical bugfixes -# - - -# -# Daily development snapshots -# - -##################################################################### -# -# Direct Backport section.. only patches already in Linus' or maintainer git trees -# (for linux-next) should go here. -# We will regularly drop patches from this section as we rebase to newer -# kernels. - - -# Driver backports, new device IDs and the like -# - -# Kernel CVE patches - these go last in the backport section -# no non-cve patches should go here! - - -# -# End of the Direct Backports section -# -##################################################################### - - - -##################################################################### -# -# Boot time and power patches -# Section maintainer: Arjan van de Ven <[email protected] -# - -# -# End of the boot time and power patches -# -##################################################################### - - - -##################################################################### -# -# All other patches -# - - -# turn on "print fatal signals" by default, so that we can debug /sbin/init -# crashes -Patch200: linux-2.6.35-fatal-signals.patch -Patch201: linux-3.0-fix-config-xen.patch - - -BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root - - -# -# This macro creates a kernel-<subpackage>-devel package. -# %%kernel_devel_package <subpackage> <pretty-name> -# -%define kernel_devel_package() \ -%package -n kernel-%{?1:%{1}-}devel\ -Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\ -Group: System/Kernel\ -Provides: kernel%{?1:-%{1}}-devel = %{version}-%{release}\ -Provides: kernel-devel = %{version}-%{release}%{?1:-%{1}}\ -Provides: kernel-devel = %{version}-%{release}%{?1:-%{1}}\ -Provides: kernel-devel-uname-r = %{KVERREL}%{?1:-%{1}}\ -Requires: kernel%{?1:-%{1}} = %{version}-%{release}\ -AutoReqProv: no\ -Requires(pre): /usr/bin/find\ -%description -n kernel%{?1:-%{1}}-devel\ -This package provides kernel headers and makefiles sufficient to build modules\ -against the %{?2:%{2} }kernel package.\ -%{nil} - -# -# This macro creates a kernel-<subpackage> and its -devel too. -# %%define variant_summary The Linux kernel compiled for <configuration> -# %%kernel_variant_package [-n <pretty-name>] <subpackage> -# -%define kernel_variant_package(n:) \ -%package -n kernel-%1\ -Summary: %{variant_summary}\ -Group: System/Kernel\ -%kernel_reqprovconf\ -%{nil} - - -%define variant_summary Kernel for PC compatible systems -%kernel_devel_package adaptation-pc -%description -n kernel-adaptation-pc -This package contains the kernel optimized for PC compatible systems platforms +%description devel +Devel for %{kernel_target_hw} kernel %prep +%setup -q -n linux-%{version} -# First we unpack the kernel tarball. -# If this isn't the first make prep, we use links to the existing clean tarball -# which speeds things up quite a bit. - -# Update to latest upstream. -%if 0%{?released_kernel} -%define vanillaversion 2.6.%{base_sublevel} -# released_kernel with stable_update available case -%if 0%{?stable_update} -%define vanillaversion 2.6.%{base_sublevel}.%{stable_update} -%endif -# non-released_kernel case -%else -%if 0%{?rcrev} -%define vanillaversion 2.6.%{upstream_sublevel}-rc%{rcrev} -%endif -%else -# pre-{base_sublevel+1}-rc1 case -%endif - - -# -# Unpack the kernel tarbal -# -%setup -q -c -cd linux-%{kversion} - - -# -# The add an -rc patch if needed -# -%if 0%{?rcrev} -# patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2 -%patch00 -p1 -%endif -%if 0%{?stable_update} -# patch-2.6.%{base_sublevel}.%{stable_update}.bz2 -%patch00 -p1 -%endif - - -# -# Then apply all the patches -# -# Reminder of the patch filename format: -# linux-<version it is supposed to be upstream>-<description-separated-with-dashes>.patch -# - - -# -# Stable patch - critical bugfixes -# - - -# -# Daily development snapshots -# - -##################################################################### -# -# Direct Backport section.. only patches already in Linus' or maintainer git trees -# (for linux-next) should go here. -# We will regularly drop patches from this section as we rebase to newer -# kernels. - - -# Driver backports, new device IDs and the like -# - -# Kernel CVE patches - these go last in the backport section -# no non-cve patches should go here! - - -# -# End of the Direct Backports section -# -##################################################################### - - - -##################################################################### -# -# Boot time and power patches -# Section maintainer: Arjan van de Ven <[email protected] -# - -# -# End of the boot time and power patches -# -##################################################################### - - - -##################################################################### -# -# All other patches -# - - -# turn on "print fatal signals" by default, so that we can debug /sbin/init -# crashes -# linux-2.6.35-fatal-signals.patch -%patch200 -p1 -#config-fix-patch -%patch201 -p1 - - -# Drop some necessary files from the source dir into the buildroot -cp $RPM_SOURCE_DIR/config-* . -cp %{SOURCE15} . - -# Dynamically generate kernel .config files from config-* files -make -f %{SOURCE20} VERSION=%{version} configs - - -# Any further pre-build tree manipulations happen here. - -chmod +x scripts/checkpatch.pl - -cp %{SOURCE10} Documentation/ - - -mkdir configs - -# -# We want to run the config checks of all configurations for all architectures always. -# That way, developers immediately found out if they forget to enable not-their-native -# architecture. It's cheap to run anyway. -# +# >> setup +# This should go in the macro section +# Determine the kernel arch and what we're building +# kernel_arch: arm/mips/x86 (for now) .. the ARCH= for the kernel +# +%{lua: +arch = rpm.expand("%{_arch}") +if arch == "arm" or arch == "mips" then +rpm.define("builds_uImage 1") +rpm.define("kernel_arch " .. arch) +else +rpm.define("builds_firmware 1") +rpm.define("builds_vmlinuz 1") +rpm.define("kernel_arch x86") +end + +-- This is the common/code name of the hardware adaptation +-- Primarily used in descriptions + +name = rpm.expand("%{name}") +pat = "kernel%-adaptation%-(.+)" +start, finish, capture = string.find(name, pat) +if start == nil then +error("Package name "..name.." doesn't match reqired pattern "..pat) +else +rpm.define("kernel_target_hw " .. capture) +end +} +cp %{SOURCE1} ./.config +# Verify the config meets the current Mer requirements +#/usr/bin/mer_verify_config .config -# now run oldconfig over all the config files -for i in kernel-*.config -do - mv $i .config - Arch="x86" - - #get ARCH from .config file for other platforms - if [ `cat .config | grep -c CONFIG_ARM=y` -eq 1 ]; then - Arch="arm" - fi - - # make oldconfig > /dev/null - echo Doing $i - - make ARCH=$Arch listnewconfig &> /tmp/configs - export conf=`cat /tmp/configs | grep CONFIG | wc -l` - echo CONF is $conf - if [ $conf -gt 0 ]; then - make ARCH=$Arch listnewconfig - exit 1 - fi - make ARCH=$Arch oldconfig > /dev/null - echo "# $Arch" > configs/$i - cat .config >> configs/$i -done +echo The target hw is %{kernel_target_hw} +echo The desc is %{summary} -# -# get rid of unwanted files resulting from patch fuzz -# (not that we can have any) -# -find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null - -cd .. +# << setup -### -### build -### %build +# >> build pre +perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}/" Makefile +%if 0%{?builds_uImage} +# << build pre -cp_vmlinux() -{ - eu-strip --remove-comment -o "$2" "$1" -} -BuildKernel() { - MakeTarget=$1 - KernelImage=$2 - TargetArch=$3 - Flavour=$4 - InstallName=${5:-vmlinuz} - - # Pick the right config file for the kernel we're building - Config=kernel${Flavour:+-${Flavour}}.config - DevelDir=/usr/src/kernels/%{KVERREL}${Flavour:+-${Flavour}} - - # When the bootable image is just the ELF kernel, strip it. - # We already copy the unstripped file into the debuginfo package. - if [ "$KernelImage" = vmlinux ]; then - CopyKernel=cp_vmlinux - else - CopyKernel=cp - fi - - KernelVer=%{version}-%{release}${Flavour:+-${Flavour}} - ExtraVer=%{?rctag}-%{release}${Flavour:+-${Flavour}} - Arch="x86" -%ifarch %{all_arm} - Arch="arm" +# >> build post %endif - - - if [ "$Arch" = "$TargetArch" ]; then - echo BUILDING A KERNEL FOR ${Flavour} %{_target_cpu}... ${KernelVer} - echo USING ARCH=$Arch - - # make sure EXTRAVERSION says what we want it to say - perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = ${ExtraVer}/" Makefile - - # and now to start the build process - - make -s mrproper - cp configs/$Config .config - - make -s ARCH=$Arch oldconfig > /dev/null - make -s CONFIG_DEBUG_SECTION_MISMATCH=y ARCH=$Arch %{?_smp_mflags} $MakeTarget %{?sparse_mflags} - make -s CONFIG_DEBUG_SECTION_MISMATCH=y ARCH=$Arch %{?_smp_mflags} modules %{?sparse_mflags} || exit 1 - - # Start installing the results - mkdir -p $RPM_BUILD_ROOT/%{image_install_path} - install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer - install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer - touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img - if [ -f arch/$Arch/boot/zImage.stub ]; then - cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || : - fi - $CopyKernel $KernelImage \ - $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer - chmod 755 $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer - - mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer - make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer -%ifnarch %{all_arm} - make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer -%endif - - # And save the headers/makefiles etc for building modules against - # - # This all looks scary, but the end result is supposed to be: - # * all arch relevant include/ files - # * all Makefile/Kconfig files - # * all script/ files - - rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build - rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/source - mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build - (cd $RPM_BUILD_ROOT/lib/modules/$KernelVer ; ln -s build source) - # dirs for additional modules per module-init-tools, kbuild/modules.txt - # first copy everything - 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 - cp System.map $RPM_BUILD_ROOT/lib/modules/$KernelVer/build - if [ -s Module.markers ]; then - cp Module.markers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build - fi - # then drop all but the needed Makefiles/Kconfig files - rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Documentation - rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts - rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include - cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build - cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build - if [ -d arch/%{_arch}/scripts ]; then - cp -a arch/%{_arch}/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || : - fi - if [ -f arch/%{_arch}/*lds ]; then - cp -a arch/%{_arch}/*lds $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/ || : - fi - rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o - rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o - cp -a --parents arch/$Arch/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build -%ifarch %{all_arm} - cp -a --parents arch/arm/mach-*/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build - cp -a --parents arch/arm/plat-*/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build +%if 0%{?builds_vmlinuz} +#make %{?jobs:-j%jobs} %{?_smp_mflags} bzImage +make %{?_smp_mflags} bzImage %endif - mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include - cd include - cp -a acpi asm-generic config crypto drm generated keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound video trace $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include - - # Make sure the Makefile and version.h have a matching timestamp so that - # external modules can be built - touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/version.h - touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/autoconf.h - # Copy .config to include/config/auto.conf so "make prepare" is unnecessary. - cp $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/config/auto.conf - cd .. - - # - # save the vmlinux file for kernel debugging into the kernel-*-devel rpm - # - - cp vmlinux $RPM_BUILD_ROOT/lib/modules/$KernelVer - - find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f >modnames - - # mark modules executable so that strip-to-file can strip them - xargs --no-run-if-empty chmod u+x < modnames - - # Generate a list of modules for block and networking. - - fgrep /drivers/ modnames | xargs --no-run-if-empty nm -upA | - sed -n 's,^.*/\([^/]*\.ko\): *U \(.*\)$,\1 \2,p' > drivers.undef - - collect_modules_list() - { - sed -r -n -e "s/^([^ ]+) \\.?($2)\$/\\1/p" drivers.undef | - LC_ALL=C sort -u > $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$1 - } - - collect_modules_list networking \ - 'register_netdev|ieee80211_register_hw|usbnet_probe' - collect_modules_list block \ - 'ata_scsi_ioctl|scsi_add_host|blk_init_queue|register_mtd_blktrans' - - # remove files that will be auto generated by depmod at rpm -i time - for i in alias ccwmap dep ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols usbmap - do - rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$i - done - - # Move the devel headers out of the root file system - mkdir -p $RPM_BUILD_ROOT/usr/src/kernels - mv $RPM_BUILD_ROOT/lib/modules/$KernelVer/build $RPM_BUILD_ROOT/$DevelDir - ln -sf ../../..$DevelDir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build - fi -} - -### -# DO it... -### - -# prepare directories -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/boot - -cd linux-%{kversion} - -BuildKernel %make_target %kernel_image x86 adaptation-pc - -### -### install -### - -%define install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\ -%%install - +#make %{?jobs:-j%jobs} %{?_smp_mflags} modules +make %{?_smp_mflags} modules +# << build post %install - -cd linux-%{kversion} - -rm -rf $RPM_BUILD_ROOT/lib/firmware - - -### -### clean -### - -%clean -rm -rf $RPM_BUILD_ROOT - -### -### scripts -### - -# -# This macro defines a %%post script for a kernel*-devel package. -# %%kernel_devel_post <subpackage> -# -%define kernel_devel_post() \ -%{expand:%%post -n kernel-%{?1:%{1}-}devel}\ -if [ -x /usr/sbin/hardlink ]\ -then\ - (cd /usr/src/kernels/%{KVERREL}%{?1:-%{1}} &&\ - /usr/bin/find . -type f | while read f; do\ - hardlink -c /usr/src/kernels/*/$f $f\ - done)\ -fi\ -%{nil} - -# This macro defines a %%posttrans script for a kernel package. -# %%kernel_variant_posttrans [-v <subpackage>] [-s <s> -r <r>] <mkinitrd-args> -# More text can follow to go at the end of this variant's %%post. -# -%define kernel_variant_posttrans(s:r:v:) \ -%{expand:%%posttrans -n kernel-%{?-v*}}\ -/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --rpmposttrans %{KVERREL}%{?-v:-%{-v*}} || exit $?\ -%{nil} - -# -# This macro defines a %%post script for a kernel package and its devel package. -# %%kernel_variant_post [-v <subpackage>] [-s <s> -r <r>] <mkinitrd-args> -# More text can follow to go at the end of this variant's %%post. -# -%define kernel_variant_post(s:r:v:) \ -%{expand:%%kernel_devel_post %{?-v*}}\ -%{expand:%%kernel_variant_posttrans %{?-v*}}\ -%{expand:%%post -n kernel-%{?-v*}}\ -/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{*} %{KVERREL}%{?-v:-%{-v*}} || exit $?\ -%{nil} - -# -# This macro defines a %%preun script for a kernel package. -# %%kernel_variant_preun <subpackage> -# -%define kernel_variant_preun() \ -%{expand:%%preun -n kernel-%{?1}}\ -/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}%{?1:-%{1}} || exit $?\ -%{nil} - - -%ifarch %all_x86 - -%kernel_variant_preun adaptation-pc -%kernel_variant_post -v adaptation-pc - -%endif - - -### -### file lists -### - - - -# -# This macro defines the %%files sections for a kernel package -# and its devel packages. -# %%kernel_variant_files [-k vmlinux] [-a <extra-files-glob>] [-e <extra-nonbinary>] <condition> <subpackage> -# -%define kernel_variant_files(a:e:k:) \ -%ifarch %{1}\ -%{expand:%%files -n kernel%{?2:-%{2}}}\ -%defattr(-,root,root)\ -/%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2:-%{2}}\ -/boot/System.map-%{KVERREL}%{?2:-%{2}}\ -#/boot/symvers-%{KVERREL}%{?2:-%{2}}.gz\ -/boot/config-%{KVERREL}%{?2:-%{2}}\ -%{?-a:%{-a*}}\ -%dir /lib/modules/%{KVERREL}%{?2:-%{2}}\ -/lib/modules/%{KVERREL}%{?2:-%{2}}/kernel\ -/lib/modules/%{KVERREL}%{?2:-%{2}}/build\ -/lib/modules/%{KVERREL}%{?2:-%{2}}/source\ -%ifnarch %{all_arm}\ -/lib/modules/%{KVERREL}%{?2:-%{2}}/vdso\ -%endif\ -/lib/modules/%{KVERREL}%{?2:-%{2}}/modules.*\ -%ghost /boot/initrd-%{KVERREL}%{?2:-%{2}}.img\ -%{?-e:%{-e*}}\ -%{expand:%%files -n kernel-%{?2:%{2}-}devel}\ -%defattr(-,root,root)\ -%verify(not mtime) /usr/src/kernels/%{KVERREL}%{?2:-%{2}}\ -/lib/modules/%{KVERREL}%{?2:-%{2}}/vmlinux \ -%endif\ -%{nil} - - -%kernel_variant_files %all_x86 adaptation-pc +rm -rf %{buildroot} +# >> install pre +# << install pre + +# >> install post + +# 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 {} \; + +# /boot +mkdir -p %{buildroot}/boot/ +make INSTALL_PATH=%{buildroot}/boot/ install + +%if 0%{?builds_uImage} +install -m 755 arch/%{kernel_arch}/boot/uImage %{buildroot}/boot/ +%endif + +%if 0%{?builds_vmlinuz} +install -m 755 arch/%{kernel_arch}/boot/bzImage %{buildroot}/boot/vmlinuz-%{kernel_version_build} +%endif + +install -m 755 .config %{buildroot}/boot/config-%{kernel_version_build} +install -m 755 System.map %{buildroot}/boot/ +install -m 755 System.map %{buildroot}/boot/System.map-%{kernel_version_build} + +# And save the headers/makefiles etc for building modules against +# +# This all looks scary, but the end result is supposed to be: +# * all arch relevant include/ files +# * all Makefile/Kconfig files +# * all script/ files + +mkdir -p %{buildroot}/%{kernel_devel_dir} + +# dirs for additional modules per module-init-tools, kbuild/modules.txt +# first copy everything +cp --parents `find -type f -name "Makefile*" -o -name "Kconfig*"` %{buildroot}/%{kernel_devel_dir} +cp Module.symvers %{buildroot}/%{kernel_devel_dir} +cp System.map %{buildroot}/%{kernel_devel_dir} +if [ -s Module.markers ]; then +cp Module.markers %{buildroot}/%{kernel_devel_dir} +fi +# then drop all but the needed Makefiles/Kconfig files +rm -rf %{buildroot}/%{kernel_devel_dir}/Documentation +rm -rf %{buildroot}/%{kernel_devel_dir}/scripts +rm -rf %{buildroot}/%{kernel_devel_dir}/include + +# Copy all scripts +cp .config %{buildroot}/%{kernel_devel_dir} +cp -a scripts %{buildroot}/%{kernel_devel_dir} +if [ -d arch/%{karch}/scripts ]; then +cp -a arch/%{kernel_arch}/scripts %{buildroot}/%{kernel_devel_dir}/arch/%{kernel_arch} +fi +# FIXME - what's this trying to do ... if *lds expands to multiple files the -f test will fail. +if [ -f arch/%{karch}/*lds ]; then +cp -a arch/%{kernel_arch}/*lds %{buildroot}/%{kernel_devel_dir}/arch/%{kernel_arch}/ +fi +# Clean any .o files from the 'scripts' +find %{buildroot}/%{kernel_devel_dir}/scripts/ -name \*.o -print0 | xargs -0 rm -f + +# arch-specific include files +cp -a --parents arch/%{kernel_arch}/include %{buildroot}/%{kernel_devel_dir} + +# arm has include files under plat- and mach- areas (x86/mips don't) +%if "%{?karch}" == "arm" +cp -a --parents arch/%{kernel_arch}/mach-*/include %{buildroot}/%{kernel_devel_dir} +cp -a --parents arch/%{kernel_arch}/plat-*/include %{buildroot}/%{kernel_devel_dir} +%endif + +# normal include files +mkdir -p %{buildroot}/%{kernel_devel_dir}/include + +# copy only include/* directories +cp -a $(find include -mindepth 1 -maxdepth 1 -type d) %{buildroot}/%{kernel_devel_dir}/include + +# Make sure the Makefile and version.h have a matching timestamp so that +# external modules can be built. Also .conf +touch -r %{buildroot}/%{kernel_devel_dir}/Makefile %{buildroot}/%{kernel_devel_dir}/include/linux/version.h +touch -r %{buildroot}/%{kernel_devel_dir}/.config %{buildroot}/%{kernel_devel_dir}/include/linux/autoconf.h + +# Copy .config to include/config/auto.conf so "make prepare" is unnecessary. +cp %{buildroot}/%{kernel_devel_dir}/.config %{buildroot}/%{kernel_devel_dir}/include/config/auto.conf + +# << install post + + +%post +# >> post +depmod -a %{kernel_version_build} +/sbin/new-kernel-pkg --package kernel-adaptation-pc --mkinitrd --depmod --install %{kernel_version_build} || exit $?\ +# << 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} +# 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 +%endif +%if 0%{?builds_uImage} +/boot/uImage +%endif +%if 0%{?builds_firmware} +/lib/firmware/* +%endif +# << files + +%files devel +%defattr(-,root,root,-) +# >> files devel +/%{_prefix}/src/kernels/%{kernel_version_build}/* +/%{_prefix}/src/kernels/%{kernel_version_build}/.config +# << files devel other changes: -------------- ++++++ kernel-adaptation-pc.config (new) --- kernel-adaptation-pc.config +++ kernel-adaptation-pc.config @@ -0,0 +1,3904 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/x86 3.6.11 Kernel Configuration +# +# CONFIG_64BIT is not set +CONFIG_X86_32=y +# CONFIG_X86_64 is not set +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf32-i386" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_MMU=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_GPIO=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_CPU_AUTOPROBE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_ZONE_DMA32 is not set +# CONFIG_AUDIT_ARCH is not set +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_INTEL_TXT=y +CONFIG_X86_32_SMP=y +CONFIG_X86_HT=y +CONFIG_X86_32_LAZY_GS=y +CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" +CONFIG_ARCH_CPU_PROBE_RELEASE=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_HAVE_IRQ_WORK=y +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +# CONFIG_FHANDLE is not set +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_AUDIT=y +# CONFIG_AUDITSYSCALL is not set +# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set +CONFIG_HAVE_GENERIC_HARDIRQS=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_IRQ_DOMAIN=y +# CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_KTIME_SCALAR=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_GENERIC_CMOS_UPDATE=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y + +# +# RCU Subsystem +# +CONFIG_TREE_PREEMPT_RCU=y +CONFIG_PREEMPT_RCU=y +CONFIG_RCU_FANOUT=32 +CONFIG_RCU_FANOUT_LEAF=16 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_RCU_FAST_NO_HZ is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_RCU_BOOST is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=17 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_CGROUPS=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_RESOURCE_COUNTERS=y +# CONFIG_MEMCG is not set +CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_CFS_BANDWIDTH is not set +CONFIG_RT_GROUP_SCHED=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_SCHED_AUTOGROUP=y +CONFIG_SYSFS_DEPRECATED=y +# CONFIG_SYSFS_DEPRECATED_V2 is not set +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_RD_XZ=y +CONFIG_RD_LZO=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EXPERT=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +CONFIG_KALLSYMS_ALL=y +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +# CONFIG_EMBEDDED is not set +CONFIG_HAVE_PERF_EVENTS=y + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +# CONFIG_COMPAT_BRK is not set +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +# CONFIG_OPROFILE is not set (3705 more lines skipped) ++++++ kernel-adaptation-pc.yaml (new) --- kernel-adaptation-pc.yaml +++ kernel-adaptation-pc.yaml @@ -0,0 +1,28 @@ +Name: kernel-adaptation-pc +Summary: Kernel Adaptation %{kernel_target_hw} +Version: 3.6.11 +Release: 6 +Group: Kernel/Linux Kernel +License: GPLv2 +Sources: + - linux-%{version}.tar.bz2 + - "%{name}.config" +Description: Kernel for %{kernel_target_hw}. + +RequiresPre: + - kmod + - mkinitrd >= 6.0.39-1 +PkgConfigBR: + - ncurses +Provides: + - kernel = %{kernel_version} +Configure: none +Builder: none +SubPackages: + - Name: devel + Summary: Devel files for %{kernel_target_hw} kernel + Group: Development/System + Description: Devel for %{kernel_target_hw} kernel + Provides: + - kernel-devel = %{kernel_version} + ++++++ linux-3.0.tar.bz2 -> linux-3.6.11.tar.bz2 (8045728 lines skipped) ++++++ deleted files: --- COPYING.modules --- Makefile --- Makefile.config --- config-adaptation-pc --- config-generic --- configcommon.pl --- configdiff.pl --- kernel.spec.in --- linux-2.6.35-fatal-signals.patch --- linux-3.0-fix-config-xen.patch --- linux-3.0.tar.bz2.sign --- makespec.pl --- merge.pl --- series submit: home:yunta / virtualbox -> CE:Adaptation:x86-generic / virtualbox changes files: -------------- --- virtualbox.changes +++ virtualbox.changes @@ -0,0 +1,4 @@ +* Mon Nov 05 2012 Maciej Blomberg <[email protected]> - 4.2.4 +- Upgraded to upstream 4.2.4 +- All previous patches broken + old: ---- VirtualBox-4.1.18-patched.tar.bz2 vbox-default-os-type.diff vbox-no-build-dates.diff vbox-permissions_warning.diff virtualbox-4.1.18-UserManual.pdf virtualbox-4.1.18-rpmlintrc virtualbox-kernel-3.6.patch new: ---- VirtualBox-4.2.4.tar.bz2 virtualbox-4.2.4-UserManual.pdf virtualbox-4.2.4-rpmlintrc spec files: ----------- --- virtualbox.spec +++ virtualbox.spec @@ -35,7 +35,8 @@ BuildRequires: e2fsprogs-devel BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: kernel-adaptation-pc-devel +BuildRequires: kernel-adaptation-pc >= 3.6.1 +BuildRequires: kernel-adaptation-pc-devel >= 3.6.1 %define kernel_version %{expand:%(rpm -q --qf '[%%{version}-%%{release}]' kernel-adaptation-pc-devel)} BuildRequires: kbuild #BuildRequires: kernel-syms @@ -58,7 +59,7 @@ #BuildRequires: yasm #BuildRequires: zlib-devel-static -Version: 4.1.18 +Version: 4.2.4 Release: 1 Summary: VirtualBox is an Emulator License: GPL-2.0+ @@ -69,7 +70,7 @@ # script virtualbox-patch-source.sh will do the job :) # WARNING: This is not a comment, but the real command to repack souce #%(bash %{_sourcedir}/virtualbox-patch-source.sh VirtualBox-%{version}.tar.bz2) -Source0: VirtualBox-%{version}-patched.tar.bz2 +Source0: VirtualBox-%{version}.tar.bz2 Source1: %{name}-%{version}-UserManual.pdf Source2: %{name}-60-vboxdrv.rules Source3: %{name}-60-vboxguest.rules @@ -102,16 +103,12 @@ Patch8: vbox-python-detection.diff #PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is displayed, when user #try to start VirtualBox and is not memeber of vboxusers group -Patch99: vbox-permissions_warning.diff #PATCH-FIX-OPENSUSE Do not include build dates on binaries, makes build-compare happier -Patch100: vbox-no-build-dates.diff -Patch101: vbox-default-os-type.diff +#YPatch101: vbox-default-os-type.diff #disable update in vbox gui Patch103: vbox-disable-updates.diff #use pie/fPIE for setuid binaries (bnc#743143) Patch104: vbox-fpie.diff -# Fix compilation with kernel 3.6, upstream r42784 -Patch105: virtualbox-kernel-3.6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #PreReq: pwdutils permissions Requires: %{name}-host-kmp = %version @@ -164,18 +161,17 @@ ########################################### %prep %setup -q -n VirtualBox-%{version} -%patch1 -%patch2 +%patch1 -p1 +%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch6 -p1 %patch8 -p1 -%patch99 -p1 -%patch100 -%patch101 +#Y%patch100 +#Y%patch101 %patch103 %patch104 -p1 -%patch105 -p1 +#Y%patch105 -p1 #copy user manual %__cp %{S:1} UserManual.pdf #copy kbuild config @@ -224,9 +220,13 @@ # # VBOX_PATH_PACKAGE_DOCS set propper path for link to pdf in .desktop file # VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable some functionality in gui + +#cp tools/linux.x86/bin/yasm %{buildroot}/yasm + echo "build basic parts" -/usr/bin/kmk %{?_smp_mflags} VBOX_GCC_WERR= KBUILD_VERBOSE=2 VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= TOOL_YASM_AS=/home/abuild/rpmbuild/BUILD/VirtualBox-4.1.18/tools/linux.x86/bin/yasm VBOX_PATH_PACKAGE_DOCS=/usr/share/doc/packages/virtualbox VBOX_ONLY_ADDITIONS=1 vboxsf-mod vboxvideo_drm-mod /home/abuild/rpmbuild/BUILD/VirtualBox-4.1.18/out/linux.x86/release/bin/additions/{mount.vboxsf,VBoxControl,VBoxService} -# +/usr/bin/kmk %{?_smp_mflags} VBOX_GCC_WERR= KBUILD_VERBOSE=2 VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= TOOL_YASM_AS=`pwd`/tools/linux.x86/bin/yasm VBOX_PATH_PACKAGE_DOCS=/usr/share/doc/packages/virtualbox VBOX_ONLY_ADDITIONS=1 vboxsf-mod vboxvideo_drm-mod mount VBoxControl VBoxService + + # build kernel modules for guest and host (check novel-kmp package as example) # host modules : vboxdrv,vboxnetflt,vboxnetadp # guest modules : vboxguest,vboxsf,vboxvideo @@ -236,7 +236,7 @@ src/VBox/Additions/linux/export_modules modules_build_dir/modules.tar.gz pushd modules_build_dir tar xf modules.tar.gz -KERN_DIR=/usr/src/kernels/3.*-adaptation-pc make +KERN_DIR=/usr/src/kernels/%{kernel_version} make popd @@ -253,15 +253,14 @@ export INSTALL_MOD_PATH=%{buildroot} export INSTALL_MOD_DIR=vbox # Feel free to find a better solution: -KERNEL_DIR=/usr/src/kernels/%{kernel_version}-adaptation-pc - +KERNEL_DIR=/usr/src/kernels/%{kernel_version} # -M doesn't work if it ends in "/." :/ for module_name in modules_build_dir/*/. do %__make -C $KERNEL_DIR modules_install M=$(dirname $PWD/$module_name) done # Clean up spurious stuff -rm -f %{buildroot}/lib/modules/%{kernel_version}-adaptation-pc/modules.* +rm -f %{buildroot}/lib/modules/*/modules.* ########################################### echo "entering guest-tools install section" @@ -288,4 +287,4 @@ %files guest-modules %defattr(-, root, root) -/lib/modules/%{kernel_version}-adaptation-pc/vbox +/lib/modules/*/vbox other changes: -------------- ++++++ VirtualBox-4.1.18-patched.tar.bz2 -> VirtualBox-4.2.4.tar.bz2 (5899932 lines skipped) ++++++ vbox-disable-updates.diff --- vbox-disable-updates.diff +++ vbox-disable-updates.diff @@ -11,14 +11,14 @@ m_pUpdatePeriodCombo->setCurrentIndex(m_cache.m_periodIndex); --- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h +++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h -@@ -34,7 +34,6 @@ public: +@@ -39,7 +39,6 @@ { GLSettingsPage_General = 0, GLSettingsPage_Input, - GLSettingsPage_Update, GLSettingsPage_Language, + GLSettingsPage_Display, GLSettingsPage_USB, - GLSettingsPage_Network, --- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp @@ -340,15 +340,6 @@ UISettingsDialogGlobal::UISettingsDialog ++++++ vbox-vboxadd-init-script.diff --- vbox-vboxadd-init-script.diff +++ vbox-vboxadd-init-script.diff @@ -1,8 +1,7 @@ -Index: src/VBox/Additions/linux/installer/vboxadd.sh -=================================================================== ---- src/VBox/Additions/linux/installer/vboxadd.sh.orig -+++ src/VBox/Additions/linux/installer/vboxadd.sh -@@ -21,14 +21,18 @@ +diff -Naur VirtualBox-4.2.4-orig/src/VBox/Additions/linux/installer/vboxadd.sh VirtualBox-4.2.4/src/VBox/Additions/linux/installer/vboxadd.sh +--- VirtualBox-4.2.4-orig/src/VBox/Additions/linux/installer/vboxadd.sh 2012-10-26 19:23:34.000000000 +0300 ++++ VirtualBox-4.2.4/src/VBox/Additions/linux/installer/vboxadd.sh 2012-10-29 22:23:54.384329027 +0200 +@@ -21,11 +21,12 @@ # ### BEGIN INIT INFO # Provides: vboxadd @@ -17,24 +16,17 @@ +# Short-Description: VirtualBox Linux Additions kernel modules ### END INIT INFO --. /var/lib/VBoxGuestAdditions/config -+if [ -f /var/lib/VBoxGuestAdditions/config ]; then -+ . /var/lib/VBoxGuestAdditions/config -+fi -+ - export BUILD_TYPE - export USERNAME - -@@ -169,8 +173,6 @@ fi - + PATH=$PATH:/bin:/sbin:/usr/sbin +@@ -178,8 +179,6 @@ dev=/dev/vboxguest userdev=/dev/vboxuser + config=/var/lib/VBoxGuestAdditions/config -owner=vboxadd -group=1 test_for_gcc_and_make() { -@@ -256,12 +258,6 @@ do_vboxguest_non_udev() +@@ -250,12 +249,6 @@ fail "Cannot create device $dev with major $maj and minor $min" } fi @@ -47,7 +39,7 @@ if [ ! -c $userdev ]; then maj=10 -@@ -272,12 +268,6 @@ do_vboxguest_non_udev() +@@ -266,12 +259,6 @@ rmmod vboxguest 2>/dev/null fail "Cannot create device $userdev with major $maj and minor $min" } @@ -60,43 +52,26 @@ fi fi } -@@ -308,8 +298,7 @@ start() - do_vboxguest_non_udev;; - esac - -- if [ -n "$BUILDVBOXSF" ]; then -- running_vboxsf || { -+ running_vboxsf || { - $MODPROBE vboxsf > /dev/null 2>&1 || { - if dmesg | grep "vboxConnect failed" > /dev/null 2>&1; then - fail_msg -@@ -319,8 +308,7 @@ start() - fi - fail "modprobe vboxsf failed" - } -- } -- fi -+ } - - # Mount all shared folders from /etc/fstab. Normally this is done by some - # other startup script but this requires the vboxdrv kernel module loaded. -@@ -337,10 +325,8 @@ stop() - if ! umount -a -t vboxsf 2>/dev/null; then - fail "Cannot unmount vboxsf folders" - fi -- if [ -n "$BUILDVBOXSF" ]; then -- if running_vboxsf; then -- rmmod vboxsf 2>/dev/null || fail "Cannot unload module vboxsf" -- fi -+ if running_vboxsf; then -+ rmmod vboxsf 2>/dev/null || fail "Cannot unload module vboxsf" - fi - if running_vboxguest; then - rmmod vboxguest 2>/dev/null || fail "Cannot unload module vboxguest" -@@ -500,16 +486,8 @@ extra_setup() +@@ -483,32 +470,6 @@ # setup_script setup() { +- if test -r $config; then +- . $config +- else +- fail "Configuration file $config not found" +- fi +- test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" || +- fail "Configuration file $config not complete" +- export BUILD_TYPE +- export USERNAME +- +- MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER" +- BUILDINTMP="$MODULE_SRC/build_in_tmp" +- DODKMS="$MODULE_SRC/do_dkms" +- chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1 +- chcon -t bin_t "$DODKMS" > /dev/null 2>&1 +- - setup_modules - mod_succ="$?" - extra_setup @@ -107,8 +82,6 @@ - start - fi - fi -+ begin "Recompiling VirtualBox kernel module, NOT. It has been packaged." -+ succ_msg } # cleanup_script ++++++ vbox-vboxdrv-init-script.diff --- vbox-vboxdrv-init-script.diff +++ vbox-vboxdrv-init-script.diff @@ -1,24 +1,7 @@ -Index: src/VBox/Installer/linux/vboxdrv.sh.in -=================================================================== ---- src/VBox/Installer/linux/vboxdrv.sh.in.orig -+++ src/VBox/Installer/linux/vboxdrv.sh.in -@@ -19,11 +19,12 @@ - # - ### BEGIN INIT INFO - # Provides: vboxdrv --# Required-Start: $syslog --# Required-Stop: --# Default-Start: 2 3 4 5 -+# Required-Start: $syslog $remote_fs -+# Required-Stop: $syslog $remote_fs -+# Default-Start: 2 3 5 - # Default-Stop: 0 1 6 - # Short-Description: VirtualBox Linux kernel module -+# Description: VirtualBox Linux kernel module - ### END INIT INFO - - PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH -@@ -195,13 +196,6 @@ start() +diff -Naur VirtualBox-4.2.4-orig/src/VBox/Installer/linux/vboxdrv.sh.in VirtualBox-4.2.4/src/VBox/Installer/linux/vboxdrv.sh.in +--- VirtualBox-4.2.4-orig/src/VBox/Installer/linux/vboxdrv.sh.in 2012-10-29 21:58:09.000000000 +0200 ++++ VirtualBox-4.2.4/src/VBox/Installer/linux/vboxdrv.sh.in 2012-10-29 21:59:31.337352017 +0200 +@@ -193,13 +193,6 @@ fi fi # ensure permissions @@ -32,14 +15,17 @@ if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why" fi -@@ -299,58 +293,8 @@ stop_vms() +@@ -297,70 +290,8 @@ # setup_script setup() { - stop -- begin_msg "Uninstalling old VirtualBox DKMS kernel modules" -- $DODKMS uninstall > $LOG -- succ_msg +- DKMS=`which dkms 2>/dev/null` +- if [ -n "$DKMS" ]; then +- begin_msg "Uninstalling old VirtualBox DKMS kernel modules" +- $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG +- succ_msg +- fi - if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then - begin_msg "Removing old VirtualBox pci kernel module" - find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null @@ -60,27 +46,36 @@ - find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null - succ_msg - fi -- begin_msg "Trying to register the VirtualBox kernel modules using DKMS" -- if ! $DODKMS install >> $LOG; then -- fail_msg "Failed, trying without DKMS" +- if [ -n "$DKMS" ]; then +- begin_msg "Trying to register the VirtualBox kernel modules using DKMS" +- if ! $DODKMS install vboxhost $VERSION >> $LOG; then +- fail_msg "Failed, trying without DKMS" +- DKMS="" +- fi +- fi +- if [ -z "$DKMS" ]; then - begin_msg "Recompiling VirtualBox kernel modules" -- if ! $BUILDVBOXDRV \ +- if ! $BUILDINTMP \ - --save-module-symvers /tmp/vboxdrv-Module.symvers \ +- --module-source "$MODULE_SRC/vboxdrv" \ - --no-print-directory install >> $LOG 2>&1; then - failure "Look at $LOG to find out what went wrong" - fi -- if ! $BUILDVBOXNETFLT \ +- if ! $BUILDINTMP \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ +- --module-source "$MODULE_SRC/vboxnetflt" \ - --no-print-directory install >> $LOG 2>&1; then - failure "Look at $LOG to find out what went wrong" - fi -- if ! $BUILDVBOXNETADP \ +- if ! $BUILDINTMP \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ +- --module-source "$MODULE_SRC/vboxnetadp" \ - --no-print-directory install >> $LOG 2>&1; then - failure "Look at $LOG to find out what went wrong" - fi -- if ! $BUILDVBOXPCI \ +- if ! $BUILDINTMP \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ +- --module-source "$MODULE_SRC/vboxpci" \ - --no-print-directory install >> $LOG 2>&1; then - failure "Look at $LOG to find out what went wrong" - fi ++++++ virtualbox-4.2.4-UserManual.pdf (new) --- virtualbox-4.2.4-UserManual.pdf +++ virtualbox-4.2.4-UserManual.pdf @@ -0,0 +1,52686 @@ +%PDF-1.4 +%ÐÔÅØ +1 0 obj +<< /S /GoTo /D (chapter.1) >> +endobj +4 0 obj +(1 First steps) +endobj +5 0 obj +<< /S /GoTo /D (section.1.1) >> +endobj +8 0 obj +(1.1 Why is virtualization useful?) +endobj +9 0 obj +<< /S /GoTo /D (section.1.2) >> +endobj +12 0 obj +(1.2 Some terminology) +endobj +13 0 obj +<< /S /GoTo /D (section.1.3) >> +endobj +16 0 obj +(1.3 Features overview) +endobj +17 0 obj +<< /S /GoTo /D (section.1.4) >> +endobj +20 0 obj +(1.4 Supported host operating systems) +endobj +21 0 obj +<< /S /GoTo /D (section.1.5) >> +endobj +24 0 obj +(1.5 Installing VirtualBox and extension packs) +endobj +25 0 obj +<< /S /GoTo /D (section.1.6) >> +endobj +28 0 obj +(1.6 Starting VirtualBox) +endobj +29 0 obj +<< /S /GoTo /D (section.1.7) >> +endobj +32 0 obj +(1.7 Creating your first virtual machine) +endobj +33 0 obj +<< /S /GoTo /D (section.1.8) >> +endobj +36 0 obj +(1.8 Running your virtual machine) +endobj +37 0 obj +<< /S /GoTo /D (subsection.1.8.1) >> +endobj +40 0 obj +(1.8.1 Starting a new VM for the first time) +endobj +41 0 obj +<< /S /GoTo /D (subsection.1.8.2) >> +endobj +44 0 obj +(1.8.2 Capturing and releasing keyboard and mouse) +endobj +45 0 obj +<< /S /GoTo /D (subsection.1.8.3) >> +endobj +48 0 obj +(1.8.3 Typing special characters) +endobj +49 0 obj +<< /S /GoTo /D (subsection.1.8.4) >> +endobj +52 0 obj +(1.8.4 Changing removable media) +endobj +53 0 obj +<< /S /GoTo /D (subsection.1.8.5) >> +endobj +56 0 obj +(1.8.5 Resizing the machine's window) +endobj +57 0 obj +<< /S /GoTo /D (subsection.1.8.6) >> +endobj +60 0 obj +(1.8.6 Saving the state of the machine) +endobj +61 0 obj +<< /S /GoTo /D (section.1.9) >> +endobj +64 0 obj +(1.9 Snapshots) +endobj +65 0 obj +<< /S /GoTo /D (subsection.1.9.1) >> +endobj +68 0 obj +(1.9.1 Taking, restoring and deleting snapshots) +endobj +69 0 obj +<< /S /GoTo /D (subsection.1.9.2) >> +endobj +72 0 obj +(1.9.2 Snapshot contents) +endobj +73 0 obj +<< /S /GoTo /D (section.1.10) >> +endobj +76 0 obj +(1.10 Virtual machine configuration) +endobj +77 0 obj +<< /S /GoTo /D (section.1.11) >> +endobj +80 0 obj +(1.11 Removing virtual machines) +endobj +81 0 obj +<< /S /GoTo /D (section.1.12) >> +endobj +84 0 obj +(1.12 Cloning virtual machines) +endobj +85 0 obj +<< /S /GoTo /D (section.1.13) >> +endobj +88 0 obj +(1.13 Importing and exporting virtual machines) +endobj +89 0 obj +<< /S /GoTo /D (section.1.14) >> +endobj +92 0 obj +(1.14 Alternative front-ends) +endobj +93 0 obj +<< /S /GoTo /D (chapter.2) >> +endobj +96 0 obj +(2 Installation details) +endobj +97 0 obj +<< /S /GoTo /D (section.2.1) >> +endobj +100 0 obj +(2.1 Installing on Windows hosts) +endobj +101 0 obj +<< /S /GoTo /D (subsection.2.1.1) >> +endobj +104 0 obj +(2.1.1 Prerequisites) +endobj +105 0 obj +<< /S /GoTo /D (subsection.2.1.2) >> +endobj +108 0 obj +(2.1.2 Performing the installation) +endobj +109 0 obj +<< /S /GoTo /D (subsection.2.1.3) >> +endobj +112 0 obj +(2.1.3 Uninstallation) +endobj +113 0 obj +<< /S /GoTo /D (subsection.2.1.4) >> +endobj +116 0 obj +(2.1.4 Unattended installation) +endobj +117 0 obj +<< /S /GoTo /D (section.2.2) >> +endobj +120 0 obj +(2.2 Installing on Mac OS X hosts) +endobj +121 0 obj +<< /S /GoTo /D (subsection.2.2.1) >> +endobj +124 0 obj +(2.2.1 Performing the installation) +endobj +125 0 obj +<< /S /GoTo /D (subsection.2.2.2) >> +endobj +128 0 obj +(2.2.2 Uninstallation) +endobj +129 0 obj +<< /S /GoTo /D (subsection.2.2.3) >> +endobj +132 0 obj +(2.2.3 Unattended installation) (52487 more lines skipped) ++++++ virtualbox-4.2.4-rpmlintrc (new) --- virtualbox-4.2.4-rpmlintrc +++ virtualbox-4.2.4-rpmlintrc @@ -0,0 +1,3 @@ +addFilter("incoherent-init-script-name vboxdrv") +addFilter("incoherent-init-script-name vboxadd") +addFilter("xorg-x11-driver-virtualbox-ose.* shlib-policy-missing-suffix") ++++++ deleted files: --- vbox-default-os-type.diff --- vbox-no-build-dates.diff --- vbox-permissions_warning.diff --- virtualbox-4.1.18-UserManual.pdf --- virtualbox-4.1.18-rpmlintrc --- virtualbox-kernel-3.6.patch
