Magellan Linux

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

    Diff of /tags/grubby-8_40_20170706/new-kernel-pkg

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

    revision 2971 by niro, Thu Jun 30 10:06:57 2016 UTC revision 2973 by niro, Thu Jun 30 10:22:14 2016 UTC
    # Line 165  usage() Line 165  usage()
    165   echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2   echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2
    166   echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2   echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2
    167   echo "       [--add-plymouth-initrd]" >&2   echo "       [--add-plymouth-initrd]" >&2
    168   echo "       [--host-only] [--devtree=<devicetree.dtb>]" >&2   echo "       [--host-only] [--devtree=<devicetree.dtb>] [--devtreedir=</devicetree/path/>]" >&2
    169   echo "       <--install | --remove | --update> <kernel-version>" >&2   echo "       <--install | --remove | --update> <kernel-version>" >&2
    170   echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2   echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2
    171   exit 1   exit 1
    # Line 236  install() Line 236  install()
    236   fi   fi
    237    
    238   DEVTREE=""   DEVTREE=""
    239   if [[ x${devtreefile} != x ]] && [ -f "${devtreefile}" ]   if [[ -n ${devtreefile} ]] && [ -f ${devtreefile} ]
    240   then   then
    241   [[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"   [[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"
    242   DEVTREE="--devtree ${devtreefile}"   DEVTREE="--devtree ${devtreefile}"
    243   fi   fi
    244    
    245     DEVTREEDIR=""
    246     if [[ -n ${devtreedir} ]] && [ -d ${devtreedir} ]
    247     then
    248     [ -n ${verbose} ] && echo "found ${devtreedir} and using it with grubby"
    249     DEVTREEDIR="--devtreedir ${devtreedir}"
    250     fi
    251    
    252   # FIXME: is this a good heuristic to find out if we're on iSeries?   # FIXME: is this a good heuristic to find out if we're on iSeries?
    253   if [ -d /proc/iSeries ]   if [ -d /proc/iSeries ]
    254   then   then
    # Line 352  install() Line 359  install()
    359   [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
    360    
    361   ARGS="--extlinux -c ${extlinuxConfig} --add-kernel=${kernelImage} \   ARGS="--extlinux -c ${extlinuxConfig} --add-kernel=${kernelImage} \
    362   ${DEVTREE} ${INITRD} --copy-default --title \"${title}\${debugtitle}\" \   ${DEVTREEDIR} ${DEVTREE} \
    363     ${INITRD} --copy-default --title \"${title}\${debugtitle}\" \
    364   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
    365   ${mbargs:+--mbargs=\"${mbargs}\"} \   ${mbargs:+--mbargs=\"${mbargs}\"} \
    366   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    # Line 506  update() Line 514  update()
    514   fi   fi
    515    
    516   DEVTREE=""   DEVTREE=""
    517   if [[ x${devtreefile} != x ]] && [ -f ${devtreefile} ]   if [[ -n ${devtreefile} ]] && [ -f ${devtreefile} ]
    518   then   then
    519   [[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"   [[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"
    520   DEVTREE="--devtree ${devtreefile}"   DEVTREE="--devtree ${devtreefile}"
    521   fi   fi
    522    
    523     DEVTREEDIR=""
    524     if [[ -n ${devtreedir} ]] && [ -d ${devtreedir} ]
    525     then
    526     [[ -n ${verbose} ]] && echo "found ${devtreedir} and using it with grubby"
    527     DEVTREEDIR="--devtreedir ${devtreedir}"
    528     fi
    529    
    530   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    531   then   then
    532   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
    # Line 614  update() Line 629  update()
    629   then   then
    630   [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
    631   ARGS="--extlinux -c ${extlinuxConfig} --update-kernel=${kernelImage} \   ARGS="--extlinux -c ${extlinuxConfig} --update-kernel=${kernelImage} \
    632   ${DEVTREE} ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \   ${DEVTREE} ${DEVTREEDIR} ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
    633   ${removeargs:+--remove-args=\"${removeargs}\"} \   ${removeargs:+--remove-args=\"${removeargs}\"} \
    634   --title=\"${title}\${debugtitle}\""   --title=\"${title}\${debugtitle}\""
    635   rungrubby --debug ${ARGS}   rungrubby --debug ${ARGS}
    # Line 694  do Line 709  do
    709   fi   fi
    710   ;;   ;;
    711    
    712     --devtreedir*)
    713     if [[ $1 == --devtreedir\=* ]]
    714     then
    715     devtreedir=${1#--devtreedir=}
    716     else
    717     devtreedir=$2
    718     shift
    719     fi
    720     ;;
    721    
    722   --dracut)   --dracut)
    723   dracut=--dracut   dracut=--dracut
    724   ;;   ;;
    # Line 879  fi Line 904  fi
    904    
    905  if [[ ${ARCH} =~ armv[5|7].*l ]]  if [[ ${ARCH} =~ armv[5|7].*l ]]
    906  then  then
    907   if [ -d ${bootPrefix}/dtb-${version}/ ]   if [[ -z ${SHIPSDTB} ]] || [[ ${SHIPSDTB} != yes ]]
    908   then   then
    909   devtreedir="${bootPrefix}/dtb-${version}/"   if [[ -n ${dtbfile} ]] && [ -f ${bootPrefix}/dtb-${version}/${dtbfile} ]
    910   if [[ -n ${dtbfile} ]] && [ -f ${devtreedir}/${dtbfile} ]   then
    911     devtreefile="${bootPrefix}/dtb-${version}/${dtbfile}"
    912     [[ -n ${verbose} ]] && echo "devtreefile is ${devtreefile}"
    913     elif [ -d ${bootPrefix}/dtb-${version}/ ]
    914   then   then
    915   devtreefile="${devtreedir}/${dtbfile}"   devtreedir="${bootPrefix}/dtb-${version}/"
    916     [[ -n ${verbose} ]] && echo "devtreedir is ${devtreedir}"
    917   fi   fi
    918   fi   fi
    919  fi  fi
    Legend:
    Removed from v.2971  
    changed lines
      Added in v.2973