Magellan Linux

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 18717 by niro, Wed Aug 14 10:47:24 2013 UTC
# Line 113  KPBUILD="${PBUILD}" Line 113  KPBUILD="${PBUILD}"
113  KBRANCH="${BRANCH}"  KBRANCH="${BRANCH}"
114  SPECIAL_VARS="${SPECIAL_VARS} KPVER KPBUILD KBRANCH"  SPECIAL_VARS="${SPECIAL_VARS} KPVER KPBUILD KBRANCH"
115    
116    # dummy function to apply kernel patches
117    kernel_apply_patches()
118    {
119     return 0
120    }
121    
122  kernel_src_prepare()  kernel_src_prepare()
123  {  {
124   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
# Line 123  kernel_src_prepare() Line 129  kernel_src_prepare()
129   chmod -R a+r-w+X,u+w ${SRCDIR} || die   chmod -R a+r-w+X,u+w ${SRCDIR} || die
130    
131   cd ${SRCDIR}   cd ${SRCDIR}
132     kernel_apply_patches || die
133    
134   # fixes INSTALL_PATH to /boot and EXTRAVERSION   # fixes INSTALL_PATH to /boot and EXTRAVERSION
135   sed -i -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \   sed -i -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
# Line 133  kernel_src_prepare() Line 140  kernel_src_prepare()
140   if [[ ${PVER%%.*} -gt 2 ]]   if [[ ${PVER%%.*} -gt 2 ]]
141   then   then
142   local sublevel="$(echo ${PVER} | cut -d. -f3)"   local sublevel="$(echo ${PVER} | cut -d. -f3)"
143   sed -i "s:^\(SUBLEVEL =\).*:\1 ${sublevel}:" Makefile || die   sed -i "s:^\(SUBLEVEL =\).*:\1 ${sublevel}:" Makefile || die
144   fi   fi
145  }  }
146    
# Line 192  kernel_image_src_install() Line 199  kernel_image_src_install()
199   minstalldir /boot || die   minstalldir /boot || die
200    
201   # install modules   # install modules
202   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
203    
204   # install kernelimage   # install kernelimage
205   if [[ -z ${KERNEL_IMAGE_PATH} ]]   if [[ -z ${KERNEL_IMAGE_PATH} ]]
# Line 236  KRNINITRD= Line 243  KRNINITRD=
243   || die   || die
244    
245   # fix build symlink   # fix build symlink
246   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 ]
247   then   then
248   echo "fixing build symlink"   echo "fixing build symlink"
249   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
250   mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \   mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \
251   /lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build \   /usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/build \
252   || die   || die
253   fi   fi
254    
255   # and fixing source symlink   # and fixing source symlink
256   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 ]
257   then   then
258   echo "fixing source symlink"   echo "fixing source symlink"
259   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
260   mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \   mlink /usr/src/linux-${PVER}-${BRANCH}-${PBUILD} \
261   /lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source \   /usr/lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source \
262   || die   || die
263   fi   fi
264    
265   # remove firmware bits if $LINUX_FIRMWARE was set   # remove firmware bits if $LINUX_FIRMWARE was set
266   if [[ ! -z ${LINUX_FIRMWARE} ]] && [[ ${LINUX_FIRMWARE} != internal ]]   if [[ ! -z ${LINUX_FIRMWARE} ]] && [[ ${LINUX_FIRMWARE} != internal ]]
267   then   then
268   if [[ -d ${BINDIR}/lib/firmware ]]   if [[ -d ${BINDIR}/usr/lib/firmware ]]
269   then   then
270   rm -rv ${BINDIR}/lib/firmware   rm -rv ${BINDIR}/usr/lib/firmware
271   fi   fi
272   fi   fi
273    
# Line 399  kernel_image_postremove() Line 406  kernel_image_postremove()
406   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
407   then   then
408   # remove old image entry from grub   # remove old image entry from grub
409   new-kernel-pkg -v --rminitrd --remove ${KPVER}-${KBRANCH}-${KPBUILD}   new-kernel-pkg -v --rminitrd --rmmoddep --remove ${KPVER}-${KBRANCH}-${KPBUILD}
410   fi   fi
411  }  }
412    

Legend:
Removed from v.11369  
changed lines
  Added in v.18717