diff options
| -rw-r--r-- | patches/opnfv-fuel/0008-build-docker-Import-Enea-Armband-keys.patch | 23 | ||||
| -rw-r--r-- | patches/opnfv-fuel/multiarch-mirrors/0001-build-install-Add-arm64-deb-repositories-setup.patch (renamed from patches/opnfv-fuel/multiarch-mirrors/0001-Add-arm64-deb-repositories-setup.patch) | 87 | ||||
| -rw-r--r-- | patches/opnfv-fuel/multiarch-plugins/0001-fpb-Support-multiple-versions-of-packages.patch | 4 |
3 files changed, 77 insertions, 37 deletions
diff --git a/patches/opnfv-fuel/0008-build-docker-Import-Enea-Armband-keys.patch b/patches/opnfv-fuel/0008-build-docker-Import-Enea-Armband-keys.patch new file mode 100644 index 00000000..e48b2200 --- /dev/null +++ b/patches/opnfv-fuel/0008-build-docker-Import-Enea-Armband-keys.patch @@ -0,0 +1,23 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Fri, 28 Oct 2016 16:06:20 +0200 +Subject: [PATCH] build/docker: Import Enea Armband keys + +JIRA: ARMBAND-96 + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + build/docker/Dockerfile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile +index 4beb560..04c4d2b 100644 +--- a/build/docker/Dockerfile ++++ b/build/docker/Dockerfile +@@ -33,5 +33,7 @@ RUN git clone -b INSERT_FPB_BRANCH INSERT_FPB_REPO && cd fuel-plugins && \ + # fuel-infra key + RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BCE5CC461FA22B08 ++# Enea Armband key ++RUN apt-key adv --keyserver keys.gnupg.net --recv-keys DEAB90BA798AB1D1 + + 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/patches/opnfv-fuel/multiarch-mirrors/0001-Add-arm64-deb-repositories-setup.patch b/patches/opnfv-fuel/multiarch-mirrors/0001-build-install-Add-arm64-deb-repositories-setup.patch index 43d86375..7faaeb49 100644 --- a/patches/opnfv-fuel/multiarch-mirrors/0001-Add-arm64-deb-repositories-setup.patch +++ b/patches/opnfv-fuel/multiarch-mirrors/0001-build-install-Add-arm64-deb-repositories-setup.patch @@ -1,21 +1,36 @@ From: Stanislaw Kardach <stanislaw.kardach@cavium.com> Date: Wed, 24 Feb 2016 20:04:03 +0100 -Subject: [PATCH] Add arm64 deb repositories setup +Subject: [PATCH] build/install: Add arm64 deb repositories setup +If local MOS mirror patching is enabled, we need to regenerate the +repo metadata using apt-ftparchive. + +[ Alexandru Avadanii ] +Fixed non-existing paths for deb files, slightly refactoring our +approach. + +FIXME: Use UBUNTU_ARCH env var instead of hardcoding the arch list. +While fixing that, also take care of missed s/trusty/mos9.0/g +in {un,}install.sh. + +Closes-bug: ARMBAND-163 + +Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com> +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- build/f_isoroot/f_kscfg/ks.cfg.patch | 10 ++++++++++ - build/install/apt-ftparchive-deb.conf | 8 +++++++- + build/install/apt-ftparchive-deb.conf | 9 ++++----- build/install/apt-ftparchive-release.conf | 2 +- - build/install/apt-ftparchive-udeb.conf | 7 ++++++- + build/install/apt-ftparchive-udeb.conf | 10 ++++------ build/install/install.sh | 22 ++++++++++++++++++---- build/install/uninstall.sh | 18 ++++++++++-------- - 6 files changed, 52 insertions(+), 15 deletions(-) + 6 files changed, 47 insertions(+), 24 deletions(-) diff --git a/build/f_isoroot/f_kscfg/ks.cfg.patch b/build/f_isoroot/f_kscfg/ks.cfg.patch index a6840e4..84a241f 100644 --- a/build/f_isoroot/f_kscfg/ks.cfg.patch +++ b/build/f_isoroot/f_kscfg/ks.cfg.patch -@@ -1,6 +1,16 @@ +@@ -1,5 +1,15 @@ *** /dev/null 2016-04-26 10:10:11.481587709 +0200 --- ks.cfg 2016-04-26 10:10:11.481587709 +0200 *************** @@ -31,63 +46,67 @@ index a6840e4..84a241f 100644 +*************** *** 579,584 **** --- 579,592 ---- - diff --git a/build/install/apt-ftparchive-deb.conf b/build/install/apt-ftparchive-deb.conf -index 0d15aec..e6392f8 100644 +index edcb1f2..81ead2b 100644 --- a/build/install/apt-ftparchive-deb.conf +++ b/build/install/apt-ftparchive-deb.conf -@@ -16,10 +16,14 @@ TreeDefault { - Directory "pool"; +@@ -10,14 +10,13 @@ + + Dir { + ArchiveDir "."; ++ CacheDir "/tmp"; }; +-TreeDefault { ++Tree "dists/mos9.0" { ++ Architectures "amd64 arm64"; + Directory "pool"; +-}; +- -BinDirectory "pool/main" { -+BinDirectory "pool/main/binary-amd64" { - Packages "dists/mos9.0/main/binary-amd64/Packages"; +- Packages "dists/mos9.0/main/binary-amd64/Packages"; ++ Sections "main"; }; -+BinDirectory "pool/main/binary-arm64" { -+ Packages "dists/mos9.0/main/binary-arm64/Packages"; -+}; -+ Default { - Packages { - Extensions ".deb"; diff --git a/build/install/apt-ftparchive-release.conf b/build/install/apt-ftparchive-release.conf -index 02706bd..2838714 100644 +index e40ff68..ceaf71a 100644 --- a/build/install/apt-ftparchive-release.conf +++ b/build/install/apt-ftparchive-release.conf -@@ -13,6 +13,6 @@ APT::FTPArchive::Release::Label "Ubuntu"; +@@ -13,6 +13,6 @@ APT::FTPArchive::Release::Label "mos9.0"; 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"; APT::FTPArchive::Release::Description "Ubuntu Trusty Tahr 14.04 LTS"; ++APT::FTPArchive::Contents "no"; diff --git a/build/install/apt-ftparchive-udeb.conf b/build/install/apt-ftparchive-udeb.conf -index 3b5b239..c6ab4fb 100644 +index 3b5b239..8852db7 100644 --- a/build/install/apt-ftparchive-udeb.conf +++ b/build/install/apt-ftparchive-udeb.conf -@@ -16,11 +16,16 @@ TreeDefault { - Directory "pool"; +@@ -10,15 +10,13 @@ + + Dir { + ArchiveDir "."; ++ CacheDir "/tmp"; }; +-TreeDefault { ++Tree "dists/mos9.0" { ++ Architectures "amd64 arm64"; + Directory "pool"; +-}; +- -BinDirectory "pool/debian-installer" { -+BinDirectory "pool/debian-installer/binary-amd64" { - Packages "dists/trusty/main/debian-installer/binary-amd64/Packages"; - BinOverride "./indices/override.trusty.main.debian-installer"; +- Packages "dists/trusty/main/debian-installer/binary-amd64/Packages"; +- BinOverride "./indices/override.trusty.main.debian-installer"; ++ Sections "main"; }; -+BinDirectory "pool/debian-installer/binary-arm64" { -+ Packages "dists/trusty/main/debian-installer/binary-arm64/Packages"; -+ BinOverride "./indices/override.trusty.main.debian-installer"; -+}; -+ Default { - Packages { - Extensions ".udeb"; diff --git a/build/install/install.sh b/build/install/install.sh -index 866d304..9e003bb 100755 +index d1a49f3..0561207 100755 --- a/build/install/install.sh +++ b/build/install/install.sh @@ -122,12 +122,24 @@ prep_make_live() { 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 6fc8bdbe..2be2e096 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 @@ -17,7 +17,7 @@ diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index 624f233..ab0d0d3 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile -@@ -23,7 +23,14 @@ RUN apt-get install -y software-properties-common python-software-properties \ +@@ -23,5 +23,12 @@ RUN apt-get install -y software-properties-common python-software-properties \ build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev RUN gem install fpm @@ -32,8 +32,6 @@ index 624f233..ab0d0d3 100644 + 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 index 783881e..74f6346 100644 --- a/build/docker/Makefile +++ b/build/docker/Makefile |