#
# see doc in Makefile
#
+
#
# kernel
#
-# until we are able to build the new kernel layout:
-# use the old exploded-tree, 2.6.20-based, version on fc4, 6 & 7
-# and the new one on f8 - that requires the build-id patch
-
-#
# use a package name with srpm in it:
-# in this case the srpm is created by running make srpm in the codebase
+# so the source rpm is created by running make srpm in the codebase
#
srpm-kernel-$(HOSTARCH)-MODULES := linux-patches
endif
KERNELS += srpm-kernel-$(HOSTARCH)
-#else
-#kernel-$(HOSTARCH)-MODULES := linux-tree
-#kernel-$(HOSTARCH)-SPEC := scripts/kernel-2.6-planetlab.spec
-#ifeq ($(HOSTARCH),i386)
-#kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
-#else
-#kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
-#endif
-#KERNELS += kernel-$(HOSTARCH)
-#endif
-
kernel: $(KERNELS)
kernel-clean: $(foreach package,$(KERNELS),$(package)-clean)
-ALL += $(KERNELS)
-
-# the first kernel package defined here
+# the first kernel package defined here for convenience
kernel_package := $(word 1,$(KERNELS))
+ALL += $(KERNELS)
+# this is to mark on which image a given rpm is supposed to go
+IN_BOOTCD += $(KERNELS)
+IN_VSERVER += $(KERNELS)
+IN_BOOTSTRAPFS += $(KERNELS)
+# turns out myplc installs kernel-vserver
+IN_MYPLC += $(KERNELS)
+
#
# libnl
#
util-vserver-MODULES := util-vserver
util-vserver-SPEC := util-vserver.spec
util-vserver-RPMFLAGS:= --without dietlibc
-util-vserver-DEPENDDEVELS := libnl
ALL += util-vserver
+IN_BOOTSTRAPFS += util-vserver
+
+#
+# util-vserver-pl
+#
+util-vserver-pl-MODULES := util-vserver-pl
+util-vserver-pl-SPEC := util-vserver-pl.spec
+util-vserver-pl-DEPENDDEVELRPMS := libnl libnl-devel util-vserver-lib util-vserver-devel util-vserver-core
+ALL += util-vserver-pl
+IN_BOOTSTRAPFS += util-vserver-pl
#
# NodeUpdate
NodeUpdate-MODULES := NodeUpdate
NodeUpdate-SPEC := NodeUpdate.spec
ALL += NodeUpdate
+IN_BOOTSTRAPFS += NodeUpdate
#
# ipod
#
-PingOfDeath-MODULES := PingOfDeath
-PingOfDeath-SPEC := ipod.spec
-ALL += PingOfDeath
+ipod-MODULES := PingOfDeath
+ipod-SPEC := ipod.spec
+ALL += ipod
+IN_BOOTSTRAPFS += ipod
#
# NodeManager
NodeManager-MODULES := NodeManager
NodeManager-SPEC := NodeManager.spec
ALL += NodeManager
+IN_BOOTSTRAPFS += NodeManager
#
# pl_sshd
pl_sshd-MODULES := pl_sshd
pl_sshd-SPEC := pl_sshd.spec
ALL += pl_sshd
+IN_BOOTSTRAPFS += pl_sshd
#
# libhttpd++:
# Deprecate when vsys takes over [sapan].
# keep in build for proper.
#
-libhttpd++-MODULES := libhttpd++
-libhttpd++-SPEC := libhttpd++.spec
-ALL += libhttpd++
+libhttpd-MODULES := libhttpd++
+libhttpd-SPEC := libhttpd++.spec
+ALL += libhttpd
#
# proper: Privileged Operations Service
#
proper-MODULES := proper
proper-SPEC := proper.spec
-proper-RPMBUILD := sudo bash ./rpmbuild.sh
-# proper uses scripts in util-python for building
-proper-DEPENDDEVELS := libhttpd++ util-python
-# disabled temporarily (or ?)
-# need to check that these two define a -devel package
-#ALL += proper
+proper-DEPENDDEVELRPMS := libhttpd++-devel
+ALL += proper
#
# codemux: Port 80 demux
codemux-SPEC := codemux.spec
codemux-RPMBUILD := sudo bash ./rpmbuild.sh
ALL += codemux
+IN_BOOTSTRAPFS += codemux
#
# ulogd
#
ulogd-MODULES := ulogd
ulogd-SPEC := ulogd.spec
-ulogd-DEPENDDEVELS := $(kernel_package) proper
+ulogd-DEPENDDEVELRPMS := kernel-devel proper-libs proper-devel
ALL += ulogd
+IN_VSERVER += ulogd
#
# fprobe-ulog
fprobe-ulog-MODULES := fprobe-ulog
fprobe-ulog-SPEC := fprobe-ulog.spec
ALL += fprobe-ulog
+IN_BOOTSTRAPFS += fprobe-ulog
#
# netflow
netflow-MODULES := PlanetFlow
netflow-SPEC := netflow.spec
ALL += netflow
+IN_BOOTSTRAPFS += netflow
#
# PlanetLab Mom: Cleans up your mess
pl_mom-MODULES := Mom
pl_mom-SPEC := pl_mom.spec
ALL += pl_mom
+IN_BOOTSTRAPFS += pl_mom
#
# iptables
#
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
-iptables-DEPENDDEVELS := $(kernel_package)
+iptables-DEPENDDEVELRPMS := kernel-devel
ALL += iptables
+IN_BOOTSTRAPFS += iptables
#
# iproute
iproute-MODULES := iproute2
iproute-SPEC := iproute.spec
ALL += iproute
-
-#
-# util-python
-#
-# [marc] deprecate with proper
-#
-util-python-MODULES := util-python
-util-python-SPEC := util-python.spec
-ALL += util-python
+IN_BOOTSTRAPFS += iproute
#
# vsys
ifeq ($(RELEASE),7)
ALL += vsys
endif
+ifeq ($(RELEASE),8)
+ALL += vsys
+endif
endif
#
PLCAPI-MODULES := PLCAPI
PLCAPI-SPEC := PLCAPI.spec
ALL += PLCAPI
+IN_MYPLC += PLCAPI
#
# PLCWWW
PLCWWW-MODULES := WWW
PLCWWW-SPEC := PLCWWW.spec
ALL += PLCWWW
+IN_MYPLC += PLCWWW
#
# bootmanager
# Package must be built as root
bootmanager-RPMBUILD := sudo bash ./rpmbuild.sh
ALL += bootmanager
+IN_MYPLC += bootmanager
#
# pypcilib : used in bootcd
pypcilib-MODULES := pypcilib
pypcilib-SPEC := pypcilib.spec
ALL += pypcilib
+IN_BOOTCD += pypcilib
-# copy the current list, so as to keep image-building rpms out
-ALL-REGULARS := $(ALL)
+#
+# bootcd
+#
+bootcd-MODULES := BootCD build
+bootcd-SPEC := bootcd.spec
+bootcd-RPMBUILD := sudo bash ./rpmbuild.sh
+# package has *some* dependencies, at least these ones
+bootcd-DEPENDS := $(IN_BOOTCD)
+bootcd-DEPENDFILES := RPMS/yumgroups.xml
+ALL += bootcd
+IN_MYPLC += bootcd
#
# vserver : reference image for slices
vserver-SPEC := vserver-reference.spec
# Package must be built as root
vserver-RPMBUILD := sudo bash ./rpmbuild.sh
-# package requires all regular packages
-vserver-DEPENDS := $(ALL-REGULARS)
+# this list is useful for manual builds only, since nightly builds
+# always redo all sequentially - try to keep updated
+vserver-DEPENDS := $(IN_VSERVER)
vserver-DEPENDFILES := RPMS/yumgroups.xml
ALL += vserver
-
-#
-# bootcd
-#
-bootcd-MODULES := BootCD BootManager build
-bootcd-SPEC := bootcd.spec
-bootcd-RPMBUILD := sudo bash ./rpmbuild.sh
-# package has *some* dependencies, at least these ones
-bootcd-DEPENDS := $(ALL-REGULARS)
-bootcd-DEPENDFILES := RPMS/yumgroups.xml
-ALL += bootcd
+IN_BOOTSTRAPFS := vserver
#
# bootstrapfs
bootstrapfs-SPEC := bootstrapfs.spec
bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh
# package requires all regular packages
-bootstrapfs-DEPENDS := $(ALL-REGULARS)
+bootstrapfs-DEPENDS := $(IN_BOOTSTRAPFS)
bootstrapfs-DEPENDFILES := RPMS/yumgroups.xml
ALL += bootstrapfs
+IN_MYPLC += bootstrapfs
#
# myplc : initial, chroot-based packaging
# Package must be built as root
myplc-RPMBUILD := sudo bash ./rpmbuild.sh
# myplc may require all packages
-myplc-DEPENDS := $(filter-out vserver,$(ALL))
-myplc-DEPENDFILES := RPMS/yumgroups.xml
+myplc-DEPENDS := $(IN_MYPLC)
+myplc-DEPENDFILES := RPMS/yumgroups.xml myplc-release
ALL += myplc
#
myplc-native-SPEC := myplc-native.spec
# Package must be built as root
myplc-native-RPMBUILD := sudo bash ./rpmbuild.sh
-# Thierry : don't depend on these at build-time
-#myplc-native-DEPENDS := $(MyPLC-DEPENDS)
+# Thierry : don't depend on anything at build-time
+#myplc-native-DEPENDS :=
# Thierry : dunno about this one, let's stay safe
-myplc-native-DEPENDFILES := $(MyPLC-DEPENDFILES)
-#ALL += myplc-native
+myplc-native-DEPENDFILES := myplc-release
+ALL += myplc-native
-#
-# MyPLC development environment : chroot-based
-#
-myplc-devel-MODULES := MyPLC build
-myplc-devel-SPEC := myplc-devel.spec
-myplc-devel-RPMBUILD := sudo bash ./rpmbuild.sh
-#ALL += myplc-devel
-
-#
-# MyPLC native development environment
-#
-myplc-devel-native-MODULES := MyPLC
-myplc-devel-native-SPEC := myplc-devel-native.spec
-#ALL += myplc-devel-native
git://git.onelab.eu / build.git / blobdiff