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 <su...@medhas.org>
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
