no dependice on external initrd.img as they are generated at the end of install

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/8/head
Robert Nelson 14 years ago
parent 7dea8900c6
commit 22c8ec21dc

@ -0,0 +1,9 @@
Easy:
* use LATEST STABLE/TESTING kernel from rcn-ee.net instead of hard coding it
* cleanup firmware mess, just copy needed firmware from the mainline git tree
More Effort:
* imx support
* ext2 boot instead of vfat (latest u-boot)
* random http link to *.deb package

@ -30,7 +30,7 @@ unset BETA_KERNEL
unset USB_ROOTFS unset USB_ROOTFS
unset PRINTK unset PRINTK
SCRIPT_VERSION="1.01" SCRIPT_VERSION="1.02"
IN_VALID_UBOOT=1 IN_VALID_UBOOT=1
MIRROR="http://rcn-ee.net/deb/" MIRROR="http://rcn-ee.net/deb/"
@ -202,8 +202,6 @@ fi
wget -c --directory-prefix=${DIR}/dl/${DIST} ${MIRROR}${DIST}/v${KERNEL}/linux-image-${KERNEL}_1.0${DIST}_armel.deb wget -c --directory-prefix=${DIR}/dl/${DIST} ${MIRROR}${DIST}/v${KERNEL}/linux-image-${KERNEL}_1.0${DIST}_armel.deb
wget -c --directory-prefix=${DIR}/dl/${DIST} ${MIRROR}${DIST}/v${KERNEL}/initrd.img-${KERNEL}
if [ "${FIRMWARE}" ] ; then if [ "${FIRMWARE}" ] ; then
echo "" echo ""
@ -491,8 +489,6 @@ sudo cp -v ${TEMPDIR}/dl/${UBOOT} ${TEMPDIR}/disk/u-boot.bin
echo "uInitrd Installer" echo "uInitrd Installer"
sudo mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d ${TEMPDIR}/initrd.mod.gz ${TEMPDIR}/disk/uInitrd.net sudo mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d ${TEMPDIR}/initrd.mod.gz ${TEMPDIR}/disk/uInitrd.net
echo "uInitrd Normal Boot"
sudo mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d ${DIR}/dl/${DIST}/initrd.img-${KERNEL} ${TEMPDIR}/disk/uInitrd.end
echo "uImage" echo "uImage"
sudo mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 -n ${KERNEL} -d ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/uImage.net sudo mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 -n ${KERNEL} -d ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/uImage.net

@ -3,7 +3,7 @@ new file mode 100755
index 0000000..6d06fc7 index 0000000..6d06fc7
--- /dev/null --- /dev/null
+++ b/usr/lib/finish-install.d/08rcn-omap +++ b/usr/lib/finish-install.d/08rcn-omap
@@ -0,0 +1,35 @@ @@ -0,0 +1,37 @@
+#!/bin/sh -e +#!/bin/sh -e
+cp /etc/flash-kernel.conf /target/etc/flash-kernel.conf +cp /etc/flash-kernel.conf /target/etc/flash-kernel.conf
+cp /etc/ttyO2.conf /target/etc/init/ttyO2.conf +cp /etc/ttyO2.conf /target/etc/init/ttyO2.conf
@ -21,9 +21,11 @@ index 0000000..6d06fc7
+ rm -f /tmp/mmc/uImage || true + rm -f /tmp/mmc/uImage || true
+ rm -f /tmp/mmc/uImage.bak || true + rm -f /tmp/mmc/uImage.bak || true
+ +
+ mv /tmp/mmc/uInitrd.end /tmp/mmc/uInitrd
+ mv /tmp/mmc/uImage.net /tmp/mmc/uImage + mv /tmp/mmc/uImage.net /tmp/mmc/uImage
+ LD_LIBRARY_PATH=/target/lib /target/usr/bin/dpkg-deb -x /tmp/mmc/linux-image-*_1.0*_armel.deb /target/ + LD_LIBRARY_PATH=/target/lib /target/usr/bin/dpkg-deb -x /tmp/mmc/linux-image-*_1.0*_armel.deb /target/
+ chroot /target update-initramfs -c -k `uname -r`
+ chroot /target mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-`uname -r` /boot/uInitrd
+ cp /target/boot/uInitrd /tmp/mmc/uInitrd
+ rm -f /tmp/mmc/linux-image-*_1.0*_armel.deb || true + rm -f /tmp/mmc/linux-image-*_1.0*_armel.deb || true
+ sync + sync
+ umount /tmp/mmc + umount /tmp/mmc
@ -34,7 +36,7 @@ index 0000000..6d06fc7
+ #smsc95xx kevent workaround/hack + #smsc95xx kevent workaround/hack
+ echo "vm.min_free_kbytes = 8192" >> /target/etc/sysctl.conf + echo "vm.min_free_kbytes = 8192" >> /target/etc/sysctl.conf
+ +
+ cp -ru /lib/firmware/ /target/lib/ + cp -r /lib/firmware/ /target/lib/
+ +
+ rm -f /etc/rcn.conf + rm -f /etc/rcn.conf
+fi +fi

