From 1e022c2f573a9b9d823d485f12603100f080eb51 Mon Sep 17 00:00:00 2001 From: HelioGuilherme66 Date: Sun, 17 Jun 2018 17:07:27 +0100 Subject: [PATCH 1/5] Vagrant setup for Fedora 28 --- vagrant/fedora-28/Vagrantfile | 24 ++++++++++++++++++++++++ vagrant/fedora-28/bootstrap.sh | 31 +++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 vagrant/fedora-28/Vagrantfile create mode 100644 vagrant/fedora-28/bootstrap.sh diff --git a/vagrant/fedora-28/Vagrantfile b/vagrant/fedora-28/Vagrantfile new file mode 100644 index 00000000..aec7a43d --- /dev/null +++ b/vagrant/fedora-28/Vagrantfile @@ -0,0 +1,24 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure("2") do |config| + + # Set which Vagrant "box" (base image) to use, and tell it how to set up the + # VM, packages to install, etc. + config.vm.box = "fedora/28-cloud-base" + config.vm.provision :shell, path: "bootstrap.sh" + + # Additional parameters for the VM + config.vm.provider "virtualbox" do |vb| + vb.memory = 4096 + vb.cpus = 4 + end + + # Share the Phoenix/dist folder so the VM can get the source tarball and has + # a place to put the build results. + config.vm.synced_folder "../../dist", "/home/vagrant/dist" + + # And share a folder with the build script + config.vm.synced_folder "../scripts", "/home/vagrant/scripts" + +end diff --git a/vagrant/fedora-28/bootstrap.sh b/vagrant/fedora-28/bootstrap.sh new file mode 100644 index 00000000..dcbb75fc --- /dev/null +++ b/vagrant/fedora-28/bootstrap.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# Set up and update package repos +dnf -y update +dnf -y install yum-utils + + +# Install necessary development tools, libs, etc. +dnf -y group install "Development Tools" +dnf -y install gcc-c++ + +dnf -y install gtk2 gtk2-devel gtk3 gtk3-devel \ + webkitgtk4 webkitgtk4-devel \ + libjpeg-turbo-devel libpng-devel libtiff-devel \ + SDL SDL-devel gstreamer gstreamer-devel gstreamer-plugins-base-devel \ + freeglut freeglut-devel libnotify libnotify-devel libSM-devel \ + libXtst-devel + + +# Install all available Python packages and their dev packages +dnf -y install python python-tools python-devel python2-virtualenv +dnf -y install python3 python3-tools python3-devel +#dnf -y install python35 + +# Set up virtual environments for each Python where the Phoenix builds will be +# done. Set them to the vagrant user so the venv's can be updated by pip later. +mkdir venvs +virtualenv --python=python2.7 venvs/Py27 +#python3.5 -m venv venvs/Py35 +python3.6 -m venv venvs/Py36 +chown -R vagrant:vagrant venvs From 0d594bcaa088382a16f93e0780595f58b5f2ae53 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 23 Jun 2018 11:11:23 -0700 Subject: [PATCH 2/5] Add fedora-28 to build.py --- build.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.py b/build.py index c7b99106..63f34eb2 100755 --- a/build.py +++ b/build.py @@ -1517,7 +1517,8 @@ def cmd_build_vagrant(options, args): 'debian-9 all all', 'fedora-23 all all', 'fedora-26 all all', - 'fedora-27 all gtk3', # no webkitgtk for gtk2?? + 'fedora-27 all gtk3', # no webkitgtk for gtk2 + 'fedora-28 all gtk3', # no webkitgtk for gtk2 'ubuntu-14.04 all all', 'ubuntu-16.04 all all', 'ubuntu-18.04 all all', From 39d8b7b7a3b87b79dbe9319478e52896e350180d Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 23 Jun 2018 11:14:09 -0700 Subject: [PATCH 3/5] Remove fedora-23 --- build.py | 1 - vagrant/fedora-23/Vagrantfile | 24 ------------------------ vagrant/fedora-23/bootstrap.sh | 30 ------------------------------ 3 files changed, 55 deletions(-) delete mode 100644 vagrant/fedora-23/Vagrantfile delete mode 100644 vagrant/fedora-23/bootstrap.sh diff --git a/build.py b/build.py index 63f34eb2..7b2c959d 100755 --- a/build.py +++ b/build.py @@ -1515,7 +1515,6 @@ def cmd_build_vagrant(options, args): VMs = [ 'centos-7 all all', 'debian-8 all all', 'debian-9 all all', - 'fedora-23 all all', 'fedora-26 all all', 'fedora-27 all gtk3', # no webkitgtk for gtk2 'fedora-28 all gtk3', # no webkitgtk for gtk2 diff --git a/vagrant/fedora-23/Vagrantfile b/vagrant/fedora-23/Vagrantfile deleted file mode 100644 index fc96c749..00000000 --- a/vagrant/fedora-23/Vagrantfile +++ /dev/null @@ -1,24 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant.configure("2") do |config| - - # Set which Vagrant "box" (base image) to use, and tell it how to set up the - # VM, packages to install, etc. - config.vm.box = "fedora/23-cloud-base" - config.vm.provision :shell, path: "bootstrap.sh" - - # Additional parameters for the VM - config.vm.provider "virtualbox" do |vb| - vb.memory = 4096 - vb.cpus = 4 - end - - # Share the Phoenix/dist folder so the VM can get the source tarball and has - # a place to put the build results. - config.vm.synced_folder "../../dist", "/home/vagrant/dist" - - # And share a folder with the build script - config.vm.synced_folder "../scripts", "/home/vagrant/scripts" - -end diff --git a/vagrant/fedora-23/bootstrap.sh b/vagrant/fedora-23/bootstrap.sh deleted file mode 100644 index 89ca4af8..00000000 --- a/vagrant/fedora-23/bootstrap.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# Set up and update package repos -dnf -y update -dnf -y install yum-utils - - -# Install necessary development tools, libs, etc. -dnf -y group install "Development Tools" -dnf -y install gcc-c++ - -dnf -y install gtk2 gtk2-devel gtk3 gtk3-devel \ - webkitgtk webkitgtk-devel webkitgtk3 webkitgtk3-devel \ - libjpeg-turbo-devel libpng-devel libtiff-devel \ - SDL SDL-devel gstreamer gstreamer-devel gstreamer-plugins-base-devel \ - freeglut freeglut-devel libnotify libnotify-devel libSM-devel - -# Install all available Python packages and their dev packages -dnf -y install python python-tools python-devel python-virtualenv -dnf -y install python34 python34-tools python34-devel -dnf -y install python3 python3-tools python3-devel -dnf -y install python35 - -# Set up virtual environments for each Python where the Phoenix builds will be -# done. Set them to the vagrant user so the venv's can be updated by pip later. -mkdir venvs -virtualenv --python=python2.7 venvs/Py27 -python3.4 -m venv venvs/Py34 -python3.5 -m venv venvs/Py35 -chown -R vagrant:vagrant venvs From 6e0cd9016965223ca82f82a6fcdbf26e0d1889c1 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 23 Jun 2018 11:14:34 -0700 Subject: [PATCH 4/5] Added changelog --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index bce139f4..c7288b12 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -26,6 +26,9 @@ Changes in this release include the following: * Sort pages by dock_pos when added to automatic (agw.aui) notebook. (#882) +* Added Vagrant configuration for Fedora-28. Removed Fedora-23 (#884) + + From d1618fae1769f8d992e1713c9ad7a03fd8015c76 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 23 Jun 2018 18:25:08 -0700 Subject: [PATCH 5/5] don't auto-update VB guest additions in this VM, it may break it. --- vagrant/fedora-28/Vagrantfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vagrant/fedora-28/Vagrantfile b/vagrant/fedora-28/Vagrantfile index aec7a43d..5cd4a40c 100644 --- a/vagrant/fedora-28/Vagrantfile +++ b/vagrant/fedora-28/Vagrantfile @@ -21,4 +21,8 @@ Vagrant.configure("2") do |config| # And share a folder with the build script config.vm.synced_folder "../scripts", "/home/vagrant/scripts" + # set auto_update to false, if you do NOT want to check the correct + # additions version when booting this machine + config.vbguest.auto_update = false + end