build: this is the fun part -- make core and plugin invoke trivial

build/common.sh

@@ -325,16 +325,21 @@ install_packages()
 	done
 }
 
-create_packages()
+custom_packages()
 {
 	chroot ${1} /bin/sh -es << EOF
-echo -n ">>> Creating custom package for ${2}... "
+# clear the internal staging area and package files
+rm -rf ${1}
+
+# run the package build process
+make -C ${2} DESTDIR=${1} FLAVOUR=${PRODUCT_FLAVOUR} install
+make -C ${2} DESTDIR=${1} scripts
+make -C ${2} DESTDIR=${1} manifest > ${1}/+MANIFEST
+make -C ${2} DESTDIR=${1} plist > ${1}/plist
+
+echo -n ">>> Creating custom package for \$(make -C ${2} name)... "
 pkg create -m ${1} -r ${1} -p ${1}/plist -o ${PACKAGESDIR}/All
 echo "done"
-
-# clear the internal staging area and package files
-# XXX bad for debugging
-rm -rf ${1}
 EOF
 }
 

build/core.sh

@@ -40,12 +40,6 @@ setup_clone ${STAGEDIR} ${PORTSDIR}
 extract_packages ${STAGEDIR} ${CORE_NAME}
 install_packages ${STAGEDIR} git gettext-tools ${CORE_DEPS}
 
-chroot ${STAGEDIR} /bin/sh -es << EOF
-make -C ${COREDIR} DESTDIR=${STAGEDIR} FLAVOUR=${PRODUCT_FLAVOUR} install
-make -C ${COREDIR} DESTDIR=${STAGEDIR} scripts
-make -C ${COREDIR} DESTDIR=${STAGEDIR} manifest > ${STAGEDIR}/+MANIFEST
-make -C ${COREDIR} DESTDIR=${STAGEDIR} plist > ${STAGEDIR}/plist
-EOF
+custom_packages ${STAGEDIR} ${COREDIR}
 
-create_packages ${STAGEDIR} ${CORE_NAME}
 bundle_packages ${STAGEDIR}

build/plugins.sh

@@ -39,19 +39,12 @@ done
 setup_stage ${STAGEDIR}
 setup_base ${STAGEDIR}
 setup_clone ${STAGEDIR} ${PLUGINSDIR}
+
 extract_packages ${STAGEDIR} ${PLUGIN_NAMES}
 install_packages ${STAGEDIR}
 
 for PLUGIN in ${PLUGINS}; do
-	chroot ${STAGEDIR} /bin/sh -es << EOF
-
-make -C ${PLUGINSDIR}/${PLUGIN} DESTDIR=${STAGEDIR} install
-make -C ${PLUGINSDIR}/${PLUGIN} DESTDIR=${STAGEDIR} scripts
-
-make -C ${PLUGINSDIR}/${PLUGIN} DESTDIR=${STAGEDIR} manifest > ${STAGEDIR}/+MANIFEST
-make -C ${PLUGINSDIR}/${PLUGIN} DESTDIR=${STAGEDIR} plist > ${STAGEDIR}/plist
-EOF
-	create_packages ${STAGEDIR} $(make -C ${PLUGINSDIR}/${PLUGIN} name)
+	custom_packages ${STAGEDIR} ${PLUGINSDIR}/${PLUGIN}
 done
 
 bundle_packages ${STAGEDIR}