/[magellan-source]/tags/grubby-8_40_20170706/new-kernel-pkg

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

Parent Directory | Revision Log | View Patch Patch

-revision 2961 by niro,
Wed Jun 29 14:39:19 2016 UTC
+revision 2993 by niro,
Thu Jun 30 10:35:55 2016 UTC
 Line 155 
 mbkernel="${HYPERVISOR}"
  mbargs="${HYPERVISOR_ARGS}"
  adddracutargs=""
  addplymouthinitrd=""
- DEBUGARG="systemd.debug"
+ DEBUGARG="systemd.log_level=debug systemd.log_target=kmsg"
  usage()
  {
 Line 165 
 usage()
  	echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2
  	echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2
  	echo "       [--add-plymouth-initrd]" >&2
- 	echo "       [--host-only] [--devtree=<devicetree.dtb>]" >&2
+ 	echo "       [--host-only] [--devtree=<devicetree.dtb>] [--devtreedir=</devicetree/path/>]" >&2
  	echo "       <--install | --remove | --update> <kernel-version>" >&2
  	echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2
  	exit 1
 Line 177 
 rungrubby()
  	then
  		[[ ${MAKEDEBUG} != yes ]] && return 0
  		[[ -n ${verbose} ]] && echo "- First, making a debug entry."
- 		declare -x debugtitle=" with debugging"
+ 		if [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
+ 		then
+ 			declare -x debugtitle="_with_debugging"
+ 		else
+ 			declare -x debugtitle=" with debugging"
+ 		fi
  		declare -x debugargs="${DEBUGARG}"
  		shift
  	else
-Line 236 
 install()
+Line 241 
 install()
  	fi
  	DEVTREE=""
- 	if [[ x${devtreefile} != x ]] && [ -f "${devtreefile}" ]
+ 	if [[ -n ${devtreefile} ]] && [ -f ${devtreefile} ]
  	then
  		[[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"
  		DEVTREE="--devtree ${devtreefile}"
  	fi
+ 	DEVTREEDIR=""
+ 	if [[ -n ${devtreedir} ]] && [ -d ${devtreedir} ]
+ 	then
+ 		[ -n ${verbose} ] && echo "found ${devtreedir} and using it with grubby"
+ 		DEVTREEDIR="--devtreedir ${devtreedir}"
+ 	fi
  	# FIXME: is this a good heuristic to find out if we're on iSeries?
  	if [ -d /proc/iSeries ]
  	then
-Line 352 
 install()
+Line 364 
 install()
  		[[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
  		ARGS="--extlinux -c ${extlinuxConfig} --add-kernel=${kernelImage} \
+ 			${DEVTREEDIR} ${DEVTREE} \
  			${INITRD} --copy-default --title \"${title}\${debugtitle}\" \
  			${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
  			${mbargs:+--mbargs=\"${mbargs}\"} \
-Line 505 
 update()
+Line 518 
 update()
  		fi
  	fi
+ 	DEVTREE=""
+ 	if [[ -n ${devtreefile} ]] && [ -f ${devtreefile} ]
+ 	then
+ 		[[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"
+ 		DEVTREE="--devtree ${devtreefile}"
+ 	fi
+ 	DEVTREEDIR=""
+ 	if [[ -n ${devtreedir} ]] && [ -d ${devtreedir} ]
+ 	then
+ 		[[ -n ${verbose} ]] && echo "found ${devtreedir} and using it with grubby"
+ 		DEVTREEDIR="--devtreedir ${devtreedir}"
+ 	fi
  	if [[ -n ${cfgGrub} ]]
  	then
  		[[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
-Line 607 
 update()
+Line 634 
 update()
  	then
  		[[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
  		ARGS="--extlinux -c ${extlinuxConfig} --update-kernel=${kernelImage} \
- 			${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
+ 			${DEVTREE} ${DEVTREEDIR} ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
  			${removeargs:+--remove-args=\"${removeargs}\"} \
  			--title=\"${title}\${debugtitle}\""
  		rungrubby --debug ${ARGS}
-Line 657 
 doRmmoddep()
+Line 684 
 doRmmoddep()
  	fi
  }
+ # kernel image for 2.4 is kernel
+ if [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]
+ then
+ 	if [[ ${kernelmajor} = 2.4 ]]
+ 	then
+ 		kernelName=kernel
+ 	fi
+ fi
  while [ $# -gt 0 ]
  do
-Line 679 
 do
+Line 714 
 do
  			fi
  			;;
+ 		--devtreedir*)
+ 			if [[ $1 == --devtreedir\=* ]]
+ 			then
+ 				devtreedir=${1#--devtreedir=}
+ 			else
+ 				devtreedir=$2
+ 				shift
+ 			fi
+ 			;;
  		--dracut)
  			dracut=--dracut
  			;;
-Line 794 
 do
+Line 839 
 do
  			fi
  			;;
+ 		--kernel-name*)
+ 			if [[ $1 == --kernel-name\=* ]]
+ 			then
+ 				kernelName=${1#--kernel-name=}
+ 			else
+ 				kernelName="$2"
+ 				shift
+ 			fi
+ 			;;
  		-v)
  			verbose=-v
  			;;
-Line 832 
 fi
+Line 887 
 fi
  kernelmajor=$(echo ${kernel} | cut -d . -f 1,2)
- # kernel image for 2.4 is kernel
- if [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]
- then
- 	if [[ ${kernelmajor} = 2.4 ]]
- 	then
- 		kernelName=kernel
- 	fi
- fi
  [[ ${kernelImage} ]] || kernelImage="${bootPrefix}/${kernelName}-${version}"
  # set the initrd file based on arch; ia64 is the only currently known oddball
-Line 861 
 then
+Line 907 
 then
  fi
  [[ -n ${verbose} ]] && echo "initrdfile is ${initrdfile}"
+ if [[ ${ARCH} =~ armv[5|7].*l ]]
+ then
+ 	if [[ -z ${SHIPSDTB} ]] || [[ ${SHIPSDTB} != yes ]]
+ 	then
+ 		if [[ -n ${dtbfile} ]] && [ -f ${bootPrefix}/dtb-${version}/${dtbfile} ]
+ 		then
+ 			devtreefile="${bootPrefix}/dtb-${version}/${dtbfile}"
+ 			[[ -n ${verbose} ]] && echo "devtreefile is ${devtreefile}"
+ 		elif [ -d ${bootPrefix}/dtb-${version}/ ]
+ 		then
+ 			devtreedir="${bootPrefix}/dtb-${version}/"
+ 			[[ -n ${verbose} ]] && echo "devtreedir is ${devtreedir}"
+ 		fi
+ 	fi
+ fi
+ [[ -n ${verbose} ]] && echo "devtreedir is ${devtreedir}"
  # add dracut i18n, keyboard and plymouth kernel args if requested
  if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]
  then
-Line 907 
 then
+Line 970 
 then
  fi
  # set this as the default if we have the package and it matches
- if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] &&
+ if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] && [[ -n ${DEFAULTKERNEL} ]]
- 	[[ -n ${DEFAULTKERNEL} ]] && [[ ${package} = ${DEFAULTKERNEL} ]]
  then
- 	makedefault="--make-default"
+ 	if [[ ${package} = ${DEFAULTKERNEL} ]] || [[ ${package}-core = ${DEFAULTKERNEL} ]]
- 	[[ -n ${verbose} ]] && echo "making it the default based on config"
+ 	then
+ 		makedefault="--make-default"
+ 		[[ -n ${verbose} ]] && echo "making it the default based on config"
+ 	fi
  fi
  if [[ ${moddep} = make ]]

 Legend:



Removed from v.2961
 


changed lines


 
Added in v.2993
 Legend:



Removed from v.2961
 


changed lines


 
Added in v.2993
-Removed from v.2961
+Added in v.2993