From 324a7dc6a248b45c9b8d9025529f612d512095d6 Mon Sep 17 00:00:00 2001 From: Michael Vincerra Date: Sat, 15 Dec 2018 18:57:37 -0800 Subject: [PATCH 1/5] Modifies source/Makefile in order to: - Adds new 'py' directive with Bash script - Adds same Bash script under json directive - Invoke child Makefile in /scripts/_python - Execute bundle_lister.py - Provide 'py' directive for future Python scripts Signed-off-by: Michael Vincerra --- source/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/Makefile b/source/Makefile index 655286aa..9e49b866 100644 --- a/source/Makefile +++ b/source/Makefile @@ -6,6 +6,7 @@ SPHINXOPTS = SPHINXBUILD = sphinx-build PAPER = BUILDDIR = _build +SCRIPTDIR = scripts/_python # User-friendly check for sphinx-build ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1) @@ -56,6 +57,9 @@ html: @echo @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." +py: + $(MAKE) -C $(SCRIPTDIR) py + dirhtml: $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml @echo @@ -73,6 +77,7 @@ pickle: json: $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json + $(MAKE) -C $(SCRIPTDIR) py @echo @echo "Build finished; now you can process the JSON files." From 1f3c60968a937a32a26bf608d37e0d6b4abdb022 Mon Sep 17 00:00:00 2001 From: Michael Vincerra Date: Thu, 31 Jan 2019 14:09:22 -0800 Subject: [PATCH 2/5] Moves all bundle_lister.py and assoc. files to bundle_lister dir. Signed-off-by: Michael Vincerra --- source/scripts/_python/Makefile | 6 +++--- source/scripts/_python/{ => bundle_lister}/README.md | 0 source/scripts/_python/{ => bundle_lister}/bundle_lister.py | 0 .../_python/{ => bundle_lister}/cloned_repo/.gitkeep | 0 source/scripts/_python/{ => bundle_lister}/requirements.txt | 0 source/scripts/_python/{ => bundle_lister}/styles.css | 0 source/scripts/_python/{ => bundle_lister}/template.html | 0 7 files changed, 3 insertions(+), 3 deletions(-) rename source/scripts/_python/{ => bundle_lister}/README.md (100%) rename source/scripts/_python/{ => bundle_lister}/bundle_lister.py (100%) rename source/scripts/_python/{ => bundle_lister}/cloned_repo/.gitkeep (100%) rename source/scripts/_python/{ => bundle_lister}/requirements.txt (100%) rename source/scripts/_python/{ => bundle_lister}/styles.css (100%) rename source/scripts/_python/{ => bundle_lister}/template.html (100%) diff --git a/source/scripts/_python/Makefile b/source/scripts/_python/Makefile index d7b5ffc2..b94b2670 100644 --- a/source/scripts/_python/Makefile +++ b/source/scripts/_python/Makefile @@ -1,9 +1,9 @@ py: - python bundle_lister.py - cp bundles.html.txt ../../clear-linux/reference/bundles + python bundle_lister/bundle_lister.py + cp bundle_lister/bundles.html.txt ../../clear-linux/reference/bundles rm -rf cloned_repo/* - rm bundles.html.txt + rm bundle_lister/bundles.html.txt @echo "Python script finished successfully!" diff --git a/source/scripts/_python/README.md b/source/scripts/_python/bundle_lister/README.md similarity index 100% rename from source/scripts/_python/README.md rename to source/scripts/_python/bundle_lister/README.md diff --git a/source/scripts/_python/bundle_lister.py b/source/scripts/_python/bundle_lister/bundle_lister.py similarity index 100% rename from source/scripts/_python/bundle_lister.py rename to source/scripts/_python/bundle_lister/bundle_lister.py diff --git a/source/scripts/_python/cloned_repo/.gitkeep b/source/scripts/_python/bundle_lister/cloned_repo/.gitkeep similarity index 100% rename from source/scripts/_python/cloned_repo/.gitkeep rename to source/scripts/_python/bundle_lister/cloned_repo/.gitkeep diff --git a/source/scripts/_python/requirements.txt b/source/scripts/_python/bundle_lister/requirements.txt similarity index 100% rename from source/scripts/_python/requirements.txt rename to source/scripts/_python/bundle_lister/requirements.txt diff --git a/source/scripts/_python/styles.css b/source/scripts/_python/bundle_lister/styles.css similarity index 100% rename from source/scripts/_python/styles.css rename to source/scripts/_python/bundle_lister/styles.css diff --git a/source/scripts/_python/template.html b/source/scripts/_python/bundle_lister/template.html similarity index 100% rename from source/scripts/_python/template.html rename to source/scripts/_python/bundle_lister/template.html From a5f8bf686a2b2bca014f44f3cc6c7326de19f79d Mon Sep 17 00:00:00 2001 From: Qi Zheng Date: Fri, 1 Feb 2019 10:35:18 +0800 Subject: [PATCH 3/5] dlrs.rst: Updates DLRS tutorial The ksonnet was added to CL bundle cloud-native-basic, no need manually install anymore. Signed-off-by: Qi Zheng --- source/clear-linux/tutorials/dlrs.rst | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/clear-linux/tutorials/dlrs.rst b/source/clear-linux/tutorials/dlrs.rst index af828320..113f3c8e 100644 --- a/source/clear-linux/tutorials/dlrs.rst +++ b/source/clear-linux/tutorials/dlrs.rst @@ -141,7 +141,12 @@ cycle. ksonnet\* ********* -Kubeflow uses ksonnet* to manage deployments, so we need to install that before setting up Kubeflow. On |CL|, follow these steps: +Kubeflow uses ksonnet* to manage deployments, so we need to install that before setting up Kubeflow. + +Since Clear Linux version 27550, the ksonnet was added to the bundle cloud-native-basic. But if using +old versions (not recommended), please manually install the ksonnet as below. + +On |CL|, follow these steps: .. code-block:: bash From d4c59fdf5691df0c4f27697d3429f392db4fc876 Mon Sep 17 00:00:00 2001 From: Michael Vincerra Date: Fri, 1 Feb 2019 11:43:21 -0800 Subject: [PATCH 4/5] Reset file structure to original organization. Signed-off-by: Michael Vincerra --- source/scripts/_python/Makefile | 8 ++++---- source/scripts/_python/{bundle_lister => }/README.md | 0 .../scripts/_python/{bundle_lister => }/bundle_lister.py | 0 .../_python/{bundle_lister => }/cloned_repo/.gitkeep | 0 .../scripts/_python/{bundle_lister => }/requirements.txt | 0 source/scripts/_python/{bundle_lister => }/styles.css | 0 source/scripts/_python/{bundle_lister => }/template.html | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename source/scripts/_python/{bundle_lister => }/README.md (100%) rename source/scripts/_python/{bundle_lister => }/bundle_lister.py (100%) rename source/scripts/_python/{bundle_lister => }/cloned_repo/.gitkeep (100%) rename source/scripts/_python/{bundle_lister => }/requirements.txt (100%) rename source/scripts/_python/{bundle_lister => }/styles.css (100%) rename source/scripts/_python/{bundle_lister => }/template.html (100%) diff --git a/source/scripts/_python/Makefile b/source/scripts/_python/Makefile index b94b2670..92d7e523 100644 --- a/source/scripts/_python/Makefile +++ b/source/scripts/_python/Makefile @@ -1,9 +1,9 @@ py: - python bundle_lister/bundle_lister.py - cp bundle_lister/bundles.html.txt ../../clear-linux/reference/bundles - rm -rf cloned_repo/* - rm bundle_lister/bundles.html.txt + python bundle_lister.py + cp bundles.html.txt ../../clear-linux/reference/bundles + rm -rf bundle_lister/cloned_repo/* + rm bundles.html.txt @echo "Python script finished successfully!" diff --git a/source/scripts/_python/bundle_lister/README.md b/source/scripts/_python/README.md similarity index 100% rename from source/scripts/_python/bundle_lister/README.md rename to source/scripts/_python/README.md diff --git a/source/scripts/_python/bundle_lister/bundle_lister.py b/source/scripts/_python/bundle_lister.py similarity index 100% rename from source/scripts/_python/bundle_lister/bundle_lister.py rename to source/scripts/_python/bundle_lister.py diff --git a/source/scripts/_python/bundle_lister/cloned_repo/.gitkeep b/source/scripts/_python/cloned_repo/.gitkeep similarity index 100% rename from source/scripts/_python/bundle_lister/cloned_repo/.gitkeep rename to source/scripts/_python/cloned_repo/.gitkeep diff --git a/source/scripts/_python/bundle_lister/requirements.txt b/source/scripts/_python/requirements.txt similarity index 100% rename from source/scripts/_python/bundle_lister/requirements.txt rename to source/scripts/_python/requirements.txt diff --git a/source/scripts/_python/bundle_lister/styles.css b/source/scripts/_python/styles.css similarity index 100% rename from source/scripts/_python/bundle_lister/styles.css rename to source/scripts/_python/styles.css diff --git a/source/scripts/_python/bundle_lister/template.html b/source/scripts/_python/template.html similarity index 100% rename from source/scripts/_python/bundle_lister/template.html rename to source/scripts/_python/template.html From 816cb9fc7931bcfe769d244aa88b6de0b878e45b Mon Sep 17 00:00:00 2001 From: Michael Vincerra Date: Fri, 1 Feb 2019 16:10:36 -0800 Subject: [PATCH 5/5] Adds method to copy OVMF.fd from usr/share/qemu/OVMF.fd to wd. Signed-off-by: Michael Vincerra --- .../get-started/virtual-machine-install/kvm.rst | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/source/clear-linux/get-started/virtual-machine-install/kvm.rst b/source/clear-linux/get-started/virtual-machine-install/kvm.rst index 718bd559..5f8cd200 100644 --- a/source/clear-linux/get-started/virtual-machine-install/kvm.rst +++ b/source/clear-linux/get-started/virtual-machine-install/kvm.rst @@ -64,8 +64,19 @@ Download and launch the virtual machine unxz clear--kvm.img.xz #. Download the `OVMF file`_ file that provides UEFI support for - virtual machines from the `image `_ - directory. + virtual machines from the `image `_ directory. + +#. Copy :file:`OVMF.fd` to the working directory, as shown below. + + .. code-block:: bash + + cp /usr/share/qemu/OVMF.fd + + .. note:: + + Replace with your own. + + For non-Clear Linux hosts, the preferred approach is to download it from https://cdn.download.clearlinux.org/image/OVMF.fd #. Download the sample `QEMU-KVM launcher`_ script from the `image `_ directory. This script