Magellan Linux

Diff of /branches/magellan-next/include/kernel26.sminc

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

revision 6659 by niro, Tue Sep 14 20:37:17 2010 UTC revision 7954 by niro, Sun Jun 5 11:41:17 2011 UTC
# Line 22  else Line 22  else
22   KERNEL_ARCH_EXTENSION=""   KERNEL_ARCH_EXTENSION=""
23  fi  fi
24    
25    # remove included firmware bits if requested
26    # set the version here like USE_LINUX_FIRMARE="20110605"
27    # version "internal" keeps the bits too
28    if [[ ! -z ${LINUX_FIRMWARE}  ]] || [[ ${LINUX_FIRMWARE} != internal ]]
29    then
30     DEPEND="${DEPEND}
31     >= sys-kernel/linux-firmware-${LINUX_FIRMWARE}"
32    fi
33    
34  # some sane defaults  # some sane defaults
35  : ${SRCFILE="linux-${PVER/${PSUBVER}/}.tar.bz2"}  : ${SRCFILE="linux-${PVER/${PSUBVER}/}.tar.bz2"}
36  : ${SRCDIR="${BUILDDIR}/linux-${PVER}-${BRANCH}-${PBUILD}"}  : ${SRCDIR="${BUILDDIR}/linux-${PVER}-${BRANCH}-${PBUILD}"}
# Line 166  KRNINITRD= Line 175  KRNINITRD=
175   /lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source \   /lib/modules/${PVER}-${BRANCH}-${PBUILD}${KERNEL_ARCH_EXTENSION}/source \
176   || die   || die
177   fi   fi
178    
179     # remove firmware bits if $LINUX_FIRMWARE was set
180     if [[ ! -z ${LINUX_FIRMWARE} ]] || [[ ${LINUX_FIRMWARE} != internal ]]
181     then
182     if [[ -d ${BINDIR}/lib/firmware ]]
183     then
184     rm -rv ${BINDIR}/lib/firmware
185     fi
186     fi
187  }  }
188    
189  kernel26_sources_src_install()  kernel26_sources_src_install()
# Line 280  kernel26_image_postremove() Line 298  kernel26_image_postremove()
298   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
299   then   then
300   # remove old image entry from grub   # remove old image entry from grub
301   new-kernel-pkg -v --remove ${KPVER}-${KBRANCH}-${KPBUILD}   new-kernel-pkg -v --rminitrd --remove ${KPVER}-${KBRANCH}-${KPBUILD}
302   fi   fi
303  }  }
304    
# Line 301  kernel26_image_postinstall() Line 319  kernel26_image_postinstall()
319   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]   if [[ -z ${MROOT} ]] || [[ ${MROOT} = / ]]
320   then   then
321   new-kernel-pkg -v --mkinitrd --make-default --install ${KPVER}-${KBRANCH}-${KPBUILD}   new-kernel-pkg -v --mkinitrd --make-default --install ${KPVER}-${KBRANCH}-${KPBUILD}
  # remove the current one  
  new-kernel-pkg -v --rminitrd --remove $(uname -r)  
322   fi   fi
323    
324   # symlink actual kernel to /boot/vmlinuz etc...   # symlink actual kernel to /boot/vmlinuz etc...

Legend:
Removed from v.6659  
changed lines
  Added in v.7954