build: make aux set behave more like packages

We are going to store aux sets for each build to avoid future
issues with missing build dependencies.

Also, go121 is the default these days and 1.20 isn't used anymore
as witnessed by the missing go package in the aux set at the moment.
This commit is contained in:
Franco Fichtner 2024-04-03 14:15:45 +02:00
parent 2f78942a56
commit 2192311374
4 changed files with 13 additions and 5 deletions

View File

@ -1047,6 +1047,8 @@ bundle_packages()
echo -n ">>> Creating aux package set for ${PACKAGEVER}... "
tar -C ${BASEDIR}${PACKAGESDIR}-aux -cf ${AUXSET} .
echo "done"
generate_signature ${AUXSET}
fi
sh ./clean.sh ports

View File

@ -35,6 +35,12 @@ VERSIONDIR="/usr/local/opnsense/version"
for ARG in ${@}; do
case ${ARG} in
aux)
AUXSET=$(find_set aux)
if [ -f "${AUXSET}" ]; then
generate_signature ${AUXSET}
fi
;;
base)
BASESET=$(find_set base)
if [ -f "${BASESET}" ]; then

View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (c) 2018-2019 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2018-2024 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -42,12 +42,12 @@ for ARG in ${@}; do
arm|dvd|nano|serial|vga|vm)
upload ${ARG} ${IMAGESDIR} "*-${ARG}-*${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}*"
;;
aux|distfiles|packages|release)
upload ${ARG} ${SETSDIR} "${ARG}-*"
;;
base|kernel)
upload ${ARG} ${SETSDIR} "${ARG}-*${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}*"
;;
distfiles|packages|release)
upload ${ARG} ${SETSDIR} "${ARG}-*"
;;
log)
upload ${ARG} ${LOGSDIR} "${PRODUCT_VERSION}-*"
;;

View File

@ -1,4 +1,4 @@
#ORIGIN IGNORE
devel/cmake-core
lang/go120 arm
lang/go121 arm
lang/rust arm,aarch64