Page MenuHomeFreeBSD
Files F152696153

D56271.id174964.diff
No OneTemporary
Actions

D56271.id174964.diff
View Options

diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2162,7 +2162,7 @@
create-packages-world: _pkgbootstrap _repodir .PHONY
${_+_}@cd ${.CURDIR}; \
- ${MAKE} -f Makefile.inc1 \
+ PATH="${TMPPATH}" ${MAKE} -f Makefile.inc1 \
DESTDIR=${WSTAGEDIR} \
PKG_VERSION=${PKG_VERSION} create-world-packages
@@ -2171,13 +2171,13 @@
.ORDER: create-packages-source create-packages-sets
create-packages-sets: _pkgbootstrap _repodir .PHONY
${_+_}@cd ${.CURDIR}; \
- ${MAKE} -f Makefile.inc1 \
+ PATH="${TMPPATH}" ${MAKE} -f Makefile.inc1 \
DESTDIR=${WSTAGEDIR} \
PKG_VERSION=${PKG_VERSION} create-sets-packages
create-packages-kernel: _pkgbootstrap _repodir .PHONY
${_+_}@cd ${.CURDIR}; \
- ${MAKE} -f Makefile.inc1 \
+ PATH="${TMPPATH}" ${MAKE} -f Makefile.inc1 \
DESTDIR=${KSTAGEDIR} \
PKG_VERSION=${PKG_VERSION} DISTDIR=kernel \
SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \
@@ -2191,7 +2191,7 @@
create-packages-source: _pkgbootstrap _repodir .PHONY
${_+_}@cd ${.CURDIR}; \
- ${MAKE} -f Makefile.inc1 \
+ PATH="${TMPPATH}" ${MAKE} -f Makefile.inc1 \
DESTDIR=${SSTAGEDIR} \
PKG_VERSION=${PKG_VERSION} \
SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \
@@ -2206,7 +2206,7 @@
( echo "@override_prefix /usr/src" ; \
${GIT_CMD} ls-files --recurse-submodules ":!:sys/" ) \
> ${SSTAGEDIR}/src.plist
- ${SRCDIR}/release/packages/generate-ucl.lua \
+ flua ${SRCDIR}/release/packages/generate-ucl.lua \
PKGNAME "src" \
PKGGENNAME "src" \
VERSION "${PKG_VERSION}" \
@@ -2232,7 +2232,7 @@
( echo "@override_prefix /usr/src" ; \
${GIT_CMD} ls-files --recurse-submodules "sys/" ) \
> ${SSTAGEDIR}/src-sys.plist
- ${SRCDIR}/release/packages/generate-ucl.lua \
+ flua ${SRCDIR}/release/packages/generate-ucl.lua \
PKGNAME "src-sys" \
PKGGENNAME "src-sys" \
VERSION "${PKG_VERSION}" \
@@ -2264,7 +2264,8 @@
echo "_PKGS+= $${pkgname}" ; \
done > ${WSTAGEDIR}/packages.mk
${_+_}@cd ${.CURDIR}; \
- ${MAKE} -f Makefile.inc1 create-world-packages-jobs \
+ PATH="${TMPPATH}" ${MAKE} -f Makefile.inc1 \
+ create-world-packages-jobs \
SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \
.MAKE.JOB.PREFIX=
@@ -2324,7 +2325,7 @@
create-dtb-package: .PHONY
@if [ -f ${KSTAGEDIR}/${DISTDIR}/dtb.plist ]; then \
- ${SRCDIR}/release/packages/generate-ucl.lua \
+ flua ${SRCDIR}/release/packages/generate-ucl.lua \
PKGNAME "dtb" \
PKGGENNAME "dtb" \
VERSION "${PKG_VERSION}" \
@@ -2358,7 +2359,7 @@
${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.meta | \
awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
-v kernel=yes -v _kernconf=${INSTALLKERNEL} ; \
- ${SRCDIR}/release/packages/generate-ucl.lua \
+ flua ${SRCDIR}/release/packages/generate-ucl.lua \
PKGNAME "kernel-${INSTALLKERNEL:tl}${flavor}" \
PKGGENNAME "kernel" \
VERSION "${PKG_VERSION}" \
@@ -2400,7 +2401,7 @@
${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.${_kernel}.meta | \
awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
-v kernel=yes -v _kernconf=${_kernel} ; \
- ${SRCDIR}/release/packages/generate-ucl.lua \
+ flua ${SRCDIR}/release/packages/generate-ucl.lua \
PKGNAME "kernel-${_kernel:tl}${flavor}" \
PKGGENNAME "kernel" \
FORCEINCLUDE "kernel${flavor}" \
diff --git a/release/packages/create-sets.sh b/release/packages/create-sets.sh
--- a/release/packages/create-sets.sh
+++ b/release/packages/create-sets.sh
@@ -57,7 +57,7 @@
setvar="$(echo "$set" | tr - _)"
eval deps=\"\$PKGS_${setvar}\"
- "${srcdir}/release/packages/generate-set-ucl.lua" \
+ flua "${srcdir}/release/packages/generate-set-ucl.lua" \
"${srcdir}/release/packages/set-template.ucl" \
PKGNAME "$set" \
SET_DEPENDS "$deps" \
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -82,7 +82,7 @@
fi
cap_arg="$( make -f ${srctree}/share/mk/bsd.endian.mk -VCAP_MKDB_ENDIAN )"
- ${srctree}/release/packages/generate-ucl.lua \
+ flua ${srctree}/release/packages/generate-ucl.lua \
VERSION "${PKG_VERSION}" \
PKGNAME "${origname}" \
PKGGENNAME "${outname}" \

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 17, 1:56 PM (6 m, 41 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31563448
Default Alt Text
D56271.id174964.diff (4 KB)

Event Timeline