diff --git a/config.mk b/config.mk index 09db7c116..8dd755e85 100644 --- a/config.mk +++ b/config.mk @@ -19,7 +19,6 @@ iso.path:=$(BUILD_DIR)/iso/nailgun-ubuntu-12.04-amd64.iso image.centos.url=http://mc0n1-srt.srt.mirantis.net/centos63.qcow2 centos.packages=$(BUILD_DIR)/packages/centos -ubuntu.packages=$(BUILD_DIR)/packages/ubuntu bootstrap.linux:=$(BUILD_DIR)/bootstrap/linux bootstrap.initrd:=$(BUILD_DIR)/bootstrap/initrd.gz diff --git a/iso/EFI/BOOT/BOOTX64.conf b/iso/EFI/BOOT/BOOTX64.conf deleted file mode 100644 index 2609b99d6..000000000 --- a/iso/EFI/BOOT/BOOTX64.conf +++ /dev/null @@ -1,14 +0,0 @@ -#debug --graphics -default=0 -splashimage=/EFI/BOOT/splash.xpm.gz -timeout 5 -hiddenmenu -title CentOS 6.3 - kernel /images/pxeboot/vmlinuz - initrd /images/pxeboot/initrd.img -title Install system with basic video driver - kernel /images/pxeboot/vmlinuz xdriver=vesa nomodeset askmethod - initrd /images/pxeboot/initrd.img -title rescue - kernel /images/pxeboot/vmlinuz rescue askmethod - initrd /images/pxeboot/initrd.img diff --git a/iso/EFI/BOOT/BOOTX64.efi b/iso/EFI/BOOT/BOOTX64.efi deleted file mode 100644 index 4508ea4cb..000000000 Binary files a/iso/EFI/BOOT/BOOTX64.efi and /dev/null differ diff --git a/iso/EFI/BOOT/TRANS.TBL b/iso/EFI/BOOT/TRANS.TBL deleted file mode 100644 index ed14e75ee..000000000 --- a/iso/EFI/BOOT/TRANS.TBL +++ /dev/null @@ -1,3 +0,0 @@ -F BOOTX64.CON;1 BOOTX64.conf -F BOOTX64.EFI;1 BOOTX64.efi -F SPLASH_X.GZ;1 splash.xpm.gz diff --git a/iso/EFI/BOOT/splash.xpm.gz b/iso/EFI/BOOT/splash.xpm.gz deleted file mode 100644 index 860d1ae3f..000000000 Binary files a/iso/EFI/BOOT/splash.xpm.gz and /dev/null differ diff --git a/iso/EFI/TRANS.TBL b/iso/EFI/TRANS.TBL deleted file mode 100644 index 514bdb384..000000000 --- a/iso/EFI/TRANS.TBL +++ /dev/null @@ -1 +0,0 @@ -D BOOT BOOT diff --git a/iso/module.mk b/iso/module.mk index 19345c370..e8f556679 100644 --- a/iso/module.mk +++ b/iso/module.mk @@ -34,16 +34,17 @@ $/isoroot-centos.done: \ createrepo -g `readlink -f "$(centos.packages)/comps.xml"` -u media://`head -1 $(ISOROOT)/.discinfo` $(ISOROOT) $(ACTION.TOUCH) -$(centos.packages)/comps.xml: +$(ISOROOT)/repodata/comps.xml.gz: mkdir -p $(ISOROOT)/repodata - wget -nc -O $(ISOROOT)/repodata/comps.xml.gz $(CENTOS_63_MIRROR)/`wget -qO- $(CENTOS_63_MIRROR)/repodata/repomd.xml | \ + wget -O $(ISOROOT)/repodata/comps.xml.gz $(CENTOS_63_MIRROR)/`wget -qO- $(CENTOS_63_MIRROR)/repodata/repomd.xml | \ xml2 | grep 'comps\.xml\.gz' | awk -F'=' '{ print $$2 }'` + +$(centos.packages)/comps.xml: $(ISOROOT)/repodata/comps.xml.gz gunzip -c $(ISOROOT)/repodata/comps.xml.gz > $(centos.packages)/comps.xml - rm -f $(ISOROOT)/repodata/comps.xml.gz $(ISOLINUX_FILES): mkdir -p $(ISOROOT)/isolinux/ - wget -nc -O $(ISOROOT)/isolinux/$@ $(CENTOS_63_MIRROR)/isolinux/$(@F) || true + test -f $(ISOROOT)/isolinux/$@ || wget -O $(ISOROOT)/isolinux/$@ $(CENTOS_63_MIRROR)/isolinux/$(@F) $(ISOROOT)/isolinux/isolinux.cfg: iso/isolinux/isolinux.cfg ; $(ACTION.COPY) @@ -54,14 +55,14 @@ $/isoroot-isolinux.done: \ $(IMAGES_FILES): mkdir -p $(ISOROOT)/images/ - wget -nc -O $(ISOROOT)/images/$@ $(CENTOS_63_MIRROR)/images/$(@F) || true + test -f $(ISOROOT)/images/$@ || wget -O $(ISOROOT)/images/$@ $(CENTOS_63_MIRROR)/images/$(@F) $/isoroot-prepare.done:\ $(IMAGES_FILES) \ $(ACTION.TOUCH) $(GPGFILES): - wget -nc -O $(ISOROOT)/$@ $(CENTOS_63_GPG)/$(@F) || true + test -f $(ISOROOT)/$@ || wget -nc -O $(ISOROOT)/$@ $(CENTOS_63_GPG)/$(@F) $/isoroot-gpg.done:\ $(GPGFILES) \ @@ -80,7 +81,6 @@ $/isoroot.done: \ # $(addprefix $(ISOROOT)/EFI/,$(call find-files,iso/EFI)) \ $(addprefix $(ISOROOT)/nailgun/,$(call find-files,nailgun)) \ $(addprefix $(ISOROOT)/nailgun/bin/,create_release agent) \ - $(addprefix $(ISOROOT)/nailgun/solo/,solo.rb solo.json) \ $(addprefix $(ISOROOT)/nailgun/cookbooks/,$(call find-files,cookbooks)) \ $(addprefix $(ISOROOT)/nailgun/,openstack-essex.json) \ $(ISOROOT)/eggs \ @@ -97,7 +97,6 @@ $(ISOROOT)/ks.cfg: iso/ks.cfg ; $(ACTION.COPY) $(ISOROOT)/nailgun/openstack-essex.json: scripts/release/openstack-essex.json ; $(ACTION.COPY) $(ISOROOT)/nailgun/cookbooks/%: cookbooks/% ; $(ACTION.COPY) -$(ISOROOT)/nailgun/solo/%: iso/solo/% ; $(ACTION.COPY) $(ISOROOT)/nailgun/bin/%: bin/% ; $(ACTION.COPY) $(ISOROOT)/nailgun/%: nailgun/% ; $(ACTION.COPY) $(ISOROOT)/.discinfo: iso/.discinfo ; $(ACTION.COPY) diff --git a/os/centos/module.mk b/os/centos/module.mk index 2376bb741..c6b1b7f68 100644 --- a/os/centos/module.mk +++ b/os/centos/module.mk @@ -114,6 +114,13 @@ name = RHEL $(CENTOS_63_RELEASE) - RPMforge.net - extras baseurl = $(RPMFORGEMIRROR)/el$(CENTOS_63_MAJOR)/en/$(CENTOS_63_ARCH)/extras gpgcheck = 0 enabled = 0 + +[puppetlabs] +name=Puppet Labs Packages +baseurl=http://yum.puppetlabs.com/el/$(CENTOS_63_MAJOR)/products/$(CENTOS_63_ARCH)/ +enabled=1 +gpgcheck=1 +gpgkey=http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs endef $(CENTOS_REPO_DIR)etc/yum-$(REPO_SUFFIX).repos.d/base.repo: export contents:=$(yum_$(REPO_SUFFIX)_repo) diff --git a/os/module.mk b/os/module.mk index c8921cecf..43b42095b 100644 --- a/os/module.mk +++ b/os/module.mk @@ -1,27 +1,3 @@ - -define image-mount-rules-template -$($1_ROOT)/%: $1_ISO:=$($1_ISO) -$($1_ROOT)/%: $1_ROOT:=$($1_ROOT) - -$($1_ROOT)/%: - mkdir -p $$(@D) - fuseiso $$($1_ISO) $$($1_ROOT) - -clean: $($1_ROOT)/umount - -.PHONY: $($1_ROOT)/mount $($1_ROOT)/umount -$($1_ROOT)/mount: - -$($1_ROOT)/umount: - -fusermount -u $$($1_ROOT) - -endef - -image-mount-rules=$(eval $(call image-mount-rules-template,$1,$2,$3)) - -CENTOS_63_ISO:=$(BINARIES_DIR)/CentOS-6.3-x86_64-minimal.iso -CENTOS_63_ROOT:=$(BUILD_DIR)/images/centos-6.3-minimal CENTOS_63_MAJOR:=6 CENTOS_63_RELEASE:=6.3 CENTOS_63_ARCH:=x86_64 -$(call image-mount-rules,CENTOS_63)