build: progress for base/kernel and a bit of dependency shuffling

Makefile

@@ -34,9 +34,8 @@ SRCDIR?=	/usr/src
 
 src: base kernel
 packages: ports plugins core
-sets: src packages
-images: iso memstick nano
-everything: sets images
+sets iso memstick nano: src packages
+everything release: iso memstick nano
 
 # Expand target arguments for the script append:
 

build/base.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2014-2015 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2014-2016 Franco Fichtner <franco@opnsense.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -29,10 +29,17 @@ set -e
 
 . ./common.sh && $(${SCRUB_ARGS})
 
-sh ./clean.sh base
-
 git_describe ${SRCDIR}
 
+BASESET=${SETSDIR}/base-${REPO_VERSION}-${ARCH}
+
+if [ -f ${BASESET}.txz ]; then
+	echo ">>> Base is up to date"
+	exit 0
+fi
+
+sh ./clean.sh base
+
 MAKEARGS="SRCCONF=${CONFIGDIR}/src.conf COMPILER_TYPE=clang __MAKE_CONF="
 ENVFILTER="env -i USER=${USER} LOGNAME=${LOGNAME} HOME=${HOME} \
 SHELL=${SHELL} BLOCKSIZE=${BLOCKSIZE} MAIL=${MAIL} PATH=${PATH} \
@@ -44,11 +51,9 @@ ${ENVFILTER} make -C${SRCDIR} -j${CPUS} buildworld ${MAKEARGS} NO_CLEAN=yes
 ${ENVFILTER} make -C${SRCDIR}/release obj ${MAKEARGS}
 ${ENVFILTER} make -C${SRCDIR}/release base.txz ${MAKEARGS}
 
-BASESET=${SETSDIR}/base-${REPO_VERSION}-${ARCH}
-
 mv $(make -C${SRCDIR}/release -V .OBJDIR)/base.txz ${BASESET}.txz
 
-echo -n "Generating obsolete file list... "
+echo -n ">>> Generating obsolete file list... "
 
 tar -tf ${BASESET}.txz | \
     sed -e 's/^\.//g' -e '/\/$/d' | sort > /tmp/setdiff.new.${$}

build/kernel.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2014-2015 Franco Fichtner <franco@opnsense.org>
+# Copyright (c) 2014-2016 Franco Fichtner <franco@opnsense.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -29,10 +29,17 @@ set -e
 
 . ./common.sh && $(${SCRUB_ARGS})
 
-sh ./clean.sh kernel
-
 git_describe ${SRCDIR}
 
+KERNELSET=${SETSDIR}/kernel-${REPO_VERSION}-${ARCH}
+
+if [ -f ${KERNELSET}.txz ]; then
+	echo ">>> Kernel is up to date"
+	exit 0
+fi
+
+sh ./clean.sh kernel
+
 BUILD_KERNEL="SMP"
 
 # XXX move config to src.git
@@ -44,8 +51,6 @@ make -C${SRCDIR} -j${CPUS} buildkernel ${MAKEARGS} NO_KERNELCLEAN=yes
 make -C${SRCDIR}/release obj ${MAKEARGS}
 make -C${SRCDIR}/release kernel.txz ${MAKEARGS}
 
-KERNELSET=${SETSDIR}/kernel-${REPO_VERSION}-${ARCH}
-
 mv $(make -C${SRCDIR}/release -V .OBJDIR)/kernel.txz ${KERNELSET}.txz
 
 generate_signature ${KERNELSET}.txz

build/release.sh

@@ -40,12 +40,6 @@ fi
 
 sh ./clean.sh release images
 
-echo ">>> Creating images for ${PRODUCT_RELEASE}"
-
-sh ./memstick.sh
-sh ./nano.sh
-sh ./iso.sh
-
 setup_stage ${STAGEDIR}
 
 echo -n ">>> Compressing images for ${PRODUCT_RELEASE}... "