Add support for xtra-bits-dir of mkisoimages.sh via XTRADIR
ClosedPublic
Actions

Authored by dteske on Sep 10 2015, 11:05 PM.

Details

Reviewers

kmacy
gjb
allanjude
bapt

Commits

rS290282: MFC r287696:
rS287696: The <arch>/mkisoimages.sh script in release knows how to add

Summary

The <arch>/mkisoimages.sh script in release knows how to add
extra bits from an "xtra-bits-dir". This feature is unusable
from release/Makefile. Add an XTRADIR setting to use it.

Test Plan

cd release
make -DXTRADIR=/path/to/xtra/ cdrom

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 482
Build 482: arc lint + arc unit

Event Timeline

dteske updated this revision to Diff 8662.Sep 10 2015, 11:05 PM

dteske retitled this revision from to Add support for xtra-bits-dir of mkisoimages.sh via XTRADIR.

dteske updated this object.

dteske edited the test plan for this revision. (Show Details)

dteske added reviewers: gjb, kmacy, bapt, allanjude.

dteske added a subscriber: marcel.

Herald added a subscriber: imp. · View Herald TranscriptSep 10 2015, 11:05 PM

kmacy accepted this revision.Sep 11 2015, 9:42 PM

kmacy edited edge metadata.

This revision is now accepted and ready to land.Sep 11 2015, 9:42 PM

Closed by commit rS287696: The <arch>/mkisoimages.sh script in release knows how to add (authored by dteske). · Explain WhySep 11 2015, 9:45 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

release/

Makefile

7 lines

Diff 8662

View Options

release/Makefile

Show First 20 Lines • Show All 166 Lines • ▼ Show 20 Lines
# default: <empty>		# default: <empty>
#		#
# PYDISTUTILS_BUILDARGS		# PYDISTUTILS_BUILDARGS
# - Arguments to build with distutils.		# - Arguments to build with distutils.
# default: <empty>		# default: <empty>
#		#
# PYDISTUTILS_INSTALLARGS		# PYDISTUTILS_INSTALLARGS
# - Arguments to install with distutils.		# - Arguments to install with distutils.
# default: -c -O1 --prefix=${PREFIX} --single-version-externally-managed --root=${STAGEDIR}		# default: --no-compile --prefix=${PREFIX} --single-version-externally-managed --root=${STAGEDIR}
#		#
# PYDISTUTILS_EGGINFO		# PYDISTUTILS_EGGINFO
# - Canonical name for egg-info.		# - Canonical name for egg-info.
# default: ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}.egg-info		# default: ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}.egg-info
#		#
# PEP517_BUILD_CMD - Command sequence for a PEP-517 build frontend that builds a wheel.		# PEP517_BUILD_CMD - Command sequence for a PEP-517 build frontend that builds a wheel.
# default: ${PYTHON_CMD} -m build -n -w		# default: ${PYTHON_CMD} -m build -n -w
#		#
▲ Show 20 Lines • Show All 454 Lines • ▼ Show 20 Lines
# distutils support		# distutils support
PYSETUP?= setup.py		PYSETUP?= setup.py
PYDISTUTILS_SETUP?= -c \		PYDISTUTILS_SETUP?= -c \
"import sys; import setuptools; \		"import sys; import setuptools; \
__file__='${PYSETUP}'; sys.argv[0]='${PYSETUP}'; \		__file__='${PYSETUP}'; sys.argv[0]='${PYSETUP}'; \
exec(compile(open(__file__, 'rb').read().replace(b'\\r\\n', b'\\n'), __file__, 'exec'))"		exec(compile(open(__file__, 'rb').read().replace(b'\\r\\n', b'\\n'), __file__, 'exec'))"
PYDISTUTILS_CONFIGUREARGS?= # empty		PYDISTUTILS_CONFIGUREARGS?= # empty
PYDISTUTILS_BUILDARGS?= # empty		PYDISTUTILS_BUILDARGS?= # empty
PYDISTUTILS_INSTALLARGS?= -c -O1 --prefix=${PREFIX}		PYDISTUTILS_INSTALLARGS?= --no-compile --prefix=${PREFIX}
. if defined(_PYTHON_FEATURE_DISTUTILS)		. if defined(_PYTHON_FEATURE_DISTUTILS)
. if !defined(PYDISTUTILS_INSTALLNOSINGLE)		. if !defined(PYDISTUTILS_INSTALLNOSINGLE)
PYDISTUTILS_INSTALLARGS+= --single-version-externally-managed		PYDISTUTILS_INSTALLARGS+= --single-version-externally-managed
. endif		. endif
PYDISTUTILS_INSTALLARGS+= --root=${STAGEDIR}		PYDISTUTILS_INSTALLARGS+= --root=${STAGEDIR}
. endif		. endif
PYDISTUTILS_INSTALLARGS:= --record ${_PYTHONPKGLIST} \		PYDISTUTILS_INSTALLARGS:= --record ${_PYTHONPKGLIST} \
${PYDISTUTILS_INSTALLARGS}		${PYDISTUTILS_INSTALLARGS}
▲ Show 20 Lines • Show All 150 Lines • ▼ Show 20 Lines	PLIST_SUB+= PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \
PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;} \		PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;} \
PYTHON_PLATFORM=${PYTHON_PLATFORM} \		PYTHON_PLATFORM=${PYTHON_PLATFORM} \
PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \		PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \
PYTHON_SUFFIX=${PYTHON_SUFFIX} \		PYTHON_SUFFIX=${PYTHON_SUFFIX} \
PYTHON_EXT_SUFFIX=${PYTHON_EXT_SUFFIX} \		PYTHON_EXT_SUFFIX=${PYTHON_EXT_SUFFIX} \
PYTHON_VER=${PYTHON_VER} \		PYTHON_VER=${PYTHON_VER} \
PYTHON_VERSION=${PYTHON_VERSION}		PYTHON_VERSION=${PYTHON_VERSION}
. if ${PYTHON_REL} < 30000		. if ${PYTHON_REL} < 30000
SUB_LIST+= PYTHON2="" PYTHON3="@comment "		SUB_LIST+= PYTHON2="" PYTHON3="@comment "
		tcbernerAuthorUnsubmitted Not Done Inline Actions ^ why does this make sense, to have that in the SLIST? tcberner: ^ why does this make sense, to have that in the SLIST?
		vishwinUnsubmitted Done Inline Actions documentation consistency, even though I doubt this will get much use in say a pkg-message vishwin: documentation consistency, even though I doubt this will get much use in say a pkg-message
PLIST_SUB+= PYTHON2="" PYTHON3="@comment "		PLIST_SUB+= PYTHON2="" PYTHON3="@comment "
. else		. else
SUB_LIST+= PYTHON2="@comment " PYTHON3=""		SUB_LIST+= PYTHON2="@comment " PYTHON3=""
PLIST_SUB+= PYTHON2="@comment " PYTHON3=""		PLIST_SUB+= PYTHON2="@comment " PYTHON3=""
. endif		. endif

_USES_POST+= python		_USES_POST+= python
.endif # _INCLUDE_USES_PYTHON_MK		.endif # _INCLUDE_USES_PYTHON_MK
▲ Show 20 Lines • Show All 101 Lines • Show Last 20 Lines

Add support for xtra-bits-dir of mkisoimages.sh via XTRADIRClosedPublicActions