Browse Source

kernel: update to 4.13.2

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

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

@@ -31,8 +31,8 @@ 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 12
-%define patchlevel 10
+%define sublevel 13
+%define patchlevel 2
 %define kversion 4.%{sublevel}
 %define rpmversion 4.%{sublevel}.%{patchlevel}
 %define release 2%{?_dist_release}
@@ -249,7 +249,7 @@ Patch2700: linux-2.6.35-drm-update.patch
 Patch2710: linux-2.6-drm-ignore-invalid-EDID-extensions.patch
 
 # Sound
-Patch3000: linux-4.12_ALC1220_anotherID.patch
+# Patch3000: linux-4.12_ALC1220_anotherID.patch
 
 #
 # External drivers that are about to get accepted upstream
@@ -275,7 +275,7 @@ Patch3000: linux-4.12_ALC1220_anotherID.patch
 # amount of drivers they touch. But only these should go here. 
 # Not patches you're too lazy for to put in the proper place.
 #
-Patch10000: linux-3.18-LINUX_COMPILER-LANG_C.patch
+Patch10000: linux-4.13-LINUX_COMPILER-LANG_C.patch
 Patch10010: linux-4.11_tmon_Makefile.patch
 Patch10020: linux-4.11_menuconfig_Makefile.patch
 
@@ -605,7 +605,7 @@ cd linux-%{kversion}
 # v4l
 
 # Sound
-%patch3000 -p1 -b .ALC1220_anotherID
+# %patch3000 -p1 -b .ALC1220_anotherID
 
 #
 # External drivers that are about to get accepted upstream
@@ -1021,8 +1021,14 @@ exit 0
 
 %post 
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --mkinitrd --depmod --install %{KVERREL}
-
+if [ -x /sbin/new-kernel-pkg ]; then
+   if [ -x /usr/bin/dracut ]; then
+      /sbin/new-kernel-pkg --mkinitrd --dracut \
+      			   --host-only --depmod --install %{KVERREL}
+   else
+      /sbin/new-kernel-pkg --mkinitrd --depmod --install %{KVERREL}
+   fi
+fi
 
 cd /boot
 # vmlinuz symlinks to new default kernel
@@ -1067,7 +1073,14 @@ fi
 
 %post pae
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --mkinitrd --depmod --install %{KVERREL}pae
+if [ -x /sbin/new-kernel-pkg ]; then
+   if [ -x /usr/bin/dracut ]; then
+      /sbin/new-kernel-pkg --mkinitrd --dracut \
+      			   --host-only --depmod --install %{KVERREL}pae
+   else
+      /sbin/new-kernel-pkg --mkinitrd --depmod --install %{KVERREL}pae
+   fi
+fi
 
 cd /boot
 # vmlinuz-pae symlinks to new default pae kernel
@@ -1178,8 +1191,6 @@ fi
 /usr/src/kernels/%{KVERREL}pae-%{_target_cpu}
 %endif
 
-
-
 # only some architecture builds need kernel-source
 %if %{buildsource}
 %files source
@@ -1226,6 +1237,16 @@ fi
 %endif
 
 %changelog
+* Sun Sep 17 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.13.2-2
+- update post script for dracut
+
+* Fri Sep 15 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.13.2-1
+- update to 4.13.2
+- drop patch3000 (is included in new release)
+- update patch10000
+- use dracut if dracut is installed
+  (Not added to R: yet)
+
 * Sun Sep  3 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.12.10-2
 - drop e1000e update (patch1460,61) because of MTU handling issue
   (Thanks to tomop-san)