From ab2a4d93dee7b1e34422cb2d17187e2fdff10def Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sun, 30 Oct 2016 02:12:39 +0200 Subject: AArch64: Ubuntu local partial mirror: Add arm64 NOTE: Temporarily patch "packetary" in Armband until we upstream two small fixes. Bootstrap build, deploy target image build: - Switch from public Ubuntu mirrors to 10.20.0.2. Squash master fixes: - f_repobuild: Fixup missing OPNFV plugin deps Packetary solves "libasound2" with "liboss4-salsa-asound2" from universe, leading to openjdk failing to install. Work around this by altering recently introduced packetary-driven local mirror build to include OPNFV plugin deps into "main" comp. - local mirror: Add missing vgabios for arm64 JIRA: ARMBAND-35 JIRA: ARMBAND-169 Conflicts: .gitmodules armband-fuel-config.mk patches/opnfv-fuel/0022-bootstrap-Use-public-Ubuntu-ports-mirrors.patch patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch Change-Id: I14645cfeebb486063e7b8198de273f68285b11cd Signed-off-by: Alexandru Avadanii --- ...bootstrap-Use-public-Ubuntu-ports-mirrors.patch | 46 ---------------------- 1 file changed, 46 deletions(-) delete mode 100644 patches/opnfv-fuel/0022-bootstrap-Use-public-Ubuntu-ports-mirrors.patch (limited to 'patches/opnfv-fuel/0022-bootstrap-Use-public-Ubuntu-ports-mirrors.patch') diff --git a/patches/opnfv-fuel/0022-bootstrap-Use-public-Ubuntu-ports-mirrors.patch b/patches/opnfv-fuel/0022-bootstrap-Use-public-Ubuntu-ports-mirrors.patch deleted file mode 100644 index ff13b39b..00000000 --- a/patches/opnfv-fuel/0022-bootstrap-Use-public-Ubuntu-ports-mirrors.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Alexandru Avadanii -Date: Thu, 3 Mar 2016 19:18:27 +0100 -Subject: [PATCH] bootstrap: Use public Ubuntu-ports mirrors. - -Instead of relying on 127.0.0.1 partial Ubuntu mirror, use -public archives. -While doing so, switch to Ubuntu-ports, enabling building arm64 -bootstraps. - -NOTE: This disables the abillity to build amd64 bootstraps with -current config. ---- - build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml -index aa12c45..2e4843d 100644 ---- a/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml -+++ b/build/f_isoroot/f_repobuild/fuel_bootstrap_cli.yaml -@@ -36,19 +36,19 @@ - repos: - - name: ubuntu - section: "main universe multiverse" -- uri: "http://127.0.0.1:8080/mirrors/ubuntu" -+ uri: "http://ports.ubuntu.com/ubuntu-ports" - priority: - suite: trusty - type: deb - - name: ubuntu-updates - section: "main universe multiverse" -- uri: "http://127.0.0.1:8080/mirrors/ubuntu" -+ uri: "http://ports.ubuntu.com/ubuntu-ports" - priority: - suite: trusty-updates - type: deb - - name: ubuntu-security - section: "main universe multiverse" -- uri: "http://127.0.0.1:8080/mirrors/ubuntu" -+ uri: "http://ports.ubuntu.com/ubuntu-ports" - priority: - suite: trusty-security - type: deb -@@ -60,2 +60,3 @@ - direct_repo_addresses: -+ - "ports.ubuntu.com" - - "127.0.0.1" -- cgit 1.2.3-korg