Page MenuHomeFreeBSD
Files F102040912

D46288.diff
No OneTemporary
Actions

D46288.diff
View Options

diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2119,17 +2119,13 @@
create-packages: .PHONY create-packages-world create-packages-kernel create-packages-source
-create-source-packages: _pkgbootstrap .PHONY
+create-source-src-package: _pkgbootstrap .PHONY
rm -f ${SSTAGEDIR}/*.plist 2>/dev/null || :
.if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git)
@cd ${SRCDIR}; \
( echo "@override_prefix /usr/src" ; \
${GIT_CMD} ls-files --recurse-submodules ":!:sys/" ) \
> ${SSTAGEDIR}/src.plist
- @cd ${SRCDIR}; \
- ( echo "@override_prefix /usr/src" ; \
- ${GIT_CMD} ls-files --recurse-submodules "sys/" ) \
- > ${SSTAGEDIR}/src-sys.plist
${SRCDIR}/release/packages/generate-ucl.lua \
PKGNAME "src" \
PKGGENNAME "src" \
@@ -2141,6 +2137,22 @@
PKG_WWW "${PKG_WWW}" \
${SRCDIR}/release/packages/template.ucl \
${SSTAGEDIR}/src.ucl
+ ${PKG_CMD} -o ABI=${PKG_ABI} \
+ -o OSVERSION="${SRCRELDATE}" \
+ create -f ${PKG_FORMAT} \
+ -M ${SSTAGEDIR}/src.ucl \
+ -p ${SSTAGEDIR}/src.plist \
+ -r ${SRCDIR} \
+ -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR}
+.endif
+
+create-source-src-sys-package: _pkgbootstrap .PHONY
+ rm -f ${SSTAGEDIR}/*.plist 2>/dev/null || :
+.if !empty(GIT_CMD) && exists(${GIT_CMD}) && exists(${SRCDIR}/.git)
+ @cd ${SRCDIR}; \
+ ( echo "@override_prefix /usr/src" ; \
+ ${GIT_CMD} ls-files --recurse-submodules "sys/" ) \
+ > ${SSTAGEDIR}/src-sys.plist
${SRCDIR}/release/packages/generate-ucl.lua \
PKGNAME "src-sys" \
PKGGENNAME "src" \
@@ -2152,13 +2164,6 @@
PKG_WWW "${PKG_WWW}" \
${SRCDIR}/release/packages/template.ucl \
${SSTAGEDIR}/src-sys.ucl
- ${PKG_CMD} -o ABI=${PKG_ABI} \
- -o OSVERSION="${SRCRELDATE}" \
- create -f ${PKG_FORMAT} \
- -M ${SSTAGEDIR}/src.ucl \
- -p ${SSTAGEDIR}/src.plist \
- -r ${SRCDIR} \
- -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR}
${PKG_CMD} -o ABI=${PKG_ABI} \
-o OSVERSION="${SRCRELDATE}" \
create -f ${PKG_FORMAT} \
@@ -2168,6 +2173,8 @@
-o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR}
.endif
+create-source-packages: .PHONY _pkgbootstrap create-source-src-package create-source-src-sys-package
+
create-world-packages: _pkgbootstrap .PHONY
@rm -f ${WSTAGEDIR}/*.plist 2>/dev/null || :
@cd ${WSTAGEDIR} ; \

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 7, 9:06 PM (18 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
11017170
Default Alt Text
D46288.diff (2 KB)

Event Timeline