diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2011-07-21 04:39:21 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2011-07-21 04:39:21 +0000 |
| commit | 867742e27e6abc4b53db16683ca3873d0ee3695e (patch) | |
| tree | 799d000f5e85dcd2a06c36a966ad9b1e848286ab | |
| parent | Remove dependency on expiring port security/jce_policy14. Update to (diff) | |
Temporary workaround for INDEX building on pointyhat-west: allow override
of LINUX_OSRELEASE. pointyhat-west itself might have a different version
of linux compat than whatever we are testing on the client nodes.
The more general solution is in ports/135221, which needs a careful -exp
run to test.
Hat: portmgr
Notes
Notes:
svn path=/head/; revision=278066
| -rw-r--r-- | emulators/linux_base-c6/Makefile | 2 | ||||
| -rw-r--r-- | emulators/linux_base-f10/Makefile | 2 | ||||
| -rw-r--r-- | emulators/linux_dist-gentoo-stage3/Makefile | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile index 097ddf154a36..d7c4b34822b7 100644 --- a/emulators/linux_base-c6/Makefile +++ b/emulators/linux_base-c6/Makefile @@ -122,7 +122,9 @@ EXTRACT_AFTER_ARGS?= | ${CPIO} -id --quiet .include <bsd.port.pre.mk> +.if !defined(PACKAGE_BUILDING) || (defined(PACKAGE_BUILDING) && !defined(LINUX_OSRELEASE) ) LINUX_OSRELEASE!= ${ECHO_CMD} `${SYSCTL} -n compat.linux.osrelease 2>/dev/null` +.endif .if ${LINUX_OSRELEASE}x == "x" IGNORE= linuxulator is not (kld)loaded diff --git a/emulators/linux_base-f10/Makefile b/emulators/linux_base-f10/Makefile index 097ddf154a36..d7c4b34822b7 100644 --- a/emulators/linux_base-f10/Makefile +++ b/emulators/linux_base-f10/Makefile @@ -122,7 +122,9 @@ EXTRACT_AFTER_ARGS?= | ${CPIO} -id --quiet .include <bsd.port.pre.mk> +.if !defined(PACKAGE_BUILDING) || (defined(PACKAGE_BUILDING) && !defined(LINUX_OSRELEASE) ) LINUX_OSRELEASE!= ${ECHO_CMD} `${SYSCTL} -n compat.linux.osrelease 2>/dev/null` +.endif .if ${LINUX_OSRELEASE}x == "x" IGNORE= linuxulator is not (kld)loaded diff --git a/emulators/linux_dist-gentoo-stage3/Makefile b/emulators/linux_dist-gentoo-stage3/Makefile index 42370f54ff2f..4439201d735f 100644 --- a/emulators/linux_dist-gentoo-stage3/Makefile +++ b/emulators/linux_dist-gentoo-stage3/Makefile @@ -43,7 +43,9 @@ PREFIX_SUBDIR= ${PORTNAME}/ .include <bsd.port.pre.mk> +.if !defined(PACKAGE_BUILDING) || (defined(PACKAGE_BUILDING) && !defined(LINUX_OSRELEASE) ) LINUX_OSRELEASE!= ${ECHO_CMD} `${SYSCTL} -n compat.linux.osrelease 2>/dev/null` +.endif .if ${LINUX_OSRELEASE}x == "x" IGNORE= linuxulator is not (kld)loaded |