Magellan Linux

  • Back to homepage
    • /[smage]/branches/R11-unstable/include/kernel.sminc

    Diff of /branches/R11-unstable/include/kernel.sminc

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

    revision 11369 by niro, Sun Mar 4 14:16:15 2012 UTC revision 13880 by niro, Mon Oct 29 07:51:50 2012 UTC
    # Line 133  kernel_src_prepare() Line 133  kernel_src_prepare()
    133   if [[ ${PVER%%.*} -gt 2 ]]   if [[ ${PVER%%.*} -gt 2 ]]
    134   then   then
    135   local sublevel="$(echo ${PVER} | cut -d. -f3)"   local sublevel="$(echo ${PVER} | cut -d. -f3)"
    136   sed -i "s:^\(SUBLEVEL =\).*:\1 ${sublevel}:" Makefile || die   sed -i "s:^\(SUBLEVEL =\).*:\1 ${sublevel}:" Makefile || die
    137   fi   fi
    138  }  }
    139    
    # Line 192  kernel_image_src_install() Line 192  kernel_image_src_install()
    192   minstalldir /boot || die   minstalldir /boot || die
    193    
    194   # install modules   # install modules
    195   make ARCH=${ARCH/i*86/x86} INSTALL_MOD_PATH=${BINDIR} modules_install || die   make ARCH=${ARCH/i*86/x86} INSTALL_MOD_PATH=${BINDIR}/usr modules_install || die
    196    
    197   # install kernelimage   # install kernelimage
    198   if [[ -z ${KERNEL_IMAGE_PATH} ]]   if [[ -z ${KERNEL_IMAGE_PATH} ]]
    # Line 236  KRNINITRD= Line 236  KRNINITRD=
    236   || die   || die
    237    
    238   # fix build symlink   # fix build symlink
    239   if [ -L ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build ]   if [ -L ${BINDIR}/usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build ]
    240   then   then
    241   echo "fixing build symlink"   echo "fixing build symlink"
    242   rm ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build || die   rm ${BINDIR}/usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build || die
    243   mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \   mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \
    244   /lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build \   /usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build \
    245   || die   || die
    246   fi   fi
    247    
    248   # and fixing source symlink   # and fixing source symlink
    249   if [ -L ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source ]   if [ -L ${BINDIR}/usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source ]
    250   then   then
    251   echo "fixing source symlink"   echo "fixing source symlink"
    252   rm ${BINDIR}/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source || die   rm ${BINDIR}/usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source || die
    253   mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \   mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \
    254   /lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source \   /usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source \
    255   || die   || die
    256   fi   fi
    257    
    258   # remove firmware bits if $LINUX_FIRMWARE was set   # remove firmware bits if $LINUX_FIRMWARE was set
    259   if [[ ! -z ${LINUX_FIRMWARE} ]] && [[ ${LINUX_FIRMWARE} != internal ]]   if [[ ! -z ${LINUX_FIRMWARE} ]] && [[ ${LINUX_FIRMWARE} != internal ]]
    260   then   then
    261   if [[ -d ${BINDIR}/lib/firmware ]]   if [[ -d ${BINDIR}/usr/lib/firmware ]]
    262   then   then
    263   rm -rv ${BINDIR}/lib/firmware   rm -rv ${BINDIR}/usr/lib/firmware
    264   fi   fi
    265   fi   fi
    266    
    # Line 399  kernel_image_postremove() Line 399  kernel_image_postremove()
    399   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
    400   then   then
    401   # remove old image entry from grub   # remove old image entry from grub
    402   new-kernel-pkg -v --rminitrd --remove ${KPVER}-${KBRANCH}-${KPBUILD}   new-kernel-pkg -v --rminitrd --rmmoddep --remove ${KPVER}-${KBRANCH}-${KPBUILD}
    403   fi   fi
    404  }  }
    405    
    Legend:
    Removed from v.11369  
    changed lines
      Added in v.13880