Magellan Linux

  • Back to homepage
    • /[magellan-source]/tags/grubby-8_36/new-kernel-pkg

    Diff of /tags/grubby-8_36/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 1848 by niro, Mon Jul 2 13:07:56 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"}
    # Line 126  then Line 125  then
    125   mounted=""   mounted=""
    126   liloFlag=""   liloFlag=""
    127   isx86=""   isx86=""
    128   if [[ ${machine} == "OMAP3 Beagle Board" ]] || [[ ${machine} == "OMAP4 Panda board" ]]   if [[ -z ${UBOOT_IMGADDR} ]]
    129   then   then
    130   ubootAddress=0x80008000   machine=${MACHINE:-$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')}
    131     # A few machines use an alternate kernel load address
    132     if [[ "${machine}" =~ ^OMAP[3|4].* ]]
    133     then
    134     ubootAddress=0x80008000
    135     elif [[ "${machine}" =~ ^Efika\ MX.* ]]
    136     then
    137     ubootAddress=0x90008000
    138     else
    139     ubootAddress=0x00008000
    140     fi
    141   else   else
    142   ubootAddress=0x00008000   ubootAddress="${UBOOT_IMGADDR}"
    143   fi   fi
    144  else  else
    145   # this leaves i?86 and x86_64   # this leaves i?86 and x86_64
    # Line 406  remove() Line 415  remove()
    415   then   then
    416   tmpKList=$(mktemp ${ubootDir}/${ubootKList}.XXXX)   tmpKList=$(mktemp ${ubootDir}/${ubootKList}.XXXX)
    417   curversion=$(tail -n1 ${ubootDir}/${ubootKList})   curversion=$(tail -n1 ${ubootDir}/${ubootKList})
    418   sed "/${version}/d" ${ubootDir}/${ubootKList} > ${tmpKList}   sed "/$version$/d" ${ubootDir}/${ubootKList} > ${tmpKList}
    419   newversion=$(tail -n1 ${tmpKList})   newversion=$(tail -n1 ${tmpKList})
    420   if [ -f ${ubootDir}/uImage-${newversion} ] && [ -f ${ubootDir}/uInitrd-${newversion} ]   if [ -f ${ubootDir}/uImage-${newversion} ] && [ -f ${ubootDir}/uInitrd-${newversion} ]
    421   then   then
    Legend:
    Removed from v.1803  
    changed lines
      Added in v.1848