[meta-cloud-services][PATCH 1/2] django-pyscss: uprev to version 2.0.2

[meta-cloud-services][PATCH 1/2] django-pyscss: uprev to version 2.0.2

[Mark Asselstine]

This uprev is needed to work around an error when attempting to log in
to the horizon dashboard:

Couldn't find anything to import: bootstrap/variables

The upstream fix bd8b2ae8bf21b9c4f671d9364cdc41fbced9b214 [Retain the
imported file path] forms the basis of the 2.0.2 release and fixes
this error, per bug:
https://github.com/fusionbox/django-pyscss/issues/34.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
 .../{python-django-pyscss_2.0.1.bb => python-django-pyscss_2.0.2.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-openstack/recipes-devtools/python/{python-django-pyscss_2.0.1.bb => python-django-pyscss_2.0.2.bb} (81%)

diff --git a/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.1.bb b/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb
similarity index 81%
rename from meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.1.bb
rename to meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb
index 43dbc9f..7c5606a 100644
--- a/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.1.bb
+++ b/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=07339dad721a3ae7e420b8b751a15c70"
 SRCNAME = "django-pyscss"
 SRC_URI = "http://pypi.python.org/packages/source/d/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "4df1b89942f41b8e8bde8704efcfe6c2"
-SRC_URI[sha256sum] = "03fa4d7e483d87eaa4df0e91b337d078a39fcca897952e8d65ebdca7f759a822"
+SRC_URI[md5sum] = "f8dbcc4d314c8e220aa311ec6561b06d"
+SRC_URI[sha256sum] = "0f4844f8fd3f69f4d428a616fdcf2b650a24862dd81443ae3fba14980c7b0615"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
-- 
2.1.4

[meta-overc][PATCH] local.conf.sample: set DISTRO

[Mark Asselstine]

My builds kept on producing images with sysvinit as the init system
despite being told that systemd was the expected default throughout
meta-overc. After poking around I found that the DISTRO in the
local.conf.sample still had the default DISTRO set to 'poky' so
changing this to be the expected 'pod'.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
 meta-pod/conf/local.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-pod/conf/local.conf.sample b/meta-pod/conf/local.conf.sample
index a5f9bfd..dbab304 100644
--- a/meta-pod/conf/local.conf.sample
+++ b/meta-pod/conf/local.conf.sample
@@ -115,7 +115,7 @@ KMACHINE_genericx86-64 ?= "common-pc-64"
 # Ultimately when creating custom policy, people will likely end up subclassing 
 # these defaults.
 #
-DISTRO ?= "poky"
+DISTRO ?= "pod"
 # As an example of a subclass there is a "bleeding" edge policy configuration
 # where many versions are set to the absolute latest code from the upstream 
 # source control systems. This is just mentioned here as an example, its not
-- 
2.1.4

Re: [meta-overc][PATCH] local.conf.sample: set DISTRO

[Mark Asselstine]

Please ignore this one, accidentally got picked up in my send-email expression.

Mark

On Thu, Oct 29, 2015 at 10:54 PM, Mark Asselstine
<mark.asselstine@windriver.com> wrote:
> My builds kept on producing images with sysvinit as the init system
> despite being told that systemd was the expected default throughout
> meta-overc. After poking around I found that the DISTRO in the
> local.conf.sample still had the default DISTRO set to 'poky' so
> changing this to be the expected 'pod'.
>
> Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
> ---
>  meta-pod/conf/local.conf.sample | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-pod/conf/local.conf.sample b/meta-pod/conf/local.conf.sample
> index a5f9bfd..dbab304 100644
> --- a/meta-pod/conf/local.conf.sample
> +++ b/meta-pod/conf/local.conf.sample
> @@ -115,7 +115,7 @@ KMACHINE_genericx86-64 ?= "common-pc-64"
>  # Ultimately when creating custom policy, people will likely end up subclassing
>  # these defaults.
>  #
> -DISTRO ?= "poky"
> +DISTRO ?= "pod"
>  # As an example of a subclass there is a "bleeding" edge policy configuration
>  # where many versions are set to the absolute latest code from the upstream
>  # source control systems. This is just mentioned here as an example, its not
> --
> 2.1.4
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization

[meta-cloud-services][PATCH 2/2] horizon: add an upstream patch needed for pyscss 1.3.4

[Mark Asselstine]

Without this patch we will get an error:
Don't know how to merge conflicting combinators: <SimpleSelector: u'+ .btn:not(:first-child)'> and <SimpleSelector: u'> .btn'>

when attempting to connect to the horizon dashboard.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
---
 .../Compatibility-fix-for-pyscss-1.3.4.patch       | 68 ++++++++++++++++++++++
 .../recipes-devtools/python/python-horizon_git.bb  |  1 +
 2 files changed, 69 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-horizon/Compatibility-fix-for-pyscss-1.3.4.patch

diff --git a/meta-openstack/recipes-devtools/python/python-horizon/Compatibility-fix-for-pyscss-1.3.4.patch b/meta-openstack/recipes-devtools/python/python-horizon/Compatibility-fix-for-pyscss-1.3.4.patch
new file mode 100644
index 0000000..a94d757
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-horizon/Compatibility-fix-for-pyscss-1.3.4.patch
@@ -0,0 +1,68 @@
+From cca93ade7c23c1f2794376161b6660a459292eee Mon Sep 17 00:00:00 2001
+From: Richard Jones <r1chardj0n3s@gmail.com>
+Date: Fri, 1 May 2015 11:39:37 +1000
+Subject: [PATCH] Compatibility fix for pyscss 1.3.4
+
+Commit cca93ade7c23c1f2794376161b6660a459292eee from
+https://github.com/openstack/horizon.git
+
+This commit alters the action-list.scss file so it is compatible
+with the newer version of pyScss (1.3.4+), allowing us to
+upgrade to that version.
+
+This change is a prerequisite for the update to get into the
+global requirements so that that change can pass testing.
+
+Change-Id: Idec7ce039b57476ce20b7b678431459c2ca0bdbf
+Co-Authored-By: Kelly Domico <kelly.domico@hp.com>
+---
+ .../static/angular/action-list/action-list.scss    | 23 +++++++++++++++++++---
+ 1 file changed, 20 insertions(+), 3 deletions(-)
+ mode change 100644 => 100755 horizon/static/angular/action-list/action-list.scss
+
+diff --git a/horizon/static/angular/action-list/action-list.scss b/horizon/static/angular/action-list/action-list.scss
+old mode 100644
+new mode 100755
+index 58092e0..5b3fcc4
+--- a/horizon/static/angular/action-list/action-list.scss
++++ b/horizon/static/angular/action-list/action-list.scss
+@@ -22,16 +22,33 @@ action-list.btn-group {
+     right: -0.35em;
+     z-index: 3;
+ 
+-    & + .btn:not(:first-child) {
++    & + .btn:last-child:not(:first-child):not(.dropdown-toggle),
++    & + .btn:not(:last-child):not(:first-child):not(.dropdown-toggle),
++    & + .btn.single-button:not(:first-child),
++    & + .btn.split-button:not(:first-child):not(:last-child) {
+       border-top-left-radius: 4px;
+       border-bottom-left-radius: 4px;
++    }
++  }
+ 
+-      &.btn-sm {
++  &.btn-group-sm {
++    notifications {
++      & + .btn:last-child:not(:first-child):not(.dropdown-toggle),
++      & + .btn:not(:last-child):not(:first-child):not(.dropdown-toggle),
++      & + .btn.single-button:not(:first-child),
++      & + .btn.split-button:not(:first-child):not(:last-child) {
+         border-top-left-radius: 3px;
+         border-bottom-left-radius: 3px;
+       }
++    }
++  }
+ 
+-      &.btn-lg {
++  &.btn-group-lg {
++    notifications {
++      & + .btn:last-child:not(:first-child):not(.dropdown-toggle),
++      & + .btn:not(:last-child):not(:first-child):not(.dropdown-toggle),
++      & + .btn.single-button:not(:first-child),
++      & + .btn.split-button:not(:first-child):not(:last-child) {
+         border-top-left-radius: 6px;
+         border-bottom-left-radius: 6px;
+       }
+-- 
+2.1.4
+
diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index f5c6c03..cf62d44 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -70,6 +70,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
     file://openstack-dashboard-apache.conf \
     file://local_settings.py \
     file://horizon-use-full-package-path-to-test-directories.patch \
+    file://Compatibility-fix-for-pyscss-1.3.4.patch \
     "
 
 SRCREV = "b99cf48ff346494198fb9740495eacc14fa406bf"
-- 
2.1.4

Re: [meta-cloud-services][PATCH 1/2] django-pyscss: uprev to version 2.0.2

[Bruce Ashfield]

On 15-10-29 10:54 PM, Mark Asselstine wrote:
> This uprev is needed to work around an error when attempting to log in
> to the horizon dashboard:

merged both patches to master.

Bruce

>
> Couldn't find anything to import: bootstrap/variables
>
> The upstream fix bd8b2ae8bf21b9c4f671d9364cdc41fbced9b214 [Retain the
> imported file path] forms the basis of the 2.0.2 release and fixes
> this error, per bug:
> https://github.com/fusionbox/django-pyscss/issues/34.
>
> Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
> ---
>   .../{python-django-pyscss_2.0.1.bb => python-django-pyscss_2.0.2.bb}  | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>   rename meta-openstack/recipes-devtools/python/{python-django-pyscss_2.0.1.bb => python-django-pyscss_2.0.2.bb} (81%)
>
> diff --git a/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.1.bb b/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb
> similarity index 81%
> rename from meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.1.bb
> rename to meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb
> index 43dbc9f..7c5606a 100644
> --- a/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.1.bb
> +++ b/meta-openstack/recipes-devtools/python/python-django-pyscss_2.0.2.bb
> @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=07339dad721a3ae7e420b8b751a15c70"
>   SRCNAME = "django-pyscss"
>   SRC_URI = "http://pypi.python.org/packages/source/d/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
>
> -SRC_URI[md5sum] = "4df1b89942f41b8e8bde8704efcfe6c2"
> -SRC_URI[sha256sum] = "03fa4d7e483d87eaa4df0e91b337d078a39fcca897952e8d65ebdca7f759a822"
> +SRC_URI[md5sum] = "f8dbcc4d314c8e220aa311ec6561b06d"
> +SRC_URI[sha256sum] = "0f4844f8fd3f69f4d428a616fdcf2b650a24862dd81443ae3fba14980c7b0615"
>
>   S = "${WORKDIR}/${SRCNAME}-${PV}"
>
>