From 384e4b719a08ed25ca5f28a2d65e4993689a42de Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Fri, 6 Jan 2006 21:37:10 +0000 Subject: [PATCH] merge changes from HEAD --- Makefile | 48 ++++++++++++++++++++++++++++++++--- Makerules | 55 +++++------------------------------------ Rules.mk | 55 +++++------------------------------------ groups/v3_yumgroups.xml | 54 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 110 insertions(+), 102 deletions(-) diff --git a/Makefile b/Makefile index b5e0f8a8..a8d3e465 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # Mark Huang # Copyright (C) 2003-2005 The Trustees of Princeton University # -# $Id: Makefile,v 1.79 2005/09/04 17:37:36 mlhuang Exp $ +# $Id: Makefile,v 1.83 2005/12/27 23:19:51 mef Exp $ # # Default target @@ -35,6 +35,12 @@ INITIAL := HEAD TAG := HEAD CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs +# By default, the naming convention for built RPMS is +# --.planetlab..rpm +# Set PLDISTRO on the command line to differentiate between downstream +# variants. +PLDISTRO := planetlab + # # kernel # @@ -204,6 +210,15 @@ resman-MODULE := resman resman-SPEC := resman/resman.spec ALL += resman +# +# libhttpd++: +# + +libhttpd++-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs +libhttpd++-MODULE := libhttpd++ +libhttpd++-SPEC := libhttpd++/libhttpd++.spec +ALL += libhttpd++ + # # Proper: Privileged Operations Service # @@ -213,6 +228,8 @@ proper-MODULE := proper proper-SPEC := proper/proper.spec ALL += proper +proper: libhttpd++ + # # ulogd # @@ -262,6 +279,15 @@ kexec-tools-MODULE := kexec-tools kexec-tools-SPEC := kexec-tools/kexec-tools.spec ALL += kexec-tools +# +# dhcp +# + +dhcp-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs +dhcp-MODULE := dhcp +dhcp-SPEC := dhcp/dhcp.spec +ALL += dhcp + # # util-python # @@ -302,12 +328,28 @@ bootmanager-SPEC := bootmanager/bootmanager.spec bootmanager-RPMBUILD := sudo rpmbuild ALL += bootmanager -# bootmanager may require current packages +# bootmanager requires current packages bootmanager: $(filter-out bootmanager,$(ALL)) # ...and the yum manifest bootmanager: RPMS/yumgroups.xml +# +# bootcd +# + +bootcd-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs +bootcd-MODULE := bootcd_v3 +bootcd-SPEC := bootcd_v3/bootcd.spec +bootcd-RPMBUILD := sudo rpmbuild +ALL += bootcd + +# bootcd requires current packages +bootcd: $(filter-out bootcd,$(ALL)) + +# ...and the yum manifest +bootcd: RPMS/yumgroups.xml + ifeq ($(findstring $(package),$(ALL)),) # Build all packages @@ -364,7 +406,7 @@ $(foreach package,$(ALL),$(package)-clean): %-clean: # Remove all generated files clean: - rm -rf BUILD RPMS SOURCES SPECS SRPMS .rpmmacros .cvsps + rm -rf BUILD RPMS SOURCES SPECS SRPMS .rpmmacros .cvsps tmp .PHONY: all $(ALL) $(foreach package,$(ALL),$(package)-clean) clean diff --git a/Makerules b/Makerules index 7b638299..fa6c0051 100644 --- a/Makerules +++ b/Makerules @@ -4,10 +4,10 @@ # Mark Huang # Copyright (C) 2003-2005 The Trustees of Princeton University # -# $Id: Makerules,v 1.16 2005/09/01 18:58:45 mlhuang Exp $ +# $Id: Makerules,v 1.18 2005/12/15 17:02:07 mlhuang Exp $ # -# Base cvsps and rpmbuild in the current directory +# Base rpmbuild in the current directory export HOME := $(shell pwd) export CVSROOT CVS_RSH @@ -25,16 +25,6 @@ $(MK): SPECS/$(notdir $(SPEC)).in -e 's/^$${define}[ ]*\([^ ]*\)[ ]*\([^ ]*\)/\1 := \2/p' \ -e 's/^\([^ ]*\):[ ]*\([^ ]*\)/\1 := \2/p' \ $< > $@ -ifneq ($(INITIAL),$(TAG)) - # Get list of PatchSets - cvsps --cvs-direct --root $(CVSROOT) -r $(INITIAL) $(if $(TAG:HEAD=),-r $(TAG)) $(MODULE) | \ - sed -ne 's|^PatchSet[ ]*\([0-9]*\)|PATCHES += \1|p' >> $@ -ifeq ($(shell echo $(MAKE_VERSION) | awk '{ print ($$1 < 3.80) }'),1) - # make-3.80 can use $(eval) instead (see below) - cvsps --cvs-direct --root $(CVSROOT) -r $(INITIAL) $(if $(TAG:HEAD=),-r $(TAG)) $(MODULE) | \ - sh Patchrules >> $@ -endif -endif SPECS/$(notdir $(SPEC)).in: mkdir -p SPECS @@ -75,30 +65,6 @@ SOURCES/$(Base0).tar.gz SOURCES/$(Base0).tgz: SOURCES/$(Base0) SOURCES/$(Base0).tar: SOURCES/$(Base0) tar cpf $@ -C SOURCES $(Base0) -# -# Generate patches -# - -define PATCH_template - -# In case the spec file did not explicitly list the PatchSet -ifeq ($$(origin Patch$(1)),undefined) -Patch$(1) := $$(package)-$(1).patch.bz2 -endif - -# Get rid of URL -Patch$(1) := $$(notdir $$(Patch$(1))) - -# Add patch to the list of sources -SOURCES += SOURCES/$$(Patch$(1)) - -# Generate uncompressed patch -SOURCES/$$(patsubst %.gz,%,$$(patsubst %.bz2,%,$$(Patch$(1)))): - mkdir -p SOURCES - cvsps --cvs-direct --root $$(CVSROOT) -g -s $(1) $$(MODULE) > $$@ - -endef - # bzip2 %.bz2: % bzip2 -c $< > $@ @@ -107,9 +73,6 @@ endef %.gz: % gzip -c $< > $@ -# Generate rules to generate patches (make-3.80 and above expands this) -$(foreach n,$(PATCHES),$(eval $(call PATCH_template,$(n)))) - # # Generate spec file # @@ -126,19 +89,14 @@ ifeq ($(TAG),HEAD) # Define date for untagged builds echo "%define date $(DATE)" >> $@ endif - # Rewrite patch sections of spec file - perl -n -e ' \ - next if /^Patch.*/; \ - next if /^%patch.*/; \ - print; \ - if (/^Source.*/) { $(foreach n,$(PATCHES),print "Patch$(n): $(Patch$(n))\n";) } \ - if (/^%setup.*/) { $(foreach n,$(PATCHES),print "%patch$(n) -p1\n";) } \ - ' $< >> $@ + echo "%define pldistro $(PLDISTRO)" >> $@ + cat $< >> $@ # # Build # +RPMFLAGS += --define "pldistro $(PLDISTRO)" ifeq ($(TAG),HEAD) RPMFLAGS += --define "date $(DATE)" endif @@ -171,7 +129,6 @@ clean: SOURCES/$(Base0)* SOURCES/$(package)* \ SPECS/$(notdir $(SPEC)).in SPECS/$(notdir $(SPEC)) $(MK) \ SRPMS/$(NVR).src.rpm \ - tmp \ - .cvsps/$(subst /,#,$(CVSROOT)/$(MODULE)) + tmp .PHONY: all clean diff --git a/Rules.mk b/Rules.mk index 7b638299..fa6c0051 100644 --- a/Rules.mk +++ b/Rules.mk @@ -4,10 +4,10 @@ # Mark Huang # Copyright (C) 2003-2005 The Trustees of Princeton University # -# $Id: Makerules,v 1.16 2005/09/01 18:58:45 mlhuang Exp $ +# $Id: Makerules,v 1.18 2005/12/15 17:02:07 mlhuang Exp $ # -# Base cvsps and rpmbuild in the current directory +# Base rpmbuild in the current directory export HOME := $(shell pwd) export CVSROOT CVS_RSH @@ -25,16 +25,6 @@ $(MK): SPECS/$(notdir $(SPEC)).in -e 's/^$${define}[ ]*\([^ ]*\)[ ]*\([^ ]*\)/\1 := \2/p' \ -e 's/^\([^ ]*\):[ ]*\([^ ]*\)/\1 := \2/p' \ $< > $@ -ifneq ($(INITIAL),$(TAG)) - # Get list of PatchSets - cvsps --cvs-direct --root $(CVSROOT) -r $(INITIAL) $(if $(TAG:HEAD=),-r $(TAG)) $(MODULE) | \ - sed -ne 's|^PatchSet[ ]*\([0-9]*\)|PATCHES += \1|p' >> $@ -ifeq ($(shell echo $(MAKE_VERSION) | awk '{ print ($$1 < 3.80) }'),1) - # make-3.80 can use $(eval) instead (see below) - cvsps --cvs-direct --root $(CVSROOT) -r $(INITIAL) $(if $(TAG:HEAD=),-r $(TAG)) $(MODULE) | \ - sh Patchrules >> $@ -endif -endif SPECS/$(notdir $(SPEC)).in: mkdir -p SPECS @@ -75,30 +65,6 @@ SOURCES/$(Base0).tar.gz SOURCES/$(Base0).tgz: SOURCES/$(Base0) SOURCES/$(Base0).tar: SOURCES/$(Base0) tar cpf $@ -C SOURCES $(Base0) -# -# Generate patches -# - -define PATCH_template - -# In case the spec file did not explicitly list the PatchSet -ifeq ($$(origin Patch$(1)),undefined) -Patch$(1) := $$(package)-$(1).patch.bz2 -endif - -# Get rid of URL -Patch$(1) := $$(notdir $$(Patch$(1))) - -# Add patch to the list of sources -SOURCES += SOURCES/$$(Patch$(1)) - -# Generate uncompressed patch -SOURCES/$$(patsubst %.gz,%,$$(patsubst %.bz2,%,$$(Patch$(1)))): - mkdir -p SOURCES - cvsps --cvs-direct --root $$(CVSROOT) -g -s $(1) $$(MODULE) > $$@ - -endef - # bzip2 %.bz2: % bzip2 -c $< > $@ @@ -107,9 +73,6 @@ endef %.gz: % gzip -c $< > $@ -# Generate rules to generate patches (make-3.80 and above expands this) -$(foreach n,$(PATCHES),$(eval $(call PATCH_template,$(n)))) - # # Generate spec file # @@ -126,19 +89,14 @@ ifeq ($(TAG),HEAD) # Define date for untagged builds echo "%define date $(DATE)" >> $@ endif - # Rewrite patch sections of spec file - perl -n -e ' \ - next if /^Patch.*/; \ - next if /^%patch.*/; \ - print; \ - if (/^Source.*/) { $(foreach n,$(PATCHES),print "Patch$(n): $(Patch$(n))\n";) } \ - if (/^%setup.*/) { $(foreach n,$(PATCHES),print "%patch$(n) -p1\n";) } \ - ' $< >> $@ + echo "%define pldistro $(PLDISTRO)" >> $@ + cat $< >> $@ # # Build # +RPMFLAGS += --define "pldistro $(PLDISTRO)" ifeq ($(TAG),HEAD) RPMFLAGS += --define "date $(DATE)" endif @@ -171,7 +129,6 @@ clean: SOURCES/$(Base0)* SOURCES/$(package)* \ SPECS/$(notdir $(SPEC)).in SPECS/$(notdir $(SPEC)) $(MK) \ SRPMS/$(NVR).src.rpm \ - tmp \ - .cvsps/$(subst /,#,$(CVSROOT)/$(MODULE)) + tmp .PHONY: all clean diff --git a/groups/v3_yumgroups.xml b/groups/v3_yumgroups.xml index 7b4b107e..4fc94b36 100644 --- a/groups/v3_yumgroups.xml +++ b/groups/v3_yumgroups.xml @@ -25,7 +25,6 @@ kbd kernel libtermcap - losetup passwd procps readline @@ -162,4 +161,57 @@ + + bootcd + BootCD + true + BootCD Image + + dhclient + bash + coreutils + iputils + kernel + bzip2 + crontabs + diffutils + logrotate + openssh-clients + passwd + rsh + rsync + sudo + tcpdump + telnet + traceroute + time + vixie-cron + wget + yum + curl + gzip + perl + python + tar + pciutils + kbd + authconfig + hdparm + lvm + lvm2 + kexec-tools + gnupg + nano + parted + pyparted + openssh-server + openssh-clients + ncftp + dosfstools + dos2unix + bind-utils + sharutils + + + -- 2.47.0