瀏覽代碼

kernel: update to 4.14.16

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11464 ec354946-7b23-47d6-9f5a-488ba84defc7
iwamoto 7 年之前
父節點
當前提交
e454a09fec
共有 1 個文件被更改,包括 72 次插入21 次删除
  1. 72 21
      k/kernel/kernel-vl.spec

+ 72 - 21
k/kernel/kernel-vl.spec

@@ -31,11 +31,11 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 # that the kernel isn't the stock distribution kernel, for example by
 # adding some text to the end of the version number.
 #
-%define sublevel 13
-%define patchlevel 8
+%define sublevel 14
+%define patchlevel 16
 %define kversion 4.%{sublevel}
 %define rpmversion 4.%{sublevel}.%{patchlevel}
-%define release 1%{?_dist_release}
+%define release 3%{?_dist_release}
 
 %define make_target bzImage
 %define hdrarch %_target_cpu
@@ -115,7 +115,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 # We moved the drm include files into kernel-headers, make sure there's
 # a recent enough libdrm-devel on the system that doesn't have those.
 #
-%define kernel_headers_conflicts libdrm-devel < 2.4.0-4
+%define kernel_headers_conflicts libdrm-devel < 2.4.0-4 cpufrequtils < 009
 
 #
 # Packages that need to be installed before the kernel is, because the %post
@@ -160,6 +160,7 @@ BuildRequires: net-tools
 BuildRequires: gcc >= 3.3.5, binutils >= 2.15
 BuildRequires: bc
 BuildRequires: openssl-devel
+BuildRequires: linux-firmware
 %if %{with_tools}
 BuildRequires: pciutils-devel gettext ncurses-devel
 %endif
@@ -169,15 +170,15 @@ Vendor:		Project Vine
 Distribution:	Vine Linux
 Packager:	daisuke, shaolin, iwamoto, Takemikaduchi
 
-Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-%{kversion}.tar.xz
-
+Source0: ftp://ftp.kernel.org/pub/linux/kernel/v4.x/linux-%{kversion}.tar.xz
 Source10: COPYING.modules
 Source11: genkey
-
 Source21: kernel-%{kversion}-i686.config
 Source22: kernel-%{kversion}-i686-pae.config
 Source23: kernel-%{kversion}-x86_64.config
 
+Source30: cpupower_initd
+Source31: cpupower_sysconfig
 
 # Source 100 - 500 for Vine Linux
 # fb boot logo
@@ -188,6 +189,7 @@ Source100: logo_vine_clut224.ppm
 #
 %if %{patchlevel}
 Patch1: patch-%{kversion}.%{patchlevel}.xz
+# Patch2: patch-4.14.14-rc1.xz
 %endif
 
 # Patches 100 through 500 are meant for architecture patches
@@ -223,7 +225,7 @@ Patch1610: linux-2.6.23-atkbd-dell-multimedia.patch
 Patch1630: linux-2.6.23-module_version.patch
 Patch1650: linux-3.8-input-kill-stupid-messages.patch
 Patch1770: linux-2.6-valid-ether-addr.patch
-Patch1850: silence-fbcon-logo.patch
+Patch1850: linux-4.14-silence-fbcon-logo.patch
 Patch1890: linux-2.6.35-mmc-sdhci-update.patch
 
 Patch1900: linux-2.6.35-quirk-lenovo-itpm.patch
@@ -303,6 +305,7 @@ Summary(ja): 特定のバージョンのカーネル用のモジュールを構
 Group: System Environment/Kernel
 AutoReqProv: no
 Provides: kernel26-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Requires: elfutils-libelf-devel
 
 %description devel
 This package provides kernel headers and makefiles sufficient to build modules
@@ -383,6 +386,7 @@ Obsoletes: glibc-kernheaders
 Provides: glibc-kernheaders = 3.0-46
 Conflicts: %{kernel_headers_conflicts}
 
+
 %description headers
 Kernel-headers includes the C header files that specify the interface
 between the Linux kernel and userspace libraries and programs.  The
@@ -458,19 +462,16 @@ AutoReqProv: no
 This package provides kernel headers and makefiles sufficient to build modules
 against the PAE capable kernel package.
 
-
 %if %{with_tools}
 %package -n kernel-tools
 Summary: Assortment of tools for the Linux kernel
 Group: Development/System
 License: GPLv2
