kernel: update to 4.12.10

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11153 ec354946-7b23-47d6-9f5a-488ba84defc7

k/kernel/kernel-vl.spec

@@ -19,6 +19,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 %define builddoc 0
 %define buildsource 0
 
+%define with_tools   1
 %define with_headers 1
 %define with_firmware 0
 
@@ -30,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 4
-%define patchlevel 52
+%define sublevel 12
+%define patchlevel 10
 %define kversion 4.%{sublevel}
 %define rpmversion 4.%{sublevel}.%{patchlevel}
-%define release 2.1%{?_dist_release}
+%define release 1%{?_dist_release}
 
 %define make_target bzImage
 %define hdrarch %_target_cpu
@@ -44,7 +45,6 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 
 # groups of related archs
 %define all_x86 i686
-%define all_ppc ppciseries ppcpseries ppc ppc64
 
 # Override generic defaults with per-arch defaults 
 
@@ -70,6 +70,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 %define buildsource 1
 %define builddoc 1
 %define with_firmware 0
+%define _binaries_in_noarch_packages_terminate_build 0
 %endif
 
 %ifarch %{all_x86}
@@ -85,42 +86,6 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 %define asmarch x86
 %endif
 
-%ifarch ppc64
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
-%define image_install_path boot
-%define make_target bzImage zImage.stub
-%define hdrarch powerpc
-%define asmarch powerpc
-%endif
-
-%ifarch ppc64iseries
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
-%define image_install_path boot
-%define make_target bzImage
-%endif
-
-%ifarch sparc
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc.config
-%endif
-
-%ifarch sparc64
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc64*.config
-%define asmarch sparc
-%endif
-
-%ifarch ppc
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc*.config
-%define image_install_path boot
-%define make_target vmlinux
-%define hdrarch powerpc
-%define asmarch powerpc
-%endif
-
-%ifarch ia64
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64.config
-%define image_install_path boot/efi/EFI/redhat
-%endif
-
 #
 # Three sets of minimum package version requirements in the form of Conflicts:
 # to versions below the minimum
@@ -163,7 +128,7 @@ Group: System Environment/Kernel
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch i686 x86_64 %{all_ppc}
+ExclusiveArch: noarch i686 x86_64
 ExclusiveOS: Linux
 Provides: kernel = %{rpmversion}
 Provides: kernel26 = %{rpmversion}
@@ -173,7 +138,7 @@ Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}
 Provides: alsa-driver = 1.0.20
 Requires(pre): %{kernel_prereq}
 %if "%{_dist_release}" >= "vl7"
-Requires(pre): mkinitrd >= 6.0.93-22
+Requires(pre): mkinitrd >= 6.0.93-24
 %endif
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
@@ -195,6 +160,10 @@ BuildRequires: net-tools
 BuildRequires: gcc >= 3.3.5, binutils >= 2.15
 BuildRequires: bc
 BuildRequires: openssl-devel
+%if %{with_tools}
+BuildRequires: pciutils-devel gettext ncurses-devel
+%endif
+
 
 Vendor:		Project Vine
 Distribution:	Vine Linux
@@ -208,7 +177,6 @@ Source11: genkey
 Source21: kernel-%{kversion}-i686.config
 Source22: kernel-%{kversion}-i686-pae.config
 Source23: kernel-%{kversion}-x86_64.config
-Source32: kernel-%{kversion}-ppc.config
 
 
 # Source 100 - 500 for Vine Linux
@@ -230,9 +198,6 @@ Patch1: patch-%{kversion}.%{patchlevel}.xz
 # Patch280: linux-2.6-x86-workaround-failures-on-intel-atom.patch
 
 
-# 300 - 399   ppc(64)
-Patch350: linux-2.6.23-windtunnel-printk.patch
-
 #
 # Patches 800 through 899 are reserved for bugfixes to the core system
 # and patches related to how RPMs are build
@@ -250,7 +215,8 @@ Patch1394: linux-2.6-zd1211rw-gw-us54gxs.patch
 # tg3 add new id (5778[26])
 Patch1430: linux-3.9.2-tg3-support-newid.patch
 # e1000e update
-Patch1460: linux-4.4.52_update_e1000e_3.3.5.3.patch.xz
+Patch1460: linux-4.12.2_update_e1000e_3.3.5.3.patch
+Patch1461: linux-4.11_e1000e_3.3.5.3_buildfix.patch
 
 # Misc bits.
 Patch1610: linux-2.6.23-atkbd-dell-multimedia.patch
