diff --git a/patch/kernel/sun4i-default/0040-dev-packaging.patch b/patch/kernel/sun4i-default/0040-dev-packaging.patch index 3a035c6489..908e19729c 100644 --- a/patch/kernel/sun4i-default/0040-dev-packaging.patch +++ b/patch/kernel/sun4i-default/0040-dev-packaging.patch @@ -169,7 +169,7 @@ index ed7ccdc..4bda948 100644 for script in postinst postrm preinst prerm ; do mkdir -p "$tmpdir$debhookdir/$script.d" cat < "$tmpdir/DEBIAN/$script" -@@ -149,12 +201,39 @@ set -e +@@ -149,12 +201,40 @@ set -e # Pass maintainer script parameters to hook scripts export DEB_MAINT_PARAMS="\$*" @@ -204,6 +204,7 @@ index ed7ccdc..4bda948 100644 +sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/preinst +cat >> $tmpdir/DEBIAN/preinst <> $tmpdir/DEBIAN/preinst + diff --git a/scripts/nand-sata-install/usr/lib/nand-sata-install/nand-sata-install.sh b/scripts/nand-sata-install/usr/lib/nand-sata-install/nand-sata-install.sh index 8ae015ed48..4491251739 100644 --- a/scripts/nand-sata-install/usr/lib/nand-sata-install/nand-sata-install.sh +++ b/scripts/nand-sata-install/usr/lib/nand-sata-install/nand-sata-install.sh @@ -74,6 +74,12 @@ extraargs=console=tty1 hdmi.audio=EDID:0 disp.screen0_output_mode=EDID:0 console EOF sync [[ $DEVICE_TYPE = "a20" ]] && echo "machid=10bb" >> /mnt/bootfs/uEnv.txt +# ugly hack becouse we don't have sources for A10 nand uboot +if [[ $(cat /var/run/machine.id) == "Cubieboard" ]]; then + cp /mnt/bootfs/uEnv.txt /mnt/rootfs/boot/uEnv.txt + cp /mnt/bootfs/script.bin /mnt/rootfs/boot/script.bin + cp /mnt/bootfs/uImage /mnt/rootfs/boot/uImage +fi umountdevice "/dev/nand" tune2fs -o journal_data_writeback /dev/nand2 >/dev/null 2>&1 tune2fs -O ^has_journal /dev/nand2 >/dev/null 2>&1