build/prefech: use PRODUCT_ABI when no manual version was set

Makes prefetch work out of the box. The initial version is very
likely capable of building packages for the whole series.
This commit is contained in:
Franco Fichtner 2021-01-13 11:14:00 +01:00
parent 684a52fe45
commit 3bc587dcb8
2 changed files with 9 additions and 6 deletions

View File

@ -231,13 +231,12 @@ Acquiring precompiled sets from the mirrors
Compiled sets can be prefetched from a mirror if they exist,
while removing any previously available set:
# make prefetch-<option>[,...] VERSION=version.to.prefetch
# make prefetch-<option>[,...] [VERSION=version.to.prefetch]
Available prefetch options are:
* base: prefetch the base set
* kernel: prefetch the kernel set
* kernel-dbg: prefetch the debug kernel set (if available)
* packages: prefetch the packages set
Using signatures to verify integrity

View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (c) 2016-2020 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2016-2021 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -35,25 +35,29 @@ git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
MIRRORSETDIR="${PRODUCT_MIRROR}/${SRCABI}/${PRODUCT_SETTINGS}/sets"
if [ -z "${VERSION}" ]; then
VERSION=${PRODUCT_ABI}
fi
for ARG in ${@}; do
case ${ARG} in
base)
sh ./clean.sh ${ARG}
URL="${MIRRORSETDIR}/${ARG}-${PRODUCT_VERSION}-${PRODUCT_ARCH}"
URL="${MIRRORSETDIR}/${ARG}-${VERSION}-${PRODUCT_ARCH}"
for SUFFIX in txz.sig txz; do
fetch -o ${SETSDIR} ${URL}.${SUFFIX} || true
done
;;
kernel)
sh ./clean.sh kernel
URL="${MIRRORSETDIR}/${ARG}-${PRODUCT_VERSION}-${PRODUCT_ARCH}"
URL="${MIRRORSETDIR}/${ARG}-${VERSION}-${PRODUCT_ARCH}"
for SUFFIX in txz.sig txz; do
fetch -o ${SETSDIR} ${URL}.${SUFFIX} || true
done
;;
packages)
sh ./clean.sh ${ARG}
URL="${MIRRORSETDIR}/${ARG}-${PRODUCT_VERSION}-${PRODUCT_FLAVOUR}-${PRODUCT_ARCH}"
URL="${MIRRORSETDIR}/${ARG}-${VERSION}-${PRODUCT_FLAVOUR}-${PRODUCT_ARCH}"
for SUFFIX in tar.sig tar; do
fetch -o ${SETSDIR} ${URL}.${SUFFIX} || true
done