diff options
| author | Alan Somers <asomers@FreeBSD.org> | 2019-06-27 23:50:54 +0000 |
|---|---|---|
| committer | Alan Somers <asomers@FreeBSD.org> | 2019-06-27 23:50:54 +0000 |
| commit | 7f49ce7a0b5f0d501d233308d73ccb1bf191a68b (patch) | |
| tree | e83ad4ddd396607f9b0ea1a3a8262ce92aa3fcf9 /release | |
| parent | c1afff113ceec2c78b96b2e52379cb5a9275d5fb (diff) | |
| parent | e3680954376d380b897066a542ba7cf0b7ba9124 (diff) | |
Notes
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile.mirrors | 4 | ||||
| -rw-r--r-- | release/picobsd/bridge/PICOBSD | 1 | ||||
| -rwxr-xr-x | release/picobsd/build/picobsd | 4 | ||||
| -rw-r--r-- | release/picobsd/qemu/PICOBSD | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index 44589d698c3ca..6857ff0eafb13 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -19,6 +19,7 @@ FTPDIR?= ${RELEASEDIR}/ftp-stage .if exists(${RELEASEDIR}) STAGE_TARGETS?= iso-images-stage .endif +SRCBRANCH!= ${SVN_CMD} info --show-item relative-url ${WORLDDIR} .if (defined(EMBEDDED_TARGET) && !empty(EMBEDDED_TARGET)) || (defined(EMBEDDEDBUILD) && !empty(EMBEDDEDBUILD)) . if ${TARGET:Marm*} != "" || ${EMBEDDED_TARGET:Marm*} != "" @@ -185,6 +186,9 @@ iso-images-stage: .if exists(${RELEASEDIR}/ftp) mkdir -p ${FTP_DIR} cp -p ${RELEASEDIR}/ftp/*.txz ${RELEASEDIR}/ftp/MANIFEST ${FTP_DIR} + echo ${BUILDDATE} > ${FTP_DIR}/BUILDDATE + echo ${SRCBRANCH} > ${FTP_DIR}/SRCBRANCH + echo r${SVNREVISION} > ${FTP_DIR}/REVISION cd ${TLD}/${TARGET} && \ ln -s ${TARGET_ARCH}/${REVISION}-${BRANCH} \ ${REVISION}-${BRANCH} diff --git a/release/picobsd/bridge/PICOBSD b/release/picobsd/bridge/PICOBSD index bc1185d61c644..c06091dcb8889 100644 --- a/release/picobsd/bridge/PICOBSD +++ b/release/picobsd/bridge/PICOBSD @@ -50,7 +50,6 @@ device if_bridge # qemu, so we set HZ explicitly. options HZ=1000 -device random # used by ssh device pci # Floppy drives diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd index 807f9acd72426..2d057ed81c5cc 100755 --- a/release/picobsd/build/picobsd +++ b/release/picobsd/build/picobsd @@ -437,7 +437,7 @@ populate_floppy_fs() { # OK ${MY_TREE}/floppy.tree.${SITE} ; do if [ -d ${FLOPPY_TREE} ] ; then (cd ${FLOPPY_TREE} ; tar -cf - \ - --exclude .svn ${excl} . ) | \ + --exclude .git --exclude .svn ${excl} . ) | \ (cd ${dst} ; tar x${o_tarv}f - ) log "Copied from ${FLOPPY_TREE}" fi @@ -698,7 +698,7 @@ populate_mfs_tree() { for MFS_TREE in ${PICO_TREE}/mfs_tree ${MY_TREE}/mfs_tree ; do if [ -d ${MFS_TREE} ] ; then log "Copy ${MFS_TREE} ..." - (cd ${MFS_TREE} ; tar -cf - --exclude .svn . ) | \ + (cd ${MFS_TREE} ; tar -cf - --exclude .git --exclude .svn . ) | \ (cd ${dst} ; tar x${o_tarv}f - ) fi done diff --git a/release/picobsd/qemu/PICOBSD b/release/picobsd/qemu/PICOBSD index 16b175385b0ab..f3a9f9ccaf28d 100644 --- a/release/picobsd/qemu/PICOBSD +++ b/release/picobsd/qemu/PICOBSD @@ -56,7 +56,6 @@ device if_bridge # qemu, so we set HZ explicitly. options HZ=1000 -device random # used by ssh device pci # Floppy drives |