@ -3,7 +3,7 @@ new file mode 100755
index 0000000..6d06fc7 index 0000000..6d06fc7
--- /dev/null --- /dev/null
+++ b/usr/lib/finish-install.d/08rcn-omap +++ b/usr/lib/finish-install.d/08rcn-omap
@@ -0,0 +1,35 @@ @@ -0,0 +1,37 @@
+#!/bin/sh -e +#!/bin/sh -e
+cp /etc/flash-kernel.conf /target/etc/flash-kernel.conf +cp /etc/flash-kernel.conf /target/etc/flash-kernel.conf
+cp /etc/ttyO2.conf /target/etc/init/ttyO2.conf +cp /etc/ttyO2.conf /target/etc/init/ttyO2.conf
@ -21,9 +21,11 @@ index 0000000..6d06fc7
+ rm -f /tmp/mmc/uImage || true + rm -f /tmp/mmc/uImage || true
+ rm -f /tmp/mmc/uImage.bak || true + rm -f /tmp/mmc/uImage.bak || true
+ +
+ mv /tmp/mmc/uInitrd.end /tmp/mmc/uInitrd
+ mv /tmp/mmc/uImage.net /tmp/mmc/uImage + mv /tmp/mmc/uImage.net /tmp/mmc/uImage
+ LD_LIBRARY_PATH=/target/lib /target/usr/bin/dpkg-deb -x /tmp/mmc/linux-image-*_1.0*_armel.deb /target/ + LD_LIBRARY_PATH=/target/lib /target/usr/bin/dpkg-deb -x /tmp/mmc/linux-image-*_1.0*_armel.deb /target/
+ chroot /target update-initramfs -c -k `uname -r`
+ chroot /target mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-`uname -r` /boot/uInitrd
+ cp /target/boot/uInitrd /tmp/mmc/uInitrd
+ rm -f /tmp/mmc/linux-image-*_1.0*_armel.deb || true + rm -f /tmp/mmc/linux-image-*_1.0*_armel.deb || true
+ sync + sync
+ umount /tmp/mmc + umount /tmp/mmc
@ -34,7 +36,7 @@ index 0000000..6d06fc7
+ #smsc95xx kevent workaround/hack + #smsc95xx kevent workaround/hack
+ echo "vm.min_free_kbytes = 8192" >> /target/etc/sysctl.conf + echo "vm.min_free_kbytes = 8192" >> /target/etc/sysctl.conf
+ +
+ cp -ru /lib/firmware/ /target/lib/ + cp -r /lib/firmware/ /target/lib/
+ +
+ rm -f /etc/rcn.conf + rm -f /etc/rcn.conf
+fi +fi

@ -3,7 +3,7 @@ new file mode 100755
index 0000000..6d06fc7 index 0000000..6d06fc7
--- /dev/null --- /dev/null
+++ b/usr/lib/finish-install.d/08rcn-omap +++ b/usr/lib/finish-install.d/08rcn-omap
@@ -0,0 +1,31 @@ @@ -0,0 +1,34 @@
+#!/bin/sh -e +#!/bin/sh -e
+cp /etc/e2fsck.conf /target/etc/e2fsck.conf +cp /etc/e2fsck.conf /target/etc/e2fsck.conf
+ +
@ -13,9 +13,12 @@ index 0000000..6d06fc7
+ rm -f /tmp/mmc/boot.scr || true + rm -f /tmp/mmc/boot.scr || true
+ mv /tmp/mmc/user.scr /tmp/mmc/boot.scr + mv /tmp/mmc/user.scr /tmp/mmc/boot.scr
+ rm -f /tmp/mmc/uInitrd.net || true + rm -f /tmp/mmc/uInitrd.net || true
+ mv /tmp/mmc/uInitrd.end /tmp/mmc/uInitrd +
+ mv /tmp/mmc/uImage.net /tmp/mmc/uImage + mv /tmp/mmc/uImage.net /tmp/mmc/uImage
+ LD_LIBRARY_PATH=/target/lib /target/usr/bin/dpkg-deb -x /tmp/mmc/linux-image-*_1.0*_armel.deb /target/ + LD_LIBRARY_PATH=/target/lib /target/usr/bin/dpkg-deb -x /tmp/mmc/linux-image-*_1.0*_armel.deb /target/
+ chroot /target update-initramfs -c -k `uname -r`
+ chroot /target mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-`uname -r` /boot/uInitrd
+ cp /target/boot/uInitrd /tmp/mmc/uInitrd
+ rm -f /tmp/mmc/linux-image-*_1.0*_armel.deb || true + rm -f /tmp/mmc/linux-image-*_1.0*_armel.deb || true
+ sync + sync
+ umount /tmp/mmc + umount /tmp/mmc
@ -30,7 +33,7 @@ index 0000000..6d06fc7
+ cat /target/etc/inittab | grep ttyO2 || echo "S:2345:respawn:/sbin/getty 115200 ttyO2" >> /target/etc/inittab + cat /target/etc/inittab | grep ttyO2 || echo "S:2345:respawn:/sbin/getty 115200 ttyO2" >> /target/etc/inittab
+ fi + fi
+ +
+ cp -ru /lib/firmware/ /target/lib/ + cp -r /lib/firmware/ /target/lib/
+ +
+ rm -f /etc/rcn.conf + rm -f /etc/rcn.conf
+fi +fi

Loading…
Cancel
Save