Magellan Linux

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

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

revision 7958 by niro, Sun Jun 5 11:41:17 2011 UTC revision 7959 by niro, Sun Jun 5 22:09:30 2011 UTC
# Line 25  fi Line 25  fi
25  # remove included firmware bits if requested  # remove included firmware bits if requested
26  # set the version here like USE_LINUX_FIRMARE="20110605"  # set the version here like USE_LINUX_FIRMARE="20110605"
27  # version "internal" keeps the bits too  # version "internal" keeps the bits too
28  if [[ ! -z ${LINUX_FIRMWARE}  ]] || [[ ${LINUX_FIRMWARE} != internal ]]  if [[ ! -z ${LINUX_FIRMWARE}  ]] && [[ ${LINUX_FIRMWARE} != internal ]]
29  then  then
30   DEPEND="${DEPEND}   DEPEND="${DEPEND}
31   >= sys-kernel/linux-firmware-${LINUX_FIRMWARE}"   >= sys-kernel/linux-firmware-${LINUX_FIRMWARE}"
# Line 177  KRNINITRD= Line 177  KRNINITRD=
177   fi   fi
178    
179   # remove firmware bits if $LINUX_FIRMWARE was set   # remove firmware bits if $LINUX_FIRMWARE was set
180   if [[ ! -z ${LINUX_FIRMWARE} ]] || [[ ${LINUX_FIRMWARE} != internal ]]   if [[ ! -z ${LINUX_FIRMWARE} ]] && [[ ${LINUX_FIRMWARE} != internal ]]
181   then   then
182   if [[ -d ${BINDIR}/lib/firmware ]]   if [[ -d ${BINDIR}/lib/firmware ]]
183   then   then

Legend:
Removed from v.7958  
changed lines
  Added in v.7959