build: proper PHP version propagation, src.conf for kernel build
This commit is contained in:
Franco Fichtner
parent
c2e58cdf14
commit
044618e7dd
|
|
@ -45,8 +45,13 @@ BASE_SET=${SETSDIR}/base-${REPO_VERSION}-${PRODUCT_ARCH}
|
|||
|
||||
setup_stage ${STAGEDIR}
|
||||
|
||||
MAKE_ARGS="TARGET_ARCH=${PRODUCT_ARCH} TARGET=${PRODUCT_TARGET}"
|
||||
MAKE_ARGS="${MAKE_ARGS} SRCCONF=${CONFIGDIR}/src.conf __MAKE_CONF="
|
||||
MAKE_ARGS="
|
||||
TARGET_ARCH=${PRODUCT_ARCH}
|
||||
TARGET=${PRODUCT_TARGET}
|
||||
SRCCONF=${CONFIGDIR}/src.conf
|
||||
__MAKE_CONF=
|
||||
"
|
||||
|
||||
# XXX for our RPI2 builds, needs a better place in the long run
|
||||
MAKE_ARGS="${MAKE_ARGS} UBLDR_LOADADDR=0x2000000"
|
||||
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@ echo "${PORTS_LIST}" | while read PORT_ORIGIN; do
|
|||
echo ">>> Fetching \${PORT_ORIGIN}..."
|
||||
make -C ${PORTSDIR}/\${PORT_ORIGIN} fetch-recursive \
|
||||
PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR} \
|
||||
PRODUCT_PHP=${PRODUCT_PHP} \
|
||||
UNAME_r=\$(freebsd-version)
|
||||
done
|
||||
EOF
|
||||
|
|
|
|||
|
|
@ -49,8 +49,13 @@ if [ -f ${CONFIGDIR}/${PRODUCT_KERNEL} ]; then
|
|||
"${SRCDIR}/sys/${PRODUCT_TARGET}/conf/${PRODUCT_KERNEL}"
|
||||
fi
|
||||
|
||||
MAKE_ARGS="TARGET_ARCH=${PRODUCT_ARCH} TARGET=${PRODUCT_TARGET}"
|
||||
MAKE_ARGS="${MAKE_ARGS} KERNCONF=${PRODUCT_KERNEL} __MAKE_CONF="
|
||||
MAKE_ARGS="
|
||||
TARGET_ARCH=${PRODUCT_ARCH}
|
||||
TARGET=${PRODUCT_TARGET}
|
||||
KERNCONF=${PRODUCT_KERNEL}
|
||||
SRCCONF=${CONFIGDIR}/src.conf
|
||||
__MAKE_CONF=
|
||||
"
|
||||
|
||||
${ENV_FILTER} make -s -C${SRCDIR} -j${CPUS} buildkernel ${MAKE_ARGS} NO_KERNELCLEAN=yes
|
||||
${ENV_FILTER} make -s -C${SRCDIR}/release obj ${MAKE_ARGS}
|
||||
|
|
|
|||
|
|
@ -134,7 +134,9 @@ pkg create -nao ${PACKAGESDIR}/All
|
|||
echo "${PORTS_LIST}" | while read PORT_ORIGIN; do
|
||||
# check whether the package has already been built
|
||||
PKGFILE=\$(make -C ${PORTSDIR}/\${PORT_ORIGIN} -V PKGFILE \
|
||||
PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR} PACKAGES=${PACKAGESDIR} \
|
||||
PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR} \
|
||||
PRODUCT_PHP=${PRODUCT_PHP} \
|
||||
PACKAGES=${PACKAGESDIR} \
|
||||
UNAME_r=\$(freebsd-version))
|
||||
if [ -f \${PKGFILE} ]; then
|
||||
continue
|
||||
|
|
@ -153,8 +155,11 @@ echo "${PORTS_LIST}" | while read PORT_ORIGIN; do
|
|||
fi
|
||||
|
||||
make -s -C ${PORTSDIR}/\${PORT_ORIGIN} install \
|
||||
PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR} PACKAGES=${PACKAGESDIR} \
|
||||
USE_PACKAGE_DEPENDS=yes UNAME_r=\$(freebsd-version)
|
||||
PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR} \
|
||||
PRODUCT_PHP=${PRODUCT_PHP} \
|
||||
PACKAGES=${PACKAGESDIR} \
|
||||
USE_PACKAGE_DEPENDS=yes \
|
||||
UNAME_r=\$(freebsd-version)
|
||||
|
||||
echo "${PORTS_LIST}" | while read PORT_DEPENDS; do
|
||||
PORT_DEPNAME=\$(pkg query -e "%o == \${PORT_DEPENDS}" %n)
|
||||
|
|
@ -170,6 +175,7 @@ echo "${PORTS_LIST}" | while read PORT_ORIGIN; do
|
|||
|
||||
make -s -C ${PORTSDIR}/\${PORT_ORIGIN} clean \
|
||||
PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR} \
|
||||
PRODUCT_PHP=${PRODUCT_PHP} \
|
||||
UNAME_r=\$(freebsd-version)
|
||||
|
||||
pkg set -yaA1
|
||||
|
|
|
|||
|
|
@ -33,7 +33,11 @@ SELF=skim
|
|||
|
||||
setup_stage ${STAGEDIR}
|
||||
|
||||
MAKE_ARGS="__MAKE_CONF=${CONFIGDIR}/make.conf PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR}"
|
||||
MAKE_ARGS="
|
||||
__MAKE_CONF=${CONFIGDIR}/make.conf
|
||||
PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR}
|
||||
PRODUCT_PHP=${PRODUCT_PHP}
|
||||
"
|
||||
|
||||
if [ -z "${PORTS_LIST}" ]; then
|
||||
PORTS_LIST=$(
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
# stand-alone glue for cryptographic flavour detection
|
||||
# stand-alone glue for dependency detection
|
||||
|
||||
PRODUCT_OPENSSL?= /usr/local/bin/openssl
|
||||
_PRODUCT_FLAVOUR!= if [ -f ${PRODUCT_OPENSSL} ]; \
|
||||
then ${PRODUCT_OPENSSL} version; \
|
||||
|
|
@ -6,6 +7,15 @@ _PRODUCT_FLAVOUR!= if [ -f ${PRODUCT_OPENSSL} ]; \
|
|||
echo Base; \
|
||||
fi
|
||||
PRODUCT_FLAVOUR?= ${_PRODUCT_FLAVOUR:[1]}
|
||||
|
||||
PRODUCT_PHPBIN?= /usr/local/bin/php
|
||||
_PRODUCT_PHP!= if [ -f ${PRODUCT_PHPBIN} ]; \
|
||||
then ${PRODUCT_PHPBIN} -v; \
|
||||
else \
|
||||
echo "PHP 7.0"; \
|
||||
fi
|
||||
PRODUCT_PHP?= ${_PRODUCT_PHP:[2]:S/./ /g:[1..2]:tW:S/ //}
|
||||
|
||||
PRODUCT_GSSAPI?= GSSAPI_MIT
|
||||
|
||||
# global options
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
# stand-alone glue for cryptographic flavour detection
|
||||
# stand-alone glue for dependency detection
|
||||
|
||||
PRODUCT_OPENSSL?= /usr/local/bin/openssl
|
||||
_PRODUCT_FLAVOUR!= if [ -f ${PRODUCT_OPENSSL} ]; \
|
||||
then ${PRODUCT_OPENSSL} version; \
|
||||
|
|
@ -6,6 +7,15 @@ _PRODUCT_FLAVOUR!= if [ -f ${PRODUCT_OPENSSL} ]; \
|
|||
echo Base; \
|
||||
fi
|
||||
PRODUCT_FLAVOUR?= ${_PRODUCT_FLAVOUR:[1]}
|
||||
|
||||
PRODUCT_PHPBIN?= /usr/local/bin/php
|
||||
_PRODUCT_PHP!= if [ -f ${PRODUCT_PHPBIN} ]; \
|
||||
then ${PRODUCT_PHPBIN} -v; \
|
||||
else \
|
||||
echo "PHP 7.0"; \
|
||||
fi
|
||||
PRODUCT_PHP?= ${_PRODUCT_PHP:[2]:S/./ /g:[1..2]:tW:S/ //}
|
||||
|
||||
PRODUCT_GSSAPI?= GSSAPI_MIT
|
||||
|
||||
# global options
|
||||
|
|
|
|||
Loading…
Reference in New Issue