From edbe5f4967af92e508105006646396eb876a5ec3 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 19 Feb 2015 10:53:18 -0600
Subject: [PATCH] ubuntu: no acpi-support-base

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 configs/bb.org-console-debian-stable.conf     | 14 +++------
 configs/bb.org-debian-next-4gb-v3.14.conf     | 30 ++++++++-----------
 configs/bb.org-debian-next-4gb.conf           | 30 ++++++++-----------
 .../rcn-ee_console_ubuntu_stable_armhf.conf   |  2 +-
 4 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/configs/bb.org-console-debian-stable.conf b/configs/bb.org-console-debian-stable.conf
index ebb6db442..bbf535b89 100644
--- a/configs/bb.org-console-debian-stable.conf
+++ b/configs/bb.org-console-debian-stable.conf
@@ -12,9 +12,11 @@ image_type="console"
 deb_distribution="debian"
 deb_codename="wheezy"
 deb_arch="armhf"
-deb_include="ca-certificates dosfstools initramfs-tools linux-base openssh-server patch rsync systemd sudo wget"
+deb_include="ca-certificates dosfstools initramfs-tools linux-base \
+openssh-server patch rsync sudo systemd wget"
 #
-deb_exclude="aptitude aptitude-common groff-base info install-info manpages man-db tasksel tasksel-data"
+deb_exclude="aptitude aptitude-common groff-base info install-info man-db \
+manpages tasksel tasksel-data"
 #
 deb_components="main contrib non-free"
 deb_mirror=""
@@ -46,14 +48,6 @@ bbx15-ducati-firmware-installer rcn-ee-archive-keyring tiomapconf"
 repo_rcnee_pkg_version="3.8.13-bone70"
 #include_firmware="enable"
 #
-#repo_external="enable"
-#repo_external_arch="armhf"
-#repo_external_server="http://debian.beagleboard.org/packages"
-#repo_external_dist="wheezy-bbb"
-#repo_external_components="main"
-#repo_external_key="debian.beagleboard.org-archive-keyring.asc"
-#repo_external_pkg_list="beaglebone"
-#
 chroot_COPY_SETUP_SDCARD="enable"
 chroot_before_hook=""
 chroot_after_hook=""
diff --git a/configs/bb.org-debian-next-4gb-v3.14.conf b/configs/bb.org-debian-next-4gb-v3.14.conf
index aaee508e6..4d8404097 100644
--- a/configs/bb.org-debian-next-4gb-v3.14.conf
+++ b/configs/bb.org-debian-next-4gb-v3.14.conf
@@ -17,15 +17,12 @@ deb_include="alsa-utils apache2 autoconf automake avahi-daemon bash-completion \
 bc bison bluetooth build-essential ca-certificates connman cpufrequtils curl \
 dbus-x11 debhelper dnsmasq dosfstools fakeroot fbset file firmware-atheros \
 firmware-ralink firmware-realtek firmware-zd1211 flex gdb git-core hdparm \
-hexedit hostapd htop i2c-tools info initramfs-tools iw libtool libncurses5-dev \
-lightdm linux-base locales lshw lsof lzma lzop \
-openssh-server openbox ppp \
-read-edid rfkill rsync ruby ruby-dev \
-screen ssl-cert systemd sudo tightvncserver tmux usb-modeswitch usbutils \
-u-boot-tools v4l-utils vim wireless-tools wget wpasupplicant wvdial xinput \
-xinput-calibrator xorg xserver-xorg-video-fbdev \
-xserver-xorg-video-modesetting zd1211-firmware \
-python-minimal"
+hexedit hostapd htop i2c-tools info initramfs-tools iw libncurses5-dev libtool \
+lightdm linux-base locales lshw lsof lzma lzop openbox openssh-server ppp \
+python-minimal read-edid rfkill rsync ruby ruby-dev screen ssl-cert sudo systemd \
+ tightvncserver tmux u-boot-tools usb-modeswitch usbutils v4l-utils vim wget \
+wireless-tools wpasupplicant wvdial xinput xinput-calibrator \
+xorg xserver-xorg-video-fbdev xserver-xorg-video-modesetting zd1211-firmware"
 #
 deb_exclude=""
 #
@@ -36,10 +33,9 @@ deb_mirror=""
 ##
 #python-2.7: due to: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769106
 #
-deb_additional_pkgs="libpython2.7-dev lsb-release \
-nodejs nodejs-legacy npm pastebinit python-dev \
-python-opencv python-pip python-serial \
-libopencv-dev systemd-sysv"
+deb_additional_pkgs="libopencv-dev libpython2.7-dev lsb-release nodejs \
+nodejs-legacy npm pastebinit python-dev python-opencv python-pip python-serial \
+systemd-sysv"
 ##
 rfs_username="debian"
 rfs_fullname="Demo User"
@@ -60,11 +56,11 @@ rfs_ssh_user_pass="enable"
 repo_rcnee="enable"
 repo_rcnee_pkg_list="linux-image-3.14.33-ti-r50 \
 am335x-pru-package ap-hotspot bbx15-ducati-firmware-installer cloud9-installer \
-cmst compton-conf dart-1.8 device-tree-compiler libfm-tools libsoc2 libsoc-dev \
-lxqt-about lxqt-admin lxqt-config lxqt-common lxqt-globalkeys \
+cmst compton-conf dart-1.8 device-tree-compiler libfm-tools libsoc-dev libsoc2 \
+lximage-qt lxqt-about lxqt-admin lxqt-common lxqt-config lxqt-globalkeys \
 lxqt-notificationd lxqt-panel lxqt-policykit lxqt-runner lxqt-session obconf \
-pcmanfm-qt5 lximage-qt rcn-ee-archive-keyring tiomapconf \
-ti-pru-cgt-installer qterminal qupzilla xserver-xorg-video-omap"
+pcmanfm-qt5 qterminal qupzilla rcn-ee-archive-keyring ti-pru-cgt-installer \
+tiomapconf xserver-xorg-video-omap"
 #
 repo_rcnee_pkg_version="3.14.33-ti-r50"
 include_firmware="enable"
