Permalink
Browse files

OS-653 illumos-live configure should be able to specify which overlay…

…s to use
  • Loading branch information...
rmustacc committed Sep 29, 2011
1 parent b43ecd5 commit e0efe7debc2111c39cf5fadd7ebaf114f953012c
Showing with 16 additions and 1 deletion.
  1. +1 −0 .gitignore
  2. +2 −1 Makefile
  3. +13 −0 configure
View
@@ -42,3 +42,4 @@ tools/pwgen-2.06/Makefile
tools/pwgen-2.06/autom4te.cache
manifest.gen
manifest.d/
+overlay/order
View
@@ -6,14 +6,15 @@ MPROTO=$(ROOT)/manifest.d
PATH=/opt/local/bin:/opt/local/sbin:/opt/local/gcc34/bin:/usr/xpg4/bin:/usr/bin:/usr/sbin:/usr/sfw/bin:/usr/openwin/bin:/opt/SUNWspro/bin:/usr/ccs/bin
LOCAL_SUBDIRS:=$(shell ls projects/local)
MANIFEST=manifest.gen
+OVERLAYS:=$(shell cat overlay/order)
world: 0-illumos-stamp 0-extra-stamp 0-livesrc-stamp 0-local-stamp \
0-tools-stamp 0-man-stamp 0-devpro-stamp
live: world manifest
(cd $(ROOT)/src_addon && gmake DESTDIR=$(PROTO) install)
mkdir -p ${ROOT}/log
- (cd $(ROOT) && pfexec ./tools/build_live $(ROOT)/$(MANIFEST) $(ROOT)/output $(ROOT)/overlay/generic $(ROOT)/overlay/sdc $(ROOT)/proto $(ROOT)/man/man)
+ (cd $(ROOT) && pfexec ./tools/build_live $(ROOT)/$(MANIFEST) $(ROOT)/output $(OVERLAYS) $(ROOT)/proto $(ROOT)/man/man)
manifest:
rm -f $(MANIFEST) $(MPROTO)/*
View
@@ -156,6 +156,19 @@ if [ ! -f "projects/illumos-extra/Makefile" ]; then
fi
ROOT=`pwd`
+echo "==> Setting up overlay"
+
+if [ -z "${OVERLAYS}" ]; then
+ echo "FATAL: overlay order not specified"
+ exit 1
+fi
+
+rm -f ${ROOT}/overlay/order
+touch ${ROOT}/overlay/order
+for entry in ${OVERLAYS}; do
+ echo -n "${ROOT}/overlay/${entry} " >> ${ROOT}/overlay/order
+done
+
echo "==> Setting up illumos-gate"
cd ${ROOT}/projects/illumos

0 comments on commit e0efe7d

Please sign in to comment.