Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/grubby/new-kernel-pkg

    Diff of /trunk/grubby/new-kernel-pkg

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

    revision 1803 by niro, Mon Apr 16 17:51:27 2012 UTC revision 1940 by niro, Mon Oct 1 12:39:50 2012 UTC
    # Line 112  then Line 112  then
    112   lilo=/sbin/zipl   lilo=/sbin/zipl
    113   runLilo="yes"   runLilo="yes"
    114   isx86=""   isx86=""
    115  elif [[ ${ARCH} = armv7l ]] || [[ ${ARCH} = armv7hl ]] || [[ ${ARCH} = armv5tel ]]  elif [[ ${ARCH} =~ armv[5|7].*l ]]
    116  then  then
      machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')  
    117   liloConfig=""   liloConfig=""
    118   bootPrefix=/boot   bootPrefix=/boot
    119   ubootDir=${UBOOT_DIR:-"/boot/uboot"}   ubootDir=${UBOOT_DIR:-"/boot"}
    120   ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}   ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}
    121   ubootKList=${UBOOT_KLIST:-"klist.txt"}   ubootKList=${UBOOT_KLIST:-"klist.txt"}
    122   ubootDevice=/dev/${UBOOT_DEVICE:-"mmcblk0p1"}   ubootDevice=/dev/${UBOOT_DEVICE:-"mmcblk0p1"}
    123   ubootDefaultImage=${UBOOT_UIMAGE:-"uImage"}   ubootDefaultImage=${UBOOT_UIMAGE:-"uImage"}
    124   ubootDefaultInitrd=${UBOOT_UINITRD:-"uInitrd"}   ubootDefaultInitrd=${UBOOT_UINITRD:-"uInitrd"}
    125     ubootAddress=${UBOOT_IMGADDR:-"0x00008000"}
    126   mounted=""   mounted=""
    127   liloFlag=""   liloFlag=""
    128   isx86=""   isx86=""
      if [[ ${machine} == "OMAP3 Beagle Board" ]] || [[ ${machine} == "OMAP4 Panda board" ]]  
      then  
      ubootAddress=0x80008000  
      else  
      ubootAddress=0x00008000  
      fi  
    129  else  else
    130   # this leaves i?86 and x86_64   # this leaves i?86 and x86_64
    131   liloConfig=/etc/lilo.conf   liloConfig=/etc/lilo.conf
    # Line 284  install() Line 278  install()
    278   else   else
    279   title="Magellan Linux [ ${version} ]"   title="Magellan Linux [ ${version} ]"
    280   fi   fi
    281   ${grubby} --grub2 -c ${grub2EfiConfig} \   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \
    282   --add-kernel=${bootPrefix}/${kernelName}-${version} \   --add-kernel=${bootPrefix}/${kernelName}-${version} \
    283   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    284   ${mbkernel:+--add-multiboot="${mbkernel}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} \
    # Line 406  remove() Line 400  remove()
    400   then   then
    401   tmpKList=$(mktemp ${ubootDir}/${ubootKList}.XXXX)   tmpKList=$(mktemp ${ubootDir}/${ubootKList}.XXXX)
    402   curversion=$(tail -n1 ${ubootDir}/${ubootKList})   curversion=$(tail -n1 ${ubootDir}/${ubootKList})
    403   sed "/${version}/d" ${ubootDir}/${ubootKList} > ${tmpKList}   sed "/$version$/d" ${ubootDir}/${ubootKList} > ${tmpKList}
    404   newversion=$(tail -n1 ${tmpKList})   newversion=$(tail -n1 ${tmpKList})
    405   if [ -f ${ubootDir}/uImage-${newversion} ] && [ -f ${ubootDir}/uInitrd-${newversion} ]   if [ -f ${ubootDir}/uImage-${newversion} ] && [ -f ${ubootDir}/uInitrd-${newversion} ]
    406   then   then
    # Line 870  then Line 864  then
    864   fi   fi
    865  fi  fi
    866    
    867    # if we're using U-Boot, check if the default load address should change
    868    if [[ -n ${cfguBoot} ]] && [[ -z ${UBOOT_IMGADDR} ]]
    869    then
    870     [[ ${version}  =~ .([^.]*)$ ]]
    871     platform=${BASH_REMATCH[1]}
    872     # A few platforms use an alternate kernel load address
    873     if [[ ${platform} = omap ]]
    874     then
    875     ubootAddress=0x80008000
    876     elif [[ ${platform} = imx ]]
    877     then
    878     ubootAddress=0x90008000
    879     fi
    880    fi
    881    
    882  # if we have a lilo config on an x86 box, see if the default boot loader  # if we have a lilo config on an x86 box, see if the default boot loader
    883  # is lilo to determine if it should be run  # is lilo to determine if it should be run
    884  if [[ -n ${cfgLilo} ]] && [[ -n ${isx86} ]]  if [[ -n ${cfgLilo} ]] && [[ -n ${isx86} ]]
    Legend:
    Removed from v.1803  
    changed lines
      Added in v.1940