config: remove core.conf, we can do without it now

build/core.sh

@@ -31,8 +31,6 @@ SELF=core
 
 . ./common.sh && $(${SCRUB_ARGS})
 
-. ${CONFIGDIR}/core.conf
-
 check_packages ${SELF} ${@}
 
 setup_stage ${STAGEDIR}
@@ -45,22 +43,20 @@ remove_packages ${STAGEDIR} ${@}
 install_packages ${STAGEDIR} pkg git gettext-tools
 lock_packages ${STAGEDIR}
 
-for CORE in ${CORE_LIST}; do
-	CORE_ARGS=
-
+for BRANCH in master ${COREBRANCH}; do
 	setup_copy ${STAGEDIR} ${COREDIR}
-	git_reset ${STAGEDIR}${COREDIR} ${CORE}
+	git_reset ${STAGEDIR}${COREDIR} ${BRANCH}
 
-	CORE_NAME=$(make -C ${STAGEDIR}${COREDIR} ${CORE_ARGS} name)
+	CORE_ARGS="CORE_ARCH=${PRODUCT_ARCH}"
+
+	CORE_NAME=$(make -C ${STAGEDIR}${COREDIR} ${CORE_ARGS} name)
+	CORE_DEPS=$(make -C ${STAGEDIR}${COREDIR} ${CORE_ARGS} depends)
 
 	if search_packages ${STAGEDIR} ${CORE_NAME}; then
 		# already built
 		continue
 	fi
 
-	CORE_ARGS="CORE_ARCH=${PRODUCT_ARCH} ${CORE_ARGS}"
-	CORE_DEPS=$(make -C ${STAGEDIR}${COREDIR} ${CORE_ARGS} depends)
-
 	install_packages ${STAGEDIR} ${CORE_DEPS}
 	custom_packages ${STAGEDIR} ${COREDIR} "${CORE_ARGS}"
 done

build/prefetch.sh

@@ -31,10 +31,8 @@ SELF=prefetch
 
 . ./common.sh && $(${SCRUB_ARGS})
 
-. ${CONFIGDIR}/core.conf
-
 # XXX does not adapt to FreeBSD version used
-ABI="FreeBSD:11:${PRODUCT_ARCH}/${CORE_ABI}"
+ABI="FreeBSD:11:${PRODUCT_ARCH}/${PRODUCT_SETTINGS}"
 
 for ARG in ${@}; do
 	case ${ARG} in

config/17.1/core.conf

@@ -1,2 +0,0 @@
-export CORE_LIST="master stable/17.1"
-export CORE_ABI="17.1"