@@ -263,17 +229,17 @@ Patch1890: linux-2.6.35-mmc-sdhci-update.patch
 Patch1900: linux-2.6.35-quirk-lenovo-itpm.patch
 
 # initial MBA Mid2011 hacky support
-Patch1910: linux-4.4-macbookair_middle2011_fixedmode_hackyhack.patch
+# Patch1910: linux-4.4-macbookair_middle2011_fixedmode_hackyhack.patch
 
 # pt1 fix
-Patch1920: linux-3.7.1-pt1fix.patch
+# Patch1920: linux-3.7.1-pt1fix.patch
 
 # IDE
 Patch2010: linux-3.2-ide-piix-prefer-ata_piix.patch
 
 # SCSI
 Patch2301: linux-2.6.23-VMWare5-fix-LSI_emulation.patch
-Patch2504: linux-2.6-at76.patch
+# Patch2504: linux-2.6-at76.patch
 
 # DRM
 # drm update from ubuntu maverick kernel
@@ -282,28 +248,27 @@ Patch2700: linux-2.6.35-drm-update.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=31154
 Patch2710: linux-2.6-drm-ignore-invalid-EDID-extensions.patch
 
-
+# Sound
+Patch3000: linux-4.12_ALC1220_anotherID.patch
 
 #
 # External drivers that are about to get accepted upstream
 #
 
-
-
 #
 # 6000 to 10000 is for Vine Linux
 #
 
 # aufs4
 %define aufs_version 4.4-20160615
-Patch6100: aufs%{aufs_version}.patch
-Source6100: aufs%{aufs_version}.tar.xz
+# Patch6100: aufs%{aufs_version}.patch
+# Source6100: aufs%{aufs_version}.tar.xz
 
 #
 # TuxOnIce (formerly suspend2) patch
 %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
+# Patch9000: tuxonice-for-linux-%{tuxonice_version}.patch.xz
+# Patch9001: 0001-toi-4.1-attempt-to-fix-compiling-without-TOI.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -311,6 +276,8 @@ Patch9001: 0001-toi-4.1-attempt-to-fix-compiling-without-TOI.patch
 # Not patches you're too lazy for to put in the proper place.
 #
 Patch10000: linux-3.18-LINUX_COMPILER-LANG_C.patch
+Patch10010: linux-4.11_tmon_Makefile.patch
+Patch10020: linux-4.11_menuconfig_Makefile.patch
 
 # Security fix patches
 
@@ -492,6 +459,46 @@ 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
+Requires: kernel-tools-libs = %{version}-%{release}
+%description -n kernel-tools
+This package contains the tools/ directory from the kernel source
+and the supporting documentation.
+
+%package -n kernel-tools-libs
+Summary: Libraries for the kernels-tools
+Group: Development/System
+License: GPLv2
+%description -n kernel-tools-libs
+This package contains the libraries built from the tools/ directory
+from the kernel source.
+
+%package -n kernel-tools-libs-devel
+Summary: Assortment of tools for the Linux kernel
+Group: Development/System
+License: GPLv2
+Requires: kernel-tools = %{version}-%{release}
+# Provides:  cpupowerutils-devel = 1:009-0.6.p1
+# Obsoletes: cpupowerutils-devel < 1:009-0.6.p1
+Requires: kernel-tools-libs = %{version}-%{release}
+# Provides: kernel-tools-devel
+%description -n kernel-tools-libs-devel
+This package contains the development files for the tools/ directory from
+the kernel source.
+
+%endif # with_tools
+
 %prep
 
 %setup -q -n %{name}-%{version} -c
@@ -518,20 +525,6 @@ cd linux-%{kversion}
 
 # %patch280 -p1
 
-# 
-# ppc(64)
-#
-
-%patch350 -p1
-
-#
-# ia64
-#
-
-#
-# sparc/sparc64
-#
-
 
 #
 # Patches 500 through 1000 are reserved for bugfixes to the core system
@@ -565,6 +558,7 @@ cd linux-%{kversion}
 %patch1430 -p1
 # e1000e
 %patch1460 -p1
+%patch1461 -p1
 
 # Misc fixes
 # Make multimedia buttons on Dell Inspiron 8200 work.
@@ -588,10 +582,10 @@ cd linux-%{kversion}
 ##VINE## %patch1900 -p1
 
 # initial MBA Mid2011 hacky support
