From 39aea9af4f54b24639bce61c32c6bf13a19b34e9 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 13 Mar 2014 10:46:59 -0500
Subject: [PATCH] cleanup: include_pkgs_list -> deb_include conversion
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
beagleboard.org_image.sh | 5 +++--
eewiki_barefs_image.sh | 5 +++--
eewiki_base_image.sh | 5 +++--
rcn-ee_image.sh | 5 +++--
rcn-ee_test_image.sh | 5 +++--
releases.sh | 2 +-
scripts/debootstrap.sh | 4 ++--
7 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/beagleboard.org_image.sh b/beagleboard.org_image.sh
index dd8bd9413..47904e0a2 100755
--- a/beagleboard.org_image.sh
+++ b/beagleboard.org_image.sh
@@ -104,6 +104,8 @@ minimal_armel () {
deb_distribution="${deb_distribution}"
deb_codename="${deb_codename}"
deb_arch="${deb_arch}"
+ deb_include="${deb_include}"
+
time="${time}"
deb_mirror="${deb_mirror}"
@@ -111,7 +113,6 @@ minimal_armel () {
apt_proxy="${apt_proxy}"
- include_pkgs_list="${include_pkgs_list}"
exclude_pkgs_list="${exclude_pkgs_list}"
base_pkg_list="${base_pkg_list}"
chroot_multiarch_armel="${chroot_multiarch_armel}"
@@ -274,7 +275,7 @@ pkg_list () {
if [ ! "x${no_pkgs}" = "xenable" ] ; then
. ${DIR}/var/pkg_list.sh
- include_pkgs_list="git-core,initramfs-tools,locales,sudo,wget"
+ deb_include="git-core,initramfs-tools,locales,sudo,wget"
if [ "x${include_firmware}" = "xenable" ] ; then
base_pkg_list="${base_pkgs} ${extra_pkgs} ${bborg_pkg_list} ${firmware_pkgs}"
diff --git a/eewiki_barefs_image.sh b/eewiki_barefs_image.sh
index f7e11184f..af014a082 100755
--- a/eewiki_barefs_image.sh
+++ b/eewiki_barefs_image.sh
@@ -62,6 +62,8 @@ minimal_armel () {
deb_distribution="${deb_distribution}"
deb_codename="${deb_codename}"
deb_arch="${deb_arch}"
+ deb_include="${deb_include}"
+
time="${time}"
deb_mirror="${deb_mirror}"
@@ -69,7 +71,6 @@ minimal_armel () {
apt_proxy="${apt_proxy}"
- include_pkgs_list="${include_pkgs_list}"
exclude_pkgs_list="${exclude_pkgs_list}"
base_pkg_list="${base_pkg_list}"
chroot_multiarch_armel="${chroot_multiarch_armel}"
@@ -164,7 +165,7 @@ pkg_list () {
if [ ! "x${no_pkgs}" = "xenable" ] ; then
. ${DIR}/var/pkg_list.sh
- include_pkgs_list=""
+ deb_include=""
if [ "x${include_firmware}" = "xenable" ] ; then
base_pkg_list="${base_pkgs} ${extra_pkgs} ${firmware_pkgs}"
diff --git a/eewiki_base_image.sh b/eewiki_base_image.sh
index 5de40c3d9..4ed66588f 100755
--- a/eewiki_base_image.sh
+++ b/eewiki_base_image.sh
@@ -63,6 +63,8 @@ minimal_armel () {
deb_distribution="${deb_distribution}"
deb_codename="${deb_codename}"
deb_arch="${deb_arch}"
+ deb_include="${deb_include}"
+
time="${time}"
deb_mirror="${deb_mirror}"
@@ -70,7 +72,6 @@ minimal_armel () {
apt_proxy="${apt_proxy}"
- include_pkgs_list="${include_pkgs_list}"
exclude_pkgs_list="${exclude_pkgs_list}"
base_pkg_list="${base_pkg_list}"
chroot_multiarch_armel="${chroot_multiarch_armel}"
@@ -167,7 +168,7 @@ pkg_list () {
if [ ! "x${no_pkgs}" = "xenable" ] ; then
. ${DIR}/var/pkg_list.sh
- include_pkgs_list="initramfs-tools,locales,sudo"
+ deb_include="initramfs-tools,locales,sudo"
if [ "x${include_firmware}" = "xenable" ] ; then
base_pkg_list="${nand_pkgs} ${base_pkgs} ${extra_pkgs} ${firmware_pkgs}"
diff --git a/rcn-ee_image.sh b/rcn-ee_image.sh
index a3ba67dda..f86c72d72 100755
--- a/rcn-ee_image.sh
+++ b/rcn-ee_image.sh
@@ -72,6 +72,8 @@ minimal_armel () {
deb_distribution="${deb_distribution}"
deb_codename="${deb_codename}"
deb_arch="${deb_arch}"
+ deb_include="${deb_include}"
+
time="${time}"
deb_mirror="${deb_mirror}"
@@ -79,7 +81,6 @@ minimal_armel () {
apt_proxy="${apt_proxy}"
- include_pkgs_list="${include_pkgs_list}"
exclude_pkgs_list="${exclude_pkgs_list}"
base_pkg_list="${base_pkg_list}"
chroot_multiarch_armel="${chroot_multiarch_armel}"
@@ -229,7 +230,7 @@ pkg_list () {
if [ ! "x${no_pkgs}" = "xenable" ] ; then
. ${DIR}/var/pkg_list.sh
- include_pkgs_list="git-core,initramfs-tools,locales,sudo,wget"
+ deb_include="git-core,initramfs-tools,locales,sudo,wget"
if [ "x${include_firmware}" = "xenable" ] ; then
base_pkg_list="${base_pkgs} ${extra_pkgs} ${firmware_pkgs}"
diff --git a/rcn-ee_test_image.sh b/rcn-ee_test_image.sh
index 5cf7558ed..688e9bd5d 100755
--- a/rcn-ee_test_image.sh
+++ b/rcn-ee_test_image.sh
@@ -72,6 +72,8 @@ minimal_armel () {
deb_distribution="${deb_distribution}"
deb_codename="${deb_codename}"
deb_arch="${deb_arch}"
+ deb_include="${deb_include}"
+
time="${time}"
deb_mirror="${deb_mirror}"
@@ -79,7 +81,6 @@ minimal_armel () {
apt_proxy="${apt_proxy}"
- include_pkgs_list="${include_pkgs_list}"
exclude_pkgs_list="${exclude_pkgs_list}"
base_pkg_list="${base_pkg_list}"
chroot_multiarch_armel="${chroot_multiarch_armel}"
@@ -200,7 +201,7 @@ pkg_list () {
if [ ! "x${no_pkgs}" = "xenable" ] ; then
. ${DIR}/var/pkg_list.sh
- include_pkgs_list="git-core,initramfs-tools,locales,sudo,wget"
+ deb_include="git-core,initramfs-tools,locales,sudo,wget"
if [ "x${include_firmware}" = "xenable" ] ; then
base_pkg_list="${base_pkgs} ${extra_pkgs} ${firmware_pkgs}"
diff --git a/releases.sh b/releases.sh
index d521d07ce..525455fe9 100644
--- a/releases.sh
+++ b/releases.sh
@@ -17,7 +17,7 @@ select_custom_kernel () {
machinekit_release () {
image_type="machinekit"
- include_pkgs_list="git-core,initramfs-tools,locales,sudo,wget"
+ deb_include="git-core,initramfs-tools,locales,sudo,wget"
extra_pkgs="nfs-common git-core build-essential autoconf libgd2-xpm libpth-dev dvipng tcl8.5-dev tk8.5-dev bwidget blt libxaw7-dev libncurses5-dev libreadline-dev asciidoc source-highlight dblatex xsltproc groff python-dev python-support python-tk python-lxml libglu1-mesa-dev libgl1-mesa-dev libgtk2.0-dev libgnomeprintui2.2-dev gettext libboost-python-dev texlive-lang-cyrillic libmodbus-dev libboost-thread-dev libboost-serialization-dev python-gtk2 python-gtk2-dev python-gtk2-doc python-gi python-gtksourceview2 python-imaging-tk python-notify2 python-vte python-xlib flex bison python-gtkglext1 python-serial ssh-askpass xfce4 lightdm netsurf u-boot-tools libtk-img"
#extra_pkgs="gitk git-gui"
firmware_pkgs="atmel-firmware firmware-ralink libertas-firmware zd1211-firmware"
diff --git a/scripts/debootstrap.sh b/scripts/debootstrap.sh
index 36c9a7f46..ff430bb39 100755
--- a/scripts/debootstrap.sh
+++ b/scripts/debootstrap.sh
@@ -60,8 +60,8 @@ check_defines () {
esac
fi
- if [ "${include_pkgs_list}" ] ; then
- include="--include ${include_pkgs_list}"
+ if [ "${deb_include}" ] ; then
+ include="--include ${deb_include}"
else
include=""
fi
--
GitLab