Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rocko migration: remove rng-tools 

This tool was only needed for old kernels, newer kernels use the hardware
random number generator themselves.

https://jira.digi.com/browse/DEL-5518

Signed-off-by: Jose Diaz de Grenu <Jose.DiazdeGrenu@digi.com>
This commit is contained in:
Jose Diaz de Grenu 2018-01-02 10:27:10 +01:00
parent f65b736bb0
commit 7416361505
7 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-digi-arm/conf/machine/ccimx6sbc.conf
View File

@ -5,9 +5,6 @@
# Contains the ConnectCore 6 module.
include conf/machine/include/ccimx6.inc
# To be removed (rng-tools) once kernel 3.14 is deprecated
MACHINE_EXTRA_RRECOMMENDS += "rng-tools"
# Firmware
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}"
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_WIFI', '1' , 'firmware-atheros-ath6kl', '', d)}"

1
meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
View File

@ -55,7 +55,6 @@ FILES_${PN} = "/"
RDEPENDS_${PN}_append_ccimx6sbc = " \
cryptsetup \
rng-tools \
"
RDEPENDS_${PN}_append_ccimx6qpsbc = " cryptsetup"

6
meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init
View File

@ -394,12 +394,6 @@ mkdir -p /var/lock
# Set kernel console loglevel.
sysctl -q -w kernel.printk=4
# Launch 'rngd' to feed random data to kernel entropy pool
# for kernels previous to v3.17
if [ "$(get_kernel_version)" -lt "$(((3 << 8) + 17))" ]; then
mkdir -p /var/run && rngd
fi
# Start psplash.
psplash &

5
meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
View File

@ -27,13 +27,10 @@ RDEPENDS_${PN} = " \
u-boot-fw-utils \
"
RDEPENDS_${PN}_append_ccimx6sbc = " \
RDEPENDS_${PN}_append_ccimx6 = " \
cryptsetup \
rng-tools \
"
RDEPENDS_${PN}_append_ccimx6qpsbc = " cryptsetup"
RDEPENDS_${PN}_append_ccimx6ul = " \
mtd-utils-ubifs \
"

23
meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/ccimx6/trustfence-initramfs-init
View File

@ -24,19 +24,6 @@ error() {
sync && poweroff -f
}
#------------------------------------------------------------------------------
# Function - get_kernel_version
#
# Obtain the kernel version and return it in number format
#
# @return - kernel version
#------------------------------------------------------------------------------
get_kernel_version() {
major="$(uname -r | cut -d'.' -f1)"
minor="$(uname -r | cut -d'.' -f2)"
echo $(((major << 8) + minor))
}
# Main
#------------------------------------------------------------------------------
# Setup the environment.
@ -51,12 +38,6 @@ mount -t devtmpfs devtmpfs /dev
LOGLEVEL="$(sysctl -n kernel.printk)"
sysctl -q -w kernel.printk=4
# Launch 'rngd' to feed random data to kernel entropy pool
# for kernels previous to v3.17
if [ "$(get_kernel_version)" -lt "$(((3 << 8) + 17))" ]; then
mkdir -p /var/run && rngd
fi
for arg in $(cat /proc/cmdline); do
case "${arg}" in
init=*|rescue=1|root=*) eval ${arg};;
@ -91,13 +72,9 @@ mount ${FSTYPE:+-t ${FSTYPE}} ${root} /newroot
#
# Clean-up and do the switch_root to the final rootfs
#
# - explicit kill 'rngd' daemon so it doesn't leak to the final rootfs
# - restore previous kernel console loglevel
# - umount virtual filesystems
#
if [ "$(get_kernel_version)" -lt "$(((3 << 8) + 17))" ]; then
pkill -9 rngd
fi
[ -n "${LOGLEVEL}" ] && sysctl -q -w kernel.printk="${LOGLEVEL}"
mount --move /dev /newroot/dev
umount /sys /proc

2
meta-digi-dey/recipes-support/rng-tools/rng-tools/default
View File

@ -1,2 +0,0 @@
# Specify rng device
RNG_DEVICE=/dev/hwrng

3
meta-digi-dey/recipes-support/rng-tools/rng-tools_%.bbappend
View File

@ -1,3 +0,0 @@
# Copyright (C) 2016 Digi International.
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"