From be55fa4c829bf42fbdd0f1d01b74ec512891f4cc Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Thu, 24 Jul 2014 19:54:49 -0500 Subject: [PATCH] mk_mmc.sh: bring in zz-uenv_txt Signed-off-by: Robert Nelson --- lib/shared/zz-uenv_txt | 25 +++++++++++++++++++++++++ mk_mmc.sh | 4 ++++ 2 files changed, 29 insertions(+) create mode 100644 lib/shared/zz-uenv_txt diff --git a/lib/shared/zz-uenv_txt b/lib/shared/zz-uenv_txt new file mode 100644 index 0000000..6f665d8 --- /dev/null +++ b/lib/shared/zz-uenv_txt @@ -0,0 +1,25 @@ +#!/bin/sh -e + +version="$1" + +if [ -f /boot/uEnv.txt ] ; then + + # passing the kernel version is required + if [ -z "${version}" ]; then + echo >&2 "W: zz-uenv_txt: ${DPKG_MAINTSCRIPT_PACKAGE:-kernel package} did not pass a version number" + exit 2 + fi + + unset older_kernel + older_kernel=$(grep uname_r /boot/uEnv.txt | grep -v '#' | awk -F"=" '{print $2}' || true) + + if [ ! "x${older_kernel}" = "x" ] ; then + if [ ! "x${older_kernel}" = "x${version}" ] ; then + echo "zz-uenv_txt: Updating /boot/uEnv.txt [uname_r=${version}]" + sed -i -e 's:uname_r='${older_kernel}':uname_r='${version}':g' /boot/uEnv.txt + fi + else + echo "uname_r=${version}" >> /boot/uEnv.txt + fi +fi + diff --git a/mk_mmc.sh b/mk_mmc.sh index 27feab0..0b9781d 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -852,6 +852,9 @@ finish_installing_device () { chroot /target /bin/bash /usr/bin/finish-install.sh + cp /zz-uenv_txt /target/etc/kernel/postinst.d/ + chmod +x /target/etc/kernel/postinst.d/zz-uenv_txt + rm -f /target/mounts || true cat /proc/mounts > /target/boot/uboot/backup/proc_mounts @@ -926,6 +929,7 @@ initrd_preseed_settings () { finish_installing_device setup_parition_recipe + cp -v "${DIR}/lib/shared/zz-uenv_txt" ${TEMPDIR}/initrd-tree/zz-uenv_txt cp -v "${DIR}/lib/${DIST}-preseed.cfg" ${TEMPDIR}/initrd-tree/preseed.cfg #repos.rcn-ee.net: add linux-image-${uname -r}