Page MenuHomeFreeBSD
Files F150600545

D52899.id163505.diff
No OneTemporary
Actions

D52899.id163505.diff
View Options

diff --git a/release/Makefile b/release/Makefile
--- a/release/Makefile
+++ b/release/Makefile
@@ -135,6 +135,9 @@
IMAGES+= memstick.img
IMAGES+= mini-memstick.img
.endif
+.if !defined(NOPKGBASE) || empty(NOPKGBASE)
+RELEASE_TARGETS+= pkgbase-repo.tar
+.endif
CLEANFILES= packagesystem *.txz MANIFEST release ${IMAGES}
.if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES)
@@ -145,7 +148,7 @@
.if defined(WITH_DVD) && !empty(WITH_DVD)
CLEANFILES+= pkg-stage
.endif
-CLEANDIRS= dist pkgdb-dvd pkgdb-disc1 pkgbase-repo pkgbase-repo-dir ftp disc1 disc1-disc1 disc1-memstick bootonly bootonly-bootonly bootonly-memstick dvd
+CLEANDIRS= dist pkgdb-dvd pkgdb-disc1 pkgbase-repo pkgbase-repo-dir ftp disc1 disc1-disc1 disc1-memstick bootonly bootonly-bootonly bootonly-memstick dvd pkgbase-repo.tar
beforeclean:
chflags -R noschg .
.include <bsd.obj.mk>
@@ -216,6 +219,9 @@
( ${IMAKE} -C ${WORLDDIR} packages REPODIR=${.OBJDIR}/pkgbase-repo \
INCLUDE_PKG_IN_PKGBASE_REPO=YES BOOTSTRAP_PKG_FROM_PORTS=YES )
+pkgbase-repo.tar: pkgbase-repo
+ tar -cf pkgbase-repo.tar pkgbase-repo
+
pkgbase-repo-dir: pkgbase-repo
mkdir -p pkgbase-repo-dir
printf "FreeBSD-base: { url: "file://%s", enabled: yes }" \
@@ -465,6 +471,12 @@
( cd ${DESTDIR} && sha512 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA512 )
( cd ${DESTDIR} && sha256 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA256 )
.endif
+.if !defined (NOPKGBASE) || empty(NOPKGBASE)
+ mkdir -p ${DESTDIR}/pkgbase
+ cp -p pkgbase-repo.tar ${DESTDIR}/pkgbase/
+ ( cd ${DESTDIR}/pkgbase && sha256 pkgbase-repo.tar > CHECKSUM.SHA256 )
+ ( cd ${DESTDIR}/pkgbase && sha512 pkgbase-repo.tar > CHECKSUM.SHA512 )
+.endif
.include "${.CURDIR}/Makefile.inc1"
.include "${.CURDIR}/Makefile.vm"
diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors
--- a/release/Makefile.mirrors
+++ b/release/Makefile.mirrors
@@ -63,6 +63,11 @@
OCI_DIR= ${TLD}/OCI-IMAGES/${REVISION}-${BRANCH}/${TARGET_ARCH}
.endif
+.if !defined(NOPKGBASE) || empty(NOPKGBASE)
+STAGE_TARGETS+= pkgbase-repo-stage
+PKGBASE_REPO_DIR= ${TLD}/PKGBASE-REPOS/${REVISION}-${BRANCH}/${TARGET_ARCH}
+.endif
+
CLEANFILES+= ${STAGE_TARGETS}
CHECKSUM_FILES?= SHA512 SHA256
SNAP_SUFFIX!= echo ${_SNAP_SUFFIX:S,^-,,1} | tr -d ' '
@@ -366,5 +371,44 @@
. endfor
.endif
+pkgbase-repo-stage:
+ mkdir -p ${PKGBASE_REPO_DIR}
+.if defined(SNAPSHOT) && !empty(SNAPSHOT)
+. if exists(${PKGBASE_REPO_DIR}/Latest)
+ rm -rf ${PKGBASE_REPO_DIR}/Latest
+. endif
+ mkdir -p ${PKGBASE_REPO_DIR}/Latest
+ mkdir -p ${PKGBASE_REPO_DIR}/${BUILDDATE}
+ cd ${RELEASEDIR}/pkgbase && \
+ mv pkgbase-repo.tar pkgbase-repo-${SNAP_SUFFIX}.tar
+ cp -p ${RELEASEDIR}/pkgbase/pkgbase-repo-${SNAP_SUFFIX}.tar \
+ ${PKGBASE_REPO_DIR}/${BUILDDATE}/pkgbase-repo-${SNAP_SUFFIX}.tar
+ cd ${PKGBASE_REPO_DIR}/Latest && \
+ ln -s ../${BUILDDATE}/pkgbase-repo-${SNAP_SUFFIX}.tar \
+ pkgbase-repo.tar
+ cd ${RELEASEDIR}/pkgbase && rm -f CHECKSUM.*
+. for CHECKSUM in ${CHECKSUM_FILES}
+ cd ${RELEASEDIR}/pkgbase && \
+ ${CHECKSUM:tl} pkgbase-repo-*.tar > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX}
+ cp -p ${RELEASEDIR}/pkgbase/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \
+ ${PKGBASE_REPO_DIR}/${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX}
+ cd ${PKGBASE_REPO_DIR}/Latest && \
+ ln -s ../${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \
+ CHECKSUM.${CHECKSUM}
+. endfor
+.else # not snapshot
+. if exists(${PKGBASE_REPO_DIR}/Latest)
+ rm -rf ${PKGBASE_REPO_DIR}/Latest
+. endif
+ mkdir -p ${PKGBASE_REPO_DIR}/Latest
+ cp -p ${RELEASEDIR}/pkgbase/pkgbase-repo.tar \
+ ${PKGBASE_REPO_DIR}/Latest/pkgbase-repo.tar
+. endfor
+. for CHECKSUM in ${CHECKSUM_FILES}
+ cp -p ${RELEASEDIR}/pkgbase/CHECKSUM.${CHECKSUM} \
+ ${PKGBASE_REPO_DIR}/Latest/CHECKSUM.${CHECKSUM}
+. endfor
+.endif
+
ftp-stage: remove-old-bits ${STAGE_TARGETS}

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 3, 5:24 PM (4 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30759876
Default Alt Text
D52899.id163505.diff (3 KB)

Event Timeline