From ea86e42014f5483d3cf3786c6707884198d7a65c Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Tue, 31 Jan 2012 20:40:04 +0100
Subject: [PATCH] [molecules/beaglebone] reorganize molecules, drop 16GB image
 in favour of 2GB

---
 molecules/beaglebone.common                   |  7 ++++
 .../sabayon-arm-beaglebone-base-16G.spec      | 24 -----------
 ...ec => sabayon-arm-beaglebone-base-2G.spec} |  4 +-
 scripts/iso_build.sh                          |  6 +--
 scripts/mkloopcard_beaglebone_chroot_hook.sh  | 40 ++++++++++++++-----
 5 files changed, 41 insertions(+), 40 deletions(-)
 delete mode 100644 molecules/sabayon-arm-beaglebone-base-16G.spec
 rename molecules/{sabayon-arm-beaglebone-base-8G.spec => sabayon-arm-beaglebone-base-2G.spec} (91%)

diff --git a/molecules/beaglebone.common b/molecules/beaglebone.common
index 51293dc..395ae20 100644
--- a/molecules/beaglebone.common
+++ b/molecules/beaglebone.common
@@ -1,5 +1,12 @@
 # List of packages to add on the BeagleBoard xM
 packages_to_add:
+	app-misc/sabayonlive-tools,
+	app-misc/sabayon-skel,
+	app-admin/syslog-ng,
+	net-fs/nfs-utils,
+	net-misc/ntp,
+	sys-apps/keyboard-configuration-helpers,
+	sys-apps/language-configuration-helpers,
 	sys-kernel/linux-beaglebone
 
 # List of packages to remove from the BeagleBoard xM image
diff --git a/molecules/sabayon-arm-beaglebone-base-16G.spec b/molecules/sabayon-arm-beaglebone-base-16G.spec
deleted file mode 100644
index a67d993..0000000
--- a/molecules/sabayon-arm-beaglebone-base-16G.spec
+++ /dev/null
@@ -1,24 +0,0 @@
-%import /sabayon/molecules/arm-base.common
-%import /sabayon/molecules/beaglebone.common
-
-# Release desc (the actual release description)
-release_desc: armv7a BeagleBone
-
-# Release Version (used to generate release_file)
-release_version: 8
-
-# Specify image file name (image file name will be automatically
-# produced otherwise)
-image_name: Sabayon_Linux_8_armv7a_BeagleBone_Base_16GB.img
-
-# Specify the image file size in Megabytes. This is mandatory.
-# To avoid runtime failure, make sure the image is large enough to fit your
-# chroot data.
-image_mb: 16000
-
-# Path to boot partition data (MLO, u-boot.img etc)
-source_boot_directory: /sabayon/boot/arm/beaglebone
-
-# External script that will generate the image file.
-# The same can be copied onto a MMC by using dd
-image_generator_script: /sabayon/scripts/beaglebone_image_generator_script.sh
diff --git a/molecules/sabayon-arm-beaglebone-base-8G.spec b/molecules/sabayon-arm-beaglebone-base-2G.spec
similarity index 91%
rename from molecules/sabayon-arm-beaglebone-base-8G.spec
rename to molecules/sabayon-arm-beaglebone-base-2G.spec
index 12240e2..68799d3 100644
--- a/molecules/sabayon-arm-beaglebone-base-8G.spec
+++ b/molecules/sabayon-arm-beaglebone-base-2G.spec
@@ -9,12 +9,12 @@ release_version: 8
 
 # Specify image file name (image file name will be automatically
 # produced otherwise)
-image_name: Sabayon_Linux_8_armv7a_BeagleBone_Base_8GB.img
+image_name: Sabayon_Linux_8_armv7a_BeagleBone_Base_2GB.img
 
 # Specify the image file size in Megabytes. This is mandatory.
 # To avoid runtime failure, make sure the image is large enough to fit your
 # chroot data.
-image_mb: 7800
+image_mb: 2000
 
 # Path to boot partition data (MLO, u-boot.img etc)
 source_boot_directory: /sabayon/boot/arm/beaglebone
diff --git a/scripts/iso_build.sh b/scripts/iso_build.sh
index 178b79d..a4974dd 100755
--- a/scripts/iso_build.sh
+++ b/scripts/iso_build.sh
@@ -38,14 +38,12 @@ export LANGUAGE="en_US.UTF-8"
 
 if [ "${ACTION}" = "weekly" ]; then
 	ARM_SOURCE_SPECS=(
+		"sabayon-arm-beaglebone-base-2G.spec"
 		"sabayon-arm-beaglebone-base-4G.spec"
-		"sabayon-arm-beaglebone-base-8G.spec"
-		"sabayon-arm-beaglebone-base-16G.spec"
 	)
 	ARM_SOURCE_SPECS_IMG=(
+		"Sabayon_Linux_DAILY_armv7a_BeagleBone_Base_2GB.img"
 		"Sabayon_Linux_DAILY_armv7a_BeagleBone_Base_4GB.img"
-		"Sabayon_Linux_DAILY_armv7a_BeagleBone_Base_8GB.img"
-		"Sabayon_Linux_DAILY_armv7a_BeagleBone_Base_16GB.img"
 	)
 	SOURCE_SPECS=()
 	SOURCE_SPECS_ISO=()
diff --git a/scripts/mkloopcard_beaglebone_chroot_hook.sh b/scripts/mkloopcard_beaglebone_chroot_hook.sh
index 1043bb0..dc4a087 100755
--- a/scripts/mkloopcard_beaglebone_chroot_hook.sh
+++ b/scripts/mkloopcard_beaglebone_chroot_hook.sh
@@ -6,19 +6,39 @@
 env-update
 . /etc/profile
 
-# enable sshd by default
-rc-update add sshd default
+setup_boot() {
+	# enable sshd by default
+	rc-update add sshd default
+	# select the first available kernel
+	eselect uimage set 1
+	# cleaning up deps
+	rc-update --update
+}
 
-# select the first available kernel
-eselect uimage set 1
+setup_users() {
+	# setup root password to... root!
+	echo root:root | chpasswd
+	# setup normal user "sabayon"
+	(
+		if [ ! -x "/sbin/sabayon-functions.sh" ]; then
+			echo "no /sbin/sabayon-functions.sh found"
+			exit 1
+		fi
+		. /sbin/sabayon-functions.sh
+		sabayon_setup_live_user "sabayon" || exit 1
+		# setup "sabayon" password to... sabayon!
+		echo "sabayon:sabayon" | chpasswd
+	)
+}
 
-# setup root password to... root!
-echo root:root | chpasswd
-# cleaning up deps
-rc-update --update
+setup_serial() {
+	# Setup serial login
+	echo "s0:12345:respawn:/sbin/agetty 115200 ttyO0 vt100" >> /etc/inittab
+}
 
-# Setup serial login
-echo "s0:12345:respawn:/sbin/agetty 115200 ttyO0 vt100" >> /etc/inittab
+setup_boot
+setup_users
+setup_serial
 
 exit 0