diff --git a/configs/bb.org-debian-next-4gb.conf b/configs/bb.org-debian-next-4gb.conf
index e6328374e..38011f307 100644
--- a/configs/bb.org-debian-next-4gb.conf
+++ b/configs/bb.org-debian-next-4gb.conf
@@ -17,15 +17,12 @@ deb_include="alsa-utils apache2 autoconf automake avahi-daemon bash-completion \
 bc bison bluetooth build-essential ca-certificates connman cpufrequtils curl \
 dbus-x11 debhelper dnsmasq dosfstools fakeroot fbset file firmware-atheros \
 firmware-ralink firmware-realtek firmware-zd1211 flex gdb git-core hdparm \
-hexedit hostapd htop i2c-tools info initramfs-tools iw libtool libncurses5-dev \
-lightdm linux-base locales lshw lsof lzma lzop \
-openssh-server openbox ppp \
-read-edid rfkill rsync ruby ruby-dev \
-screen ssl-cert systemd sudo tightvncserver tmux usb-modeswitch usbutils \
-u-boot-tools v4l-utils vim wireless-tools wget wpasupplicant wvdial xinput \
-xinput-calibrator xorg xserver-xorg-video-fbdev \
-xserver-xorg-video-modesetting zd1211-firmware \
-python-minimal"
+hexedit hostapd htop i2c-tools info initramfs-tools iw libncurses5-dev libtool \
+lightdm linux-base locales lshw lsof lzma lzop openbox openssh-server ppp \
+python-minimal read-edid rfkill rsync ruby ruby-dev screen ssl-cert sudo systemd \
+ tightvncserver tmux u-boot-tools usb-modeswitch usbutils v4l-utils vim wget \
+wireless-tools wpasupplicant wvdial xinput xinput-calibrator \
+xorg xserver-xorg-video-fbdev xserver-xorg-video-modesetting zd1211-firmware"
 #
 deb_exclude=""
 #
@@ -36,10 +33,9 @@ deb_mirror=""
 ##
 #python-2.7: due to: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769106
 #
-deb_additional_pkgs="libpython2.7-dev lsb-release \
-nodejs nodejs-legacy npm pastebinit python-dev \
-python-opencv python-pip python-serial \
-libopencv-dev systemd-sysv"
+deb_additional_pkgs="libopencv-dev libpython2.7-dev lsb-release nodejs \
+nodejs-legacy npm pastebinit python-dev python-opencv python-pip python-serial \
+systemd-sysv"
 ##
 rfs_username="debian"
 rfs_fullname="Demo User"
@@ -60,11 +56,11 @@ rfs_ssh_user_pass="enable"
 repo_rcnee="enable"
 repo_rcnee_pkg_list="linux-image-3.8.13-bone70 \
 am335x-pru-package ap-hotspot bbx15-ducati-firmware-installer cloud9-installer \
-cmst compton-conf dart-1.8 device-tree-compiler libfm-tools libsoc2 libsoc-dev \
-lxqt-about lxqt-admin lxqt-config lxqt-common lxqt-globalkeys \
+cmst compton-conf dart-1.8 device-tree-compiler libfm-tools libsoc-dev libsoc2 \
+lximage-qt lxqt-about lxqt-admin lxqt-common lxqt-config lxqt-globalkeys \
 lxqt-notificationd lxqt-panel lxqt-policykit lxqt-runner lxqt-session obconf \
-pcmanfm-qt5 lximage-qt rcn-ee-archive-keyring tiomapconf \
-ti-pru-cgt-installer qterminal qupzilla xserver-xorg-video-omap"
+pcmanfm-qt5 qterminal qupzilla rcn-ee-archive-keyring ti-pru-cgt-installer \
+tiomapconf xserver-xorg-video-omap"
 #
 repo_rcnee_pkg_version="3.8.13-bone70"
 include_firmware="enable"
diff --git a/configs/rcn-ee_console_ubuntu_stable_armhf.conf b/configs/rcn-ee_console_ubuntu_stable_armhf.conf
index 41098eaf2..110158413 100644
--- a/configs/rcn-ee_console_ubuntu_stable_armhf.conf
+++ b/configs/rcn-ee_console_ubuntu_stable_armhf.conf
@@ -11,7 +11,7 @@ image_type="console"
 deb_distribution="ubuntu"
 deb_codename="trusty"
 deb_arch="armhf"
-deb_include="acpi-support-base acpid alsa-utils apache2 avahi-daemon \
+deb_include="acpid alsa-utils apache2 avahi-daemon \
 bash-completion bsdmainutils ca-certificates cpufrequtils dnsmasq dosfstools \
 fbset file git-core hdparm hexedit hostapd i2c-tools initramfs-tools linux-base \
 locales lowpan-tools lshw memtester nano openssh-server patch ppp read-edid \
-- 
GitLab