From 5ea165cc1da51afb8e0cdef2f109d2f1a25a0999 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 7 Jun 2018 19:37:13 -0500
Subject: [PATCH] elinux: sync bionic changes

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 .../bb.org-debian-buster-efi-iot-v4.14.conf   |  2 +-
 configs/bb.org-debian-buster-iot-v4.14.conf   |  2 +-
 configs/bb.org-debian-buster-iot-v4.9.conf    |  2 +-
 .../bb.org-ubuntu-bionic-ros-iot-v4.14.conf   |  2 +-
 .../rcn-ee_console_debian_buster_armhf.conf   | 18 ++++++++++++----
 .../rcn-ee_console_debian_stretch_armhf.conf  | 21 ++++++++++++++-----
 .../rcn-ee_console_ubuntu_bionic_armhf.conf   | 21 +++++++++++++------
 7 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/configs/bb.org-debian-buster-efi-iot-v4.14.conf b/configs/bb.org-debian-buster-efi-iot-v4.14.conf
index c6df62604..0470914cb 100644
--- a/configs/bb.org-debian-buster-efi-iot-v4.14.conf
+++ b/configs/bb.org-debian-buster-efi-iot-v4.14.conf
@@ -26,8 +26,8 @@ deb_include="	\
 	cpufrequtils	\
 	curl	\
 	device-tree-compiler	\
-	dosfstools	\
 	dnsmasq	\
+	dosfstools	\
 	fake-hwclock	\
 	firmware-atheros	\
 	firmware-brcm80211	\
diff --git a/configs/bb.org-debian-buster-iot-v4.14.conf b/configs/bb.org-debian-buster-iot-v4.14.conf
index e803c7a05..d23208dfd 100644
--- a/configs/bb.org-debian-buster-iot-v4.14.conf
+++ b/configs/bb.org-debian-buster-iot-v4.14.conf
@@ -26,8 +26,8 @@ deb_include="	\
 	cpufrequtils	\
 	curl	\
 	device-tree-compiler	\
-	dosfstools	\
 	dnsmasq	\
+	dosfstools	\
 	fake-hwclock	\
 	firmware-atheros	\
 	firmware-brcm80211	\
diff --git a/configs/bb.org-debian-buster-iot-v4.9.conf b/configs/bb.org-debian-buster-iot-v4.9.conf
index 85eee649a..fdb9cddff 100644
--- a/configs/bb.org-debian-buster-iot-v4.9.conf
+++ b/configs/bb.org-debian-buster-iot-v4.9.conf
@@ -26,8 +26,8 @@ deb_include="	\
 	cpufrequtils	\
 	curl	\
 	device-tree-compiler	\
-	dosfstools	\
 	dnsmasq	\
+	dosfstools	\
 	fake-hwclock	\
 	firmware-atheros	\
 	firmware-brcm80211	\
diff --git a/configs/bb.org-ubuntu-bionic-ros-iot-v4.14.conf b/configs/bb.org-ubuntu-bionic-ros-iot-v4.14.conf
index 598ff3c65..aaf6625f8 100644
--- a/configs/bb.org-ubuntu-bionic-ros-iot-v4.14.conf
+++ b/configs/bb.org-ubuntu-bionic-ros-iot-v4.14.conf
@@ -26,8 +26,8 @@ deb_include="	\
 	cpufrequtils	\
 	curl	\
 	device-tree-compiler	\
-	dosfstools	\
 	dnsmasq	\
+	dosfstools	\
 	fake-hwclock	\
 	git	\
 	gnupg	\
diff --git a/configs/rcn-ee_console_debian_buster_armhf.conf b/configs/rcn-ee_console_debian_buster_armhf.conf
index 5be335b76..c06446e3b 100644
--- a/configs/rcn-ee_console_debian_buster_armhf.conf
+++ b/configs/rcn-ee_console_debian_buster_armhf.conf
@@ -17,13 +17,18 @@ deb_include="	\
 	alsa-utils	\
 	avahi-utils	\
 	bash-completion	\
+	bc	\
+	bluetooth	\
 	bsdmainutils	\
+	build-essential	\
 	ca-certificates	\
+	can-utils	\
 	cpufrequtils	\
 	crda	\
 	device-tree-compiler	\
 	dnsmasq	\
 	dosfstools	\
+	fake-hwclock	\
 	fbset	\
 	file	\
 	firmware-atheros	\
@@ -35,6 +40,7 @@ deb_include="	\
 	firmware-zd1211	\
 	git	\
 	gnupg	\
