Browse Source

kernel-4.14.153-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12315 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 4 years ago
parent
commit
498835e05b
1 changed files with 25 additions and 6 deletions
  1. 25 6
      k/kernel/kernel-vl.spec

+ 25 - 6
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 145
+%define patchlevel 153
 %define kversion 4.%{sublevel}
 %define rpmversion 4.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}
@@ -161,6 +161,7 @@ BuildRequires: gcc >= 3.3.5, binutils >= 2.15
 BuildRequires: bc
 BuildRequires: openssl-devel
 BuildRequires: linux-firmware
+BuildRequires: elfutils-libelf-devel
 %if %{with_tools}
 BuildRequires: pciutils-devel gettext ncurses-devel
 %endif
@@ -168,9 +169,9 @@ BuildRequires: pciutils-devel gettext ncurses-devel
 
 Vendor:		Project Vine
 Distribution:	Vine Linux
-Packager:	daisuke, shaolin, iwamoto, Takemikaduchi
+Packager:	daisuke, shaolin, iwamoto
 
-Source0: ftp://ftp.kernel.org/pub/linux/kernel/v4.x/linux-%{kversion}.tar.xz
+Source0: https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-%{kversion}.tar.xz
 Source10: COPYING.modules
 Source11: genkey
 Source21: kernel-%{kversion}-i686.config
@@ -188,7 +189,7 @@ Source100: logo_vine_clut224.ppm
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 %if %{patchlevel}
-Patch1: patch-%{kversion}.%{patchlevel}.xz
+Patch1: https://mirrors.edge.kernel.org/pub/linux/kernel/v4.x/patch-%{kversion}.%{patchlevel}.xz
 # Patch2: patch-4.14.14-rc1.xz
 %endif
 
@@ -221,7 +222,7 @@ Patch1430: linux-3.9.2-tg3-support-newid.patch
 # Patch1461: linux-4.11_e1000e_3.3.5.3_buildfix.patch
 
 # Aquantia driver update from 4.19.y
-Patch1470: linux-4.14.111_4.19.34-aquantia_update.patch.xz
+Patch1470: linux-4.14.153_4.19.83-aquantia_update.patch.xz
 
 # Misc bits.
 Patch1610: linux-2.6.23-atkbd-dell-multimedia.patch
@@ -921,6 +922,8 @@ mkdir -p $RPM_BUILD_ROOT%{_docdir}/kernel-doc-%{kversion}/Documentation
 chmod -R a+r *
 # copy the source over
 tar cf - Documentation | tar xf - -C $RPM_BUILD_ROOT%{_docdir}/kernel-doc-%{kversion}
+
+rm -f %{buildroot}%{_datadir}/doc/kernel-doc-%{kversion}/Documentation/.gitignore
 %endif
 
 # build source package
@@ -941,6 +944,9 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/src/linux-%{kversion}/arch/x86/tools/relocs
 # don't accidentally overwrite their currently working moduleset and hose their system
 perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}custom/" $RPM_BUILD_ROOT/usr/src/linux-%{kversion}/Makefile
 install -m 644 %{SOURCE10}  $RPM_BUILD_ROOT/usr/src/linux-%{kversion}
+
+# drop binaries: kernel-source is noarch
+rm -rf %{buildroot}%{_prefix}/src/linux-%{kversion}/tools
 %endif
 
 %if %{with_headers}
@@ -973,6 +979,8 @@ make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
 
 sync;sync;sync;
 
+touch ../cpupower.lang
+
 %if %{with_tools}
 make -C tools/power/cpupower DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} mandir=%{_mandir} CPUFREQ_BENCH=false install
 rm -f %{buildroot}%{_libdir}/*.{a,la}
@@ -1012,6 +1020,7 @@ popd
 
 sync;sync;sync;
 
+
 ###
 ### clean
 ###
@@ -1174,8 +1183,10 @@ fi
 %files 
 %defattr(-,root,root)
 /%{image_install_path}/*-%{KVERREL}
+%if %{image_install_path} != "boot"
 /boot/System.map-%{KVERREL}
 /boot/config-%{KVERREL}
+%endif
 %dir /lib/modules/%{KVERREL}
 /lib/modules/%{KVERREL}/modules.*
 /lib/modules/%{KVERREL}/kernel
@@ -1191,8 +1202,10 @@ fi
 %files pae
 %defattr(-,root,root)
 /%{image_install_path}/*-%{KVERREL}pae
+%if %{image_install_path} != "boot"
 /boot/System.map-%{KVERREL}pae
 /boot/config-%{KVERREL}pae
+%endif
 %dir /lib/modules/%{KVERREL}pae
 /lib/modules/%{KVERREL}pae/modules.*
 /lib/modules/%{KVERREL}pae/kernel
@@ -1224,7 +1237,7 @@ fi
 
 
 %if %{with_tools}
-%files -n kernel-tools 
+%files -n kernel-tools -f cpupower.lang
 %defattr(-,root,root)
 
 %{_bindir}/cpupower
@@ -1251,6 +1264,12 @@ fi
 %endif
 
 %changelog
+* Tue Nov 12 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.14.153-1
+- updated to 4.14.153.
+- updated Patch1470 (aquantia).
+- enabled kprobes.
+- 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