Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernelbump.git;a=commitdiff;h=29a35c0c0115e4ca03ce1e1e40b432316878a6ca
commit 29a35c0c0115e4ca03ce1e1e40b432316878a6ca Author: DeX77 <[email protected]> Date: Tue Apr 18 12:11:27 2017 +0200 kernel-4.10.11-1-x86_64 * version bump * split traceevent plugins * complete refactoring: * create initrd in kernel package * use clr-boot-manager diff --git a/source/base/kernel-initrd/kernel-initrd.install b/source/base/kernel-initrd/kernel-initrd.install deleted file mode 100644 index 61ad974..0000000 --- a/source/base/kernel-initrd/kernel-initrd.install +++ /dev/null @@ -1,27 +0,0 @@ -post_install() -{ - #TODO Migration fix. Remove later - if [ -S /run/systemd/journal/dev-log ] && [ ! -L /dev/log ]; then - ln -sf /run/systemd/journal/dev-log /dev/log - fi - - if [ -f /boot/grub/grub.cfg ]; then - /usr/sbin/grub-mkconfig -o /boot/grub/grub.cfg - fi -} - -post_upgrade() -{ - post_install -} - -post_remove() -{ - post_install -} - -op=$1 -shift -$op $* - -# vim: ft=sh diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index 2990d22..12a96cc 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -16,6 +16,11 @@ Finclude kernel url="https://www.kernel.org"; depends=('kmod' 'sed') [[ -z "$_F_kernel_name" ]] && makedepends+=('unifdef') +makedepends+=('dracut>=045' 'linux-firmware>=20170223' 'xz' 'less' 'xfsprogs>=4.9.0' \ + 'jfsutils>=1.1.15-7' 'reiserfsprogs>=3.6.25-2' 'mdadm>=4.0' 'lvm2>=2.02.170' 'systemd>=231-14' \ + 'kmod>=24' 'btrfs-progs>=4.10.1' 'terminus-font-console' 'cryptsetup-luks>=1.7.4' \ + 'keyutils>=1.5.9-5' 'coreutils>=8.26' 'e2fsprogs>=1.43.4' 'intel-ucode>=20161104' 'frugalware>=2.1') +rodepends=('clr-boot-manager') groups=('base') archs=('x86_64') options+=('nodocs' 'genscriptlet') @@ -37,6 +42,12 @@ done source+=("https://www.kernel.org/pub/linux/kernel/v4.x/$_F_archive_name-$pkgver.tar.xz"; 'config.x86_64') signatures+=("https://www.kernel.org/pub/linux/kernel/v4.x/$_F_archive_name-$pkgver.tar.sign"; '') +OMITTED_MODULES="multipath systemd-bootchart" +ADDED_MODULES="dmsquash-live" + +provides==('kernel-inittd') +replaces=('kernel-inittd') +conflicts=('kernel-inittd') subpkgs=('cpupower') subdescs=('Kernel cpu powersaving tool') @@ -202,23 +213,18 @@ build() ## use verbose by default, we want to know what is going on... Fexec make $MAKEFLAGS V=1 || Fdie - Fmkdir /boot - Fmkdir /lib/{modules,firmware} - Ffilerel .config /boot/config-$_F_kernel_ver$_F_kernel_uname + Fmkdir /lib/{modules,firmware,kernel} + Ffilerel .config lib/kernel/config-$_F_kernel_ver$_F_kernel_uname if [ ! -z "$_F_kernel_vmlinuz" ]; then - Ffilerel $_F_kernel_vmlinuz /boot/$_F_kernel_path-$_F_kernel_ver$_F_kernel_uname + Ffilerel $_F_kernel_vmlinuz lib/kernel/org.frugalware.fw.$_F_kernel_path-$_F_kernel_ver$_F_kernel_uname else - Ffilerel arch/x86/boot/bzImage /boot/$_F_kernel_path-$_F_kernel_ver$_F_kernel_uname + Ffilerel arch/x86/boot/bzImage lib/kernel/org.frugalware.fw.$_F_kernel_path-$_F_kernel_ver$_F_kernel_uname fi - Fln config-$_F_kernel_ver$_F_kernel_uname /boot/config - Fln System.map-$_F_kernel_ver$_F_kernel_uname /boot/System.map - Fln $_F_kernel_path-$_F_kernel_ver$_F_kernel_uname /boot/$_F_kernel_path - make INSTALL_MOD_PATH=$Fdestdir $MAKEFLAGS modules_install || Fdie # dump symol versions so that later builds will have dependencies and # modversions - Ffilerel System.map /boot/System.map-$_F_kernel_ver$_F_kernel_uname + Ffilerel System.map lib/kernel/System.map-$_F_kernel_ver$_F_kernel_uname Ffilerel /usr/src/linux-$_F_kernel_ver$_F_kernel_uname/Module.symvers Frm /lib/modules/$_F_kernel_ver$_F_kernel_uname/build Frm /lib/modules/$_F_kernel_ver$_F_kernel_uname/source @@ -231,6 +237,21 @@ build() # remove duplicate firmware files Frm "lib/firmware/$(KERNELRELEASE)" + # create initrd + Fexec /usr/bin/dracut -N \ + --xz \ + --no-hostonly-i18n \ + --force \ + --nostrip \ + -o "$OMITTED_MODULES" \ + -a "$ADDED_MODULES" \ + --fwdir /lib/firmware \ + --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_kernel_uname \ + $_F_kernel_ver$_F_kernel_uname || Fdie + # build cpupower cd tools/power/cpupower @@ -281,6 +302,7 @@ build() Fsplit perf usr/bin/ Fsplit perf usr/libexec/ Fsplit perf usr/share/ + Fsplit perf usr/lib/traceevent/ } diff --git a/source/base/kernel/kernel.install b/source/base/kernel/kernel.install new file mode 100644 index 0000000..55a5830 --- /dev/null +++ b/source/base/kernel/kernel.install @@ -0,0 +1,20 @@ +post_install() +{ + /usr/bin/clr-boot-manager update +} + +post_upgrade() +{ + post_install +} + +post_remove() +{ + post_install +} + +op=$1 +shift +$op $* + +# vim: ft=sh diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index 50658cd..ce13aa3 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -16,7 +16,7 @@ # * _F_kernelver_stable: the number of the -stable patch to use (if any) # * _F_kernelver_nextver: the next kernel version ### -_F_kernelver_ver=4.10.9 +_F_kernelver_ver=4.10.11 _F_kernelver_rel=1 ### diff --git a/source/include/kernel.sh b/source/include/kernel.sh index 34e9fb7..054f66b 100644 --- a/source/include/kernel.sh +++ b/source/include/kernel.sh @@ -69,7 +69,7 @@ if [ -z "$_F_kernel_dontfakeversion" ]; then _F_kernel_dontfakeversion=0 fi if [ -z "$_F_kernel_uname" ]; then - _F_kernel_uname="$_F_kernel_name-fw$_F_kernel_rel" + _F_kernel_uname="$_F_kernel_name-$_F_kernel_rel.fw" fi if [ -z "$_F_kernel_path" ]; then _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
