Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=23fc4237e4ce91da0fe732c08980428e33c114d2
commit 23fc4237e4ce91da0fe732c08980428e33c114d2 Author: crazy <[email protected]> Date: Mon Feb 29 03:34:27 2016 +0100 kernel-4.4.3-1-x86_64 * change =("${foo[@]}" '') to += style * added and local alias for $_F_kernel_ver$_F_kernel_uname way to long name .. right now $_kernel ( feel free to change ) * s/$foo/${foo}/ diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index c740fee..9270cfe 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -100,7 +100,7 @@ subbackup+=('') subinstall+=('') suboptions+=('nodocs') -if [ -z "$_F_kernel_name" ]; then +if [ -z "${_F_kernel_name}" ]; then subpkgs+=('kernel-headers') subrodepends+=('') subgroups+=('devel devel-core') @@ -121,8 +121,8 @@ build() Fcd make clean || Fdie - if [ -e "$Fsrcdir/config.$CARCH" ]; then - cp $Fsrcdir/config.$CARCH .config || Fdie + if [ -e "${Fsrcdir}/config.${CARCH}" ]; then + cp ${Fsrcdir}/config.${CARCH} .config || Fdie else Fmessage "Cannot find a valid config.." exit 1 @@ -134,10 +134,10 @@ build() for i in "${_F_kernel_patches[@]}" do - Fpatch `strip_url $i` + Fpatch `strip_url ${i}` done - if [ -z "$_F_kernel_name" -a $_F_kernel_dontfakeversion -eq 0 ]; then + 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" @@ -149,8 +149,8 @@ build() yes "" | make config - if [ $_F_kernel_dontfakeversion -eq 0 ]; then - if [ "${_F_kernel_ver#*.*.}" = "$_F_kernel_ver" ]; then + 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 @@ -168,17 +168,20 @@ build() ## 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 -rfv $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 + + ## OK ok .. why to log names .. + local _kernel="$_F_kernel_ver$_F_kernel_uname" + cp -Ra ${Fsrcdir}/linux-${_F_kernelver_ver} ${Fdestdir}/usr/src/linux-${_kernel} || Fdie + rm -rfv ${Fdestdir}/usr/src/linux-${_kernel}/{.git,.gitignore,.config.old,Documentation,COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} || Fdie + Fln linux-${_kernel} /usr/src/linux + make -C ${Fdestdir}/usr/src/linux-${_kernel} scripts || Fdie + make -C ${Fdestdir}/usr/src/linux-${_kernel} 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 @@ -192,34 +195,34 @@ build() Fmkdir /boot Fmkdir /lib/{modules,firmware} - 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 + Ffilerel .config /boot/config-${_kernel} + if [ ! -z "${_F_kernel_vmlinuz}" ]; then + Ffilerel ${_F_kernel_vmlinuz} /boot/${_F_kernel_path}-${_kernel} else - if [ "$CARCH" = "arm" ]; then - Ffilerel arch/arm/boot/zImage /boot/$_F_kernel_path-$_F_kernel_ver$_F_kernel_uname + if [ "${CARCH}" = "arm" ]; then + Ffilerel arch/arm/boot/zImage /boot/${_F_kernel_path}-${_kernel} Ffilerel arch/arm/boot/uImage /boot/uImage else - Ffilerel arch/x86/boot/bzImage /boot/$_F_kernel_path-$_F_kernel_ver$_F_kernel_uname + Ffilerel arch/x86/boot/bzImage /boot/${_F_kernel_path}-${_kernel} 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 + Fln config-${_kernel} /boot/config + Fln System.map-${_kernel} /boot/System.map + Fln ${_F_kernel_path}-${_kernel} /boot/${_F_kernel_path} - make INSTALL_MOD_PATH=$Fdestdir $MAKEFLAGS modules_install || Fdie + 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 + Ffilerel System.map /boot/System.map-${_kernel} + Ffilerel /usr/src/linux-${_kernel}/Module.symvers + Frm /lib/modules/${_kernel}/build + Frm /lib/modules/${_kernel}/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 + Fln /usr/src/linux-${_kernel} /lib/modules/${_kernel}/build + Fln /usr/src/linux-${_kernel} /lib/modules/${_kernel}/source - Fexec /sbin/depmod -a -b $Fdestdir $_F_kernel_ver$_F_kernel_uname || Fdie + Fexec /sbin/depmod -a -b ${Fdestdir} ${_kernel} || Fdie # build cpupower diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index 50f1b49..c833485 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -23,7 +23,7 @@ _F_kernelver_rel=1 # == APPENDED VALUES # _F_genscriptlet_hooks: appends Fkernelver_genscriptlet_hook. ### -_F_genscriptlet_hooks=("${_F_genscriptlet_hooks[@]}" 'Fkernelver_genscriptlet_hook') +_F_genscriptlet_hooks+=('Fkernelver_genscriptlet_hook') ### # == PROVIDED FUNCTIONS @@ -39,8 +39,8 @@ Fkernelver_genscriptlet_hook() Fkernelver_compress_modules() { local _directory - _directory="$Fdestdir/lib/modules/${_F_kernelver_ver}${_F_kernel_name}-fw$_F_kernelver_rel/kernel" + _directory="$Fdestdir/lib/modules/${_F_kernelver_ver}${_F_kernel_name}-fw${_F_kernelver_rel}/kernel" Fexec find $_directory -name "*.ko" -exec xz '{}' \; || Fdie } -makedepends=("${makedepends[@]}" 'ca-certificates') \ No newline at end of file +makedepends+=('ca-certificates') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
