diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-31 20:18:25 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-31 20:59:53 +0200 |
| commit | 48bc9269c4f452ae184238e0aae37c319e6f7040 (patch) | |
| tree | 75f5b3c99916694bc6f15c08c8dc7e24226c343b /patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch | |
| parent | 4ab28df9437c18a5a08fd774322df34a68a409d0 (diff) | |
Rebase: Sync after Build system uplift to Fuel 9.0
Refresh patches after Fuel@OPNFV migrated to Mitaka in [1],
"Build system uplift to Fuel 9.0/Mitaka".
>As bootstrap_admin_node.sh has
>been transitioned into an RPM (fuel-support), the lazy designer found
>it more simple to patch that script during the Fuel build phase than
>at the OPNFV ISO generation. The patch mechanism has been changed to
>a normal context diff instead of the orig/modified file tuples
>previously used. Hopefully this will require fewer manual rebases
>(may the fuzz be with us!).
>Also the ks.cfg patching has transitioned to a context based ordinary
>patch for the same reasons, but this is as before taking place during
>OPNFV ISO generation.
[1] https://gerrit.opnfv.org/gerrit/#/c/13919/
Diffstat (limited to 'patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch')
| -rw-r--r-- | patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch b/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch index 22396768..8b2dd534 100644 --- a/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch +++ b/patches/opnfv-fuel/0003-Add-arm64-deb-repositories-setup.patch @@ -11,18 +11,27 @@ Subject: [PATCH] Add arm64 deb repositories setup build/install/uninstall.sh | 18 ++++++++++-------- 6 files changed, 43 insertions(+), 15 deletions(-) -diff --git a/build/f_isoroot/f_kscfg/ks.cfg b/build/f_isoroot/f_kscfg/ks.cfg -index c93babe..30bad1d 100644 ---- a/build/f_isoroot/f_kscfg/ks.cfg -+++ b/build/f_isoroot/f_kscfg/ks.cfg -@@ -448,6 +448,7 @@ cp -r ${SOURCE}/extra-repos ${repodir}/ - cp ${SOURCE}/.treeinfo ${repodir}/centos/x86_64 - - # Copying Ubuntu files -+# FIXME: This is missleading as dist/pool may contain multiple arch! - mkdir -p ${repodir}/ubuntu/x86_64/images - cp -r ${SOURCE}/ubuntu/dists ${repodir}/ubuntu/x86_64 - cp -r ${SOURCE}/ubuntu/pool ${repodir}/ubuntu/x86_64 +diff --git a/build/f_isoroot/f_kscfg/ks.cfg.patch b/build/f_isoroot/f_kscfg/ks.cfg.patch +index a6840e4..e1ae8fc 100644 +--- a/build/f_isoroot/f_kscfg/ks.cfg.patch ++++ b/build/f_isoroot/f_kscfg/ks.cfg.patch +@@ -1,6 +1,16 @@ + *** /dev/null 2016-04-26 10:10:11.481587709 +0200 + --- ks.cfg 2016-04-26 10:10:11.481587709 +0200 + *************** ++*** 448,453 **** ++--- 448,454 ---- ++ cp ${SOURCE}/.treeinfo ${repodir}/centos/x86_64 ++ ++ # Copying Ubuntu files +++ # FIXME: This is missleading as dist/pool may contain multiple arch! ++ mkdir -p ${repodir}/ubuntu/x86_64/images ++ cp -r ${SOURCE}/ubuntu/dists ${repodir}/ubuntu/x86_64 ++ cp -r ${SOURCE}/ubuntu/pool ${repodir}/ubuntu/x86_64 ++*************** + *** 579,584 **** + --- 579,592 ---- + diff --git a/build/install/apt-ftparchive-deb.conf b/build/install/apt-ftparchive-deb.conf index 0d15aec..e6392f8 100644 --- a/build/install/apt-ftparchive-deb.conf |