X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=coblitz.mk;h=cb2336ef3eb4aba360fe73eceec90e566861bf8f;hb=8c38255cdb9f00fac25a9d52bcc272103c1eac79;hp=70c7440fcc175c6ae19d9bbe63a762e3abd9e013;hpb=dfc6bbe56a85fd9eed13ddccf2a661855ce33067;p=build.git diff --git a/coblitz.mk b/coblitz.mk index 70c7440f..cb2336ef 100644 --- a/coblitz.mk +++ b/coblitz.mk @@ -14,16 +14,18 @@ # mkinitrd # -#ifeq "$(DISTRONAME)" "centos5" -#mkinitrd-MODULES := mkinitrd -#mkinitrd-SPEC := mkinitrd.spec -#mkinitrd-BUILD-FROM-SRPM := yes -#ALL += mkinitrd -#IN_BOOTCD += mkinitrd -#IN_VSERVER += mkinitrd -#IN_BOOTSTRAPFS += mkinitrd -#IN_MYPLC += mkinitrd -#endif +ifeq "$(PLDISTROTAGS)" "coblitz-unstable-tags.mk" +ifeq "$(DISTRONAME)" "centos5" +mkinitrd-MODULES := mkinitrd +mkinitrd-SPEC := mkinitrd.spec +mkinitrd-BUILD-FROM-SRPM := yes +ALL += mkinitrd +IN_BOOTCD += mkinitrd +IN_VSERVER += mkinitrd +IN_BOOTSTRAPFS += mkinitrd +IN_MYPLC += mkinitrd +endif +endif # # kernel @@ -34,9 +36,6 @@ kernel-MODULES := linux-2.6 kernel-SPEC := kernel-2.6.spec -#ifeq "$(DISTRONAME)" "centos5" -#kernel-DEPEND-DEVEL-RPMS: mkinitrd -#endif kernel-BUILD-FROM-SRPM := yes ifeq "$(HOSTARCH)" "i386" kernel-RPMFLAGS:= --target i686 @@ -147,7 +146,6 @@ IN_BOOTSTRAPFS += sshd # codemux-MODULES := codemux codemux-SPEC := codemux.spec -codemux-RPMBUILD := sudo bash ./rpmbuild.sh #ALL += codemux #IN_BOOTSTRAPFS += codemux @@ -347,7 +345,6 @@ IN_BOOTCD += pyplnet # bootcd-MODULES := bootcd build bootcd-SPEC := bootcd.spec -bootcd-RPMBUILD := sudo bash ./rpmbuild.sh bootcd-DEPEND-PACKAGES := $(IN_BOOTCD) bootcd-DEPEND-FILES := RPMS/yumgroups.xml bootcd-RPMDATE := yes @@ -370,7 +367,6 @@ IN_BOOTSTRAPFS += vserver # bootstrapfs-MODULES := bootstrapfs build bootstrapfs-SPEC := bootstrapfs.spec -bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml bootstrapfs-RPMDATE := yes @@ -388,7 +384,6 @@ NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS)) noderepo-MODULES := bootstrapfs noderepo-SPEC := noderepo.spec -noderepo-RPMBUILD := sudo bash ./rpmbuild.sh # package requires all regular packages noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER) noderepo-DEPEND-FILES := RPMS/yumgroups.xml