diff options
Diffstat (limited to 'patches/fuel-main')
3 files changed, 9 insertions, 98 deletions
diff --git a/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch b/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch index 15dcac3e..07f1fb93 100644 --- a/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch +++ b/patches/fuel-main/0001-Use-qemu-debootstrap-to-support-multi-arch.patch @@ -12,15 +12,15 @@ diff --git a/prepare-build-env.sh b/prepare-build-env.sh index 194e528..fa186ed 100755 --- a/prepare-build-env.sh +++ b/prepare-build-env.sh -@@ -112,7 +112,7 @@ sudo apt-get -y install build-essential make git $GEMPKG debootstrap createrepo - python-nose libvirt-bin python-ipaddr python-paramiko python-yaml \ - python-pip kpartx extlinux unzip genisoimage syslinux debmirror \ - lrzip python-daemon python-dev libparse-debcontrol-perl reprepro devscripts \ -- xorriso -+ xorriso qemu-user-static - sudo gem install bundler -v 1.2.1 - sudo gem install builder - sudo pip install xmlbuilder jinja2 pbr +@@ -112,6 +112,7 @@ + lrzip \ + python-jinja2 \ + python-yaml \ ++ qemu-user-static + reprepro \ + rpm \ + syslinux \ + unzip \ diff --git a/requirements-rpm.txt b/requirements-rpm.txt index e0aa9ba..9a2d141 100644 --- a/requirements-rpm.txt diff --git a/patches/fuel-main/0003-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch b/patches/fuel-main/0003-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch deleted file mode 100644 index e3d13b85..00000000 --- a/patches/fuel-main/0003-Add-cobbler-grub-aarch64-RPM-reinstall-to-start.sh.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Florin Dumitrascu <florin.dumitrascu@enea.com> -Date: Fri, 4 Mar 2016 17:19:41 +0100 -Subject: [PATCH] Add cobbler-grub-aarch64 RPM reinstall to start.sh - -Because /var/lib/cobbler is mounted as a volume, new cobbler aarch64 -grub loader packaged as an RPM (cobbler-grub-aarch64) should be -reinstalled if its files are missing on Docker container start. ---- - docker/cobbler/setup.sh | 2 +- - docker/cobbler/start.sh | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/docker/cobbler/setup.sh b/docker/cobbler/setup.sh -index a7fce0c..90627a8 100644 ---- a/docker/cobbler/setup.sh -+++ b/docker/cobbler/setup.sh -@@ -31,7 +31,7 @@ yum update -y - - ln -s /etc/dnsmasq.conf /etc/cobbler.dnsmasq.conf - --packages="httpd cobbler dnsmasq xinetd tftp-server" -+packages="httpd cobbler cobbler-grub-aarch64 dnsmasq xinetd tftp-server" - echo $packages | xargs -n1 yum install -y - - -diff --git a/docker/cobbler/start.sh b/docker/cobbler/start.sh -index 3c5d411..c1a359b 100644 ---- a/docker/cobbler/start.sh -+++ b/docker/cobbler/start.sh -@@ -18,6 +18,9 @@ fi - if rpm -V cobbler-web | grep -q missing; then - yum reinstall -q -y cobbler-web - fi -+if rpm -V cobbler-grub-aarch64 | grep -q missing; then -+ yum reinstall -q -y cobbler-grub-aarch64 -+fi - - - # Run puppet to apply custom config diff --git a/patches/fuel-main/0004-FIXME-cobbler-setup.sh-Keep-extra-RPM-repos.patch b/patches/fuel-main/0004-FIXME-cobbler-setup.sh-Keep-extra-RPM-repos.patch deleted file mode 100644 index e3dceeda..00000000 --- a/patches/fuel-main/0004-FIXME-cobbler-setup.sh-Keep-extra-RPM-repos.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Thu, 28 Apr 2016 01:41:45 +0200 -Subject: [PATCH] FIXME: cobbler: setup.sh: Keep extra RPM repos. - -cobbler-grub-aarch64 (arm64 specific loader) is currently -distributed and added to the cobbler docker container during -ISO build using EXTRA_RPM_REPOS envvar mechanism. - -However, since this package installs files in a mounted location, -its contents are not persistent, requiring a test and eventual -forced reinstall during container start. - -This, of course, requires the package to be available at that point, -which is not currently possible, as we remove the extra RPM repository -entry from yum config at the end of container build. - -Hacky temporary workaround: -Re-add extra RPM yum config after container is set up, only for cobbler. - -TODO: This patch should be dropped once cobbler-grub-aarch64 RPM -package gets upstreamed. ---- - docker/cobbler/setup.sh | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/docker/cobbler/setup.sh b/docker/cobbler/setup.sh -index 90627a8..508eaa4 100644 ---- a/docker/cobbler/setup.sh -+++ b/docker/cobbler/setup.sh -@@ -80,6 +80,20 @@ baseurl=file:/var/www/nailgun/mos-centos/x86_64 - gpgcheck=0 - EOF - -+## FIXME(armband): Add extra RPM repository in Cobbler container -+# Normally, extra RPM repos are not re-added post-build, but we -+# need cobbler-grub-aarch64 during each container start. -+ -+for repo in ${EXTRA_RPM_REPOS}; do -+ IFS=, read -a repo_args <<< "$repo" -+ cat << EOF >> /etc/yum.repos.d/nailgun.repo -+ -+[extra-repo-${repo_args[0]}] -+name=MOS Extra Repo ${repo_args[0]} -+baseurl=file:/var/www/nailgun/extra-repos/${repo_args[0]} -+gpgcheck=0 -+EOF -+done - yum clean all - - |