+	haveged	\
 	hdparm	\
 	hexedit	\
 	hostapd	\
@@ -46,6 +52,7 @@ deb_include="	\
 	locales	\
 	lsb-release	\
 	lshw	\
+	make	\
 	memtester	\
 	nano	\
 	nethogs	\
@@ -54,6 +61,7 @@ deb_include="	\
 	openssh-server	\
 	pastebinit	\
 	patch	\
+	pkg-config	\
 	ppp	\
 	pps-tools	\
 	python-dbus	\
@@ -73,20 +81,20 @@ deb_include="	\
 	wpasupplicant	\
 "
 
+#
 deb_exclude=""
+#
 deb_components="main contrib non-free"
 deb_mirror=""
 ##
 ##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
 ##
 deb_additional_pkgs="	\
-	bison	\
-	build-essential	\
 	btrfs-progs	\
-	flex	\
+	grub-efi-arm	\
+	ifupdown	\
 	libnss-systemd	\
 	libpam-systemd	\
-	make	\
 "
 
 ##
@@ -96,6 +104,8 @@ rfs_password="temppwd"
 rfs_hostname="arm"
 rfs_startup_scripts="enable"
 rfs_opt_scripts="https://github.com/RobertCNelson/boot-scripts"
+rfs_default_desktop=""
+rfs_desktop_background=""
 rfs_default_locale="en_US.UTF-8"
 rfs_etc_dogtag="rcn-ee.net console Debian Image"
 rfs_console_banner="Support/FAQ: http://elinux.org/BeagleBoardDebian"
diff --git a/configs/rcn-ee_console_debian_stretch_armhf.conf b/configs/rcn-ee_console_debian_stretch_armhf.conf
index 10b981137..dceab2e7f 100644
--- a/configs/rcn-ee_console_debian_stretch_armhf.conf
+++ b/configs/rcn-ee_console_debian_stretch_armhf.conf
@@ -18,13 +18,18 @@ deb_include="	\
 	apache2	\
 	avahi-utils	\
 	bash-completion	\
+	bc	\
+	bluetooth	\
 	bsdmainutils	\
+	build-essential	\
 	ca-certificates	\
+	can-utils	\
 	cpufrequtils	\
 	crda	\
 	device-tree-compiler	\
 	dnsmasq	\
 	dosfstools	\
+	fake-hwclock	\
 	fbset	\
 	file	\
 	firmware-atheros	\
@@ -35,6 +40,8 @@ deb_include="	\
 	firmware-ti-connectivity	\
 	firmware-zd1211	\
 	git	\
+	gnupg	\
+	haveged	\
 	hdparm	\
 	hexedit	\
 	hostapd	\
@@ -46,6 +53,7 @@ deb_include="	\
 	locales	\
 	lsb-release	\
 	lshw	\
+	make	\
 	memtester	\
 	nano	\
 	nethogs	\
@@ -53,6 +61,7 @@ deb_include="	\
 	openssh-server	\
 	pastebinit	\
 	patch	\
+	pkg-config	\
 	ppp	\
 	pps-tools	\
 	python-dbus	\
@@ -70,22 +79,22 @@ deb_include="	\
 	wireless-regdb	\
 	wireless-tools	\
 	wpasupplicant	\
-	wvdial	\
 "
 
