X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=ebe40889c76cbffac840ed7923db3eac6e322b5d;hb=305c3e9de9e68499fb99a7b48e35814ef9d94440;hp=de91b8e68c16a78d623c6de9971b2478beaf6149;hpb=cb23cf4fbc5bb4def4b921c11433f01f01304215;p=build.git diff --git a/planetlab.mk b/planetlab.mk index de91b8e6..ebe40889 100644 --- a/planetlab.mk +++ b/planetlab.mk @@ -133,26 +133,6 @@ 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 -IN_BOOTSTRAPFS += libhttpd - -# -# proper: Privileged Operations Service -# -proper-MODULES := proper -proper-SPEC := proper.spec -proper-DEPEND-DEVEL-RPMS := libhttpd++-devel -ALL += proper -IN_BOOTSTRAPFS += proper - # # codemux: Port 80 demux # @@ -162,15 +142,6 @@ codemux-RPMBUILD := sudo bash ./rpmbuild.sh ALL += codemux IN_BOOTSTRAPFS += codemux -# -# ulogd -# -ulogd-MODULES := ulogd -ulogd-SPEC := ulogd.spec -ulogd-DEPEND-DEVEL-RPMS := kernel-devel proper-libs proper-devel -ALL += ulogd -IN_VSERVER += ulogd - # # fprobe-ulog # @@ -299,6 +270,7 @@ bootcd-RPMBUILD := sudo bash ./rpmbuild.sh # package has *some* dependencies, at least these ones bootcd-DEPEND-PACKAGES := $(IN_BOOTCD) bootcd-DEPEND-FILES := RPMS/yumgroups.xml +bootcd-RPMDATE := yes ALL += bootcd IN_MYPLC += bootcd @@ -313,6 +285,7 @@ vserver-RPMBUILD := sudo bash ./rpmbuild.sh # always redo all sequentially - try to keep updated vserver-DEPEND-PACKAGES := $(IN_VSERVER) vserver-DEPEND-FILES := RPMS/yumgroups.xml +vserver-RPMDATE := yes ALL += vserver IN_BOOTSTRAPFS += vserver @@ -325,6 +298,7 @@ bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh # package requires all regular packages bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml +bootstrapfs-RPMDATE := yes ALL += bootstrapfs IN_MYPLC += bootstrapfs @@ -345,6 +319,7 @@ noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER) noderepo-DEPEND-FILES := RPMS/yumgroups.xml #export rpm list to the specfile noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS) +noderepo-RPMDATE := yes ALL += noderepo IN_MYPLC += noderepo @@ -358,6 +333,7 @@ myplc-RPMBUILD := sudo bash ./rpmbuild.sh # myplc may require all packages myplc-DEPEND-PACKAGES := $(IN_MYPLC) myplc-DEPEND-FILES := RPMS/yumgroups.xml myplc-release +myplc-RPMDATE := yes ALL += myplc #