diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-10-28 14:22:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-28 14:22:38 +0000 |
| commit | 0173511aec7d81239b791e765557554d7d775723 (patch) | |
| tree | aa8fb5e4779bf8fb3d5d56c10e83636b8fc7c758 | |
| parent | ef001c76ff8cda8dabd87cea4ca9d32effac7772 (diff) | |
| parent | 4ffa88c69d8e0f1980153af5556c01fdd7eee0c4 (diff) | |
Merge "build: Rebase after cirros bump / GPG addition"
| -rw-r--r-- | patches/opnfv-fuel/multiarch-mirrors/0001-Add-arm64-deb-repositories-setup.patch | 16 | ||||
| -rw-r--r-- | patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch | 4 |
2 files changed, 8 insertions, 12 deletions
diff --git a/patches/opnfv-fuel/multiarch-mirrors/0001-Add-arm64-deb-repositories-setup.patch b/patches/opnfv-fuel/multiarch-mirrors/0001-Add-arm64-deb-repositories-setup.patch index c3a76d1e..43d86375 100644 --- a/patches/opnfv-fuel/multiarch-mirrors/0001-Add-arm64-deb-repositories-setup.patch +++ b/patches/opnfv-fuel/multiarch-mirrors/0001-Add-arm64-deb-repositories-setup.patch @@ -36,21 +36,17 @@ diff --git a/build/install/apt-ftparchive-deb.conf b/build/install/apt-ftparchiv index 0d15aec..e6392f8 100644 --- a/build/install/apt-ftparchive-deb.conf +++ b/build/install/apt-ftparchive-deb.conf -@@ -16,12 +16,18 @@ TreeDefault { +@@ -16,10 +16,14 @@ TreeDefault { Directory "pool"; }; -BinDirectory "pool/main" { +BinDirectory "pool/main/binary-amd64" { - Packages "dists/trusty/main/binary-amd64/Packages"; - BinOverride "./indices/override.trusty.main"; - ExtraOverride "./indices/override.trusty.extra.main"; + Packages "dists/mos9.0/main/binary-amd64/Packages"; }; +BinDirectory "pool/main/binary-arm64" { -+ Packages "dists/trusty/main/binary-arm64/Packages"; -+ BinOverride "./indices/override.trusty.main"; -+ ExtraOverride "./indices/override.trusty.extra.main"; ++ Packages "dists/mos9.0/main/binary-arm64/Packages"; +}; + Default { @@ -61,9 +57,9 @@ index 02706bd..2838714 100644 --- a/build/install/apt-ftparchive-release.conf +++ b/build/install/apt-ftparchive-release.conf @@ -13,6 +13,6 @@ APT::FTPArchive::Release::Label "Ubuntu"; - APT::FTPArchive::Release::Suite "trusty"; - APT::FTPArchive::Release::Version "1.04"; - APT::FTPArchive::Release::Codename "trusty"; + APT::FTPArchive::Release::Suite "mos9.0"; + APT::FTPArchive::Release::Version "14.04"; + APT::FTPArchive::Release::Codename "mos9.0"; -APT::FTPArchive::Release::Architectures "amd64"; +APT::FTPArchive::Release::Architectures "amd64 arm64"; APT::FTPArchive::Release::Components "main"; diff --git a/patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch b/patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch index 35bef5c8..6fc8bdbe 100644 --- a/patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch +++ b/patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch @@ -30,10 +30,10 @@ index 624f233..ab0d0d3 100644 + (git fetch origin INSERT_FPB_CHANGE && git checkout FETCH_HEAD)) && \ + python setup.py sdist && pip install ./dist/fuel-plugin-builder-*.tar.gz && \ + cd .. && rm -rf fuel-plugins + # fuel-infra key + RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BCE5CC461FA22B08 RUN echo "ALL ALL=NOPASSWD: ALL" > /etc/sudoers.d/open-sudo - RUN echo "Defaults env_keep += \"ftp_proxy http_proxy https_proxy no_proxy RSYNC_PROXY RSYNC_CONNECT_PROG npm_config_registry\"" > /etc/sudoers.d/keep-proxies -diff --git a/build/docker/Makefile b/build/docker/Makefile index 783881e..74f6346 100644 --- a/build/docker/Makefile +++ b/build/docker/Makefile |