From 7f3cdb208656b16038dab3fb27aa23142ee4ac9b Mon Sep 17 00:00:00 2001 From: Andrey Korolyov Date: Tue, 17 Sep 2013 00:32:50 +0400 Subject: [PATCH] ubuntu debs --- config.mk | 1 + mirror/ubuntu/createchroot.mk | 2 ++ mirror/ubuntu/resolvedep/conf/distributions | 5 +++-- mirror/ubuntu/resolvedep/conf/updates | 6 +++++- requirements-deb.txt | 0 5 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 requirements-deb.txt diff --git a/config.mk b/config.mk index f3f713b84..35bcfc4cf 100644 --- a/config.mk +++ b/config.mk @@ -130,6 +130,7 @@ MIRROR_EGGS?=http://pypi.python.org/simple MIRROR_GEMS?=http://rubygems.org REQUIRED_RPMS:=$(shell grep -v "^\\s*\#" $(SOURCE_DIR)/requirements-rpm.txt) +REQUIRED_DEBS:=$(shell grep -v "^\\s*\#" $(SOURCE_DIR)/requirements-deb.txt) REQUIRED_EGGS:=$(shell grep -v "^\\s*\#" $(SOURCE_DIR)/requirements-eggs.txt) OSTF_EGGS:=$(shell grep -v "^\\s*\#" $(SOURCE_DIR)/fuel/deployment/puppet/nailgun/files/venv-ostf.txt) REQUIRED_SRCS:=$(shell grep -v ^\\s*\# $(SOURCE_DIR)/requirements-src.txt) diff --git a/mirror/ubuntu/createchroot.mk b/mirror/ubuntu/createchroot.mk index c768abad2..ebe7bf416 100644 --- a/mirror/ubuntu/createchroot.mk +++ b/mirror/ubuntu/createchroot.mk @@ -6,4 +6,6 @@ $(BUILD_DIR)/mirror/ubuntu/createchroot.done: echo deb http://download.mirantis.com/precise-grizzly-fuel-3.2 $(UBUNTU_RELEASE) main | sudo tee $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot/etc/apt/sources.list.d/mirantis.list echo 'APT::Get::AllowUnauthenticated 1;' | sudo tee $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot/etc/apt/apt.conf.d/02mirantis-unauthenticated sudo chroot $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot /bin/bash -c "apt-get -y install reprepro germinate" + sed 's/^/\ \* /g' $(SOURCE_DIR)/requirements-deb.txt | sudo tee '$(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot/requirements.txt + sudo cp -a $(SOURCE_DIR)/mirror/ubuntu/resolvedep/ $(LOCAL_MIRROR_UBUNTU_OS_BASEURL)/chroot/ $(ACTION.TOUCH) diff --git a/mirror/ubuntu/resolvedep/conf/distributions b/mirror/ubuntu/resolvedep/conf/distributions index 09658a3eb..64f6b23ef 100644 --- a/mirror/ubuntu/resolvedep/conf/distributions +++ b/mirror/ubuntu/resolvedep/conf/distributions @@ -1,6 +1,7 @@ Origin: Mirantis Label: Mirantis Codename: precise -Architectures: i386 amd64 +Architectures: amd64 Components: main restricted universe -Description: Mirantis local package mirror +Description: Mirantis local mirror +Update: MirantisRepo diff --git a/mirror/ubuntu/resolvedep/conf/updates b/mirror/ubuntu/resolvedep/conf/updates index a52340a17..65d69ebbb 100644 --- a/mirror/ubuntu/resolvedep/conf/updates +++ b/mirror/ubuntu/resolvedep/conf/updates @@ -1 +1,5 @@ -FilterList: purge ../germinate/mirror.packages +Name: MirantisRepo +Method: http://mirror.yandex.ru/ubuntu +Components: main restricted universe +Architectures: amd64 +FilterList: purge ../mirror.packages diff --git a/requirements-deb.txt b/requirements-deb.txt new file mode 100644 index 000000000..e69de29bb