[oe] [meta-python][PATCH 2/2] gateone: update to latest git

[Dan McGregor]

On 4 November 2015 at 22:03, Khem Raj <raj.khem at gmail.com> wrote:
>
>> On Nov 4, 2015, at 7:58 PM, Dan McGregor <danismostlikely at gmail.com> wrote:
>>
>> From: Dan McGregor <dan.mcgregor at usask.ca>
>>
>> This version works with pyton-tornado 4.2 as currently distributed
>> with OE.
>>
>> Signed-off-by: Dan McGregor <dan.mcgregor at usask.ca>
>> ---
>> ...on.py-Hack-around-broken-gethostname-thin.patch | 26 ----------------------
>> .../recipes-connectivity/gateone/gateone/80oe.conf |  1 +
>> .../recipes-connectivity/gateone/gateone_git.bb    |  7 +++---
>> 3 files changed, 5 insertions(+), 29 deletions(-)
>> delete mode 100644 meta-python/recipes-connectivity/gateone/gateone/0001-configuration.py-Hack-around-broken-gethostname-thin.patch
>>
>> diff --git a/meta-python/recipes-connectivity/gateone/gateone/0001-configuration.py-Hack-around-broken-gethostname-thin.patch b/meta-python/recipes-connectivity/gateone/gateone/0001-configuration.py-Hack-around-broken-gethostname-thin.patch
>> deleted file mode 100644
>> index 5f5fa91..0000000
>> --- a/meta-python/recipes-connectivity/gateone/gateone/0001-configuration.py-Hack-around-broken-gethostname-thin.patch
>> +++ /dev/null
>> @@ -1,26 +0,0 @@
>> -From d811d3bdf06d78c93c48bef762c19c392c879077 Mon Sep 17 00:00:00 2001
>> -From: Koen Kooi <koen at dominion.thruhere.net>
>> -Date: Tue, 26 Nov 2013 15:54:10 +0100
>> -Subject: [PATCH] configuration.py: Hack around broken gethostname thingy
>> -
>> -Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
>> ----
>> - gateone/core/configuration.py | 2 +-
>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>> -
>> -diff --git a/gateone/core/configuration.py b/gateone/core/configuration.py
>> -index da41cbd..d1c8222 100644
>> ---- a/gateone/core/configuration.py
>> -+++ b/gateone/core/configuration.py
>> -@@ -162,7 +162,7 @@ def define_options(installed=True):
>> -     ]
>> -     # Used both http and https above to demonstrate that both are acceptable
>> -     try:
>> --        additional_origins = socket.gethostbyname_ex(socket.gethostname())
>> -+        additional_origins = [] # additional_origins = socket.gethostbyname_ex(socket.gethostname())
>> -     except socket.gaierror:
>> -         # Couldn't get any IPs from the hostname
>> -         additional_origins = []
>> ---
>> -1.8.4.2
>> -
>> diff --git a/meta-python/recipes-connectivity/gateone/gateone/80oe.conf b/meta-python/recipes-connectivity/gateone/gateone/80oe.conf
>> index cde98bc..09cdbfa 100644
>> --- a/meta-python/recipes-connectivity/gateone/gateone/80oe.conf
>> +++ b/meta-python/recipes-connectivity/gateone/gateone/80oe.conf
>> @@ -2,6 +2,7 @@
>> {
>>     "*": {
>>         "gateone": { // These settings apply to all of Gate One
>> +            "log_file_prefix": "/var/log/gateone.log", // default would be /var/log/gateone/gateone.log
>
> Can this use ${localstatedir} some how instead of /var

I think so. That's what sed is for.

>
>>             "log_file_max_size": 5242880, // 5 megabyte logs for OE by default (default would normally be 100Mb)
>>             "log_file_num_backups": 2, // Default is normally 10
>>             "origins": ["*"], // Every device has a unique origin
>> diff --git a/meta-python/recipes-connectivity/gateone/gateone_git.bb b/meta-python/recipes-connectivity/gateone/gateone_git.bb
>> index 7eae12a..80bbae8 100644
>> --- a/meta-python/recipes-connectivity/gateone/gateone_git.bb
>> +++ b/meta-python/recipes-connectivity/gateone/gateone_git.bb
>> @@ -4,9 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=834cbc6995db88433db17cdf8953a428"
>> HOMEPAGE = "http://liftoffsoftware.com/Products/GateOne"
>>
>> PV = “1.2"
>
> Should this have SRCPV in PV

Yes, this is not a release.

>
>> -SRCREV = "1528d324088fc1c180b7fdf50f5b5c1af057eef6"
>> -SRC_URI = "git://github.com/liftoff/GateOne.git \
>> -           file://0001-configuration.py-Hack-around-broken-gethostname-thin.patch \
>> +SRCREV = "17fbf85753f4d9c317950a3ef14f811188a51cb7"
>> +SRC_URI = "git://github.com/liftoff/GateOne.git;branch=master \
>>            file://gateone-avahi.service \
>>            file://80oe.conf \
>>            file://gateone.service \
>> @@ -49,6 +48,7 @@ FILES_${PN} = "${localstatedir}/lib ${bindir} ${base_libdir} ${sysconfdir} ${PYT
>> RDEPENDS_${PN} = "mime-support \
>>                   openssh-ssh \
>>                   python-compression \
>> +                  python-contextlib \
>>                   python-crypt \
>>                   python-datetime \
>>                   python-email \
>> @@ -76,6 +76,7 @@ RDEPENDS_${PN} = "mime-support \
>>                   python-tornado \
>>                   python-unixadmin \
>>                   python-xml \
>> +                  python-html5lib \
>>                   bash \
>> "
>>
>> --
>> 2.6.2.11.gb05c2f9
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>