From f2d67766feaf1b1f6244752dd3d88c5a762a6fdf Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 14 Apr 2015 16:08:00 -0500
Subject: [PATCH] eewiki: prep for jessie, bare/minfs images

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 configs/eewiki_bare_debian_jessie_armel.conf  | 35 +++++++++++++++++
 configs/eewiki_bare_debian_jessie_armhf.conf  | 39 +++++++++++++++++++
 configs/eewiki_minfs_debian_jessie_armel.conf | 37 ++++++++++++++++++
 configs/eewiki_minfs_debian_jessie_armhf.conf |  4 +-
 publish/rcn-ee_eewiki.sh                      | 19 ++++-----
 scripts/chroot.sh                             | 19 ++++++++-
 6 files changed, 138 insertions(+), 15 deletions(-)
 create mode 100644 configs/eewiki_bare_debian_jessie_armel.conf
 create mode 100644 configs/eewiki_bare_debian_jessie_armhf.conf
 create mode 100644 configs/eewiki_minfs_debian_jessie_armel.conf

diff --git a/configs/eewiki_bare_debian_jessie_armel.conf b/configs/eewiki_bare_debian_jessie_armel.conf
new file mode 100644
index 000000000..0656fe32c
--- /dev/null
+++ b/configs/eewiki_bare_debian_jessie_armel.conf
@@ -0,0 +1,35 @@
+##
+release="8.0"
+image_type="bare"
+##
+##Debootstrap: https://wiki.debian.org/Debootstrap
+##
+##debootstrap --arch=${deb_arch} --include=${deb_include} --exclude=${deb_exclude} \
+##--components=${deb_components} --foreign ${deb_codename} /tmp/tmp.dir/ http://${deb_mirror}
+##
+deb_distribution="debian"
+deb_codename="jessie"
+deb_arch="armel"
+deb_include="busybox"
+deb_exclude="aptitude aptitude-common dmidecode groff-base info install-info manpages man-db tasksel tasksel-data vim-common vim-tiny wget whiptail"
+deb_components="main contrib non-free"
+deb_mirror=""
+##
+##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
+##
+deb_additional_pkgs=""
+##
+rfs_username="debian"
+rfs_fullname="Demo User"
+rfs_password="temppwd"
+rfs_hostname="arm"
+rfs_startup_scripts=""
+rfs_opt_scripts=""
+rfs_console_banner=""
+rfs_console_user_pass="enable"
+rfs_ssh_banner=""
+rfs_ssh_user_pass=""
+##
+chroot_not_reliable_deborphan=""
+chroot_manual_deborphan_list="libboost-iostreams1.55.0 libgdbm3 libnewt0.52 libpipeline1 libsigc++-2.0-0c2a libssl1.0.0"
+chroot_very_small_image="enable"
diff --git a/configs/eewiki_bare_debian_jessie_armhf.conf b/configs/eewiki_bare_debian_jessie_armhf.conf
new file mode 100644
index 000000000..89b3f1a40
--- /dev/null
+++ b/configs/eewiki_bare_debian_jessie_armhf.conf
@@ -0,0 +1,39 @@
+##
+release="8.0"
+image_type="bare"
+##
+##Debootstrap: https://wiki.debian.org/Debootstrap
+##
+##debootstrap --arch=${deb_arch} --include=${deb_include} --exclude=${deb_exclude} \
+##--components=${deb_components} --foreign ${deb_codename} /tmp/tmp.dir/ http://${deb_mirror}
+##
+deb_distribution="debian"
+deb_codename="jessie"
+deb_arch="armhf"
+deb_include="busybox"
+deb_exclude="aptitude aptitude-common dmidecode groff-base info install-info manpages man-db tasksel tasksel-data vim-common vim-tiny wget whiptail"
+deb_components="main contrib non-free"
+deb_mirror=""
+##
+##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
+##
+deb_additional_pkgs=""
+##
+rfs_username="debian"
+rfs_fullname="Demo User"
+rfs_password="temppwd"
+rfs_hostname="arm"
+rfs_startup_scripts=""
+rfs_opt_scripts=""
+rfs_console_banner=""
+rfs_console_user_pass="enable"
+rfs_ssh_banner=""
+rfs_ssh_user_pass=""
+##
+##enable kernel repo: http://repos.rcn-ee.net/(debian|ubuntu)
+repo_rcnee="enable"
+repo_rcnee_pkg_list=""
+##
+chroot_not_reliable_deborphan=""
+chroot_manual_deborphan_list="libboost-iostreams1.55.0 libgdbm3 libnewt0.52 libpipeline1 libsigc++-2.0-0c2a libssl1.0.0"
+chroot_very_small_image="enable"
diff --git a/configs/eewiki_minfs_debian_jessie_armel.conf b/configs/eewiki_minfs_debian_jessie_armel.conf
new file mode 100644
index 000000000..ba9047222
--- /dev/null
+++ b/configs/eewiki_minfs_debian_jessie_armel.conf
@@ -0,0 +1,37 @@
+##
+release="8.0"
+image_type="minimal"
+##
+##Debootstrap: https://wiki.debian.org/Debootstrap
+##
+##debootstrap --arch=${deb_arch} --include=${deb_include} --exclude=${deb_exclude} \
+##--components=${deb_components} --foreign ${deb_codename} /tmp/tmp.dir/ http://${deb_mirror}
+##
+deb_distribution="debian"
+deb_codename="jessie"
+deb_arch="armel"
+deb_include="initramfs-tools locales sudo mtd-utils git-core ca-certificates nano pastebinit file lsb-release bsdmainutils i2c-tools fbset hexedit hdparm memtester read-edid u-boot-tools acpid dosfstools btrfs-tools cpufrequtils ntpdate ppp usb-modeswitch usbutils apache2 openssh-server udhcpd avahi-daemon wireless-tools wpasupplicant lowpan-tools wvdial lshw hostapd rsync systemd python-dbus atmel-firmware firmware-ralink firmware-realtek libertas-firmware zd1211-firmware"
+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=""
+##
+rfs_username="debian"
+rfs_fullname="Demo User"
+rfs_password="temppwd"
+rfs_hostname="arm"
+rfs_startup_scripts="enable"
+rfs_opt_scripts="https://github.com/RobertCNelson/boot-scripts"
+rfs_default_locale="en_US.UTF-8"
+rfs_console_banner=""
+rfs_console_user_pass="enable"
+rfs_ssh_banner=""
+rfs_ssh_user_pass=""
+##
+include_firmware="enable"
+##
+#chroot_very_small_image=""
+chroot_tarball="enable"
diff --git a/configs/eewiki_minfs_debian_jessie_armhf.conf b/configs/eewiki_minfs_debian_jessie_armhf.conf
index 90b9b20be..97a19a94d 100644
--- a/configs/eewiki_minfs_debian_jessie_armhf.conf
+++ b/configs/eewiki_minfs_debian_jessie_armhf.conf
@@ -1,5 +1,5 @@
 ##
