diff options
| author | pav <pav@FreeBSD.org> | 2011-02-25 11:00:59 +0000 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2011-02-25 11:00:59 +0000 |
| commit | 25d416124daccc416f46f3c847511dea9cc9f4bb (patch) | |
| tree | 31fe7650d1c9568266a7a12f8b543f9a2b720c15 /Mk | |
| parent | ba3e5206f6b0fc953d206cbe9d061597936b453c (diff) | |
| download | FreeBSD-ports-25d416124daccc416f46f3c847511dea9cc9f4bb.zip FreeBSD-ports-25d416124daccc416f46f3c847511dea9cc9f4bb.tar.gz | |
- Allow using linux base 2.4 on FreeBSD 8.X
PR: ports/154186
Submitted by: ale
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.linux-apps.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.linux-rpm.mk | 4 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Mk/bsd.linux-apps.mk b/Mk/bsd.linux-apps.mk index d5aaa66..b71bc21 100644 --- a/Mk/bsd.linux-apps.mk +++ b/Mk/bsd.linux-apps.mk @@ -48,7 +48,7 @@ LINUX_DIST_SUFFIX= -f10 . else IGNORE= valid values for OVERRIDE_LINUX_NONBASE_PORTS are \"f8\", \"f10\" . endif -. elif ${OSVERSION} < 800076 +. elif ${OSVERSION} < 800076 || ${LINUX_OSRELEASE} == "2.4.2" # default for OSVERSION < 800076 LINUX_DIST_SUFFIX= . else diff --git a/Mk/bsd.linux-rpm.mk b/Mk/bsd.linux-rpm.mk index a18bf56..f71adc1 100644 --- a/Mk/bsd.linux-rpm.mk +++ b/Mk/bsd.linux-rpm.mk @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.linux-rpm.mk,v 1.24 2010-10-28 21:00:06 erwin Exp $ +# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.linux-rpm.mk,v 1.25 2011-02-25 11:00:59 pav Exp $ # # Variables: @@ -63,7 +63,7 @@ LINUX_RPM_ARCH?= ${ARCH} Linux_RPM_Post_Include= bsd.linux-rpm.mk LINUX_DIST?= fedora -. if ${OSVERSION} < 800076 +. if ${OSVERSION} < 800076 || ${LINUX_OSRELEASE} == "2.4.2" LINUX_DIST_VER?= 4 . else LINUX_DIST_VER?= 10 diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 1381e53..36fb761 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1949,7 +1949,7 @@ USE_LINUX= ${OVERRIDE_LINUX_BASE_PORT} LINUX_BASE_PORT= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX} . else . if ${USE_LINUX:L} == "yes" -. if ${OSVERSION} < 800076 +. if ${OSVERSION} < 800076 || ${LINUX_OSRELEASE} == "2.4.2" LINUX_BASE_PORT= ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-fc4 . else LINUX_BASE_PORT= ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-f10 |
