Current location

narf Source control manager Git

aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorPetter Reinholdtsen <pere@hungry.com>2014-12-06 10:29:06 +0100
committerPetter Reinholdtsen <pere@hungry.com>2014-12-06 10:29:30 +0100
commit78b269e1aac36b6e1a70d7bf5e8db5d6a3a8f5e7 (patch)
treeba049d7049976f90fe18dce6859da97bbc87ea94 /bin
parent253453e28b9f957f3985384ba675610f0906cfd7 (diff)
parent7088815ac7f40283c631c1bdadbbe1e8352f4048 (diff)
Merge branch 'master' of github.com:freedombox/freedom-maker.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/freedombox-customize8
-rwxr-xr-xbin/mk_freedombox_image27
2 files changed, 29 insertions, 6 deletions
diff --git a/bin/freedombox-customize b/bin/freedombox-customize
index e6e6f16..06cd706 100755
--- a/bin/freedombox-customize
+++ b/bin/freedombox-customize
@@ -71,6 +71,14 @@ chroot $rootdir adduser --gecos $username --disabled-password $username
echo $username:$password | chroot $rootdir /usr/sbin/chpasswd
chroot $rootdir adduser $username sudo
+case "$MACHINE" in
+ virtualbox)
+ # hide irrelevant console keyboard messages.
+ echo "echo \"4 4 1 7\" > /proc/sys/kernel/printk" \
+ >> /etc/init.d/rc.local
+ ;;
+esac
+
cat <<EOF > etc/apt/sources.list
deb $MIRROR $SUITE main contrib non-free
deb-src $MIRROR $SUITE main contrib non-free
diff --git a/bin/mk_freedombox_image b/bin/mk_freedombox_image
index 9a8437b..b550bb5 100755
--- a/bin/mk_freedombox_image
+++ b/bin/mk_freedombox_image
@@ -18,6 +18,11 @@ set -e # Exit on first error
#set -x # Enable debugging
IMAGE=$1
+export ARCHITECTURE
+export DESTINATION
+export MACHINE
+export SOURCE
+export SUITE
# Locate vmdebootstrap program fetched in Makefile
basedir=`pwd`
@@ -36,14 +41,13 @@ logrotate module-init-tools netbase rsyslog udev debian-archive-keyring"
# Packages needed on the dreamplug
dreamplug_pkgs="linux-image-kirkwood u-boot-tools u-boot"
+# Packages needed on the beaglebone
+beaglebone_pkgs="linux-image-armmp u-boot-tools u-boot"
+
# Packages needed for gui-based self-hosted development
dev_pkgs="task-xfce-desktop emacs org-mode git mercurial iceweasel ca-certificates"
-if [ -z "$ARCHITECTURE" ] ; then
- ARCHITECTURE=i386
-fi
-
-echo building $MACHINE for $ARCHITECTURE
+echo Building $MACHINE FreedomBox for $ARCHITECTURE.
case "$MACHINE" in
raspberry)
@@ -67,6 +71,17 @@ case "$MACHINE" in
--foreign /usr/bin/qemu-arm-static \
"
;;
+ beaglebone)
+ extra_pkgs="$beaglebone_pkgs"
+ extra_opts="\
+ --variant minbase \
+ --bootsize 128M \
+ --boottype vfat \
+ --no-kernel \
+ --no-extlinux \
+ --foreign /usr/bin/qemu-arm-static \
+"
+ ;;
virtualbox)
extra_opts="\
--grub \
@@ -108,7 +123,7 @@ sudo -H \
$VMDEBOOTSTRAP \
--log $(dirname $IMAGE)/freedombox.log \
--log-level debug \
- --size 3G \
+ --size 4G \
--image $IMAGE.img \
--hostname freedombox \
--verbose \