-release="jessie"
+release="8.0"
 image_type="minimal"
 ##
 ##Debootstrap: https://wiki.debian.org/Debootstrap
@@ -7,8 +7,6 @@ image_type="minimal"
 ##debootstrap --arch=${deb_arch} --include=${deb_include} --exclude=${deb_exclude} \
 ##--components=${deb_components} --foreign ${deb_codename} /tmp/tmp.dir/ http://${deb_mirror}
 ##
-##Debian Jessie (Stable) armhf
-##
 deb_distribution="debian"
 deb_codename="jessie"
 deb_arch="armhf"
diff --git a/publish/rcn-ee_eewiki.sh b/publish/rcn-ee_eewiki.sh
index d694ac54d..e69ffb27d 100755
--- a/publish/rcn-ee_eewiki.sh
+++ b/publish/rcn-ee_eewiki.sh
@@ -5,28 +5,25 @@ DIR="$PWD"
 
 export apt_proxy=apt-proxy:3142/
 
-./RootStock-NG.sh -c eewiki_bare_debian_wheezy_armel
-./RootStock-NG.sh -c eewiki_bare_debian_wheezy_armhf
+./RootStock-NG.sh -c eewiki_bare_debian_jessie_armel
+./RootStock-NG.sh -c eewiki_bare_debian_jessie_armhf
 
-./RootStock-NG.sh -c eewiki_minfs_debian_wheezy_armel
-./RootStock-NG.sh -c eewiki_minfs_debian_wheezy_armhf
+./RootStock-NG.sh -c eewiki_minfs_debian_jessie_armel
 ./RootStock-NG.sh -c eewiki_minfs_debian_jessie_armhf
 ./RootStock-NG.sh -c eewiki_minfs_ubuntu_trusty_armhf
 
-debian_stable="debian-7.8"
-debian_testing="debian-jessie"
+debian_jessie="debian-8.0"
 ubuntu_stable="ubuntu-14.04.2"
 archive="xz -z -8 -v"
 
 cat > ${DIR}/deploy/gift_wrap_final_images.sh <<-__EOF__
 #!/bin/bash
 
-${archive} ${debian_stable}-bare-armel-${time}.tar
-${archive} ${debian_stable}-bare-armhf-${time}.tar
+${archive} ${debian_jessie}-bare-armel-${time}.tar
+${archive} ${debian_jessie}-bare-armhf-${time}.tar
 
-${archive} ${debian_stable}-minimal-armel-${time}.tar
-${archive} ${debian_stable}-minimal-armhf-${time}.tar
-${archive} ${debian_testing}-minimal-armhf-${time}.tar
+${archive} ${debian_jessie}-minimal-armel-${time}.tar
+${archive} ${debian_jessie}-minimal-armhf-${time}.tar
 
 ${archive} ${ubuntu_stable}-minimal-armhf-${time}.tar
 
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 6f01735c6..7a3d96878 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -479,6 +479,23 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 
 		apt-get update
 		apt-get upgrade -y --force-yes
+
+		if [ -f /bin/busybox ] ; then
+			echo "Log: (chroot): Setting up BusyBox"
+
+			busybox --install -s /usr/local/bin/
+
+			#conflicts with systemd reboot...
+			if [ -f /usr/local/bin/reboot ] ; then
+				rm -f /usr/local/bin/reboot
+			fi
+
+			#tar: unrecognized option '--warning=no-timestamp'
+			#BusyBox v1.22.1 (Debian 1:1.22.0-9+deb8u1) multi-call binary.
+			if [ -f /usr/local/bin/tar ] ; then
+				rm -f /usr/local/bin/tar
+			fi
+		fi
 	}
 
 	install_pkgs () {
@@ -561,7 +578,7 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 		# Purge keep file
 		deborphan -Z
 
-		#FIXME, only tested on wheezy...
+		#FIXME, only tested on wheezy/jessie...
 		apt-get -y remove deborphan dialog gettext-base libasprintf0c2 --purge
 		apt-get clean
 	}
-- 
GitLab