1 From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
2 Date: Wed, 24 Feb 2016 20:04:03 +0100
3 Subject: [PATCH] Add arm64 deb repositories setup
6 build/f_isoroot/f_kscfg/ks.cfg.patch | 10 ++++++++++
7 build/install/apt-ftparchive-deb.conf | 8 +++++++-
8 build/install/apt-ftparchive-release.conf | 2 +-
9 build/install/apt-ftparchive-udeb.conf | 7 ++++++-
10 build/install/install.sh | 22 ++++++++++++++++++----
11 build/install/uninstall.sh | 18 ++++++++++--------
12 6 files changed, 52 insertions(+), 15 deletions(-)
14 diff --git a/build/f_isoroot/f_kscfg/ks.cfg.patch b/build/f_isoroot/f_kscfg/ks.cfg.patch
15 index a6840e4..e1ae8fc 100644
16 --- a/build/f_isoroot/f_kscfg/ks.cfg.patch
17 +++ b/build/f_isoroot/f_kscfg/ks.cfg.patch
19 *** /dev/null 2016-04-26 10:10:11.481587709 +0200
20 --- ks.cfg 2016-04-26 10:10:11.481587709 +0200
24 + cp ${SOURCE}/.treeinfo ${repodir}/centos/x86_64
26 + # Copying Ubuntu files
27 ++ # FIXME: This is missleading as dist/pool may contain multiple arch!
28 + mkdir -p ${repodir}/ubuntu/x86_64/images
29 + cp -r ${SOURCE}/ubuntu/dists ${repodir}/ubuntu/x86_64
30 + cp -r ${SOURCE}/ubuntu/pool ${repodir}/ubuntu/x86_64
35 diff --git a/build/install/apt-ftparchive-deb.conf b/build/install/apt-ftparchive-deb.conf
36 index 0d15aec..e6392f8 100644
37 --- a/build/install/apt-ftparchive-deb.conf
38 +++ b/build/install/apt-ftparchive-deb.conf
39 @@ -16,12 +16,18 @@ TreeDefault {
43 -BinDirectory "pool/main" {
44 +BinDirectory "pool/main/binary-amd64" {
45 Packages "dists/trusty/main/binary-amd64/Packages";
46 BinOverride "./indices/override.trusty.main";
47 ExtraOverride "./indices/override.trusty.extra.main";
50 +BinDirectory "pool/main/binary-arm64" {
51 + Packages "dists/trusty/main/binary-arm64/Packages";
52 + BinOverride "./indices/override.trusty.main";
53 + ExtraOverride "./indices/override.trusty.extra.main";
59 diff --git a/build/install/apt-ftparchive-release.conf b/build/install/apt-ftparchive-release.conf
60 index 02706bd..2838714 100644
61 --- a/build/install/apt-ftparchive-release.conf
62 +++ b/build/install/apt-ftparchive-release.conf
63 @@ -13,6 +13,6 @@ APT::FTPArchive::Release::Label "Ubuntu";
64 APT::FTPArchive::Release::Suite "trusty";
65 APT::FTPArchive::Release::Version "1.04";
66 APT::FTPArchive::Release::Codename "trusty";
67 -APT::FTPArchive::Release::Architectures "amd64";
68 +APT::FTPArchive::Release::Architectures "amd64 arm64";
69 APT::FTPArchive::Release::Components "main";
70 APT::FTPArchive::Release::Description "Ubuntu Trusty Tahr 14.04 LTS";
71 diff --git a/build/install/apt-ftparchive-udeb.conf b/build/install/apt-ftparchive-udeb.conf
72 index 3b5b239..c6ab4fb 100644
73 --- a/build/install/apt-ftparchive-udeb.conf
74 +++ b/build/install/apt-ftparchive-udeb.conf
75 @@ -16,11 +16,16 @@ TreeDefault {
79 -BinDirectory "pool/debian-installer" {
80 +BinDirectory "pool/debian-installer/binary-amd64" {
81 Packages "dists/trusty/main/debian-installer/binary-amd64/Packages";
82 BinOverride "./indices/override.trusty.main.debian-installer";
85 +BinDirectory "pool/debian-installer/binary-arm64" {
86 + Packages "dists/trusty/main/debian-installer/binary-arm64/Packages";
87 + BinOverride "./indices/override.trusty.main.debian-installer";
93 diff --git a/build/install/install.sh b/build/install/install.sh
94 index 4e0389e..8c29e08 100755
95 --- a/build/install/install.sh
96 +++ b/build/install/install.sh
97 @@ -122,12 +122,24 @@ prep_make_live() {
98 ssh-copy-id root@$FUELHOST
99 sshfs root@1${FUELHOST}:/ $TMP_HOSTMOUNT
101 - if [ -f $REPO/dists/trusty/main/binary-amd64/Packages.backup ]; then
102 + for arch in arm64 amd64; do
103 + if [ -f $REPO/dists/trusty/main/binary-${arch}/Packages.backup ]; then
104 + echo "Error - found backup file for Packages for ${arch}!"
108 + if [ -f $REPO/dists/trusty/main/binary-${arch}/Packages.gz.backup ]; then
109 + echo "Error - found backup file for Packages.gz for ${arch}!"
114 + if [ -f $REPO/dists/trusty/main/binary-arm64/Packages.backup ]; then
115 echo "Error - found backup file for Packages!"
119 - if [ -f $REPO/dists/trusty/main/binary-amd64/Packages.gz.backup ]; then
120 + if [ -f $REPO/dists/trusty/main/binary-arm64/Packages.gz.backup ]; then
121 echo "Error - found backup file for Packages.gz!"
124 @@ -142,8 +154,10 @@ prep_make_live() {
128 - cp $REPO/dists/trusty/main/binary-amd64/Packages $REPO/dists/trusty/main/binary-amd64/Packages.backup
129 - cp $REPO/dists/trusty/main/binary-amd64/Packages.gz $REPO/dists/trusty/main/binary-amd64/Packages.gz.backup
130 + for arch in arm64 amd64; do
131 + cp $REPO/dists/trusty/main/binary-${arch}/Packages $REPO/dists/trusty/main/binary-${arch}/Packages.backup
132 + cp $REPO/dists/trusty/main/binary-${arch}/Packages.gz $REPO/dists/trusty/main/binary-${arch}/Packages.gz.backup
134 cp $REPO/dists/trusty/Release $REPO/dists/trusty/Release.backup
135 cp -Rvp $DEST/etc/puppet $DEST/etc/puppet.backup
137 diff --git a/build/install/uninstall.sh b/build/install/uninstall.sh
138 index a9e74bc..e90c632 100755
139 --- a/build/install/uninstall.sh
140 +++ b/build/install/uninstall.sh
141 @@ -31,15 +31,17 @@ DEST=$MOUNT
142 REPO=$DEST/var/www/nailgun/ubuntu/fuelweb/x86_64
145 -if [ ! -f $REPO/dists/trusty/main/binary-amd64/Packages.backup ]; then
146 - echo "Error - didn't find backup file for Packages!"
149 +for arch in arm64 amd64; do
150 + if [ ! -f $REPO/dists/trusty/main/binary-${arch}/Packages.backup ]; then
151 + echo "Error - didn't find backup file for Packages for ${arch}!"
155 -if [ ! -f $REPO/dists/trusty/main/binary-amd64/Packages.gz.backup ]; then
156 - echo "Error - didn't find backup file for Packages.gz!"
159 + if [ ! -f $REPO/dists/trusty/main/binary-${arch}/Packages.gz.backup ]; then
160 + echo "Error - didn't find backup file for Packages.gz for ${arch}!"
165 if [ ! -f $REPO/dists/trusty/Release.backup ]; then
166 echo "Error - didn't find backup file for Release!"