Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernelbump.git;a=commitdiff;h=df9e62f6883f6a3092afc15cbb4ebd8de8985b33
commit df9e62f6883f6a3092afc15cbb4ebd8de8985b33 Author: DeX77 <[email protected]> Date: Tue Apr 18 21:45:52 2017 +0200 kernel-4.10.11-1-x86_64 * a lot of changes diff --git a/source/apps-extra/acpi_call/FrugalBuild b/source/apps-extra/acpi_call/FrugalBuild index 150bdba..0950586 100644 --- a/source/apps-extra/acpi_call/FrugalBuild +++ b/source/apps-extra/acpi_call/FrugalBuild @@ -22,7 +22,6 @@ build() { Fmake Finstallrel 644 acpi_call.ko $_F_kernelmod_dir/kernel/drivers/acpi/acpi_call.ko Fbuild_kernelmod_scriptlet - Fkernelver_compress_modules } # optimization OK diff --git a/source/apps-extra/tp-smapi/FrugalBuild b/source/apps-extra/tp-smapi/FrugalBuild index 0ca1f92..ff973a2 100644 --- a/source/apps-extra/tp-smapi/FrugalBuild +++ b/source/apps-extra/tp-smapi/FrugalBuild @@ -22,7 +22,6 @@ build() { Finstallrel 644 thinkpad_ec.ko $_F_kernelmod_dir/kernel/drivers/platform/x86/thinkpad_ec.ko Finstallrel 644 tp_smapi.ko $_F_kernelmod_dir/kernel/drivers/platform/x86/tp_smapi.ko Fbuild_kernelmod_scriptlet - Fkernelver_compress_modules } # optimization OK diff --git a/source/apps-extra/vhba-module/FrugalBuild b/source/apps-extra/vhba-module/FrugalBuild index 3c306c8..c9e0e5f 100644 --- a/source/apps-extra/vhba-module/FrugalBuild +++ b/source/apps-extra/vhba-module/FrugalBuild @@ -23,7 +23,6 @@ build() Fmake Ffilerel $_F_kernelmod_dir/kernel/drivers/scsi/vhba.ko Fbuild_kernelmod_scriptlet - Fkernelver_compress_modules Ffile /lib/udev/rules.d/60-vhba.rules } diff --git a/source/apps-extra/virtualbox-modules/FrugalBuild b/source/apps-extra/virtualbox-modules/FrugalBuild index 58a6c33..e4745c1 100644 --- a/source/apps-extra/virtualbox-modules/FrugalBuild +++ b/source/apps-extra/virtualbox-modules/FrugalBuild @@ -45,7 +45,6 @@ build() { Fbuild_kernelmod_scriptlet - Fkernelver_compress_modules } # optimization OK diff --git a/source/base-extra/frandom/FrugalBuild b/source/base-extra/frandom/FrugalBuild index a0a741e..472a90a 100644 --- a/source/base-extra/frandom/FrugalBuild +++ b/source/base-extra/frandom/FrugalBuild @@ -18,7 +18,6 @@ build() Fmake Ffilerel /lib/modules/$_F_kernelmod_uname/kernel/$pkgname.ko Fbuild_kernelmod_scriptlet - Fkernelver_compress_modules Fmkdir /etc/tmpfiles.d cat > $Fdestdir/etc/tmpfiles.d/frandom.conf << EOF c /dev/frandom 0444 root root - 235:11 diff --git a/source/base-extra/spl/FrugalBuild b/source/base-extra/spl/FrugalBuild index 7ecb952..9989e88 100644 --- a/source/base-extra/spl/FrugalBuild +++ b/source/base-extra/spl/FrugalBuild @@ -32,7 +32,6 @@ build() Fmakeinstall Fbuild_kernelmod_scriptlet - Fkernelver_compress_modules Fsplit $pkgname-source /usr/src } diff --git a/source/base-extra/zfs/FrugalBuild b/source/base-extra/zfs/FrugalBuild index 906173d..5a1b72e 100644 --- a/source/base-extra/zfs/FrugalBuild +++ b/source/base-extra/zfs/FrugalBuild @@ -33,7 +33,6 @@ build() Fmakeinstall Fbuild_kernelmod_scriptlet - Fkernelver_compress_modules cat > $Fdestdir/etc/zfs/vdev_id.conf << EOF # Put vdev configuration in this file. EOF diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index effc9b9..f920245 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -216,7 +216,7 @@ build() Fmkdir /lib/{modules,firmware,kernel} Ffilerel .config lib/kernel/config-$_F_kernel_ver$_F_kernel_uname - Ffilerel $_F_kernel_vmlinuz lib/kernel/org.frugalware.fw.$_F_kernel_ver-${_F_kernelver_rel} + Ffilerel $_F_kernel_vmlinuz lib/kernel/org.frugalware.${_F_kernelver_type}.$_F_kernel_ver-${_F_kernelver_rel} make INSTALL_MOD_PATH=$Fdestdir $MAKEFLAGS modules_install || Fdie # dump symol versions so that later builds will have dependencies and @@ -243,11 +243,11 @@ build() --early-microcode \ -i /usr/lib/sysusers.d/ /usr/lib/sysusers.d/ \ -k $Fdestdir/lib/modules/$_F_kernel_ver$_F_kernel_uname \ - $Fdestdir/lib/kernel/initrd-org.frugalware.fw.$_F_kernel_ver-$_F_kernelver_rel \ + $Fdestdir/lib/kernel/initrd-org.frugalware.${_F_kernelver_type}.$_F_kernel_ver-$_F_kernelver_rel \ $_F_kernel_ver$_F_kernel_uname || Fdie # cmdline for arch - Ffile cmdline.${CARCH} lib/kernel/cmdline-${_F_kernel_ver}-${_F_kernelver_rel} + Ffile cmdline.${CARCH} lib/kernel/cmdline-$_F_kernel_ver$_F_kernel_uname # build cpupower cd tools/power/cpupower diff --git a/source/base/kernel/cmdline.x86_64 b/source/base/kernel/cmdline.x86_64 index e69de29..9c56bb4 100644 --- a/source/base/kernel/cmdline.x86_64 +++ b/source/base/kernel/cmdline.x86_64 @@ -0,0 +1 @@ +ro systemd.show_status=1 audit=0 quiet \ No newline at end of file diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index ce13aa3..aa277a5 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -28,7 +28,6 @@ _F_genscriptlet_hooks=("${_F_genscriptlet_hooks[@]}" 'Fkernelver_genscriptlet_ho ### # == PROVIDED FUNCTIONS # * Fkernelver_genscriptlet_hook: Hook to replace kernel versions variables in .install scripts. -# * Fkernelver_compress_modules: Search for kernel modules and compress any found. ### Fkernelver_genscriptlet_hook() { @@ -36,11 +35,4 @@ Fkernelver_genscriptlet_hook() Freplace '_F_kernelver_rel' "$1" } -Fkernelver_compress_modules() -{ - local _directory - _directory="$Fdestdir/lib/modules/${_F_kernelver_ver}${_F_kernel_name}-fw$_F_kernelver_rel" - Fexec find $_directory -name "*.ko" -exec xz '{}' \; || Fdie -} - makedepends=("${makedepends[@]}" 'ca-certificates') \ No newline at end of file diff --git a/source/include/kernel.sh b/source/include/kernel.sh index 054f66b..79e57a6 100644 --- a/source/include/kernel.sh +++ b/source/include/kernel.sh @@ -44,8 +44,9 @@ Finclude kernel-version # kernel version string) # * _F_kernel_dontfakeversion if set, don't replace the kernel version string # with a generated one (from _F_kernel_ver, _F_kernel_name and _F_kernel_rel) +# * _F_kernelver_type: type of kernel to build (defaults to fw) # * _F_kernel_uname: specify the kernel version manually (defaults to -# $_F_kernel_name-fw$_F_kernel_rel) +# $_F_kernel_name-$_F_kernel_rel.$_F_kernelver_type) # * _F_kernel_path: vmlinuz on x86 # # == OVERWRITTEN VARIABLES @@ -68,8 +69,12 @@ fi if [ -z "$_F_kernel_dontfakeversion" ]; then _F_kernel_dontfakeversion=0 fi +if [ -z "$_F_kernelver_type" ]; then + _F_kernelver_type=fw +fi + if [ -z "$_F_kernel_uname" ]; then - _F_kernel_uname="$_F_kernel_name-$_F_kernel_rel.fw" + _F_kernel_uname="$_F_kernel_name-$_F_kernel_rel.$_F_kernelver_type" fi if [ -z "$_F_kernel_path" ]; then diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh index 2ba45db..23cf151 100644 --- a/source/include/nvidia.sh +++ b/source/include/nvidia.sh @@ -243,7 +243,6 @@ Fbuild_nvidia() { Frm /usr/bin/nvidia-xconfig Frm /usr/man/man1/nvidia-xconfig.1.gz - Fkernelver_compress_modules } build() { diff --git a/source/network-extra/bcmwl/FrugalBuild b/source/network-extra/bcmwl/FrugalBuild index a1fb169..71e6cd2 100644 --- a/source/network-extra/bcmwl/FrugalBuild +++ b/source/network-extra/bcmwl/FrugalBuild @@ -31,5 +31,4 @@ build() Fdocrel lib/LICENSE.txt Ffile /etc/modprobe.d/$pkgname.conf Fbuild_kernelmod_scriptlet - Fkernelver_compress_modules } diff --git a/source/network-extra/r8168/FrugalBuild b/source/network-extra/r8168/FrugalBuild index da1fdd9..38355bc 100644 --- a/source/network-extra/r8168/FrugalBuild +++ b/source/network-extra/r8168/FrugalBuild @@ -36,7 +36,6 @@ build() { Fmake Ffilerel src/r8168.ko $_F_kernelmod_dir/kernel/drivers/net/r8168.ko Ffile /etc/modprobe.d/$pkgname.conf - Fkernelver_compress_modules } # optimization OK diff --git a/source/x11-extra/nvidia/FrugalBuild b/source/x11-extra/nvidia/FrugalBuild index 355cd15..7483caa 100644 --- a/source/x11-extra/nvidia/FrugalBuild +++ b/source/x11-extra/nvidia/FrugalBuild @@ -135,7 +135,6 @@ build () { Ffile xorg-nvidia.conf /etc/X11/xorg.conf.d/15-nvidia.conf Ffile modprobe-nvidia.conf /etc/modprobe.d/nvidia.conf - Fkernelver_compress_modules } # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
