From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 7 20:40:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1772C1065673 for ; Sun, 7 Jun 2009 20:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E45688FC1E for ; Sun, 7 Jun 2009 20:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n57Ke13f019637 for ; Sun, 7 Jun 2009 20:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n57Ke1rM019636; Sun, 7 Jun 2009 20:40:01 GMT (envelope-from gnats) Resent-Date: Sun, 7 Jun 2009 20:40:01 GMT Resent-Message-Id: <200906072040.n57Ke1rM019636@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Boris Samorodov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5792D106564A for ; Sun, 7 Jun 2009 20:31:00 +0000 (UTC) (envelope-from bsam@bb.ipt.ru) Received: from bb.ipt.ru (bb.ipt.ru [194.62.233.89]) by mx1.freebsd.org (Postfix) with ESMTP id DEEF38FC1D for ; Sun, 7 Jun 2009 20:30:59 +0000 (UTC) (envelope-from bsam@bb.ipt.ru) Received: from bb.ipt.ru (localhost [127.0.0.1]) by bb.ipt.ru (8.14.3/8.14.3) with ESMTP id n57KUwTE074646 for ; Mon, 8 Jun 2009 00:30:58 +0400 (MSD) (envelope-from bsam@bb.ipt.ru) Received: (from bsam@localhost) by bb.ipt.ru (8.14.3/8.14.3/Submit) id n57KUwhA074506; Mon, 8 Jun 2009 00:30:58 +0400 (MSD) (envelope-from bsam) Message-Id: <200906072030.n57KUwhA074506@bb.ipt.ru> Date: Mon, 8 Jun 2009 00:30:58 +0400 (MSD) From: Boris Samorodov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/135334: [exp-run] change linux defaults to Fedora 10 at 8-CURRENT X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Boris Samorodov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Jun 2009 20:40:02 -0000 >Number: 135334 >Category: ports >Synopsis: [exp-run] change linux defaults to Fedora 10 at 8-CURRENT >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Jun 07 20:40:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Boris Samorodov >Release: FreeBSD 8.0-CURRENT i386 >Organization: InPharmTech, Co. >Environment: System: FreeBSD bb.ipt.ru 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Tue Jun 2 13:20:15 MSD 2009 root@bb.ipt.ru:/usr/obj/usr/src/sys/BB i386 >Description: Please, do an exp-run to change default linux ports at 8-CURRENT to Linux Fedora 10 ports. Note: the OSVERSION should be 800076 or greater. >How-To-Repeat: >Fix: --- Mk.diff begins here --- Index: bsd.linux-apps.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.linux-apps.mk,v retrieving revision 1.20 diff -u -r1.20 bsd.linux-apps.mk --- bsd.linux-apps.mk 7 Jun 2009 20:22:07 -0000 1.20 +++ bsd.linux-apps.mk 7 Jun 2009 20:24:39 -0000 @@ -48,8 +48,12 @@ . else IGNORE= valid values for OVERRIDE_LINUX_NONBASE_PORTS are \"f8\", \"f10\" . endif -. else +. elif ${OSVERSION} < 800076 +# default for OSVERSION < 800076 LINUX_DIST_SUFFIX= +. else +# default for OSVERSION >= 800076 +LINUX_DIST_SUFFIX= -f10 . endif # I'm not sure if kompozer is better for linux-f8 ports, so use nvu Index: bsd.linux-rpm.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.linux-rpm.mk,v retrieving revision 1.19 diff -u -r1.19 bsd.linux-rpm.mk --- bsd.linux-rpm.mk 1 Jun 2009 17:26:07 -0000 1.19 +++ bsd.linux-rpm.mk 7 Jun 2009 20:24:39 -0000 @@ -63,7 +63,11 @@ Linux_RPM_Post_Include= bsd.linux-rpm.mk LINUX_DIST?= fedora -LINUX_DIST_VER?= 3 +. if ${OSVERSION} < 800076 +LINUX_DIST_VER?= 4 +. else +LINUX_DIST_VER?= 10 +. endif # linux Fedora 8 infrastructure ports should be used with compat.linux.osrelease=2.6.16, # linux_base-f8 (or greater) port @@ -72,14 +76,19 @@ . if (${LINUX_OSRELEASE} != "2.6.16") IGNORE= bsd.linux-rpm.mk test failed: the port should be used with compat.linux.osrelease=2.6.16, which is supported at 8-CURRENT and has a limitted support at 7-STABLE . endif +# the default for OSVERSION < 800076 +. if ${OSVERSION} < 800076 # let's check if an apropriate linux base port is used -. if ${USE_LINUX} != f8 && ${USE_LINUX} != f9 && ${USE_LINUX} != f10 +. if ${USE_LINUX} != f8 && ${USE_LINUX} != f9 && ${USE_LINUX} != f10 IGNORE= bsd.linux-rpm.mk test failed: the port should be used with at least linux_base-f8, please read /usr/ports/UPDATING -. endif +. endif # let's check if OVERRIDE_LINUX_NONBASE_PORTS is defined -. ifndef(OVERRIDE_LINUX_NONBASE_PORTS) +. ifndef(OVERRIDE_LINUX_NONBASE_PORTS) IGNORE= bsd.linux-rpm.mk test failed: the port should be used with defined OVERRIDE_LINUX_NONBASE_PORTS, please read /usr/ports/UPDATING -. endif +. endif +# the default for OSVERSION >= 800076 +#. else +. endif # ${OSVERSION} < 800076 . endif . if defined(LINUX_DIST) Index: bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.620 diff -u -r1.620 bsd.port.mk --- bsd.port.mk 3 Jun 2009 21:50:50 -0000 1.620 +++ bsd.port.mk 7 Jun 2009 20:24:40 -0000 @@ -1838,7 +1838,11 @@ LINUX_BASE_PORT= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX} . else . if ${USE_LINUX:L} == "yes" +. if ${OSVERSION} < 800076 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 +. endif . else IGNORE= cannot be built: there is no emulators/linux_base-${USE_LINUX}, perhaps wrong use of USE_LINUX or OVERRIDE_LINUX_BASE_PORT . endif --- Mk.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: