From aba4df4fc08b53847d560b513414f0485696f577 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 7 Dec 2011 09:42:46 +0100 Subject: [PATCH] resync both distros - minimize diffs --- onelab.mk | 25 ++++++------ planetlab-k32-tags.mk | 2 +- planetlab.mk | 90 +++++++++++++++++++++++++++---------------- 3 files changed, 70 insertions(+), 47 deletions(-) diff --git a/onelab.mk b/onelab.mk index 7f74e3b1..7ac07d4d 100644 --- a/onelab.mk +++ b/onelab.mk @@ -57,6 +57,9 @@ ALL += ipfwslice # # madwifi # +# skip this with k32/f8 +ifneq "" "$(findstring k32,$(PLDISTROTAGS))" +ifneq "$(DISTRONAME)" "f8" madwifi-MODULES := madwifi madwifi-SPEC := madwifi.spec madwifi-BUILD-FROM-SRPM := yes @@ -66,6 +69,8 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \ kernel_arch=$(kernel.rpm-arch) ALL += madwifi IN_BOOTSTRAPFS += madwifi +endif +endif # # comgt @@ -96,7 +101,7 @@ ALL += umts-frontend # iptables-MODULES := iptables iptables-SPEC := iptables.spec -iptables-BUILD-FROM-SRPM := yes +iptables-BUILD-FROM-SRPM := yes iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers ALL += iptables IN_BOOTSTRAPFS += iptables @@ -106,7 +111,7 @@ IN_BOOTSTRAPFS += iptables # iproute-MODULES := iproute2 iproute-SPEC := iproute.spec -iproute-BUILD-FROM-SRPM := yes +iproute-BUILD-FROM-SRPM := yes ALL += iproute IN_BOOTSTRAPFS += iproute IN_VSERVER += iproute @@ -211,7 +216,6 @@ DistributedRateLimiting-SPEC := DistributedRateLimiting.spec ALL += DistributedRateLimiting IN_NODEREPO += DistributedRateLimiting - # # pf2slice # @@ -236,6 +240,10 @@ ifeq "$(DISTRONAME)" "centos5" local_inotify_tools=true endif +ifeq "$(DISTRONAME)" "sl6" +local_inotify_tools=true +endif + ifeq "$(local_inotify_tools)" "true" inotify-tools-MODULES := inotify-tools inotify-tools-SPEC := inotify-tools.spec @@ -332,16 +340,6 @@ monitor-DEVEL-RPMS += net-snmp net-snmp-devel ALL += monitor IN_BOOTSTRAPFS += monitor -# -# zabbix -# -zabbix-MODULES := monitor -zabbix-SPEC := zabbix.spec -zabbix-BUILD-FROM-SRPM := yes -zabbix-DEVEL-RPMS += python-cherrypy -### turn this off as zabbix comes with stock fedora or epel -###ALL += zabbix - # # PLC RT # @@ -534,6 +532,7 @@ ALL += slicerepo # myplc-MODULES := myplc myplc-SPEC := myplc.spec +myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml ALL += myplc # myplc-docs only contains docs for PLCAPI and NMAPI, but diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index dd478dc1..ab92398c 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -29,7 +29,7 @@ fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tag pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2 Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-4 inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 -openvswitch-GITPATH := git://git.planet-lab.org/openvswitch.git +openvswitch-GITPATH := git://git.planet-lab.org/openvswitch.git@master vsys-GITPATH := git://git.planet-lab.org/vsys.git@vsys-0.99-2 vsys-scripts-GITPATH := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-33 plcapi-GITPATH := git://git.planet-lab.org/plcapi@plcapi-5.0-36 diff --git a/planetlab.mk b/planetlab.mk index 3708096c..59191c51 100644 --- a/planetlab.mk +++ b/planetlab.mk @@ -39,6 +39,7 @@ kernel-RPMFLAGS:= --target i686 else kernel-RPMFLAGS:= --target $(HOSTARCH) endif +kernel-SPECVARS += kernelconfig=planetlab KERNELS += kernel kernels: $(KERNELS) @@ -49,14 +50,12 @@ ALL += $(KERNELS) IN_BOOTCD += $(KERNELS) IN_VSERVER += $(KERNELS) IN_BOOTSTRAPFS += $(KERNELS) -# turns out myplc installs kernel-vserver -IN_MYPLC += $(KERNELS) # # madwifi # - -ifeq "$(PLDISTROTAGS)" "planetlab-k32-tags.mk" +# skip this with k32/f8 +ifneq "" "$(findstring k32,$(PLDISTROTAGS))" ifneq "$(DISTRONAME)" "f8" madwifi-MODULES := madwifi madwifi-SPEC := madwifi.spec @@ -70,11 +69,33 @@ IN_BOOTSTRAPFS += madwifi endif endif +# +# iptables +# +iptables-MODULES := iptables +iptables-SPEC := iptables.spec +iptables-BUILD-FROM-SRPM := yes +iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers +ALL += iptables +IN_BOOTSTRAPFS += iptables + +# +# iproute +# +iproute-MODULES := iproute2 +iproute-SPEC := iproute.spec +iproute-BUILD-FROM-SRPM := yes +ALL += iproute +IN_BOOTSTRAPFS += iproute +IN_VSERVER += iproute +IN_BOOTCD += iproute + # # util-vserver # util-vserver-MODULES := util-vserver util-vserver-SPEC := util-vserver.spec +# starting with 0.4 util-vserver-BUILD-FROM-SRPM := yes util-vserver-RPMFLAGS:= --without dietlibc --without doc ALL += util-vserver @@ -183,27 +204,6 @@ mom-SPEC := pl_mom.spec ALL += mom IN_BOOTSTRAPFS += mom -# -# iptables -# -iptables-MODULES := iptables -iptables-SPEC := iptables.spec -iptables-BUILD-FROM-SRPM := yes -iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers -ALL += iptables -IN_BOOTSTRAPFS += iptables - -# -# iproute -# -iproute-MODULES := iproute2 -iproute-SPEC := iproute.spec -iproute-BUILD-FROM-SRPM := yes -ALL += iproute -IN_BOOTSTRAPFS += iproute -IN_VSERVER += iproute -IN_BOOTCD += iproute - # # inotify-tools - local import # rebuild this on centos5 (not found) - see kexcludes in build.common @@ -247,6 +247,14 @@ endif IN_BOOTSTRAPFS += vsys ALL += vsys +# +# vsyssh : installed in slivers +# +vsyssh-MODULES := vsys +vsyssh-SPEC := vsyssh.spec +IN_SLIVER += vsyssh +ALL += vsyssh + # # vsys-scripts # @@ -256,7 +264,7 @@ IN_BOOTSTRAPFS += vsys-scripts ALL += vsys-scripts # -# PLCAPI +# plcapi # plcapi-MODULES := plcapi plcapi-SPEC := PLCAPI.spec @@ -311,6 +319,8 @@ plcrt-MODULES := PLCRT plcrt-SPEC := plcrt.spec ALL += plcrt +# f12 has 0.9-1 already +ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)" # # pyopenssl # @@ -318,7 +328,7 @@ pyopenssl-MODULES := pyopenssl pyopenssl-SPEC := pyOpenSSL.spec pyopenssl-BUILD-FROM-SRPM := yes ALL += pyopenssl - +endif # # pyaspects @@ -363,8 +373,6 @@ ALL += sface # # nodeconfig # -# xxx needed when upgrading to 5.0 -#nodeconfig-MODULES := nodeconfig nodeconfig-MODULES := nodeconfig nodeconfig-SPEC := nodeconfig.spec ALL += nodeconfig @@ -396,7 +404,6 @@ IN_BOOTSTRAPFS += pyplnet IN_MYPLC += pyplnet IN_BOOTCD += pyplnet - # # OMF resource controller # @@ -412,7 +419,6 @@ omf-expctl-MODULES := omf omf-expctl-SPEC := omf-expctl.spec ALL += omf-expctl - # # bootcd # @@ -457,7 +463,7 @@ NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS)) noderepo-MODULES := bootstrapfs noderepo-SPEC := noderepo.spec -# package requires all regular packages +# package requires all embedded packages noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER) noderepo-DEPEND-FILES := RPMS/yumgroups.xml #export rpm list to the specfile @@ -466,6 +472,25 @@ noderepo-RPMDATE := yes ALL += noderepo IN_MYPLC += noderepo +# +# slicerepo +# +# all rpms resulting from packages marked as being in vserver +SLICEREPO_RPMS = $(foreach package,$(IN_VSERVER),$($(package).rpms)) +# replace space with +++ (specvars cannot deal with spaces) +SPACE=$(subst x, ,x) +SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS)) + +slicerepo-MODULES := bootstrapfs +slicerepo-SPEC := slicerepo.spec +# package requires all embedded packages +slicerepo-DEPEND-PACKAGES := $(IN_VSERVER) +slicerepo-DEPEND-FILES := RPMS/yumgroups.xml +#export rpm list to the specfile +slicerepo-SPECVARS = slice_rpms_plus=$(SLICEREPO_RPMS_3PLUS) +slicerepo-RPMDATE := yes +ALL += slicerepo + # # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver # @@ -486,4 +511,3 @@ release-MODULES := myplc release-SPEC := myplc-release.spec release-RPMDATE := yes ALL += release - -- 2.43.0