Current location

narf Source control manager Git

aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorNick Daly <Nick.M.Daly@gmail.com>2014-05-04 08:23:36 -0500
committerNick Daly <Nick.M.Daly@gmail.com>2014-05-04 08:23:36 -0500
commitf0e71aa0d7859a725c2b227fe748723a78873861 (patch)
treeb6b4a43f6740a6748dee39241b295b43d8bcb652 /bin
parent6252e29d5cb692a227976d17fa443941872b2c02 (diff)
Read SOURCE, SUITE variables from environment and makefile.
It was un-newbie-friendly to need to edit bin/mk_freedombox_image just to change a few environment variables, so you can now specify those options on the command line just like any other make variables: $ make SOURCE=true SUITE=jessie dreamplug SUITE was also changed back to "sid" again.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/freedombox-customize3
-rwxr-xr-xbin/mk_freedombox_image10
2 files changed, 1 insertions, 12 deletions
diff --git a/bin/freedombox-customize b/bin/freedombox-customize
index 966d0e2..fcda51c 100755
--- a/bin/freedombox-customize
+++ b/bin/freedombox-customize
@@ -23,9 +23,6 @@ echo info: building $MACHINE for $ARCHITECTURE to $DESTINATION
export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true
export LC_ALL=C LANGUAGE=C LANG=C
-# set this to 'true' to disable source fetching while debugging
-export NOSOURCE=false
-
username=fbx
password=frdm
chroot $rootdir adduser --gecos $username --disabled-password $username
diff --git a/bin/mk_freedombox_image b/bin/mk_freedombox_image
index 1179f65..a0d0dfa 100755
--- a/bin/mk_freedombox_image
+++ b/bin/mk_freedombox_image
@@ -39,15 +39,7 @@ beaglebone_pkgs="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 "$SUITE" ]; then
- SUITE=sid
-fi
-
-if [ -z "$ARCHITECTURE" ] ; then
- ARCHITECTURE=i386
-fi
-
-echo building $MACHINE for $ARCHITECTURE
+echo Building $MACHINE FreedomBox for $ARCHITECTURE.
case "$MACHINE" in
raspberry)