Magellan Linux

Diff of /trunk/include/kernel.sminc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 18719 by niro, Wed Aug 14 10:58:50 2013 UTC revision 19654 by niro, Wed Oct 9 08:02:31 2013 UTC
# Line 17  Line 17 
17  #                        version "internal" keeps the bits too  #                        version "internal" keeps the bits too
18  #  #
19  #  ${INCLUDE_KERNELVERSION_FILE}: creates a /boot/kernelversion file (deprecated)  #  ${INCLUDE_KERNELVERSION_FILE}: creates a /boot/kernelversion file (deprecated)
20    #  ${USE_KERNEL_SYMLINKS}: creates symlinks to unversioned kernel image files
21    #   - kernel-x.x.x.x -> /boot/vmlinuz
22    #   - initrd-x.x.x.x -> /boot/initrd
23    #   - config-x.x.x.x -> /boot/config
24    #   - System.map-x.x.x.x -> /boot/System.map
25    
26  sminclude mtools  sminclude mtools
27    
# Line 114  KERNEL_CONFIG="${SOURCEDIR}/${PNAME}/con Line 119  KERNEL_CONFIG="${SOURCEDIR}/${PNAME}/con
119  KPVER="${PVER}"  KPVER="${PVER}"
120  KPBUILD="${PBUILD}"  KPBUILD="${PBUILD}"
121  KBRANCH="${BRANCH}"  KBRANCH="${BRANCH}"
122  SPECIAL_VARS="${SPECIAL_VARS} KPVER KPBUILD KBRANCH"  SPECIAL_VARS="${SPECIAL_VARS} KPVER KPBUILD KBRANCH USE_KERNEL_SYMLINKS"
123    
124  # dummy function to apply kernel patches  # dummy function to apply kernel patches
125  kernel_apply_patches()  kernel_apply_patches()
# Line 190  kernel_src_compile() Line 195  kernel_src_compile()
195    
196   # at least alsa-drivers needs this one ...   # at least alsa-drivers needs this one ...
197   touch include/linux/autoconf.h || die   touch include/linux/autoconf.h || die
198    
199     # compat symlink for 3.7.x new version.h location until everything is fixed
200   ;;   ;;
201   esac   esac
202  }  }
# Line 404  kernel_image_preremove() Line 411  kernel_image_preremove()
411   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
412   then   then
413   mount /boot &> /dev/null   mount /boot &> /dev/null
  fi  
 }  
414    
 kernel_image_postremove()  
 {  
  if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]  
  then  
415   # remove old image entry from grub   # remove old image entry from grub
416   new-kernel-pkg -v --rminitrd --rmmoddep --remove ${KPVER}-${KBRANCH}-${KPBUILD}   new-kernel-pkg -v --rminitrd --rmmoddep --remove ${KPVER}-${KBRANCH}-${KPBUILD}
417   fi   fi
# Line 435  kernel_image_postinstall() Line 436  kernel_image_postinstall()
436   new-kernel-pkg -v --mkinitrd --make-default --install ${KPVER}-${KBRANCH}-${KPBUILD}   new-kernel-pkg -v --mkinitrd --make-default --install ${KPVER}-${KBRANCH}-${KPBUILD}
437   fi   fi
438    
439   # symlink actual kernel to /boot/vmlinuz etc...   if [[ ${USE_KERNEL_SYMLINKS} = true ]]
440   ln -snf kernel-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/vmlinuz   then
441   ln -snf System.map-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/System.map   # symlink actual kernel to /boot/vmlinuz etc...
442   ln -snf config-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/config   ln -snf kernel-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/vmlinuz
443   [[ -f ${MROOT}/boot/initrd-${KPVER}-${KBRANCH}-${KPBUILD}.img ]] &&   ln -snf System.map-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/System.map
444   ln -snf initrd-${KPVER}-${KBRANCH}-${KPBUILD}.img ${MROOT}/boot/initrd   ln -snf config-${KPVER}-${KBRANCH}-${KPBUILD} ${MROOT}/boot/config
445     [[ -f ${MROOT}/boot/initrd-${KPVER}-${KBRANCH}-${KPBUILD}.img ]] &&
446     ln -snf initrd-${KPVER}-${KBRANCH}-${KPBUILD}.img ${MROOT}/boot/initrd
447     fi
448  }  }
449    
450  kernel_sources_postinstall()  kernel_sources_postinstall()
# Line 487  export_inherits kernel src_prepare src_c Line 491  export_inherits kernel src_prepare src_c
491  # export pre/postinstall functions depending on KERNEL_TYPE  # export pre/postinstall functions depending on KERNEL_TYPE
492  case ${KERNEL_TYPE} in  case ${KERNEL_TYPE} in
493   image)   image)
494   export_inherits kernel_image preinstall preremove postinstall postremove   export_inherits kernel_image preinstall preremove postinstall
495   SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} kernel_image_preinstall kernel_image_preremove kernel_image_postinstall kernel_image_postremove"   SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS} kernel_image_preinstall kernel_image_preremove kernel_image_postinstall"
496   ;;   ;;
497   sources)   sources)
498   export_inherits kernel_sources postinstall   export_inherits kernel_sources postinstall

Legend:
Removed from v.18719  
changed lines
  Added in v.19654