From owner-freebsd-emulation@FreeBSD.ORG Sat Mar 18 20:54:20 2006 Return-Path: X-Original-To: freebsd-emulation@freebsd.org Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5F92116A422 for ; Sat, 18 Mar 2006 20:54:20 +0000 (UTC) (envelope-from bsam@ipt.ru) Received: from mail.ipt.ru (mail.ipt.ru [80.253.10.82]) by mx1.FreeBSD.org (Postfix) with ESMTP id E9AF843D70 for ; Sat, 18 Mar 2006 20:54:19 +0000 (GMT) (envelope-from bsam@ipt.ru) Received: from bsam by ipt.ru with local (Exim 4.60 (FreeBSD)) (envelope-from ) id 1FKiNS-0000Wf-AE for freebsd-emulation@freebsd.org; Sat, 18 Mar 2006 23:50:22 +0300 To: freebsd-emulation@freebsd.org From: Boris Samorodov Date: Sat, 18 Mar 2006 23:50:21 +0300 Message-ID: <63077458@ho.ipt.ru> User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Subject: [patch] for bsd.linux-rpm.mk (LINUX_DISTRIBUTION and more) 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: Sat, 18 Mar 2006 20:54:20 -0000 --=-=-= Hello, List! 1. I propose to use LINUX_DISTRIBUTION and VERSION (LINUX_DIST and LINUX_DIST_VER at the patch) at those ports which use USE_LINUX_RPM. So far only "fedora" and "3" are defined (they are defaults). The first option is intended to define to which distribution the port belogs to but thereis no need to install the linux distribution binaries. Current option USE_LINUX=foo implies installing linux distribution foo. 2. Currently only files for linux_base ports are saved to directories named after linux distribution names. There is no standard: o the majority of the ports use DIS_SUBDIR= rpm -- no distribution name, no version; o x11/linux-XFree86-libs: DIST_SUBDIR= rpm/i386/suse -- no version; o graphics/linux-png: DIST_SUBDIR= rpm/i386/fc3 -- combined distribution and version. I propose standard directory for fetching distfiles: DIST_SUBDIR?= rpm/${LINUX_RPM_ARCH}/${LINUX_DIST}/${LINUX_DIST_VER} The default directory may stay DIST_SUBDIR?= rpm. WBR -- Boris B. Samorodov, Research Engineer InPharmTech Co, http://www.ipt.ru Telephone & Internet Service Provider --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=patch Content-Description: patch for bsd.linux-rpm.mk --- bsd.linux-rpm.mk.orig Thu Mar 16 22:13:54 2006 +++ bsd.linux-rpm.mk Sat Mar 18 22:31:36 2006 @@ -33,10 +34,30 @@ Linux_RPM_Post_Include= bsd.linux-rpm.mk +# LINUX_DIST and LINUX_DIST_VER should be defined at the port's Makefile + +LINUX_DIST?= fedora +LINUX_DIST_VER?= 3 + +. if ${LINUX_DIST} == "fedora" MASTER_SITES?= ${MASTER_SITE_FEDORA_LINUX} -MASTER_SITE_SUBDIR?= 3/${LINUX_RPM_ARCH}/os/Fedora/RPMS/ +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 \ + updates/${LINUX_DIST_VER}/SRPMS +DIST_SUBDIR?= rpm/${LINUX_RPM_ARCH}/${LINUX_DIST}/${LINUX_DIST_VER} +. endif PKGNAMEPREFIX?= linux- +# DISTFILES and SRC_DISTFILES assume that there is only one bindist +# and one src file exists. +# Please, define them at the port's Makefile in case +# the assumption is not true. + +DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} +SRC_DISTFILES?= ${DISTNAME}${SRC_SUFX} +DIST_SUBDIR?= rpm + EXTRACT_DEPENDS+= ${RPM2CPIO}:${PORTSDIR}/archivers/rpm eXTRACT_CMD?= ${RPM2CPIO} --=-=-=--