boxtec-support
/
netinstall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

final: always generate the u-boot wrapped uInitrd

Browse Source 
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/22/head
Robert Nelson 12 years ago
parent ec9a369ebf
commit e9ae924415
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

6
lib/debian-finish.sh
Unescape View File

@ -10,7 +10,7 @@ if [ ! -f /boot/uboot/SOC.sh ] ; then
cp /etc/hwpack/SOC.sh /boot/uboot/SOC.sh cp /etc/hwpack/SOC.sh /boot/uboot/SOC.sh
echo "ERROR: [boot/uboot/SOC.sh] was missing..." >> /var/log/netinstall.log echo "ERROR: [boot/uboot/SOC.sh] was missing..." >> /var/log/netinstall.log
fi fi
source /boot/uboot/SOC.sh . /boot/uboot/SOC.sh
if [ ! -d /boot/uboot/backup/ ] ; then if [ ! -d /boot/uboot/backup/ ] ; then
mkdir -p /boot/uboot/backup/ mkdir -p /boot/uboot/backup/
@ -77,7 +77,7 @@ else
echo "WARN: [serial_tty] was undefined..." >> /var/log/netinstall.log echo "WARN: [serial_tty] was undefined..." >> /var/log/netinstall.log
fi fi
if [ "x${boot_fstype}" == "xext2" ] ; then if [ "x${boot_fstype}" = "xext2" ] ; then
echo "/dev/mmcblk0p1 /boot/uboot ext2 defaults 0 2" >> /etc/fstab echo "/dev/mmcblk0p1 /boot/uboot ext2 defaults 0 2" >> /etc/fstab
else else
echo "/dev/mmcblk0p1 /boot/uboot auto defaults 0 0" >> /etc/fstab echo "/dev/mmcblk0p1 /boot/uboot auto defaults 0 0" >> /etc/fstab
@ -146,8 +146,8 @@ if [ -f /boot/uboot/linux-image-*_1.0*_arm*.deb ] ; then
rm -f /boot/uboot/*dtbs.tar.gz || true rm -f /boot/uboot/*dtbs.tar.gz || true
rm -f /boot/uboot/*modules.tar.gz || true rm -f /boot/uboot/*modules.tar.gz || true
if [ "x${boot_image}" == "xbootm" ] ; then
mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-`uname -r` /boot/uboot/uInitrd mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-`uname -r` /boot/uboot/uInitrd
if [ "x${boot_image}" = "xbootm" ] ; then
mkimage -A arm -O linux -T kernel -C none -a ${zreladdr} -e ${zreladdr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage mkimage -A arm -O linux -T kernel -C none -a ${zreladdr} -e ${zreladdr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage
fi fi
else else

6
lib/ubuntu-finish.sh
Unescape View File

@ -10,7 +10,7 @@ if [ ! -f /boot/uboot/SOC.sh ] ; then
cp /etc/hwpack/SOC.sh /boot/uboot/SOC.sh cp /etc/hwpack/SOC.sh /boot/uboot/SOC.sh
echo "ERROR: [boot/uboot/SOC.sh] was missing..." >> /var/log/netinstall.log echo "ERROR: [boot/uboot/SOC.sh] was missing..." >> /var/log/netinstall.log
fi fi
source /boot/uboot/SOC.sh . /boot/uboot/SOC.sh
if [ ! -d /boot/uboot/backup/ ] ; then if [ ! -d /boot/uboot/backup/ ] ; then
mkdir -p /boot/uboot/backup/ mkdir -p /boot/uboot/backup/
@ -128,7 +128,7 @@ else
echo "WARN: [serial_tty] was undefined..." >> /var/log/netinstall.log echo "WARN: [serial_tty] was undefined..." >> /var/log/netinstall.log
fi fi
if [ "x${boot_fstype}" == "xext2" ] ; then if [ "x${boot_fstype}" = "xext2" ] ; then
echo "/dev/mmcblk0p1 /boot/uboot ext2 defaults 0 2" >> /etc/fstab echo "/dev/mmcblk0p1 /boot/uboot ext2 defaults 0 2" >> /etc/fstab
else else
echo "/dev/mmcblk0p1 /boot/uboot auto defaults 0 0" >> /etc/fstab echo "/dev/mmcblk0p1 /boot/uboot auto defaults 0 0" >> /etc/fstab
@ -167,8 +167,8 @@ if [ -f /boot/uboot/linux-image-*_1.0*_arm*.deb ] ; then
rm -f /boot/uboot/*dtbs.tar.gz || true rm -f /boot/uboot/*dtbs.tar.gz || true
rm -f /boot/uboot/*modules.tar.gz || true rm -f /boot/uboot/*modules.tar.gz || true
if [ "x${boot_image}" == "xbootm" ] ; then
mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-`uname -r` /boot/uboot/uInitrd mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-`uname -r` /boot/uboot/uInitrd
if [ "x${boot_image}" = "xbootm" ] ; then
mkimage -A arm -O linux -T kernel -C none -a ${zreladdr} -e ${zreladdr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage mkimage -A arm -O linux -T kernel -C none -a ${zreladdr} -e ${zreladdr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage
fi fi
else else

Write Preview
Loading…
Cancel
Save