[Midnightbsd-cvs] src [11835] U trunk/release/scripts: upadte manifest

[laffer1 at midnightbsd.org]

Revision: 11835
          http://svnweb.midnightbsd.org/src/?rev=11835
Author:   laffer1
Date:     2018-07-12 20:26:06 -0400 (Thu, 12 Jul 2018)
Log Message:
-----------
upadte manifest

Modified Paths:
--------------
    trunk/release/scripts/make-manifest.sh
    trunk/release/scripts/mm-mtree.sh

Property Changed:
----------------
    trunk/release/scripts/make-manifest.sh
    trunk/release/scripts/mm-mtree.sh

Modified: trunk/release/scripts/make-manifest.sh
===================================================================
--- trunk/release/scripts/make-manifest.sh	2018-07-13 00:22:08 UTC (rev 11834)
+++ trunk/release/scripts/make-manifest.sh	2018-07-13 00:26:06 UTC (rev 11835)
@@ -5,9 +5,9 @@
 #  Usage: make-manifest.sh foo1.txz foo2.txz ...
 #
 # The output file looks like this (tab-delimited):
-#  foo1.txz SHA256-checksu Number-of-files foo1 Description Install-by-default
+#  foo1.txz SHA256-checksum Number-of-files foo1 Description Install-by-default
 #
-# $MidnightBSD: src/release/scripts/make-manifest.sh,v 1.1 2011/12/02 13:15:03 laffer1 Exp $
+# $MidnightBSD$
 
 desc_base="Base system (MANDATORY)"
 desc_kernel="Kernel (MANDATORY)"
@@ -17,7 +17,9 @@
 desc_lib32="32-bit compatibility libraries"
 desc_ports="Ports tree"
 desc_src="System source code"
+desc_tests="Test suite"
 src_default=off
+tests_default=off
 
 for i in $*; do
 	echo "`basename $i`	`sha256 -q $i`	`tar tvf $i | wc -l | tr -d ' '`	`basename $i .txz`	\"`eval echo \\\$desc_$(basename $i .txz)`\"	`eval echo \\\${$(basename $i .txz)_default:-on}`"


Property changes on: trunk/release/scripts/make-manifest.sh
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/release/scripts/mm-mtree.sh
===================================================================
--- trunk/release/scripts/mm-mtree.sh	2018-07-13 00:22:08 UTC (rev 11834)
+++ trunk/release/scripts/mm-mtree.sh	2018-07-13 00:26:06 UTC (rev 11835)
@@ -12,7 +12,6 @@
 # dougb at FreeBSD.org
 
 # $MidnightBSD$
-# $FreeBSD: src/release/scripts/mm-mtree.sh,v 1.1.4.2 2009/08/26 21:05:17 dougb Exp $
 
 PATH=/bin:/usr/bin:/usr/sbin
 
@@ -82,6 +81,11 @@
 fi
 
 # Setup make to use system files from SOURCEDIR
+objp=${MAKEOBJDIRPREFIX}
+[ -z "${objp}" ] && objp=/usr/obj
+legacydir=${objp}${SOURCEDIR}/tmp/legacy
+legacypath=${legacydir}/usr/sbin:${legacydir}/usr/bin:${legacydir}/bin
+MM_MAKE_ARGS="${MM_MAKE_ARGS} PATH=${legacypath}:${PATH}"
 MM_MAKE="make ${ARCHSTRING} ${MM_MAKE_ARGS} -m ${SOURCEDIR}/share/mk"
 
 delete_temproot () {
@@ -132,7 +136,7 @@
 #
 rm -f ${TEMPROOT}/etc/*.db ${TEMPROOT}/etc/passwd
 
-# We only need to compare things like freebsd.cf once
+# We only need to compare things like midnightbsd.cf once
 find ${TEMPROOT}/usr/obj -type f -delete 2>/dev/null
 
 # Delete stuff we do not need to keep the mtree database small,
@@ -143,7 +147,7 @@
 
 # Build the mtree database in a temporary location.
 MTREENEW=`mktemp -t mergemaster.mtree`
-mtree -ci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null
+mtree -nci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null
 
 if [ -s "${MTREENEW}" ]; then
   echo "*** Saving mtree database for future upgrades"


Property changes on: trunk/release/scripts/mm-mtree.sh
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property