Bug#825677: freedombox-setup: Remove flash-kernel code specific for beaglebone

2016-05-30 Thread Sunil Mohan Adapa 
On 05/30/2016 07:40 PM, James Valleroy wrote:
[...]
> There's a few issues in the 80_flash-kernel script, but I think we can
> probably just remove it (and also remove machine-detect if it's no
> longer needed). I'll test this on Dreamplug and open a new bug for it.
> 

Yes please.  We should remove the machine-detect and 80_flash-kernel
script.  I can test on Cubietruck.

-- 
Sunil



signature.asc
Description: OpenPGP digital signature

Bug#825677: freedombox-setup: Remove flash-kernel code specific for beaglebone

2016-05-30 Thread James Valleroy 
On Mon, 30 May 2016 07:05:24 +0530 Sunil Mohan Adapa 
wrote:
> I saw no reason why flash-kernel should be specially for Beagle Bone
> Black, so I removed that part of the code. It is not a problem if
> flash-kernel is run during first-boot.
>
> I believe that there is no reason to run flash-kernel code for any
> machine other than Dreamplug. I wanted to deal with that at a later point.
>
> Even for Dreamplug, I don't believe that flash-kernel actually works
> given its vfat boot partition.


I've applied the patch.

You're correct that it doesn't work on Dreamplug. This is what I have in
the first run log:

/bin/ls: cannot access '/boot/vmlinuz-*-kirkwood': No such file or directory
Flashing Kernel version  ...DTB: kirkwood-dreamplug.dtb
Installing kirkwood-dreamplug.dtb into
/boot/dtbs/4.5.0-2-marvell/kirkwood-dreamplug.dtb
Installing new kirkwood-dreamplug.dtb.
ln: failed to create symbolic link '/boot/dtb-4.5.0-2-marvell':
Operation not permitted
failed.

There's a few issues in the 80_flash-kernel script, but I think we can
probably just remove it (and also remove machine-detect if it's no
longer needed). I'll test this on Dreamplug and open a new bug for it.



signature.asc
Description: OpenPGP digital signature

Bug#825677: freedombox-setup: Remove flash-kernel code specific for beaglebone

2016-05-29 Thread Sunil Mohan Adapa 
On 05/30/2016 05:40 AM, James Valleroy wrote:
[...]
> 
> It looks like this may not be working as intended. flash-kernel is still
> run during first-run, except $kernel_version is now empty. Should
> flash-kernel only be run here for dreamplug?
> 

I saw no reason why flash-kernel should be specially for Beagle Bone
Black, so I removed that part of the code.  It is not a problem if
flash-kernel is run during first-boot.

I believe that there is no reason to run flash-kernel code for any
machine other than Dreamplug.  I wanted to deal with that at a later point.

Even for Dreamplug, I don't believe that flash-kernel actually works
given its vfat boot partition.

-- 
Sunil



signature.asc
Description: OpenPGP digital signature

Bug#825677: freedombox-setup: Remove flash-kernel code specific for beaglebone

2016-05-29 Thread James Valleroy 
On Sat, 28 May 2016 23:52:03 +0530 Sunil Mohan Adapa 
wrote:
> Currently freedom-maker uses flash-kernel to generate boot script, copy
> the DTB etc. during BeagleBone Black's image building. This is no
> longer required. When a kernel is upgraded, flash-kernel is
> automatically run from the hooks.
>
> Attached patch remove this code. It has not be tested yet.

It looks like this may not be working as intended. flash-kernel is still
run during first-run, except $kernel_version is now empty. Should
flash-kernel only be run here for dreamplug?



signature.asc
Description: OpenPGP digital signature

Bug#825677: freedombox-setup: Remove flash-kernel code specific for beaglebone

2016-05-28 Thread Sunil Mohan Adapa 
Package: freedombox-setup
Version: 0.9.1
Severity: normal
Tags: patch

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Dear Maintainer,

Currently freedom-maker uses flash-kernel to generate boot script, copy
the DTB etc. during BeagleBone Black's image building.  This is no
longer required.  When a kernel is upgraded, flash-kernel is
automatically run from the hooks.

Attached patch remove this code.  It has not be tested yet.




