From 376881b1ffa8e9a1bff8927881b41db715d97852 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> Date: Thu, 5 May 2011 21:45:30 +0200 Subject: [PATCH] revert changes to devel.pkgs and keep this local to the f14 fake distro --- config.planetlab/devel.pkgs | 6 ------ f14-tags.mk | 6 ++++++ f14.mk | 6 +----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/config.planetlab/devel.pkgs b/config.planetlab/devel.pkgs index 27e4d990..9e4edb6a 100644 --- a/config.planetlab/devel.pkgs +++ b/config.planetlab/devel.pkgs @@ -110,9 +110,3 @@ package: python-dateutil package: python-lxml # DistributedRateLimiting package: libxml2-devel -########## -# this is to rebuild a kernel for a stock fedora install -# for the kernel (from the f12/ branch of linux-2.6) -package>=f14: elfutils-libelf-devel e2fsprogs -# for util-vserver -package>=f14: nss nss-devel diff --git a/f14-tags.mk b/f14-tags.mk index eb8bbb24..8cfd2569 100644 --- a/f14-tags.mk +++ b/f14-tags.mk @@ -1,8 +1,14 @@ # don't bother to upgrade linux-2.6-BRANCH := f12 linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6.32-f12 +kernel-DEVEL-RPMS += elfutils-libelf-devel +kernel-DEVEL-RPMS += e2fsprogs +kernel-DEVEL-RPMS += xmlto +kernel-DEVEL-RPMS += asciidoc util-vserver-BRANCH := f12 util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@f12-bbox-f14 +util-vserver-DEVEL-RPMS += nss nss-devel +util-vserver-DEVEL-RPMS += dietlibc # but use latest stuff for f12 that has 3.2.28 yum-BRANCH := f12 yum-GITPATH := git://git.onelab.eu/yum.git@3.2.28-5-f1x diff --git a/f14.mk b/f14.mk index 9db5e06a..f5016d82 100644 --- a/f14.mk +++ b/f14.mk @@ -1,9 +1,5 @@ # -# $Id$ -# $URL$ -# -# the f12 pldistro is to rebuild a fedora 12 vserver-capable kernel + out-to-date util-vserver -# it is intended to be used in conjunction with the stock f12 distribution +# mostly same as f12.mk - purpose is to build a minimal env. for f14-based infrastructure # # -- 2.47.0