Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=349226a7a1cebfcb26994b60e4027e7849104e9b
commit 349226a7a1cebfcb26994b60e4027e7849104e9b Author: crazy <[email protected]> Date: Mon Feb 29 02:41:08 2016 +0100 kernel-4.4.3-1-x86_64 * remove Fbuildkernel() from kernel.sh * and move all back to FrugalBuild diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index c3ccaf5..b359fbf 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -117,7 +117,107 @@ fi build() { - Fbuildkernel + Fcd + make clean || Fdie + + if [ -e "$Fsrcdir/config.$CARCH" ]; then + cp $Fsrcdir/config.$CARCH .config || Fdie + else + cp $Fsrcdir/config .config || Fdie + fi + + # not using Fpatchall here since not applying the patches from + # _F_kernel_patches() having the wrong extension would be stange :) + + for i in "${_F_kernel_patches[@]}" + do + Fpatch `strip_url $i` + done + + if [ -z "$_F_kernel_name" -a $_F_kernel_dontfakeversion -eq 0 ]; then + # stock kernel, nobody interested in the buildsystem's detail + export KBUILD_BUILD_USER="fst" + export KBUILD_BUILD_HOST="`uname -m`.frugalware.org" + fi + + # remove unneded localversions + rm -f localversion-* + rm -f ../*.{gz,bz2,sign} + + yes "" | make config + + if [ $_F_kernel_dontfakeversion -eq 0 ]; then + if [ "${_F_kernel_ver#*.*.}" = "$_F_kernel_ver" ]; then + # If patten match fails, sublevel version is missing + Fsed "SUBLEVEL =.*" "SUBLEVEL =" Makefile + else + Fsed "SUBLEVEL =.*" "SUBLEVEL = ${_F_kernel_ver#*.*.}" Makefile + fi + Fsed "EXTRAVERSION =.*" "EXTRAVERSION = $_F_kernel_uname" Makefile + else + make include/config/kernel.release + unset _F_kernel_ver + _F_kernel_uname=$(cat include/config/kernel.release) + fi + + # Force kernel firmware to be installed in kernel specific path. + Fsed 'INSTALL_FW_PATH=.*' 'INSTALL_FW_PATH=$(INSTALL_MOD_PATH)/lib/firmware/$(KERNELRELEASE)' Makefile + + ## let we do kernel$_F_kernel_name-source before make + Fmkdir /usr/src + cp -Ra $Fsrcdir/linux-$_F_kernelver_ver $Fdestdir/usr/src/linux-$_F_kernel_ver$_F_kernel_uname || Fdie + rm -rf $Fdestdir/usr/src/linux-$_F_kernel_ver$_F_kernel_uname/{.git,.gitignore,.config.old,Documentation,COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} || Fdie + Fln linux-$_F_kernel_ver$_F_kernel_uname /usr/src/linux + make -C $Fdestdir/usr/src/linux-$_F_kernel_ver$_F_kernel_uname scripts || Fdie + make -C $Fdestdir/usr/src/linux-$_F_kernel_ver$_F_kernel_uname prepare || Fdie + Fsplit kernel$_F_kernel_name-source usr/src + + if [ -z "$_F_kernel_name" ]; then + make INSTALL_HDR_PATH=$Fdestdir/usr headers_install || Fdie + [ -e $Fdestdir/usr/include/scsi ] && Frm /usr/include/scsi + [ -e $Fdestdir/usr/include/drm ] && Frm /usr/include/drm + Fsplit kernel-headers /usr + fi + + ## now time to eat some cookies and wait the kernel got compiled :) + ## use verbose by default, we want to know what is going on... + make $MAKEFLAGS V=1 || Fdie + + if [ "$CARCH" = "arm" ]; then + make uImage || Fdie + fi + + Fmkdir /boot + Ffilerel .config /boot/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 + else + if [ "$CARCH" = "arm" ]; then + Ffilerel arch/arm/boot/zImage /boot/$_F_kernel_path-$_F_kernel_ver$_F_kernel_uname + Ffilerel arch/arm/boot/uImage /boot/uImage + else + Ffilerel arch/x86/boot/bzImage /boot/$_F_kernel_path-$_F_kernel_ver$_F_kernel_uname + fi + 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 + Fmkdir /lib/{modules,firmware} + #unset MAKEFLAGS + 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 /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 + + Fln /usr/src/linux-$_F_kernel_ver$_F_kernel_uname /lib/modules/$_F_kernel_ver$_F_kernel_uname/build + Fln /usr/src/linux-$_F_kernel_ver$_F_kernel_uname /lib/modules/$_F_kernel_ver$_F_kernel_uname/source + + Fexec /sbin/depmod -a -b $Fdestdir $_F_kernel_ver$_F_kernel_uname || Fdie + # build cpupower cd tools/power/cpupower diff --git a/source/include/kernel.sh b/source/include/kernel.sh index 99d66fe..0000745 100644 --- a/source/include/kernel.sh +++ b/source/include/kernel.sh @@ -112,120 +112,6 @@ else fi ### -# == PROVIDED FUNCTIONS -# * Fbuildkernel() -### -Fbuildkernel() -{ - - Fcd - make clean || Fdie - if [ -e "$Fsrcdir/config.$CARCH" ]; then - cp $Fsrcdir/config.$CARCH .config || Fdie - else - cp $Fsrcdir/config .config || Fdie - fi - - # not using Fpatchall here since not applying the patches from - # _F_kernel_patches() having the wrong extension would be stange :) - for i in "${_F_kernel_patches[@]}" - do - Fpatch `strip_url $i` - done - - if [ -z "$_F_kernel_name" -a $_F_kernel_dontfakeversion -eq 0 ]; then - # stock kernel, nobody interested in the buildsystem's detail - export KBUILD_BUILD_USER="fst" - export KBUILD_BUILD_HOST="`uname -m`.frugalware.org" - fi - - # remove unneded localversions - rm -f localversion-* - rm -f ../*.{gz,bz2,sign} - yes "" | make config - - if [ $_F_kernel_dontfakeversion -eq 0 ]; then - if [ "${_F_kernel_ver#*.*.}" = "$_F_kernel_ver" ]; then - # If patten match fails, sublevel version is missing - Fsed "SUBLEVEL =.*" "SUBLEVEL =" Makefile - else - Fsed "SUBLEVEL =.*" "SUBLEVEL = ${_F_kernel_ver#*.*.}" Makefile - fi - Fsed "EXTRAVERSION =.*" "EXTRAVERSION = $_F_kernel_uname" Makefile - else - make include/config/kernel.release - unset _F_kernel_ver - _F_kernel_uname=$(cat include/config/kernel.release) - fi - - # Force kernel firmware to be installed in kernel specific path. - Fsed 'INSTALL_FW_PATH=.*' 'INSTALL_FW_PATH=$(INSTALL_MOD_PATH)/lib/firmware/$(KERNELRELEASE)' Makefile - - ## let we do kernel$_F_kernel_name-source before make - Fmkdir /usr/src - cp -Ra $Fsrcdir/linux-$_F_kernelver_ver $Fdestdir/usr/src/linux-$_F_kernel_ver$_F_kernel_uname || Fdie - rm -rf $Fdestdir/usr/src/linux-$_F_kernel_ver$_F_kernel_uname/{.git,.gitignore,.config.old,Documentation,COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} || Fdie - Fln linux-$_F_kernel_ver$_F_kernel_uname /usr/src/linux - make -C $Fdestdir/usr/src/linux-$_F_kernel_ver$_F_kernel_uname scripts || Fdie - make -C $Fdestdir/usr/src/linux-$_F_kernel_ver$_F_kernel_uname prepare || Fdie - Fsplit kernel$_F_kernel_name-source usr/src - - ## now the kernel$_F_kernel_name-docs - Fmkdir /usr/src/linux-$_F_kernel_ver$_F_kernel_uname - cp -Ra $Fsrcdir/linux-$_F_kernelver_ver/{Documentation,COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} \ - $Fdestdir/usr/src/linux-$_F_kernel_ver$_F_kernel_uname || Fdie - ## do we need to ln /usr/share/doc ?! - Fsplit kernel$_F_kernel_name-docs usr/src - - if [ -z "$_F_kernel_name" ]; then - make INSTALL_HDR_PATH=$Fdestdir/usr headers_install || Fdie - [ -e $Fdestdir/usr/include/scsi ] && Frm /usr/include/scsi - [ -e $Fdestdir/usr/include/drm ] && Frm /usr/include/drm - Fsplit kernel-headers /usr - fi - - ## now time to eat some cookies and wait the kernel got compiled :) - ## use verbose by default, we want to know what is going on... - make $MAKEFLAGS V=1 || Fdie - - if [ "$CARCH" = "arm" ]; then - make uImage || Fdie - fi - - Fmkdir /boot - Ffilerel .config /boot/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 - else - if [ "$CARCH" = "arm" ]; then - Ffilerel arch/arm/boot/zImage /boot/$_F_kernel_path-$_F_kernel_ver$_F_kernel_uname - Ffilerel arch/arm/boot/uImage /boot/uImage - else - Ffilerel arch/x86/boot/bzImage /boot/$_F_kernel_path-$_F_kernel_ver$_F_kernel_uname - fi - 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 - Fmkdir /lib/{modules,firmware} - #unset MAKEFLAGS - 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 /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 - - Fln /usr/src/linux-$_F_kernel_ver$_F_kernel_uname \ - /lib/modules/$_F_kernel_ver$_F_kernel_uname/build - Fln /usr/src/linux-$_F_kernel_ver$_F_kernel_uname \ - /lib/modules/$_F_kernel_ver$_F_kernel_uname/source - - Fexec /sbin/depmod -a -b $Fdestdir $_F_kernel_ver$_F_kernel_uname || Fdie -} - -### # * Fkernel_genscriptlet_hook() ### Fkernel_genscriptlet_hook() @@ -237,10 +123,3 @@ Fkernel_genscriptlet_hook() Freplace '_F_kernel_ver' "$1" } -### -# * build() just calls Fbuildkernel() -### -build() -{ - Fbuildkernel -} _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