-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAEBAgAGBQJXSeHKAAoJEDbDYUQMm8lxzwgP/3fnTBb/vYvhkWkrTxCVh5j6
GzN7do/0x5hqhRezTN2eZXbGMZcK/3uwzOCHO11XYvd68OS1xSW9wCrMglDkbj8x
yktNuoBMNcyGcCzmko6mSyFyPyFPzdSNN7jKpxD6exzmPmxJ8GGHvQC4gmJxdlN5
D5K56l+/+FLyTiSJz40WOV+PRnt5Ibn/+CnTR+mIimFvJgEx+sLU39CBLP4XDI9j
lXGOaERShtX1UDqBd/6yk8XBQK5B0BTfwoT+n+qeWCgqpColS5Ml188xSfaxqpWo
huQaCtBWrOzxTUFjhvWfmwA8HurF7y/80adDzUWh47W11GM4UJM4+Ui3gZBZkla8
yy/AXyR81YvY2R44zARhxq2DmpOHmT2Fl43z2ZvVsaaugXvsl3W9/TKJHEYhkDSj
s5M6hCuh9IjhIJjrNHnpSxPjJDxF/+J4JAxqfCg8ntfTXMGDTJcVKGd+/xo81HT5
KQgafk90oBkBE+Sy/xNaUGiAU2S0m3hWgon1PEZYrr1oXZlogJ/rre7WTaqhAU+7
U+jyexRvCeyIgRTHVtJoxsvPo9L+6tyQvXVLIkPlXiy3rQxmxA5CpwY73wQ4Sct/
cGdhO+9TSMs867XoMU9XzLCDEJvkvLmktuC4uhwSYAW2SD6zsbjeIvOk/Vg1H29J
boidPd2VkAgqAf6Hez5k
=kkKZ
-END PGP SIGNATURE-
>From b98a025f8a5b3fff8b4ed88aa10becfbedb4d745 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa 
Date: Sat, 28 May 2016 23:47:29 +0530
Subject: [PATCH] Remove flash-kernel code specific to beaglebone

Currently freedom-maker uses flash-kernel to generate boot script, copy
the DTB etc. during BeagleBone Black's image building.  This is no
longer required.  When a kernel is upgraded, flash-kernel is
automatically run from the hooks.
---
 first-run.d/80_flash-kernel |  4 
 lib/machine-detect  | 20 
 2 files changed, 24 deletions(-)

diff --git a/first-run.d/80_flash-kernel b/first-run.d/80_flash-kernel
index 614c711..e4f8f5d 100755
--- a/first-run.d/80_flash-kernel
+++ b/first-run.d/80_flash-kernel
@@ -18,10 +18,6 @@ else
 . /usr/lib/freedombox/machine-detect
 if [ "$MACHINE" = "dreamplug" ]; then
 kernel_version="$(/bin/ls /boot/vmlinuz-*-kirkwood | sort -rn | head -n1 | sed s#/boot/vmlinuz-##)"
-else
-if [ "$MACHINE" = "beaglebone" ]; then
-kernel_version="$(/bin/ls /boot/vmlinuz-*-armmp | sort -rn | head -n1 | sed s#/boot/vmlinuz-##)"
-fi
 fi
 
 log_action_begin_msg "Flashing Kernel version $kernel_version "
diff --git a/lib/machine-detect b/lib/machine-detect
index be1e0f2..498bf7a 100755
--- a/lib/machine-detect
+++ b/lib/machine-detect
@@ -22,26 +22,6 @@ case $(dpkg --print-architecture) in
 	if find /sys/devices -name 'dreamplug:*' | grep -q dreamplug: ; then
 MACHINE=dreamplug
 	fi
-
-	# Matches these:
-	# /sys/devices/leds.7/leds/beaglebone:green:heartbeat
-	# /sys/devices/leds.7/leds/beaglebone:green:mmc0
-	# /sys/devices/leds.7/leds/beaglebone:green:usr2
-	# /sys/devices/leds.7/leds/beaglebone:green:usr3
-	if find /sys/devices -name 'beaglebone:*' | grep -q beaglebone: ; then
-MACHINE=beaglebone
-	fi
-	;;
-
-armhf)
-	# Matches these:
-	# /sys/devices/leds.7/leds/beaglebone:green:heartbeat
-	# /sys/devices/leds.7/leds/beaglebone:green:mmc0
-	# /sys/devices/leds.7/leds/beaglebone:green:usr2
-	# /sys/devices/leds.7/leds/beaglebone:green:usr3
-	if find /sys/devices -name 'beaglebone:*' | grep -q beaglebone: ; then
-MACHINE=beaglebone
-	fi
 	;;
 esac
 
-- 
2.8.1