mk_mmc.sh: support deb not in repo

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/37/head
Robert Nelson 11 years ago
parent 0ca39b2064
commit 02277c1757

@ -700,15 +700,16 @@ initrd_preseed_settings () {
cp -v "${DIR}/lib/shared/zz-uenv_txt" ${TEMPDIR}/initrd-tree/zz-uenv_txt 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 cp -v "${DIR}/lib/${DIST}-preseed.cfg" ${TEMPDIR}/initrd-tree/preseed.cfg
#repos.rcn-ee.net: add linux-image-${uname -r} if [ ! "x${deb_not_in_repo}" = "xenable" ] ; then
sed -i -e 's:ntpdate:ntpdate linux-image-'$uname_r':g' ${TEMPDIR}/initrd-tree/preseed.cfg #repos.rcn-ee.net: add linux-image-${uname -r}
sed -i -e 's:ntpdate:ntpdate linux-image-'$uname_r':g' ${TEMPDIR}/initrd-tree/preseed.cfg
cat ${TEMPDIR}/initrd-tree/preseed.cfg | grep linux-image
fi
if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then
sed -i -e 's:ntpdate:ntpdate u-boot-tools:g' ${TEMPDIR}/initrd-tree/preseed.cfg sed -i -e 's:ntpdate:ntpdate u-boot-tools:g' ${TEMPDIR}/initrd-tree/preseed.cfg
fi fi
cat ${TEMPDIR}/initrd-tree/preseed.cfg | grep linux-image
case "${DIST}" in case "${DIST}" in
wheezy) wheezy)
if [ ! "x${di_serial_mode}" = "xenable" ] && [ "${conf_kernel_usb_not_builtin}" ] ; then if [ ! "x${di_serial_mode}" = "xenable" ] && [ "${conf_kernel_usb_not_builtin}" ] ; then
@ -987,7 +988,11 @@ populate_boot () {
fi fi
echo "Copying Device Tree Files:" echo "Copying Device Tree Files:"
cp ${TEMPDIR}/kernel/boot/dtbs/${uname_r}/*.dtb ${TEMPDIR}/disk/boot/dtbs/current/ if [ ! "x${deb_not_in_repo}" = "xenable" ] ; then
cp ${TEMPDIR}/kernel/boot/dtbs/${uname_r}/*.dtb ${TEMPDIR}/disk/boot/dtbs/current/
else
cp ${TEMPDIR}/kernel/boot/dtbs/${LINUX_VER}/*.dtb ${TEMPDIR}/disk/boot/dtbs/current/
fi
if [ "${conf_uboot_bootscript}" ] ; then if [ "${conf_uboot_bootscript}" ] ; then
case "${dtb}" in case "${dtb}" in
@ -1409,6 +1414,7 @@ while [ ! -z "$1" ] ; do
external_deb_file="$2" external_deb_file="$2"
DEB_FILE="${external_deb_file}" DEB_FILE="${external_deb_file}"
KERNEL_DEB=1 KERNEL_DEB=1
deb_not_in_repo="enable"
;; ;;
--use-beta-kernel) --use-beta-kernel)
BETA_KERNEL=1 BETA_KERNEL=1

Loading…
Cancel
Save