-%patch1910 -p1
+# %patch1910 -p1
 
 # pt1fix
-%patch1920 -p1
+# %patch1920 -p1
 
 # IDE
 # prefer ata_piix driver on ICH4+ chipset instead of IDE/piix
@@ -600,7 +594,7 @@ cd linux-%{kversion}
 # 3w-9xxx update (2.26.02.008)
 %patch2301 -p1
 
-%patch2504 -p1
+# %patch2504 -p1
 
 # drm fixes
 %if %{_apply_drm_patches}
@@ -610,6 +604,8 @@ cd linux-%{kversion}
 
 # v4l
 
+# Sound
+%patch3000 -p1 -b .ALC1220_anotherID
 
 #
 # External drivers that are about to get accepted upstream
@@ -628,13 +624,13 @@ cd linux-%{kversion}
 
 %if !%{_minimum_patches}
 # aufs
-%__tar xf %{SOURCE6100}
-%patch6100 -p1 -b .aufs4
-echo "header-y += aufs_type.h" >> include/uapi/linux/Kbuild
+# %__tar xf %{SOURCE6100}
+# %patch6100 -p1 -b .aufs4
+# echo "header-y += aufs_type.h" >> include/uapi/linux/Kbuild
 
 # tuxonice
-%patch9000 -p1
-%patch9001 -p1
+# %patch9000 -p1
+# %patch9001 -p1
 
 %endif
 
@@ -644,6 +640,9 @@ echo "header-y += aufs_type.h" >> include/uapi/linux/Kbuild
 # do not include localized version string in /proc/version
 %patch10000 -p1
 
+%patch10010 -p1 
+%patch10020 -p1 
+
 # security fix
 
 