-# Provides:  cpupowerutils = 1:009-0.6.p1
-# Obsoletes: cpupowerutils < 1:009-0.6.p1
-# Provides:  cpufreq-utils = 1:009-0.6.p1
-# Provides:  cpufrequtils = 1:009-0.6.p1
-# Obsoletes: cpufreq-utils < 1:009-0.6.p1
-# Obsoletes: cpufrequtils < 1:009-0.6.p1
-# Obsoletes: cpuspeed < 1:1.5-16
+# cpufrequtils 009 and cpuspeed 1.6 are dummy version number
+Obsoletes: cpufrequtils < 009
+Provides:  cpufrequtils = 009
+Obsoletes: cpuspeed < 1.6
+Provides:  cpuspeed = 1.6
 Requires: kernel-tools-libs = %{version}-%{release}
 %description -n kernel-tools
 This package contains the tools/ directory from the kernel source
@@ -509,6 +510,7 @@ cd linux-%{kversion}
 # 
 %if %{patchlevel}
 %patch1 -p1
+# %patch2 -p1
 %endif
 
 #
@@ -686,6 +688,9 @@ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -prep/" Makefile
 # find . -name "*.orig" -exec rm -fv {} \;
 # find . -name "*~" -exec rm -fv {} \;
 
+###
+chmod +x ./scripts/checkpatch.pl
+chmod +x ./tools/objtool/sync-check.sh
 
 ###
 ### build
@@ -779,6 +784,9 @@ BuildKernel() {
     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 [ -f tools/objtool/objtool ]; then
+      cp -a tools/objtool/objtool $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/objtool/ || :
+    fi
     if [ -d arch/%{_arch}/scripts ]; then
       cp -a arch/%{_arch}/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || :
     fi
@@ -977,10 +985,10 @@ mv cpupower.lang ../
     popd
 %endif
 chmod 0755 %{buildroot}%{_libdir}/libcpupower.so*
-# mkdir -p %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}/etc/rc.d/init.d/
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
-# install -m644 %{SOURCE2000} %{buildroot}%{_unitdir}/cpupower.service
-# install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower
+install -m755 %{SOURCE30} %{buildroot}/etc/rc.d/init.d/cpupower
+install -m644 %{SOURCE31} %{buildroot}%{_sysconfdir}/sysconfig/cpupower
 
 %ifarch %{ix86} x86_64
    mkdir -p %{buildroot}%{_mandir}/man8
@@ -1217,9 +1225,9 @@ fi
 %{_bindir}/centrino-decode
 %{_bindir}/powernow-k8-decode
 
-# %{_unitdir}/cpupower.service
 %{_mandir}/man[1-8]/cpupower*
-# %config(noreplace) %{_sysconfdir}/sysconfig/cpupower
+%config(noreplace) %{_sysconfdir}/sysconfig/cpupower
+/etc/rc.d/init.d/cpupower
 
 %{_bindir}/x86_energy_perf_policy
 %{_mandir}/man8/x86_energy_perf_policy*
@@ -1237,6 +1245,49 @@ fi
 %endif
 
 %changelog
+* Fri Feb  2 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.14.16-3
+- add C: cpufrequtils into kernel-headers
+
+* Fri Feb  2 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.14.16-2
+- drop O:cpufrequtils in kernel-headers
+- add O:/P: cpuspeed into kernel-tools
+
+* Thu Feb  1 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.14.16-1
+- new upstream release
+- add O:cpufrequtils, cpuspeed into kernel-tools
+- add O:cpufrequtils into kernel-headers
+  (BTS #3111)
+- add initscript/sysconfig files for cpupower command
+
+* Wed Jan 17 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.14.13-3.1
+- test package
+- add 4.14.14-rc1 patch
+
+* Tue Jan 16 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.14.13-3
+- add R: elfutils-libelf-devel into -devel package
+
+* Mon Jan 15 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.14.13-2
+- add tools/objtool/objtool into -devel package
+- fix changelog typo
+
+* Fri Jan 12 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.14.13-1
+- update to 4.14.13
+
+* Thu Dec 28 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.14.9-1
+- update to 4.14.9
+
+* Fri Dec 22 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.14.8-1
+- update to 4.14.8
+
+* Wed Dec 13 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.14.5-1
+- update to 4.14.5 (and 4.14.6 rc1)
+- change to CONFIG_USB_UHCI_HCD=m
+- add BR: linux-firmware
+
+* Wed Nov 29 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.14.2-1
+- update to 4.14.2
+- update patch1850
+
 * Thu Oct 19 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.13.8-1
 - update to 4.13.8