build: embedded marker for base/kernel #45

build/base.sh

@@ -50,6 +50,9 @@ MAKE_ARGS="${MAKE_ARGS} SRCCONF=${CONFIGDIR}/src.conf __MAKE_CONF="
 
 ${ENV_FILTER} make -s -C${SRCDIR} -j${CPUS} buildworld ${MAKE_ARGS} NO_CLEAN=yes
 ${ENV_FILTER} make -s -C${SRCDIR}/release obj ${MAKE_ARGS}
+
+build_marker base
+
 rm -f $(make -C${SRCDIR}/release -V .OBJDIR)/base.txz
 ${ENV_FILTER} make -s -C${SRCDIR}/release base.txz ${MAKE_ARGS}
 

build/common.sh

@@ -382,6 +382,22 @@ setup_chroot()
 	chroot ${1} /bin/sh /etc/rc.d/ldconfig start
 }
 
+build_marker()
+{
+	MARKER_DISTDIR="$(make -C${SRCDIR}/release -V DISTDIR)/${1}"
+	MARKER_OBJDIR="$(make -C${SRCDIR}/release -V .OBJDIR)"
+	MARKER_VERDIR="/usr/local/opnsense/version"
+
+	# reset the distribution directory as well
+	setup_stage "${MARKER_OBJDIR}/${MARKER_DISTDIR}"
+
+	MARKER="${MARKER_OBJDIR}/${MARKER_DISTDIR}/${MARKER_VERDIR}"
+
+	mkdir -p "${MARKER}"
+
+	echo "${REPO_VERSION}-${PRODUCT_ARCH}" > "${MARKER}/${1}"
+}
+
 setup_marker()
 {
 	# Let opnsense-update(8) know it's up to date

build/kernel.sh

@@ -56,6 +56,9 @@ MAKE_ARGS="${MAKE_ARGS} KERNCONF=${PRODUCT_KERNEL} __MAKE_CONF="
 
 ${ENV_FILTER} make -s -C${SRCDIR} -j${CPUS} buildkernel ${MAKE_ARGS} NO_KERNELCLEAN=yes
 ${ENV_FILTER} make -s -C${SRCDIR}/release obj ${MAKE_ARGS}
+
+build_marker kernel
+
 rm -f $(make -C${SRCDIR}/release -V .OBJDIR)/kernel.txz
 ${ENV_FILTER} make -s -C${SRCDIR}/release kernel.txz ${MAKE_ARGS}