@@ -748,11 +747,7 @@ BuildKernel() {
     mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
     install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
-%ifarch ppc
-    cp vmlinux $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
-%else
     cp arch/$Arch/boot/bzImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
-%endif
 	if [ -f arch/$Arch/boot/zImage.stub ]; then
       cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
 	fi
@@ -792,12 +787,7 @@ BuildKernel() {
     fi
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o
-%ifarch ppc
-    if [ -f arch/powerpc/lib/crtsavres.S -a -f arch/powerpc/lib/crtsavres.o ]
-    then
-      cp -a --parents arch/powerpc/lib/crtsavres.[So] $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
-    fi
-%endif
+
     if [ -d arch/%{asmarch}/include ]; then
       cp -a --parents arch/%{asmarch}/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     fi
@@ -872,6 +862,35 @@ BuildKernel
 BuildKernel pae
 %endif
 
+%if %{with_tools}
+# cpupower
+# make sure version-gen.sh is executable.
+chmod +x tools/power/cpupower/utils/version-gen.sh
+make %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false
+%ifarch %{ix86}
+    pushd tools/power/cpupower/debug/i386
+    make %{?_smp_mflags} centrino-decode powernow-k8-decode
+    popd
+%endif
+%ifarch x86_64
+    pushd tools/power/cpupower/debug/x86_64
+    make %{?_smp_mflags} centrino-decode powernow-k8-decode
+    popd
+%endif
+%ifarch %{ix86} x86_64
+   pushd tools/power/x86/x86_energy_perf_policy/
+   make
+   popd
+   pushd tools/power/x86/turbostat
+   make
+   popd
+%endif #turbostat/x86_energy_perf_policy
+pushd tools/thermal/tmon/
+make
+popd
+%endif
+
+
 ###
 ### install
 ###
@@ -938,8 +957,46 @@ rm -f $RPM_BUILD_ROOT/usr/include/asm*/irq.h
 make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
 %endif
 
-sync
+sync;sync;sync;
+
+%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}
+%find_lang cpupower
+mv cpupower.lang ../
+%ifarch %{ix86}
+    pushd tools/power/cpupower/debug/i386
+    install -m755 centrino-decode %{buildroot}%{_bindir}/centrino-decode
+    install -m755 powernow-k8-decode %{buildroot}%{_bindir}/powernow-k8-decode
+    popd
+%endif
+%ifarch x86_64
+    pushd tools/power/cpupower/debug/x86_64
+    install -m755 centrino-decode %{buildroot}%{_bindir}/centrino-decode
+    install -m755 powernow-k8-decode %{buildroot}%{_bindir}/powernow-k8-decode
+    popd
+%endif
+chmod 0755 %{buildroot}%{_libdir}/libcpupower.so*
+# mkdir -p %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+# install -m644 %{SOURCE2000} %{buildroot}%{_unitdir}/cpupower.service
+# install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower
+
+%ifarch %{ix86} x86_64
+   mkdir -p %{buildroot}%{_mandir}/man8
+   pushd tools/power/x86/x86_energy_perf_policy
+   make DESTDIR=%{buildroot} install
+   popd
+   pushd tools/power/x86/turbostat
+   make DESTDIR=%{buildroot} install
+   popd
+%endif #turbostat/x86_energy_perf_policy
+pushd tools/thermal/tmon
+make INSTALL_ROOT=%{buildroot} install
+popd
+%endif
 
+sync;sync;sync;
 
 ###
 ### clean
@@ -966,40 +1023,20 @@ exit 0
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade
 [ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --mkinitrd --depmod --install %{KVERREL}
 
-%ifarch ppc
-for MODCONFFILE in /etc/modprobe.d/modprobe.conf.dist /etc/modprobe.conf /etc/modprobe.d/modprobe.conf
-do
-  if [ -f "$MODCONFFILE" ]; then
-    TEMPFILE=`/bin/mktemp -q /tmp/modconffile.XXXXXX`
-    sed -e 's/alias sound snd-powermac$//' $MODCONFFILE > $TEMPFILE
-    cat $TEMPFILE > $MODCONFFILE
-    rm -f $TEMPFILE
-  fi
-done
-%endif
 
 cd /boot
 # vmlinuz symlinks to new default kernel
 ln -sf vmlinuz-%{KVERREL} vmlinuz
-%ifarch ppc
-ln -sf vmlinuz-%{KVERREL} vmlinux
-%endif
 ln -sf System.map-%{KVERREL} System.map
 ln -sf initrd-%{KVERREL}.img initrd.img
 # vmlinuz.old symlink to current running kernel
 current=`uname -r`
 if [ ! -f vmlinuz-${current} ]; then
   ln -sf vmlinuz-%{KVERREL} vmlinuz.old
-%ifarch ppc
-  ln -sf vmlinuz-%{KVERREL} vmlinux.old
-%endif
   ln -sf System.map-%{KVERREL} System.map.old
   ln -sf initrd-%{KVERREL}.img initrd.old.img
 else
   ln -sf vmlinuz-${current} vmlinuz.old
-%ifarch ppc
-  ln -sf vmlinuz-${current} vmlinux.old
-%endif
   ln -sf System.map-${current} System.map.old
   ln -sf initrd-${current}.img initrd.old.img
 fi
@@ -1161,7 +1198,54 @@ fi
 %endif
 
 
+%if %{with_tools}
+%files -n kernel-tools 
+%defattr(-,root,root)
+
+%{_bindir}/cpupower
+%{_bindir}/centrino-decode
+%{_bindir}/powernow-k8-decode
+
+# %{_unitdir}/cpupower.service
+%{_mandir}/man[1-8]/cpupower*
+# %config(noreplace) %{_sysconfdir}/sysconfig/cpupower
+
+%{_bindir}/x86_energy_perf_policy
+%{_mandir}/man8/x86_energy_perf_policy*
+%{_bindir}/turbostat
+%{_mandir}/man8/turbostat*
+%{_bindir}/tmon
+
+%files -n kernel-tools-libs
+%{_libdir}/libcpupower.so.0
+%{_libdir}/libcpupower.so.0.0.*
+
+%files -n kernel-tools-libs-devel
+%{_libdir}/libcpupower.so
+%{_includedir}/cpufreq.h
+%endif
+
 %changelog
+* Thu Aug 31 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.12.10-1
+- update to 4.12.10
+
+* Wed Aug  9 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.12.5-1
+- update to 4.12.5
+- fix typo in 4.12.4's changelog
+
+* Mon Jul 31 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.12.4-1
+- update to 4.12.4
+- add patch3000 for ALC1220 codec
+
+* Fri Jul 21 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.12.2-1
+- update to 4.12.2
+
+* Thu Jul 20 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.11.11-1
+- update to 4.11.11
+- add kernel-tools packages
+- drop aufs/tuxonice 
+- revome ppc/sparc if-else-endif branches
+
 * Wed Mar 29 2017 IWAI, Masaharu <iwaim.sub@gmail.com> 4.4.52-2.1
 - update to 4.4.52
 - update e1000e driver to 3.3.5.3 (Patch1460)