diff options
| -rw-r--r-- | arch/x86/configs/common_x86_64_defconfig (renamed from arch/x86/configs/generic_x86_64_defconfig) | 0 | ||||
| -rw-r--r-- | arch/x86/configs/common_x86_defconfig (renamed from arch/x86/configs/generic_x86_defconfig) | 0 | ||||
| -rw-r--r-- | packaging/kernel-x86-common.changes (renamed from packaging/kernel-x86-generic.changes) | 3 | ||||
| -rw-r--r-- | packaging/kernel-x86-common.spec (renamed from packaging/kernel-x86-generic.spec) | 10 |
4 files changed, 8 insertions, 5 deletions
diff --git a/arch/x86/configs/generic_x86_64_defconfig b/arch/x86/configs/common_x86_64_defconfig index 32480f68b55b..32480f68b55b 100644 --- a/arch/x86/configs/generic_x86_64_defconfig +++ b/arch/x86/configs/common_x86_64_defconfig diff --git a/arch/x86/configs/generic_x86_defconfig b/arch/x86/configs/common_x86_defconfig index 6ffa12ccf4f5..6ffa12ccf4f5 100644 --- a/arch/x86/configs/generic_x86_defconfig +++ b/arch/x86/configs/common_x86_defconfig diff --git a/packaging/kernel-x86-generic.changes b/packaging/kernel-x86-common.changes index 65c609d4ac4c..a6658c0f706b 100644 --- a/packaging/kernel-x86-generic.changes +++ b/packaging/kernel-x86-common.changes @@ -1,3 +1,6 @@ +* Mon Apr 21 2014 Stephane Desneux <stephane.desneux@open.eurogiciel.org> v3.14.1@d5f4730 +- bump to 3.14.1 + * Thu Apr 10 2014 Stephane Desneux <stephane.desneux@open.eurogiciel.org> v3.14@0b9bc7a - bump to kernel 3.14 diff --git a/packaging/kernel-x86-generic.spec b/packaging/kernel-x86-common.spec index 92d933ffdabc..67e8b6326ae6 100644 --- a/packaging/kernel-x86-generic.spec +++ b/packaging/kernel-x86-common.spec @@ -3,8 +3,8 @@ # from MeeGo/Moblin/Fedora # -%define upstream_version 3.14.0 -%define variant x86-generic +%define upstream_version 3.14.1 +%define variant x86-common %define kernel_version %{version}-%{release} %define kernel_full_version %{version}-%{release}-%{variant} %define arch_32bits i386 i586 i686 %{ix86} @@ -76,7 +76,7 @@ Source0: %{name}-%{version}.tar.bz2 %description -This package contains the Tizen Generic Linux kernel +This package contains the Tizen Common Linux kernel %package devel @@ -127,11 +127,11 @@ make -s -C tools/perf WERROR=0 ARCH=%{kernel_arch} # Build kernel and modules %ifarch %{arch_32bits} -make -s ARCH=%{kernel_arch} generic_x86_defconfig +make -s ARCH=%{kernel_arch} common_x86_defconfig %endif %ifarch x86_64 -make -s ARCH=%{kernel_arch} generic_x86_64_defconfig +make -s ARCH=%{kernel_arch} common_x86_64_defconfig %endif make -s ARCH=%{kernel_arch} %{?_smp_mflags} bzImage |