--- trunk/grubby/new-kernel-pkg	2013/10/21 14:03:18	2259
+++ trunk/grubby/new-kernel-pkg	2016/06/30 10:06:57	2971
@@ -79,6 +79,7 @@
 grub2Config=""
 grub2EfiConfig=""
 extlinuxConfig=""
+ubootScript="/boot/boot.scr"
 
 ARCH=$(uname -m)
 
@@ -145,6 +146,7 @@
 dracut=""
 dracuthostonly=""
 initrdfile=""
+devtreefile=""
 moddep=""
 verbose=""
 makedefault=""
@@ -153,6 +155,7 @@
 mbargs="${HYPERVISOR_ARGS}"
 adddracutargs=""
 addplymouthinitrd=""
+DEBUGARG="systemd.debug"
 
 usage()
 {
@@ -162,12 +165,55 @@
 	echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2
 	echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2
 	echo "       [--add-plymouth-initrd]" >&2
-	echo "       [--host-only]" >&2
+	echo "       [--host-only] [--devtree=<devicetree.dtb>]" >&2
 	echo "       <--install | --remove | --update> <kernel-version>" >&2
 	echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2
 	exit 1
 }
 
+rungrubby()
+{
+	if [[ $1 == --debug ]]
+	then
+		[[ ${MAKEDEBUG} != yes ]] && return 0
+		[[ -n ${verbose} ]] && echo "- First, making a debug entry."
+		declare -x debugtitle=" with debugging"
+		declare -x debugargs="${DEBUGARG}"
+		shift
+	else
+		[[ -n ${verbose} ] && echo "- Making a normal entry."
+	fi
+	$(eval $grubby $@)
+	export -n debugargs
+	export -n debugtitle
+	unset debugargs
+	unset debugtitle
+}
+
+set_title()
+{
+	if [[ -n ${banner} ]]
+	then
+		if [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
+		then
+			title=$(echo ${banner} | sed 's/ /_/g')
+		else
+			title="${banner} [ ${version} ]"
+		fi
+	elif [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
+	then
+		title=$(echo ${version} | sed 's/ /_/g')
+	elif [ -f /etc/os-release ]
+	then
+		title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
+	elif [ -f /etc/mageversion ]
+	then
+		title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
+	else
+		title="Magellan Linux [ ${version} ]"
+	fi
+}
+
 install()
 {
 	# XXX kernel should be able to be specified also (or work right on ia64)
@@ -189,6 +235,13 @@
 		fi
 	fi
 
+	DEVTREE=""
+	if [[ x${devtreefile} != x ]] && [ -f "${devtreefile}" ]
+	then
+		[[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"
+		DEVTREE="--devtree ${devtreefile}"
+	fi
+
 	# FIXME: is this a good heuristic to find out if we're on iSeries?
 	if [ -d /proc/iSeries ]
 	then
@@ -218,28 +271,20 @@
 		cfgLilo=""
 	fi
 
-	if [[ -n ${banner} ]]
-	then
-		title="${banner} [ ${version} ]"
-	elif [[ $(read_os_release id) = magellan ]]
-	then
-		title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
-	elif [ -f /etc/mageversion ]
-	then
-		title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
-	else
-		title="Magellan Linux [ ${version} ]"
-	fi
+	set_title
 
 	if [[ -n ${cfgGrub} ]]
 	then
 		[[ -n ${verbose} ]] && echo "adding ${version} to ${grubConfig}"
 
-		${grubby} --grub -c ${grubConfig} \
-			--add-kernel=${kernelImage} \
-			${INITRD} --copy-default ${makedefault} --title "${title}" \
-			${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
-			--args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
+		ARGS="--grub -c ${grubConfig} --add-kernel=${kernelImage} ${INITRD} \
+			${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
+			${mbargs:+--mbargs=\"${mbargs}\"} \
+			--title=\"${title}\${debugtitle}\" --copy-default \
+			--args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
+			--remove-kernel=\"TITLE=${title}\${debugtitle}\""
+		rungrubby --debug ${ARGS}
+		rungrubby ${ARGS} ${makedefault}
 	else
 		[[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
 	fi
@@ -247,12 +292,14 @@
 	then
 		[[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"
 
-		${grubby} --grub2 -c ${grub2Config} \
-			--add-kernel=${kernelImage} \
-			${INITRD} --copy-default ${makedefault} --title "${title}" \
-			${mbkernel:+--add-multiboot="${mbkernel}"} \
-			${mbargs:+--mbargs="${mbargs}"} \
-			--args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
+		ARGS="--grub2 -c ${grub2Config} --add-kernel=${kernelImage} ${INITRD} \
+			--copy-default --title \"${title}\${debugtitle}\" \
+			${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
+			${mbargs:+--mbargs=\"${mbargs}\"} \
+			--args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
+			--remove-kernel=\"TITLE=${title}\${debugtitle}\""
+		rungrubby --debug ${ARGS}
+		rungrubby ${ARGS} ${makedefault}
 	else
 		[[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
 	fi
@@ -260,12 +307,15 @@
 	then
 		[[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
 
-		${grubby} --grub2 -c ${grub2EfiConfig} --efi \
-			--add-kernel=${kernelImage} \
-			${INITRD} --copy-default ${makedefault} --title "${title}" \
-			${mbkernel:+--add-multiboot="${mbkernel}"} \
-			${mbargs:+--mbargs="${mbargs}"} \
-			--args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
+		ARGS="--grub2 -c ${grub2EfiConfig} --efi \
+			--add-kernel=${kernelImage} ${DEVTREE} ${INITRD} \
+			--copy-default --title \"${title}\${debugtitle}\" \
+			${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
+			${mbargs:+--mbargs=\"${mbargs}\"} \
+			--args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
+			--remove-kernel=\"TITLE=${title}\${debugtitle}\""
+		rungrubby --debug ${ARGS}
+		rungrubby ${ARGS} ${makedefault}
 	else
 		[[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"
 	fi
@@ -274,11 +324,14 @@
 	then
 		[[ -n ${verbose} ]] && echo "adding ${version} to ${liloConfig}"
 
-		${grubby} --add-kernel=${kernelImage} ${INITRD} \
-			--copy-default ${makedefault} --title ${version} \
-			${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
-			--args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${version}" \
-			--${liloFlag}
+		ARGS="--${liloFlag} --add-kernel=${kernelImage} ${INITRD} \
+			--copy-default --title \"${title}\${debugtitle}\" \
+			${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
+			${mbargs:+--mbargs=\"${mbargs}\"} \
+			--args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
+			--remove-kernel=\"TITLE=${version}\""
+		rungrubby --debug ${ARGS}
+		rungrubby ${ARGS} ${makedefault}
 
 		if [[ -n ${runLilo} ]]
 		then
@@ -298,11 +351,14 @@
 	then
 		[[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
 
-		${grubby} --extlinux -c ${extlinuxConfig} \
-			--add-kernel=${kernelImage} \
-			${INITRD} --copy-default ${makedefault} --title "${title}" \
-			${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
-			--args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
+		ARGS="--extlinux -c ${extlinuxConfig} --add-kernel=${kernelImage} \
+			${DEVTREE} ${INITRD} --copy-default --title \"${title}\${debugtitle}\" \
+			${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
+			${mbargs:+--mbargs=\"${mbargs}\"} \
+			--args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
+			--remove-kernel=\"TITLE=${title}\${debugtitle}\""
+		rungrubby --debug ${ARGS}
+		rungrubby ${ARGS} ${makedefault}
 	else
 		[[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
 	fi
@@ -435,6 +491,8 @@
 		return
 	fi
 
+	set_title
+
 	INITRD=""
 	if [ -f ${initrdfile} ]
 	then
@@ -447,14 +505,23 @@
 		fi
 	fi
 
+	DEVTREE=""
+	if [[ x${devtreefile} != x ]] && [ -f ${devtreefile} ]
+	then
+		[[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"
+		DEVTREE="--devtree ${devtreefile}"
+	fi
+
 	if [[ -n ${cfgGrub} ]]
 	then
 		[[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
-		${grubby} --grub -c ${grubConfig} \
-			--update-kernel=${kernelImage} \
-			${INITRD} \
-			${kernargs:+--args="${kernargs}"} \
-			${removeargs:+--remove-args="${removeargs}"}
+		ARGS="--grub -c ${grubConfig} --update-kernel=${kernelImage} ${INITRD} \
+			${kernargs:+--args=\"${kernargs}\"} \
+			${removeargs:+--remove-args=\"${removeargs}\"} \
+			${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
+			--title=\"${title}\${debugtitle}\""
+		rungrubby --debug ${ARGS}
+		rungrubby ${ARGS}
 	else
 		[[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
 	fi
@@ -462,11 +529,12 @@
 	if [[ -n ${cfgGrub2} ]]
 	then
 		[[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"
-		${grubby} --grub2 -c ${grub2Config} \
-			--update-kernel=${kernelImage} \
-			${INITRD} \
-			${kernargs:+--args="${kernargs}"} \
-			${removeargs:+--remove-args="${removeargs}"}
+		ARGS="--grub2 -c ${grub2Config} --update-kernel=${kernelImage} ${INITRD} \
+			${kernargs:+--args=\"${kernargs}\"} \
+			${removeargs:+--remove-args=\"${removeargs}\"} \
+			--title=\"${title}\${debugtitle}\""
+		rungrubby --debug ${ARGS}
+		rungrubby ${ARGS}
 	else
 		[[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"
 	fi
@@ -474,11 +542,12 @@
 	if [[ -n ${cfgGrub2Efi} ]]
 	then
 		[[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
-		${grubby} --grub2 -c ${grub2EfiConfig} --efi \
-			--update-kernel=${kernelImage} \
-			${INITRD} \
-			${kernargs:+--args="${kernargs}"} \
-			${removeargs:+--remove-args="${removeargs}"}
+		ARGS="--grub2 -c ${grub2EfiConfig} --efi --update-kernel=${kernelImage} \
+			${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
+			${removeargs:+--remove-args=\"${removeargs}\"} \
+			--title=\"${title}\${debugtitle}\""
+		rungrubby --debug ${ARGS}
+		rungrubby ${ARGS}
 	else
 		[[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"
 	fi
@@ -486,11 +555,12 @@
 	if [[ -n ${cfgLilo} ]]
 	then
 		[[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"
-		${grubby} --update-kernel=${kernelImage} \
-			${INITRD} \
-			${kernargs:+--args="${kernargs}"} \
-			${removeargs:+--remove-args="${removeargs}"} \
-			--${liloFlag}
+		ARGS="--${liloFlag} --update-kernel=${kernelImage} ${INITRD} \
+			${kernargs:+--args=\"${kernargs}\"} \
+			${removeargs:+--remove-args=\"${removeargs}\"} \
+			--title=\"${title}\${debugtitle}\""
+		rungrubby --debug ${ARGS}
+		rungrubby ${ARGS}
 
 		if [[ -n ${runLilo} ]]
 		then
@@ -543,11 +613,12 @@
 	if [[ -n ${cfgExtlinux} ]]
 	then
 		[[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
-		${grubby} --extlinux -c ${extlinuxConfig} \
-			--update-kernel=${kernelImage} \
-			${INITRD} \
-			${kernargs:+--args="${kernargs}"} \
-			${removeargs:+--remove-args="${removeargs}"}
+		ARGS="--extlinux -c ${extlinuxConfig} --update-kernel=${kernelImage} \
+			${DEVTREE} ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
+			${removeargs:+--remove-args=\"${removeargs}\"} \
+			--title=\"${title}\${debugtitle}\""
+		rungrubby --debug ${ARGS}
+		rungrubby ${ARGS}
 	else
 		[[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby"
 	fi
@@ -593,6 +664,14 @@
 	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
@@ -605,6 +684,16 @@
 			initrd="remove"
 			;;
 
+		--devtree*)
+			if [[ $1 == --devtree\=* ]]
+			then
+				devtreefile="${1#--devtreefile=}"
+			else
+				devtreefile="$2"
+				shift
+			fi
+			;;
+
 		--dracut)
 			dracut=--dracut
 			;;
@@ -720,6 +809,16 @@
 			fi
 			;;
 
+		--kernel-name*)
+			if [[ $1 == --kernel-name\=* ]]
+			then
+				kernelName=${1#--kernel-name=}
+			else
+				kernelName="$2"
+				shift
+			fi
+			;;
+
 		-v)
 			verbose=-v
 			;;
@@ -758,15 +857,6 @@
 
 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
@@ -787,6 +877,19 @@
 fi
 [[ -n ${verbose} ]] && echo "initrdfile is ${initrdfile}"
 
+if [[ ${ARCH} =~ armv[5|7].*l ]]
+then
+	if [ -d ${bootPrefix}/dtb-${version}/ ]
+	then
+		devtreedir="${bootPrefix}/dtb-${version}/"
+		if [[ -n ${dtbfile} ]] && [ -f ${devtreedir}/${dtbfile} ]
+		then
+			devtreefile="${devtreedir}/${dtbfile}"
+		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
@@ -833,11 +936,13 @@
 fi
 
 # set this as the default if we have the package and it matches
-if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] &&
-	[[ -n ${DEFAULTKERNEL} ]] && [[ ${package} = ${DEFAULTKERNEL} ]]
+if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] && [[ -n ${DEFAULTKERNEL} ]]
 then
-	makedefault="--make-default"
-	[[ -n ${verbose} ]] && echo "making it the default based on config"
+	if [[ ${package} = ${DEFAULTKERNEL} ]] || [[ ${package}-core = ${DEFAULTKERNEL} ]]
+	then
+		makedefault="--make-default"
+		[[ -n ${verbose} ]] && echo "making it the default based on config"
+	fi
 fi
 
 if [[ ${moddep} = make ]]