+#
 deb_exclude=""
+#
 deb_components="main contrib non-free"
 deb_mirror=""
 ##
 ##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
 ##
 deb_additional_pkgs="	\
-	bison	\
-	build-essential	\
 	btrfs-progs	\
-	flex	\
+	grub-efi-arm	\
+	ifupdown	\
+	libnss-systemd	\
 	libpam-systemd	\
-	make	\
 "
 
 ##
@@ -95,6 +104,8 @@ rfs_password="temppwd"
 rfs_hostname="arm"
 rfs_startup_scripts="enable"
 rfs_opt_scripts="https://github.com/RobertCNelson/boot-scripts"
+rfs_default_desktop=""
+rfs_desktop_background=""
 rfs_default_locale="en_US.UTF-8"
 rfs_etc_dogtag="rcn-ee.net console Debian Image"
 rfs_console_banner="Support/FAQ: http://elinux.org/BeagleBoardDebian"
diff --git a/configs/rcn-ee_console_ubuntu_bionic_armhf.conf b/configs/rcn-ee_console_ubuntu_bionic_armhf.conf
index 9eed8ffaf..36a898515 100644
--- a/configs/rcn-ee_console_ubuntu_bionic_armhf.conf
+++ b/configs/rcn-ee_console_ubuntu_bionic_armhf.conf
@@ -16,18 +16,23 @@ deb_include="	\
 	alsa-utils	\
 	avahi-utils	\
 	bash-completion	\
+	bc	\
+	bluetooth	\
 	bsdmainutils	\
+	build-essential	\
 	ca-certificates	\
-	connman	\
+	can-utils	\
 	cpufrequtils	\
 	crda	\
 	device-tree-compiler	\
 	dnsmasq	\
 	dosfstools	\
+	fake-hwclock	\
 	fbset	\
 	file	\
 	git	\
 	gnupg	\
+	haveged	\
 	hdparm	\
 	hexedit	\
 	hostapd	\
@@ -39,6 +44,7 @@ deb_include="	\
 	locales	\
 	lsb-release	\
 	lshw	\
+	make	\
 	memtester	\
 	nano	\
 	nethogs	\
@@ -47,6 +53,7 @@ deb_include="	\
 	openssh-server	\
 	pastebinit	\
 	patch	\
+	pkg-config	\
 	ppp	\
 	pps-tools	\
 	python-dbus	\
@@ -66,20 +73,20 @@ deb_include="	\
 	wpasupplicant	\
 "
 
+#
 deb_exclude=""
+#
 deb_components="main universe multiverse"
 deb_mirror=""
 ##
 ##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
 ##
 deb_additional_pkgs="	\
-	bison	\
-	build-essential	\
 	btrfs-progs	\
-	flex	\
+	grub-efi-arm	\
+	ifupdown	\
 	libnss-systemd	\
 	libpam-systemd	\
-	make	\
 "
 
 ##
@@ -89,6 +96,8 @@ rfs_password="temppwd"
 rfs_hostname="arm"
 rfs_startup_scripts="enable"
 rfs_opt_scripts="https://github.com/RobertCNelson/boot-scripts"
+rfs_default_desktop=""
+rfs_desktop_background=""
 rfs_default_locale="en_US.UTF-8"
 rfs_etc_dogtag="rcn-ee.net console Ubuntu Image"
 rfs_console_banner="Support/FAQ: http://elinux.org/BeagleBoardUbuntu"
@@ -103,8 +112,8 @@ repo_rcnee_pkg_list="	\
 	bb-customizations	\
 	bb-wl18xx-firmware	\
 	bluetooth	\
+	connman	\
 	gpiod	\
-	ifupdown	\
 	ipumm-dra7xx-installer	\
 	linux-image-4.14.44-ti-r51	\
 	linux-image-4.16.14-armv7-x0	\
-- 
GitLab