Browse Source

update to 4.14.160

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12319 ec354946-7b23-47d6-9f5a-488ba84defc7
iwamoto 4 years ago
parent
commit
444c59044a
1 changed files with 18 additions and 10 deletions
  1. 18 10
      k/kernel/kernel-vl.spec

+ 18 - 10
k/kernel/kernel-vl.spec

@@ -32,7 +32,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 # adding some text to the end of the version number.
 #
 %define sublevel 14
-%define patchlevel 153
+%define patchlevel 160
 %define kversion 4.%{sublevel}
 %define rpmversion 4.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}
@@ -63,12 +63,11 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 %define buildpae 1
 %endif
 
-# build x86 headers on i686 build
-# build noarch package with i686 build
+# source/doc build section is moved to x86_64
 %ifarch i686
-%define with_headers 1
-%define buildsource 1
-%define builddoc 1
+%define with_headers 0
+%define buildsource 0
+%define builddoc 0
 %define with_firmware 0
 %define _binaries_in_noarch_packages_terminate_build 0
 %endif
@@ -80,10 +79,15 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 %define asmarch x86
 %endif
 
+# build x86 headers on x86_64 build
+# build noarch package with x86_64 build
 %ifarch x86_64
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
 %define image_install_path boot
 %define asmarch x86
+%define with_headers 1
+%define buildsource 1
+%define builddoc 1
 %endif
 
 #
@@ -166,7 +170,6 @@ BuildRequires: elfutils-libelf-devel
 BuildRequires: pciutils-devel gettext ncurses-devel
 %endif
 
-
 Vendor:		Project Vine
 Distribution:	Vine Linux
 Packager:	daisuke, shaolin, iwamoto
@@ -266,13 +269,13 @@ Patch2710: linux-2.6-drm-ignore-invalid-EDID-extensions.patch
 #
 
 # aufs4
-%define aufs_version 4.4-20160615
+# %define aufs_version 4.4-20160615
 # Patch6100: aufs%{aufs_version}.patch
 # Source6100: aufs%{aufs_version}.tar.xz
 
 #
 # TuxOnIce (formerly suspend2) patch
-%define tuxonice_version 4.4.23-2016-04-21
+# %define tuxonice_version 4.4.23-2016-04-21
 # Patch9000: tuxonice-for-linux-%{tuxonice_version}.patch.xz
 # Patch9001: 0001-toi-4.1-attempt-to-fix-compiling-without-TOI.patch
 
@@ -1264,6 +1267,11 @@ fi
 %endif
 
 %changelog
+* Mon Dec 30 2019 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.14.160-1
+- updated to 4.14.160
+- fix changelog typo
+- build doc and source package in x86_64 instead of i686
+
 * Tue Nov 12 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.14.153-1
 - updated to 4.14.153.
 - updated Patch1470 (aquantia).
@@ -1271,7 +1279,7 @@ fi
 - dropped arch-dependent files from kernel-source.
 
 * Fri Sep 20 2019 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.14.145-1
-- update to 4.14.143 
+- update to 4.14.145 
 
 * Fri Sep 13 2019 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.14.143-1
 - update to 4.14.143