From owner-freebsd-emulation@FreeBSD.ORG Tue Mar 3 15:54:55 2009 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F1E21065670 for ; Tue, 3 Mar 2009 15:54:55 +0000 (UTC) (envelope-from bsam@ipt.ru) Received: from services.ipt.ru (services.ipt.ru [194.62.233.110]) by mx1.freebsd.org (Postfix) with ESMTP id 4BC258FC28 for ; Tue, 3 Mar 2009 15:54:55 +0000 (UTC) (envelope-from bsam@ipt.ru) Received: from bb.ipt.ru ([194.62.233.89]) by services.ipt.ru with esmtp (Exim 4.54 (FreeBSD)) id 1LeWxJ-000NwU-Fx for freebsd-emulation@freebsd.org; Tue, 03 Mar 2009 18:54:53 +0300 To: freebsd-emulation@freebsd.org From: Boris Samorodov Date: Tue, 03 Mar 2009 18:55:01 +0300 Message-ID: <14905754@bb.ipt.ru> User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Subject: [patch] Mk/bsd.linux-rpm.mk: introduce some linux-f8 infrastructure X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Mar 2009 15:54:55 -0000 --=-=-= Hello List, I'm going to commit an attached patch. This patch is a noop for current ports structure (no need to ask an approval from portmgr) but is needed for new linux-f8 ports. There are two points (both taken from emulators/linux_base-f8): . define LINUX_OSRELEASE variable (linux-f8 packages should be build with compat.linux.osrelease=2.6.16); . define MASTER_SITE_SUBDIR and MASTER_SITE_SRC_SUBDIR when LINUX_DIST_VER=8 (no such ports ATM). Opinions are welcome. Thanks. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=Mk.diff Content-Description: a patch for bsd.linux-rpm.mk Index: bsd.linux-rpm.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.linux-rpm.mk,v retrieving revision 1.13 diff -u -r1.13 bsd.linux-rpm.mk --- bsd.linux-rpm.mk 15 Aug 2008 12:29:42 -0000 1.13 +++ bsd.linux-rpm.mk 3 Mar 2009 15:49:58 -0000 @@ -27,6 +27,11 @@ # contain libraries. # BRANDELF_FILES - A list of files to brand as a linux executable in # case BRANDELF_DIRS can't be used. +# LINUX_OSRELEASE - Contains the value of compat.linux.osrelease sysctl. +# Will be used to distinguish which linux +# infrastructure ports should be used. +# Valid values: 2.4.2, 2.6.16. +# Note: this variable must be used at bsd.linux.mk should it exists .if !defined(_POSTMKINCLUDED) && !defined(Linux_RPM_Pre_Include) @@ -52,6 +57,10 @@ LINUX_RPM_ARCH?= ${ARCH} . endif +.if !defined(LINUX_OSRELEASE) +LINUX_OSRELEASE!= ${ECHO_CMD} `${SYSCTL} -n compat.linux.osrelease 2>/dev/null` +.endif + .endif .if defined(_POSTMKINCLUDED) && !defined(Linux_RPM_Post_Include) @@ -67,6 +76,16 @@ . if ${LINUX_DIST} == "fedora" . ifndef MASTER_SITES MASTER_SITES?= ${MASTER_SITE_FEDORA_LINUX} +. endif +. if ${LINUX_DIST_VER} == 8 +. if (${LINUX_OSRELEASE} != "2.6.16") && defined(PACKAGE_BUILDING) +IGNORE= packages should be built with compat.linux.osrelease=2.6.16 +. endif +MASTER_SITE_SUBDIR?= ../releases/${LINUX_DIST_VER}/Everything/${LINUX_RPM_ARCH}/os/Packages \ + ../updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}.newkey +MASTER_SITE_SRC_SUBDIR?= ../releases/${LINUX_DIST_VER}/Everything/source/SRPMS \ + ../updates/${LINUX_DIST_VER}/SRPMS.newkey +. else MASTER_SITE_SUBDIR?= ${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \ updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH} MASTER_SITE_SRC_SUBDIR?= ${LINUX_DIST_VER}/SRPMS \ --=-=-= WBR -- Boris Samorodov (bsam) Research Engineer, http://www.ipt.ru Telephone & Internet SP FreeBSD Committer, http://www.FreeBSD.org The Power To Serve --=-=-=--