openstack
/
fuel-main
Code Issues Proposed changes

Fixes to build from trunc feature 

1. Fix public Gerrit URL in config
2. Fix adding package dependencies to local mirror
3. Fix for including built packages into ISO.

Change-Id: I324fc5bcb32c12a394091115f5800e2f7c278f27
Blueprint: openstack-from-master
This commit is contained in:
Vitaly Parakhin 2014-08-29 11:46:15 +03:00
parent c450b341ea
commit 1e8434a658
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.mk
View File

@ -78,11 +78,11 @@ NO_UI_OPTIMIZE:=0
define set_vars
$(call uc,$(1))_REPO?=https://github.com/openstack/$(1).git
$(call uc,$(1))_COMMIT?=master
$(call uc,$(1))_SPEC_REPO?=https://osci-gerrit.mirantis.com/openstack-ci/openstack/$(1)-build.git
$(call uc,$(1))_SPEC_REPO?=https://review.fuel-infra.org/openstack-build/$(1)-build.git
$(call uc,$(1))_SPEC_COMMIT?=master
$(call uc,$(1))_GERRIT_URL=https://review.openstack.org/openstack/$(1)
$(call uc,$(1))_GERRIT_URL?=https://review.openstack.org/openstack/$(1).git
$(call uc,$(1))_GERRIT_COMMIT?=none
$(call uc,$(1))_SPEC_GERRIT_URL?=https://osci-gerrit.mirantis.com/openstack-ci/openstack/$(1)-build.git
$(call uc,$(1))_SPEC_GERRIT_URL?=https://review.fuel-infra.org/openstack-build/$(1)-build.git
$(call uc,$(1))_SPEC_GERRIT_COMMIT?=none
endef

1
iso/module.mk
View File

@ -58,6 +58,7 @@ else
$(BUILD_DIR)/iso/isoroot-centos.done: \
$(BUILD_DIR)/mirror/build.done \
$(BUILD_DIR)/packages/build.done \
$(BUILD_DIR)/openstack/build.done \
$(BUILD_DIR)/iso/isoroot-dotfiles.done
mkdir -p $(ISOROOT)
rsync -rp $(LOCAL_MIRROR_CENTOS_OS_BASEURL)/ $(ISOROOT)

11
packages/openstack/rpm/module.mk
View File

@ -13,6 +13,13 @@ baseurl=http://fuel-repository.mirantis.com/repos/centos-fuel-master/centos/
gpgcheck=0
enabled=0
priority=1
[openstack-local]
name=OpenStack-local
baseurl=file://$(SANDBOX)/tmp/RPMS/noarch/
gpgcheck=0
enabled=0
priority=1
endef
define INSTALL_CENTOS_REPO
@ -54,7 +61,7 @@ $(BUILD_DIR)/openstack/rpm/$1.done: \
sudo mkdir -p $$(SANDBOX)/tmp/SPECS $$(SANDBOX)/tmp/SOURCES $$(SANDBOX)/tmp/BUILD $$(SANDBOX)/tmp/BUILDROOT $$(SANDBOX)/tmp/RPMS $$(SANDBOX)/tmp/SRPMS
sudo cp $(BUILD_DIR)/openstack/rpm/sources/$1/*.tar.gz $$(SANDBOX)/tmp/SOURCES/
sudo cp -r $(BUILD_DIR)/repos/$1-build/rpm/SOURCES/* $$(SANDBOX)/tmp/SOURCES
sed "s/Version:.*/Version:\t`cat $(BUILD_DIR)/openstack/rpm/$1-version-tag`/" $(BUILD_DIR)/repos/$1-build/rpm/SPECS/openstack-$1.spec > $(BUILD_DIR)/openstack/rpm/sources/specs/openstack-$1.spec
sed "s/Version:.*/Version:\t`cat $(BUILD_DIR)/openstack/rpm/$1-version-tag`/" $(BUILD_DIR)/repos/$1-build/rpm/SPECS/*.spec > $(BUILD_DIR)/openstack/rpm/sources/specs/openstack-$1.spec
sed -i "s/Source0:.*/Source0:\t$1-`cat $(BUILD_DIR)/openstack/rpm/$1-version-tag`\.tar\.gz/" $(BUILD_DIR)/openstack/rpm/sources/specs/openstack-$1.spec
sudo cp $(BUILD_DIR)/openstack/rpm/sources/specs/openstack-$1.spec $$(SANDBOX)/tmp/
sudo chroot $$(SANDBOX) rpmbuild --nodeps -vv --define "_topdir /tmp" -bs /tmp/openstack-$1.spec
@ -63,6 +70,8 @@ $(BUILD_DIR)/openstack/rpm/$1.done: \
sudo rm -rf $$(SANDBOX)/tmp/RPMS
sudo chroot $$(SANDBOX) rpmbuild --nodeps -vv --define "_topdir /tmp" -ba /tmp/openstack-$1.spec
cp $$(SANDBOX)/tmp/RPMS/*/*$1*.rpm $(BUILD_DIR)/openstack/rpm/RPMS/x86_64
sudo createrepo $$(SANDBOX)/tmp/RPMS/noarch/
sudo yumdownloader --resolve -c $$(SANDBOX)/etc/yum.conf --enablerepo=centos --enablerepo=centos-master --enablerepo=openstack-local --destdir=$(LOCAL_MIRROR_CENTOS_OS_BASEURL)/Packages openstack-$1* | grep -v '^looking for' | tee $(BUILD_DIR)/openstack/yumdownloader.log
sudo sh -c "$$$${SANDBOX_DOWN}"
$$(ACTION.TOUCH)