hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-25 01:55:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
e9ac41698b
HardenedBSD/release/Makefile.mirrors

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

318 lines
11 KiB
Makefile
Raw Normal View History

Add a new file, Makefile.mirrors, which is intended to replace a 474-line kludge of a shell script to pre-create the directory hierarchy on ftp-master. This is not in any way connected to the build, and there is no intention to do so. This only intent here is to try to make things a little bit easier for me. But I've probably just made things worse. Sponsored by: The FreeBSD Foundation
2015-05-12 00:14:03 +02:00
#
# This Makefile helps create the directory structure on ftp-master,
# making staging builds a bit more sane.
#
# You probably do not want to use this. Really.
# You have been warned.
#
After the last influx of commits, and a REALLY BIG WARNING to the top of the file. Sponsored by: The FreeBSD Foundation
2015-05-12 03:20:27 +02:00
# Seriously.
#
# Don't use this unless you know why you're using it.
#
Add a new file, Makefile.mirrors, which is intended to replace a 474-line kludge of a shell script to pre-create the directory hierarchy on ftp-master. This is not in any way connected to the build, and there is no intention to do so. This only intent here is to try to make things a little bit easier for me. But I've probably just made things worse. Sponsored by: The FreeBSD Foundation
2015-05-12 00:14:03 +02:00
#
.include "${.CURDIR}/Makefile"
Always use the 'make install' directory as the source for images. For RE purposes, we use the default (/R within the chroot), so this helps avoid copying files multiple times and xz(1)-compressing additional times when not needed. Again, this Makefile is not for general consumption. Sponsored by: The FreeBSD Foundation
2015-05-12 02:27:52 +02:00
RELEASEDIR?= /R
Avoid polluting the filesystem when not necessary. Sponsored by: The FreeBSD Foundation
2015-05-12 03:27:58 +02:00
FTPDIR?= ${RELEASEDIR}/ftp-stage
Set STAGE_TARGETS only if RELEASEDIR exists. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:40:36 +02:00
.if exists(${RELEASEDIR})
Add a new file, Makefile.mirrors, which is intended to replace a 474-line kludge of a shell script to pre-create the directory hierarchy on ftp-master. This is not in any way connected to the build, and there is no intention to do so. This only intent here is to try to make things a little bit easier for me. But I've probably just made things worse. Sponsored by: The FreeBSD Foundation
2015-05-12 00:14:03 +02:00
STAGE_TARGETS?= iso-images-stage
Set STAGE_TARGETS only if RELEASEDIR exists. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:40:36 +02:00
.endif
Add a new file, Makefile.mirrors, which is intended to replace a 474-line kludge of a shell script to pre-create the directory hierarchy on ftp-master. This is not in any way connected to the build, and there is no intention to do so. This only intent here is to try to make things a little bit easier for me. But I've probably just made things worse. Sponsored by: The FreeBSD Foundation
2015-05-12 00:14:03 +02:00
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
.if (defined(EMBEDDED_TARGET) && !empty(EMBEDDED_TARGET)) || (defined(EMBEDDEDBUILD) && !empty(EMBEDDEDBUILD))
Fix staging riscv images. Sponsored by: Rubicon Communications, LLC (netgate.com)
2020-12-09 21:38:26 +01:00
. if ${TARGET:Marm*} != "" || ${EMBEDDED_TARGET:Marm*} != "" || ${TARGET:Mriscv*} != ""
If TARGET or EMBEDDED_TARGET == arm, set EMBEDDED variable, which helps control some of the arm-specific bits a bit more cleanly (but not really 'clean'). If BOARDNAME is defined (as is in the WANDBOARD configuration RE uses), do some magic to work with the KERNCONF and BOARDNAME to rename the file, making it a bit more intuitive for the consumer to determine which they need. Yes, it is ugly, that is why there is a big warning at the top. It is, however, still much cleaner than the now 474-line shell script, and this Makefile produces the hierarchy needed without much evil. MFC after: 1 week X-MFC-Note: needs all previous Makefile.mirror commits Sponsored by: The FreeBSD Foundation
2015-05-22 00:11:57 +02:00
EMBEDDED= 1
Fix make(1) syntax error for non-embedded targets. Sponsored by: The FreeBSD Foundation
2015-05-22 00:50:39 +02:00
. endif
If TARGET or EMBEDDED_TARGET == arm, set EMBEDDED variable, which helps control some of the arm-specific bits a bit more cleanly (but not really 'clean'). If BOARDNAME is defined (as is in the WANDBOARD configuration RE uses), do some magic to work with the KERNCONF and BOARDNAME to rename the file, making it a bit more intuitive for the consumer to determine which they need. Yes, it is ugly, that is why there is a big warning at the top. It is, however, still much cleaner than the now 474-line shell script, and this Makefile produces the hierarchy needed without much evil. MFC after: 1 week X-MFC-Note: needs all previous Makefile.mirror commits Sponsored by: The FreeBSD Foundation
2015-05-22 00:11:57 +02:00
.endif
Add a new file, Makefile.mirrors, which is intended to replace a 474-line kludge of a shell script to pre-create the directory hierarchy on ftp-master. This is not in any way connected to the build, and there is no intention to do so. This only intent here is to try to make things a little bit easier for me. But I've probably just made things worse. Sponsored by: The FreeBSD Foundation
2015-05-12 00:14:03 +02:00
# snapshot
Make Makefile.mirrors -ALPHA${N}-aware. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation
2016-05-27 03:07:48 +02:00
.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" || ${BRANCH:MALPHA*} != ""
Add a new file, Makefile.mirrors, which is intended to replace a 474-line kludge of a shell script to pre-create the directory hierarchy on ftp-master. This is not in any way connected to the build, and there is no intention to do so. This only intent here is to try to make things a little bit easier for me. But I've probably just made things worse. Sponsored by: The FreeBSD Foundation
2015-05-12 00:14:03 +02:00
SNAPSHOT= 1
TLD?= ${FTPDIR}/snapshots
Makefile.inc1: - New file. Adds logic to search for the git binary, as well as determining the branch and revision, used in various places. Makefile: - Remove searching for the svn{,lite} binary. Makefile.ec2: - Reduce duplicated code, removing searching for the svn{,lite} binary, in addition to EC2_SVN{BRANCH,REV}. - Rename EC2_SVN* with GIT* for consistency. Makefile.mirrors: - Remove the SRCBRANCH declaration, replaced with the exported GITBRANCH variable. - Update _SNAP_SUFFIX from SVNREVISION to GITREV, and remove the leading 'r' from it, since it will break git hashes. - Remove yet another instance of duplicated code to search for the svn{,version}lite binary. Sponsored by: Rubicon Communications, LLC (netgate.com)
2020-07-16 22:34:26 +02:00
.if !defined(BUILDDATE) || empty(BUILDDATE)
If TARGET or EMBEDDED_TARGET == arm, set EMBEDDED variable, which helps control some of the arm-specific bits a bit more cleanly (but not really 'clean'). If BOARDNAME is defined (as is in the WANDBOARD configuration RE uses), do some magic to work with the KERNCONF and BOARDNAME to rename the file, making it a bit more intuitive for the consumer to determine which they need. Yes, it is ugly, that is why there is a big warning at the top. It is, however, still much cleaner than the now 474-line shell script, and this Makefile produces the hierarchy needed without much evil. MFC after: 1 week X-MFC-Note: needs all previous Makefile.mirror commits Sponsored by: The FreeBSD Foundation
2015-05-22 00:11:57 +02:00
BUILDDATE!= date +%Y%m%d
Makefile.inc1: - New file. Adds logic to search for the git binary, as well as determining the branch and revision, used in various places. Makefile: - Remove searching for the svn{,lite} binary. Makefile.ec2: - Reduce duplicated code, removing searching for the svn{,lite} binary, in addition to EC2_SVN{BRANCH,REV}. - Rename EC2_SVN* with GIT* for consistency. Makefile.mirrors: - Remove the SRCBRANCH declaration, replaced with the exported GITBRANCH variable. - Update _SNAP_SUFFIX from SVNREVISION to GITREV, and remove the leading 'r' from it, since it will break git hashes. - Remove yet another instance of duplicated code to search for the svn{,version}lite binary. Sponsored by: Rubicon Communications, LLC (netgate.com)
2020-07-16 22:34:26 +02:00
.endif
Append the branch commit count to _SNAP_SUFFIX for development snapshot builds. Sponsored by: Rubicon Communications, LLC (netgate.com)
2020-12-16 19:40:49 +01:00
_SNAP_SUFFIX:= ${BUILDDATE}-${GITREV}-${GITCOUNT}
Add a new file, Makefile.mirrors, which is intended to replace a 474-line kludge of a shell script to pre-create the directory hierarchy on ftp-master. This is not in any way connected to the build, and there is no intention to do so. This only intent here is to try to make things a little bit easier for me. But I've probably just made things worse. Sponsored by: The FreeBSD Foundation
2015-05-12 00:14:03 +02:00
.else
# release
SNAPSHOT=
TLD?= ${FTPDIR}/releases
.endif
If TARGET or EMBEDDED_TARGET == arm, set EMBEDDED variable, which helps control some of the arm-specific bits a bit more cleanly (but not really 'clean'). If BOARDNAME is defined (as is in the WANDBOARD configuration RE uses), do some magic to work with the KERNCONF and BOARDNAME to rename the file, making it a bit more intuitive for the consumer to determine which they need. Yes, it is ugly, that is why there is a big warning at the top. It is, however, still much cleaner than the now 474-line shell script, and this Makefile produces the hierarchy needed without much evil. MFC after: 1 week X-MFC-Note: needs all previous Makefile.mirror commits Sponsored by: The FreeBSD Foundation
2015-05-22 00:11:57 +02:00
.if defined(EMBEDDED) && !empty(EMBEDDED)
Fix staging riscv images. Sponsored by: Rubicon Communications, LLC (netgate.com)
2020-12-09 21:38:26 +01:00
. if ${TARGET:Marm*} != "" && (${TARGET_ARCH:Marm*} != "" || ${TARGET_ARCH} == "aarch64") || ${TARGET:Mriscv*} != ""
Make Makefile.mirrors -ALPHA${N}-aware. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation
2016-05-27 03:07:48 +02:00
. if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" || ${BRANCH:MALPHA*} != ""
If TARGET or EMBEDDED_TARGET == arm, set EMBEDDED variable, which helps control some of the arm-specific bits a bit more cleanly (but not really 'clean'). If BOARDNAME is defined (as is in the WANDBOARD configuration RE uses), do some magic to work with the KERNCONF and BOARDNAME to rename the file, making it a bit more intuitive for the consumer to determine which they need. Yes, it is ugly, that is why there is a big warning at the top. It is, however, still much cleaner than the now 474-line shell script, and this Makefile produces the hierarchy needed without much evil. MFC after: 1 week X-MFC-Note: needs all previous Makefile.mirror commits Sponsored by: The FreeBSD Foundation
2015-05-22 00:11:57 +02:00
SNAPSHOT= 1
. endif
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
IMAGES:= img
If TARGET or EMBEDDED_TARGET == arm, set EMBEDDED variable, which helps control some of the arm-specific bits a bit more cleanly (but not really 'clean'). If BOARDNAME is defined (as is in the WANDBOARD configuration RE uses), do some magic to work with the KERNCONF and BOARDNAME to rename the file, making it a bit more intuitive for the consumer to determine which they need. Yes, it is ugly, that is why there is a big warning at the top. It is, however, still much cleaner than the now 474-line shell script, and this Makefile produces the hierarchy needed without much evil. MFC after: 1 week X-MFC-Note: needs all previous Makefile.mirror commits Sponsored by: The FreeBSD Foundation
2015-05-22 00:11:57 +02:00
. endif # arm/armv6
.endif # embedded
Add a new file, Makefile.mirrors, which is intended to replace a 474-line kludge of a shell script to pre-create the directory hierarchy on ftp-master. This is not in any way connected to the build, and there is no intention to do so. This only intent here is to try to make things a little bit easier for me. But I've probably just made things worse. Sponsored by: The FreeBSD Foundation
2015-05-12 00:14:03 +02:00
.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
STAGE_TARGETS+= vm-images-stage
VM_DIR= ${TLD}/VM-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH}
.endif
release: Publish non-uploaded cloudware bits While most "cloudware" (AWS, Azure, GCP, Vagrant) images get uploaded to their respective clouds, we have two images -- BASIC-CI and BASIC-CLOUDINIT -- which are published via the FTP mirrors. We have been handling these using a manual and error-prone process of copying them from the internal build directories into the FTP staging tree, but they should be handled using the "make install ftp-stage" mechanism which is used for all the other published images. This commit 1. Adds a new 'make cloud-install' target which is run as part of 'make install' and installs BASIC-CI and BASIC-CLOUDINIT images, and 2. Extends 'make ftp-stage' in Makefile.mirrors to copy those bits into the FTP staging area. As a side benefit, this will also make BASIC-CI and BASIC-CLOUDINIT images available for arm64; until now they have only been available for amd64. MFC after: 1 week
2024-06-19 21:28:42 +02:00
.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE)
STAGE_TARGETS+= ci-images-stage
CI_DIR= ${TLD}/CI-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH}
.endif
Add a new file, Makefile.mirrors, which is intended to replace a 474-line kludge of a shell script to pre-create the directory hierarchy on ftp-master. This is not in any way connected to the build, and there is no intention to do so. This only intent here is to try to make things a little bit easier for me. But I've probably just made things worse. Sponsored by: The FreeBSD Foundation
2015-05-12 00:14:03 +02:00
CLEANFILES+= ${STAGE_TARGETS}
Deprecate MD5 checksum generation in favor of SHA512. This was discussed during the 10.2-RELEASE cycle, however since we were nearing the end of the cycle, we decided to defer this change until after 10.2-RELEASE. Reminded by: so (delphij), jmg MFC after: 5 days Sponsored by: The FreeBSD Foundation
2015-10-15 00:33:11 +02:00
CHECKSUM_FILES?= SHA512 SHA256
Add a new file, Makefile.mirrors, which is intended to replace a 474-line kludge of a shell script to pre-create the directory hierarchy on ftp-master. This is not in any way connected to the build, and there is no intention to do so. This only intent here is to try to make things a little bit easier for me. But I've probably just made things worse. Sponsored by: The FreeBSD Foundation
2015-05-12 00:14:03 +02:00
SNAP_SUFFIX!= echo ${_SNAP_SUFFIX:S,^-,,1} | tr -d ' '
ISO_DIR= ${TLD}/${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}
FTP_DIR= ${TLD}/${TARGET}/${TARGET_ARCH}/${REVISION}-${BRANCH}
Temporarily 'rm -rf $FTPDIR' during additional testing. Sponsored by: The FreeBSD Foundation
2015-05-12 02:30:56 +02:00
remove-old-bits:
rm -rf ${FTPDIR}
Add a new file, Makefile.mirrors, which is intended to replace a 474-line kludge of a shell script to pre-create the directory hierarchy on ftp-master. This is not in any way connected to the build, and there is no intention to do so. This only intent here is to try to make things a little bit easier for me. But I've probably just made things worse. Sponsored by: The FreeBSD Foundation
2015-05-12 00:14:03 +02:00
iso-images-stage:
mkdir -p ${ISO_DIR}
mkdir -p ${TLD}/ISO-IMAGES/${REVISION}
Reindent after r283575. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:44:31 +02:00
.if defined(SNAPSHOT) && !empty(SNAPSHOT)
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cd ${RELEASEDIR} && rm -f CHECKSUM.*
Reindent after r283575. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:44:31 +02:00
. for IMAGE in ${IMAGES}
. if defined(EMBEDDED) && !empty(EMBEDDED)
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cd ${RELEASEDIR} && \
mv ${OSRELEASE}-${BOARDNAME}.${IMAGE}.xz \
${OSRELEASE}-${BOARDNAME}-${SNAP_SUFFIX}.${IMAGE}.xz
cp -p ${RELEASEDIR}/${OSRELEASE}-${BOARDNAME}-${SNAP_SUFFIX}.${IMAGE}.xz \
${ISO_DIR}/${OSRELEASE}-${BOARDNAME}-${SNAP_SUFFIX}.${IMAGE}.xz
cd ${TLD}/ISO-IMAGES/${REVISION} && \
ln -s \
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/${OSRELEASE}-${BOARDNAME}-${SNAP_SUFFIX}.${IMAGE}.xz
Reindent after r283575. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:44:31 +02:00
. endif # not embedded
. if exists(${RELEASEDIR}/${OSRELEASE}-${IMAGE})
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cd ${RELEASEDIR} && \
mv ${OSRELEASE}-${IMAGE} \
Remove a continuation on error, since the relevant behavior can only occur if a particular file exists. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:34:56 +02:00
${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cp -p ${RELEASEDIR}/${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE} \
${ISO_DIR}/${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}
Add a new file, Makefile.mirrors, which is intended to replace a 474-line kludge of a shell script to pre-create the directory hierarchy on ftp-master. This is not in any way connected to the build, and there is no intention to do so. This only intent here is to try to make things a little bit easier for me. But I've probably just made things worse. Sponsored by: The FreeBSD Foundation
2015-05-12 00:14:03 +02:00
cd ${TLD}/ISO-IMAGES/${REVISION} && \
ln -s \
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}
Reindent after r283575. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:44:31 +02:00
. endif
. if exists(${RELEASEDIR}/${OSRELEASE}-${IMAGE}.xz)
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cd ${RELEASEDIR} && \
mv ${OSRELEASE}-${IMAGE}.xz \
Remove a continuation on error, since the relevant behavior can only occur if a particular file exists. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:34:56 +02:00
${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}.xz
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cp -p ${RELEASEDIR}/${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}.xz \
${ISO_DIR}/${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}.xz
cd(1) to .CURDIR before calling stat(1) to fix the path to sh(1). Include xz(1)-compressed images when renaming snapshot builds. Use OSRELEASE in place of REVISION-BRANCH for checksum filenames. Sponsored by: The FreeBSD Foundation
2015-05-21 22:18:13 +02:00
cd ${TLD}/ISO-IMAGES/${REVISION} && \
ln -s \
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/${OSRELEASE}-${SNAP_SUFFIX}-${IMAGE}.xz
Reindent after r283575. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:44:31 +02:00
. endif
. endfor # images loop
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cd ${RELEASEDIR} && rm -f CHECKSUM.*
Reindent after r283575. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:44:31 +02:00
. for CHECKSUM in ${CHECKSUM_FILES}
. if defined(EMBEDDED) && !empty(EMBEDDED)
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cd ${RELEASEDIR} && ${CHECKSUM:tl} ${OSRELEASE}* > \
If TARGET or EMBEDDED_TARGET == arm, set EMBEDDED variable, which helps control some of the arm-specific bits a bit more cleanly (but not really 'clean'). If BOARDNAME is defined (as is in the WANDBOARD configuration RE uses), do some magic to work with the KERNCONF and BOARDNAME to rename the file, making it a bit more intuitive for the consumer to determine which they need. Yes, it is ugly, that is why there is a big warning at the top. It is, however, still much cleaner than the now 474-line shell script, and this Makefile produces the hierarchy needed without much evil. MFC after: 1 week X-MFC-Note: needs all previous Makefile.mirror commits Sponsored by: The FreeBSD Foundation
2015-05-22 00:11:57 +02:00
CHECKSUM.${CHECKSUM}-${OSRELEASE}-${BOARDNAME}-${SNAP_SUFFIX}
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cp -p ${RELEASEDIR}/CHECKSUM.${CHECKSUM}-${OSRELEASE}-${BOARDNAME}-${SNAP_SUFFIX} \
${ISO_DIR}/CHECKSUM.${CHECKSUM}-${OSRELEASE}-${BOARDNAME}-${SNAP_SUFFIX}
If TARGET or EMBEDDED_TARGET == arm, set EMBEDDED variable, which helps control some of the arm-specific bits a bit more cleanly (but not really 'clean'). If BOARDNAME is defined (as is in the WANDBOARD configuration RE uses), do some magic to work with the KERNCONF and BOARDNAME to rename the file, making it a bit more intuitive for the consumer to determine which they need. Yes, it is ugly, that is why there is a big warning at the top. It is, however, still much cleaner than the now 474-line shell script, and this Makefile produces the hierarchy needed without much evil. MFC after: 1 week X-MFC-Note: needs all previous Makefile.mirror commits Sponsored by: The FreeBSD Foundation
2015-05-22 00:11:57 +02:00
cd ${TLD}/ISO-IMAGES/${REVISION} && \
ln -s \
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/CHECKSUM.${CHECKSUM}-${OSRELEASE}-${BOARDNAME}-${SNAP_SUFFIX}
Reindent after r283575. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:44:31 +02:00
. else # not embedded
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cd ${RELEASEDIR} && ${CHECKSUM:tl} ${OSRELEASE}* > \
cd(1) to .CURDIR before calling stat(1) to fix the path to sh(1). Include xz(1)-compressed images when renaming snapshot builds. Use OSRELEASE in place of REVISION-BRANCH for checksum filenames. Sponsored by: The FreeBSD Foundation
2015-05-21 22:18:13 +02:00
CHECKSUM.${CHECKSUM}-${OSRELEASE}-${SNAP_SUFFIX}
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cp -p ${RELEASEDIR}/CHECKSUM.${CHECKSUM}-${OSRELEASE}-${SNAP_SUFFIX} \
${ISO_DIR}/CHECKSUM.${CHECKSUM}-${OSRELEASE}-${SNAP_SUFFIX}
Fix more path variables. Sponsored by: The FreeBSD Foundation
2015-05-12 03:04:02 +02:00
cd ${TLD}/ISO-IMAGES/${REVISION} && \
Also symlink the CHECKSUM.{SHA256,MD5} files. Sponsored by: The FreeBSD Foundation
2015-05-12 02:55:28 +02:00
ln -s \
cd(1) to .CURDIR before calling stat(1) to fix the path to sh(1). Include xz(1)-compressed images when renaming snapshot builds. Use OSRELEASE in place of REVISION-BRANCH for checksum filenames. Sponsored by: The FreeBSD Foundation
2015-05-21 22:18:13 +02:00
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/CHECKSUM.${CHECKSUM}-${OSRELEASE}-${SNAP_SUFFIX}
Reindent after r283575. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:44:31 +02:00
. endif #
. endfor # checksum files
.else # not snapshot
. for IMAGE in ${IMAGES}
. if defined(EMBEDDED) && !empty(EMBEDDED)
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cp -p ${RELEASEDIR}/${OSRELEASE}-${BOARDNAME}.${IMAGE}.xz \
${ISO_DIR}/${OSRELEASE}-${BOARDNAME}.${IMAGE}.xz
cd ${TLD}/ISO-IMAGES/${REVISION} && \
ln -s \
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/${OSRELEASE}-${BOARDNAME}.${IMAGE}.xz
Reindent after r283575. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:44:31 +02:00
. endif # not embedded
. if exists(${RELEASEDIR}/${OSRELEASE}-${IMAGE})
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cd ${RELEASEDIR} && \
cp -p ${RELEASEDIR}/${OSRELEASE}-${IMAGE} \
${ISO_DIR}/${OSRELEASE}-${IMAGE}
cd ${TLD}/ISO-IMAGES/${REVISION} && \
ln -s \
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/${OSRELEASE}-${IMAGE}
Reindent after r283575. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:44:31 +02:00
. endif
. if exists(${RELEASEDIR}/${OSRELEASE}-${IMAGE}.xz)
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cp -p ${RELEASEDIR}/${OSRELEASE}-${IMAGE}.xz \
${ISO_DIR}/${OSRELEASE}-${IMAGE}.xz
cd ${TLD}/ISO-IMAGES/${REVISION} && \
ln -s \
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/${OSRELEASE}-${IMAGE}.xz
Reindent after r283575. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:44:31 +02:00
. endif
. endfor # images loop
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cd ${RELEASEDIR} && rm -f CHECKSUM.*
Reindent after r283575. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:44:31 +02:00
. for CHECKSUM in ${CHECKSUM_FILES}
. if defined(EMBEDDED) && !empty(EMBEDDED)
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cd ${RELEASEDIR} && ${CHECKSUM:tl} ${OSRELEASE}* > \
CHECKSUM.${CHECKSUM}-${OSRELEASE}-${BOARDNAME}
cp -p ${RELEASEDIR}/CHECKSUM.${CHECKSUM}-${OSRELEASE}-${BOARDNAME} \
${ISO_DIR}/CHECKSUM.${CHECKSUM}-${OSRELEASE}-${BOARDNAME}
cd ${TLD}/ISO-IMAGES/${REVISION} && \
ln -s \
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/CHECKSUM.${CHECKSUM}-${OSRELEASE}-${BOARDNAME}
Reindent after r283575. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:44:31 +02:00
. else # not embedded
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cd ${RELEASEDIR} && ${CHECKSUM:tl} ${OSRELEASE}* > \
Include xz(1)-compressed images when not a snapshot build. Do not suffix non-snapshot checksum files with SNAP_SUFFIX. Sponsored by: The FreeBSD Foundation
2015-05-21 22:22:55 +02:00
CHECKSUM.${CHECKSUM}-${OSRELEASE}
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cp -p ${RELEASEDIR}/CHECKSUM.${CHECKSUM}-${OSRELEASE} \
${ISO_DIR}/CHECKSUM.${CHECKSUM}-${OSRELEASE}
cd ${TLD}/ISO-IMAGES/${REVISION} && \
ln -s \
../../${TARGET}/${TARGET_ARCH}/ISO-IMAGES/${REVISION}/CHECKSUM.${CHECKSUM}-${OSRELEASE}
Reindent after r283575. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:44:31 +02:00
. endif
. endfor # checksum files
.endif # release
.if exists(${RELEASEDIR}/ftp)
Add a new file, Makefile.mirrors, which is intended to replace a 474-line kludge of a shell script to pre-create the directory hierarchy on ftp-master. This is not in any way connected to the build, and there is no intention to do so. This only intent here is to try to make things a little bit easier for me. But I've probably just made things worse. Sponsored by: The FreeBSD Foundation
2015-05-12 00:14:03 +02:00
mkdir -p ${FTP_DIR}
Fix a number of logic and/or naming problems in Makefile.mirrors. Reduce a number of duplicated logic. As of this commit, this file does exactly what it is needed to do. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:04:42 +02:00
cp -p ${RELEASEDIR}/ftp/*.txz ${RELEASEDIR}/ftp/MANIFEST ${FTP_DIR}
Include files containing metadata specific to the branch in the directory where the individual distribution sets exist. The new metadata files include the build date, svn branch, and revision of the build. Requested by: Mellanox Technologies (via kib) MFC after: 3 days Sponsored by: Rubicon Communications, LLC (Netgate)
2019-06-25 16:56:13 +02:00
echo ${BUILDDATE} > ${FTP_DIR}/BUILDDATE
Makefile.inc1: - New file. Adds logic to search for the git binary, as well as determining the branch and revision, used in various places. Makefile: - Remove searching for the svn{,lite} binary. Makefile.ec2: - Reduce duplicated code, removing searching for the svn{,lite} binary, in addition to EC2_SVN{BRANCH,REV}. - Rename EC2_SVN* with GIT* for consistency. Makefile.mirrors: - Remove the SRCBRANCH declaration, replaced with the exported GITBRANCH variable. - Update _SNAP_SUFFIX from SVNREVISION to GITREV, and remove the leading 'r' from it, since it will break git hashes. - Remove yet another instance of duplicated code to search for the svn{,version}lite binary. Sponsored by: Rubicon Communications, LLC (netgate.com)
2020-07-16 22:34:26 +02:00
echo ${GITBRANCH} > ${FTP_DIR}/GITBRANCH
echo ${GITREV} > ${FTP_DIR}/REVISION
Add a new file, Makefile.mirrors, which is intended to replace a 474-line kludge of a shell script to pre-create the directory hierarchy on ftp-master. This is not in any way connected to the build, and there is no intention to do so. This only intent here is to try to make things a little bit easier for me. But I've probably just made things worse. Sponsored by: The FreeBSD Foundation
2015-05-12 00:14:03 +02:00
cd ${TLD}/${TARGET} && \
ln -s ${TARGET_ARCH}/${REVISION}-${BRANCH} \
${REVISION}-${BRANCH}
Reindent after r283575. MFC after: 3 days Sponsored by: The FreeBSD Foundation
2015-05-26 19:44:31 +02:00
.endif
Add a new file, Makefile.mirrors, which is intended to replace a 474-line kludge of a shell script to pre-create the directory hierarchy on ftp-master. This is not in any way connected to the build, and there is no intention to do so. This only intent here is to try to make things a little bit easier for me. But I've probably just made things worse. Sponsored by: The FreeBSD Foundation
2015-05-12 00:14:03 +02:00
vm-images-stage:
Fix staging virtual machine images for ftp propagation. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:38:11 +02:00
mkdir -p ${VM_DIR}
.if defined(SNAPSHOT) && !empty(SNAPSHOT)
. if exists(${VM_DIR}/Latest)
rm -rf ${VM_DIR}/Latest
. endif
mkdir -p ${VM_DIR}/Latest
mkdir -p ${VM_DIR}/${BUILDDATE}
. for VMFORMAT in ${VMFORMATS}
release: Stage non-UFS images in vm-images-stage When the VM image building code was updated to support building non-UFS images, the vm-images-stage target was not updated to install those newly built images to the FTP site. As a result, we have been sending weekly snapshot announcements since August claiming that ZFS VM images are available when they are not in fact present anywhere publicly accessible. Fixes: 32ae9a6b3937 "release: Build UFS and ZFS VM images" Reported by: Michael Dexter MFC after: 5 days
2024-05-01 19:56:51 +02:00
. for FS in ${VMFSLIST}
cd ${RELEASEDIR}/vmimages && \
mv ${OSRELEASE}-${FS}.${VMFORMAT}.xz \
${OSRELEASE}-${FS}-${SNAP_SUFFIX}.${VMFORMAT}.xz
cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${FS}-${SNAP_SUFFIX}.${VMFORMAT}.xz \
${VM_DIR}/${BUILDDATE}/${OSRELEASE}-${FS}-${SNAP_SUFFIX}.${VMFORMAT}.xz
cd ${VM_DIR}/Latest && \
ln -s ../${BUILDDATE}/${OSRELEASE}-${FS}-${SNAP_SUFFIX}.${VMFORMAT}.xz \
${OSRELEASE}-${FS}.${VMFORMAT}.xz
. endfor
release: Publish non-uploaded cloudware bits While most "cloudware" (AWS, Azure, GCP, Vagrant) images get uploaded to their respective clouds, we have two images -- BASIC-CI and BASIC-CLOUDINIT -- which are published via the FTP mirrors. We have been handling these using a manual and error-prone process of copying them from the internal build directories into the FTP staging tree, but they should be handled using the "make install ftp-stage" mechanism which is used for all the other published images. This commit 1. Adds a new 'make cloud-install' target which is run as part of 'make install' and installs BASIC-CI and BASIC-CLOUDINIT images, and 2. Extends 'make ftp-stage' in Makefile.mirrors to copy those bits into the FTP staging area. As a side benefit, this will also make BASIC-CI and BASIC-CLOUDINIT images available for arm64; until now they have only been available for amd64. MFC after: 1 week
2024-06-19 21:28:42 +02:00
. endfor
release: Don't publish CW if !WITH_CLOUDWARE If WITH_CLOUDWARE is not set, we didn't build BASIC-CLOUDWARE; don't try to install it into the /VM-IMAGES/ directory as part of ftp-stage. Fixes: 4771c2e9d1c7 "release: Publish non-uploaded cloudware bits" MFC after: 6 days
2024-06-21 02:38:46 +02:00
. if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE)
. for CW in ${CLOUDWARE}
. if ${CW} == BASIC-CLOUDINIT
. for VMFORMAT in ${${CW}_FORMAT}
. for FS in ${${CW}_FSLIST}
release: Publish non-uploaded cloudware bits While most "cloudware" (AWS, Azure, GCP, Vagrant) images get uploaded to their respective clouds, we have two images -- BASIC-CI and BASIC-CLOUDINIT -- which are published via the FTP mirrors. We have been handling these using a manual and error-prone process of copying them from the internal build directories into the FTP staging tree, but they should be handled using the "make install ftp-stage" mechanism which is used for all the other published images. This commit 1. Adds a new 'make cloud-install' target which is run as part of 'make install' and installs BASIC-CI and BASIC-CLOUDINIT images, and 2. Extends 'make ftp-stage' in Makefile.mirrors to copy those bits into the FTP staging area. As a side benefit, this will also make BASIC-CI and BASIC-CLOUDINIT images available for arm64; until now they have only been available for amd64. MFC after: 1 week
2024-06-19 21:28:42 +02:00
cd ${RELEASEDIR}/vmimages && \
mv ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \
${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz
cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \
${VM_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz
cd ${VM_DIR}/Latest && \
ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \
${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz
release: Don't publish CW if !WITH_CLOUDWARE If WITH_CLOUDWARE is not set, we didn't build BASIC-CLOUDWARE; don't try to install it into the /VM-IMAGES/ directory as part of ftp-stage. Fixes: 4771c2e9d1c7 "release: Publish non-uploaded cloudware bits" MFC after: 6 days
2024-06-21 02:38:46 +02:00
. endfor
release: Publish non-uploaded cloudware bits While most "cloudware" (AWS, Azure, GCP, Vagrant) images get uploaded to their respective clouds, we have two images -- BASIC-CI and BASIC-CLOUDINIT -- which are published via the FTP mirrors. We have been handling these using a manual and error-prone process of copying them from the internal build directories into the FTP staging tree, but they should be handled using the "make install ftp-stage" mechanism which is used for all the other published images. This commit 1. Adds a new 'make cloud-install' target which is run as part of 'make install' and installs BASIC-CI and BASIC-CLOUDINIT images, and 2. Extends 'make ftp-stage' in Makefile.mirrors to copy those bits into the FTP staging area. As a side benefit, this will also make BASIC-CI and BASIC-CLOUDINIT images available for arm64; until now they have only been available for amd64. MFC after: 1 week
2024-06-19 21:28:42 +02:00
. endfor
release: Don't publish CW if !WITH_CLOUDWARE If WITH_CLOUDWARE is not set, we didn't build BASIC-CLOUDWARE; don't try to install it into the /VM-IMAGES/ directory as part of ftp-stage. Fixes: 4771c2e9d1c7 "release: Publish non-uploaded cloudware bits" MFC after: 6 days
2024-06-21 02:38:46 +02:00
. endif
. endfor
. endif
Fix staging virtual machine images for ftp propagation. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:38:11 +02:00
cd ${RELEASEDIR}/vmimages && rm -f CHECKSUM.*
. for CHECKSUM in ${CHECKSUM_FILES}
cd ${RELEASEDIR}/vmimages && \
${CHECKSUM:tl} ${OSRELEASE}* > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX}
cp -p ${RELEASEDIR}/vmimages/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \
${VM_DIR}/${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX}
cd ${VM_DIR}/Latest && \
ln -s ../${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \
CHECKSUM.${CHECKSUM}
. endfor
.else # not snapshot
. if exists(${VM_DIR}/Latest)
rm -rf ${VM_DIR}/Latest
. endif
mkdir -p ${VM_DIR}/Latest
. for VMFORMAT in ${VMFORMATS}
release: Stage non-UFS images in vm-images-stage When the VM image building code was updated to support building non-UFS images, the vm-images-stage target was not updated to install those newly built images to the FTP site. As a result, we have been sending weekly snapshot announcements since August claiming that ZFS VM images are available when they are not in fact present anywhere publicly accessible. Fixes: 32ae9a6b3937 "release: Build UFS and ZFS VM images" Reported by: Michael Dexter MFC after: 5 days
2024-05-01 19:56:51 +02:00
. for FS in ${VMFSLIST}
cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${FS}.${VMFORMAT}.xz \
${VM_DIR}/Latest/${OSRELEASE}-${FS}.${VMFORMAT}.xz
. endfor
Fix staging virtual machine images for ftp propagation. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:38:11 +02:00
. endfor
release: Don't publish CW if !WITH_CLOUDWARE If WITH_CLOUDWARE is not set, we didn't build BASIC-CLOUDWARE; don't try to install it into the /VM-IMAGES/ directory as part of ftp-stage. Fixes: 4771c2e9d1c7 "release: Publish non-uploaded cloudware bits" MFC after: 6 days
2024-06-21 02:38:46 +02:00
. if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE)
. for CW in ${CLOUDWARE}
. if ${CW} == BASIC-CLOUDINIT
. for VMFORMAT in ${${CW}_FORMAT}
. for FS in ${${CW}_FSLIST}
release: Publish non-uploaded cloudware bits While most "cloudware" (AWS, Azure, GCP, Vagrant) images get uploaded to their respective clouds, we have two images -- BASIC-CI and BASIC-CLOUDINIT -- which are published via the FTP mirrors. We have been handling these using a manual and error-prone process of copying them from the internal build directories into the FTP staging tree, but they should be handled using the "make install ftp-stage" mechanism which is used for all the other published images. This commit 1. Adds a new 'make cloud-install' target which is run as part of 'make install' and installs BASIC-CI and BASIC-CLOUDINIT images, and 2. Extends 'make ftp-stage' in Makefile.mirrors to copy those bits into the FTP staging area. As a side benefit, this will also make BASIC-CI and BASIC-CLOUDINIT images available for arm64; until now they have only been available for amd64. MFC after: 1 week
2024-06-19 21:28:42 +02:00
cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \
${VM_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz
release: Don't publish CW if !WITH_CLOUDWARE If WITH_CLOUDWARE is not set, we didn't build BASIC-CLOUDWARE; don't try to install it into the /VM-IMAGES/ directory as part of ftp-stage. Fixes: 4771c2e9d1c7 "release: Publish non-uploaded cloudware bits" MFC after: 6 days
2024-06-21 02:38:46 +02:00
. endfor
release: Publish non-uploaded cloudware bits While most "cloudware" (AWS, Azure, GCP, Vagrant) images get uploaded to their respective clouds, we have two images -- BASIC-CI and BASIC-CLOUDINIT -- which are published via the FTP mirrors. We have been handling these using a manual and error-prone process of copying them from the internal build directories into the FTP staging tree, but they should be handled using the "make install ftp-stage" mechanism which is used for all the other published images. This commit 1. Adds a new 'make cloud-install' target which is run as part of 'make install' and installs BASIC-CI and BASIC-CLOUDINIT images, and 2. Extends 'make ftp-stage' in Makefile.mirrors to copy those bits into the FTP staging area. As a side benefit, this will also make BASIC-CI and BASIC-CLOUDINIT images available for arm64; until now they have only been available for amd64. MFC after: 1 week
2024-06-19 21:28:42 +02:00
. endfor
release: Don't publish CW if !WITH_CLOUDWARE If WITH_CLOUDWARE is not set, we didn't build BASIC-CLOUDWARE; don't try to install it into the /VM-IMAGES/ directory as part of ftp-stage. Fixes: 4771c2e9d1c7 "release: Publish non-uploaded cloudware bits" MFC after: 6 days
2024-06-21 02:38:46 +02:00
. endif
. endfor
. endif
Fix staging virtual machine images for ftp propagation. MFC after: 3 days X-MFC-Note: needs all previous changes Sponsored by: The FreeBSD Foundation
2015-05-22 23:38:11 +02:00
. for CHECKSUM in ${CHECKSUM_FILES}
cp -p ${RELEASEDIR}/vmimages/CHECKSUM.${CHECKSUM} \
${VM_DIR}/Latest/CHECKSUM.${CHECKSUM}
. endfor
.endif
Add a new file, Makefile.mirrors, which is intended to replace a 474-line kludge of a shell script to pre-create the directory hierarchy on ftp-master. This is not in any way connected to the build, and there is no intention to do so. This only intent here is to try to make things a little bit easier for me. But I've probably just made things worse. Sponsored by: The FreeBSD Foundation
2015-05-12 00:14:03 +02:00
release: Publish non-uploaded cloudware bits While most "cloudware" (AWS, Azure, GCP, Vagrant) images get uploaded to their respective clouds, we have two images -- BASIC-CI and BASIC-CLOUDINIT -- which are published via the FTP mirrors. We have been handling these using a manual and error-prone process of copying them from the internal build directories into the FTP staging tree, but they should be handled using the "make install ftp-stage" mechanism which is used for all the other published images. This commit 1. Adds a new 'make cloud-install' target which is run as part of 'make install' and installs BASIC-CI and BASIC-CLOUDINIT images, and 2. Extends 'make ftp-stage' in Makefile.mirrors to copy those bits into the FTP staging area. As a side benefit, this will also make BASIC-CI and BASIC-CLOUDINIT images available for arm64; until now they have only been available for amd64. MFC after: 1 week
2024-06-19 21:28:42 +02:00
ci-images-stage:
mkdir -p ${CI_DIR}
.if defined(SNAPSHOT) && !empty(SNAPSHOT)
. if exists(${CI_DIR}/Latest)
rm -rf ${CI_DIR}/Latest
. endif
mkdir -p ${CI_DIR}/Latest
mkdir -p ${CI_DIR}/${BUILDDATE}
. for CW in ${CLOUDWARE}
. if ${CW} == BASIC-CI
. for VMFORMAT in ${${CW}_FORMAT}
. for FS in ${${CW}_FSLIST}
cd ${RELEASEDIR}/ciimages && \
mv ${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz \
${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz
cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \
${CI_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz
cd ${CI_DIR}/Latest && \
ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \
${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz
. endfor
. endfor
. endif
. endfor
cd ${RELEASEDIR}/ciimages && rm -f CHECKSUM.*
. for CHECKSUM in ${CHECKSUM_FILES}
cd ${RELEASEDIR}/ciimages && \
${CHECKSUM:tl} ${OSRELEASE}* > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX}
cp -p ${RELEASEDIR}/ciimages/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \
${CI_DIR}/${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX}
cd ${CI_DIR}/Latest && \
ln -s ../${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \
CHECKSUM.${CHECKSUM}
. endfor
.else # not snapshot
. if exists(${CI_DIR}/Latest)
rm -rf ${CI_DIR}/Latest
. endif
mkdir -p ${CI_DIR}/Latest
. for CW in ${CLOUDWARE}
. if ${CW} == BASIC-CI
. for VMFORMAT in ${${CW}_FORMAT}
. for FS in ${${CW}_FSLIST}
cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz \
${CI_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz
. endfor
. endfor
. endif
. endfor
. for CHECKSUM in ${CHECKSUM_FILES}
cp -p ${RELEASEDIR}/ciimages/CHECKSUM.${CHECKSUM} \
${CI_DIR}/Latest/CHECKSUM.${CHECKSUM}
. endfor
.endif
Temporarily 'rm -rf $FTPDIR' during additional testing. Sponsored by: The FreeBSD Foundation
2015-05-12 02:30:56 +02:00
ftp-stage: remove-old-bits ${STAGE_TARGETS}
Add a new file, Makefile.mirrors, which is intended to replace a 474-line kludge of a shell script to pre-create the directory hierarchy on ftp-master. This is not in any way connected to the build, and there is no intention to do so. This only intent here is to try to make things a little bit easier for me. But I've probably just made things worse. Sponsored by: The FreeBSD Foundation
2015-05-12 00:14:03 +02:00
Reference in New Issue Copy Permalink