6 files changed, 77 insertions, 51 deletions

diff --git a/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch b/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch
index 309a00122a..ed656f6c6a 100644
--- a/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch
+++ b/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch
@@ -1,4 +1,4 @@
-From 3540ddcc7448dc784b65c74424c8a25132cb8534 Mon Sep 17 00:00:00 2001
+From 80190be8d9c82ed816fb571abef416a1fbfb9a35 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Tue, 31 Jul 2018 17:24:47 +0800
 Subject: [PATCH] support authentication for kickstart
@@ -12,11 +12,14 @@ which the invoker could parse this specific error.
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
+Rebase to 3.62
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 ---
  pykickstart/errors.py | 17 +++++++++++++++++
- pykickstart/load.py   | 32 +++++++++++++++++++++++++++-----
+ pykickstart/load.py   | 33 ++++++++++++++++++++++++++++-----
  pykickstart/parser.py |  4 ++--
- 3 files changed, 46 insertions(+), 7 deletions(-)
+ 3 files changed, 47 insertions(+), 7 deletions(-)
 
 diff --git a/pykickstart/errors.py b/pykickstart/errors.py
 index 8294f59..3d20bf8 100644
@@ -51,7 +54,7 @@ index 8294f59..3d20bf8 100644
 +    def __str__(self):
 +        return self.value
 diff --git a/pykickstart/load.py b/pykickstart/load.py
-index eb76b65..f51cf08 100644
+index e8301a4..45d402a 100644
 --- a/pykickstart/load.py
 +++ b/pykickstart/load.py
 @@ -18,9 +18,11 @@
@@ -85,7 +88,7 @@ index eb76b65..f51cf08 100644
      else:
          return _load_file(location)
  
-@@ -69,11 +71,31 @@ def load_to_file(location, destination):
+@@ -69,11 +71,32 @@ def load_to_file(location, destination):
          _copy_file(location, destination)
          return destination
  
@@ -111,19 +114,20 @@ index eb76b65..f51cf08 100644
 +
 +def _load_url(location, user=None, passwd=None):
      '''Load a location (URL or filename) and return contents as string'''
-+    auth = _get_auth(location, user=user, passwd=passwd)
  
++    auth = _get_auth(location, user=user, passwd=passwd)
++
      try:
--        request = requests.get(location, verify=SSL_VERIFY)
-+        request = requests.get(location, verify=SSL_VERIFY, auth=auth)
+-        request = requests.get(location, verify=SSL_VERIFY, timeout=120)
++        request = requests.get(location, verify=SSL_VERIFY, auth=auth, timeout=120)
      except SSLError as e:
          raise KickstartError(_('Error securely accessing URL "%s"') % location + ': {e}'.format(e=str(e)))
      except RequestException as e:
 diff --git a/pykickstart/parser.py b/pykickstart/parser.py
-index 7edf8aa..46c5299 100644
+index 12b0467..351dc1b 100644
 --- a/pykickstart/parser.py
 +++ b/pykickstart/parser.py
-@@ -790,7 +790,7 @@ class KickstartParser(object):
+@@ -831,7 +831,7 @@ class KickstartParser(object):
          i = PutBackIterator(s.splitlines(True) + [""])
          self._stateMachine(i)
  
@@ -132,7 +136,7 @@ index 7edf8aa..46c5299 100644
          """Process a kickstart file, given by the filename f."""
          if reset:
              self._reset()
-@@ -811,7 +811,7 @@ class KickstartParser(object):
+@@ -852,7 +852,7 @@ class KickstartParser(object):
          self.currentdir[self._includeDepth] = cd
  
          try:
diff --git a/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch b/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch
index f5483db825..cf5dd95d48 100644
--- a/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch
+++ b/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch
@@ -1,8 +1,8 @@
-From 62fdead139edb0f29b2f222efcb8f39be15b057e Mon Sep 17 00:00:00 2001
+From 42076483ed38d50400156cbb75d4c9b0180e6957 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Mon, 30 Jul 2018 15:47:13 +0800
-Subject: [PATCH 2/4] pykickstart/parser.py: add lock for readKickstart and
- support https without certification
+Subject: [PATCH] pykickstart/parser.py: add lock for readKickstart and support
+ https without certification
 
 - Add lock for readKickstart to fix race issue
 
@@ -13,15 +13,18 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
 ---
 Upstream-Status: Pending
 
+Rebase to 3.62
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
  pykickstart/load.py   |  2 +-
  pykickstart/parser.py | 18 ++++++++++++++++++
  2 files changed, 19 insertions(+), 1 deletion(-)
 
 diff --git a/pykickstart/load.py b/pykickstart/load.py
-index 8da8051..e856c8d 100644
+index 45d402a..6eeffde 100644
 --- a/pykickstart/load.py
 +++ b/pykickstart/load.py
-@@ -32,7 +32,7 @@ log = logging.getLogger("anaconda.main")
+@@ -28,7 +28,7 @@ from requests.exceptions import SSLError, RequestException
  
  is_url = lambda location: '://' in location  # RFC 3986
  
@@ -31,10 +34,10 @@ index 8da8051..e856c8d 100644
  def load_to_str(location, user=None, passwd=None):
      '''Load a destination URL or file into a string.
 diff --git a/pykickstart/parser.py b/pykickstart/parser.py
-index b95ba90..a55a9a3 100644
+index 351dc1b..aef59ca 100644
 --- a/pykickstart/parser.py
 +++ b/pykickstart/parser.py
-@@ -51,6 +51,20 @@ from pykickstart.i18n import _
+@@ -54,6 +54,20 @@ from pykickstart.i18n import _
  STATE_END = "end"
  STATE_COMMANDS = "commands"
  
@@ -55,7 +58,7 @@ index b95ba90..a55a9a3 100644
  def _preprocessStateMachine(lineIter):
      l = None
      lineno = 0
-@@ -791,6 +805,10 @@ class KickstartParser(object):
+@@ -832,6 +846,10 @@ class KickstartParser(object):
          self._stateMachine(i)
  
      def readKickstart(self, f, reset=True, username=None, password=None):
diff --git a/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch b/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch
index abe2c87e00..e2c65ee957 100644
--- a/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch
+++ b/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch
@@ -1,4 +1,4 @@
-From 737e9a7c11233183f48ce6c83d38b504c8ffed12 Mon Sep 17 00:00:00 2001
+From d5e6304dff890b39a53a96f03819aa118deb701a Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Mon, 30 Jul 2018 15:52:21 +0800
 Subject: [PATCH] load.py: retry to invoke request with timeout
@@ -11,12 +11,15 @@ network is up, the fetch works.
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
+Rebase to 3.62
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 ---
- pykickstart/load.py | 31 +++++++++++++++++++++++++++++++
- 1 file changed, 31 insertions(+)
+ pykickstart/load.py | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
 
 diff --git a/pykickstart/load.py b/pykickstart/load.py
-index 58faba6..e856c8d 100644
+index 6eeffde..da0032f 100644
 --- a/pykickstart/load.py
 +++ b/pykickstart/load.py
 @@ -20,12 +20,16 @@
@@ -66,11 +69,10 @@ index 58faba6..e856c8d 100644
  def _get_auth(location, user=None, passwd=None):
  
      auth = None
-@@ -92,6 +119,10 @@ def _get_auth(location, user=None, passwd=None):
- 
+@@ -93,6 +120,9 @@ def _get_auth(location, user=None, passwd=None):
  def _load_url(location, user=None, passwd=None):
      '''Load a location (URL or filename) and return contents as string'''
-+
+ 
 +    if not _access_url(location):
 +        raise KickstartError(_("Connection %s failed" % location))
 +
diff --git a/meta-python/recipes-extended/python-pykickstart/files/run-ptest b/meta-python/recipes-extended/python-pykickstart/files/run-ptest
new file mode 100755
index 0000000000..289e68b054
--- /dev/null
+++ b/meta-python/recipes-extended/python-pykickstart/files/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+pytest --automake --deselect tests/test_packages.py::AddGroupsAndEnvironment_TestCase --deselect tests/commands/test_reboot.py::Reboot_TestCase
diff --git a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.48.bb b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.48.bb
deleted file mode 100644
index 953068f7c3..0000000000
--- a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.48.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "A python library for manipulating kickstart files"
-HOMEPAGE = "http://fedoraproject.org/wiki/pykickstart"
-LICENSE = "GPL-2.0-or-later"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-DEPENDS = "python3"
-RDEPENDS:${PN} = "python3 \
-                  python3-requests \
-                  python3-six \
-"
-
-S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=master \
-           file://0001-support-authentication-for-kickstart.patch \
-           file://0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch \
-           file://0003-comment-out-sections-shutdown-and-environment-in-gen.patch \
-           file://0004-load.py-retry-to-invoke-request-with-timeout.patch \
-           "
-SRCREV = "fa6c80c0e5c6bee29d089899a10d26e6f7f8afd8"
-
-UPSTREAM_CHECK_GITTAGREGEX = "r(?P<pver>\d+(\.\d+)+(-\d+)*)"
-
-inherit setuptools3
diff --git a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.63.bb b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.63.bb
new file mode 100644
index 0000000000..830e46a63c
--- /dev/null
+++ b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.63.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "A python library for manipulating kickstart files"
+HOMEPAGE = "https://fedoraproject.org/wiki/pykickstart"
+LICENSE = "GPL-2.0-or-later"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=81bcece21748c91ba9992349a91ec11d"
+
+inherit python_setuptools_build_meta ptest
+
+RDEPENDS:${PN} = "python3 \
+                  python3-requests \
+                  python3-six \
+"
+
+RDEPENDS:${PN}-ptest += " \
+    python3-pytest \
+    python3-unittest-automake-output \
+"
+
+do_install_ptest() {
+    install -d ${D}${PTEST_PATH}/tests
+    cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests
+    for file in `grep -Rl unittest.main ${D}${PTEST_PATH}/tests/`; do
+        dirname=`dirname $file`
+        basename=`basename $file`
+        [ $basename != "__init__.py" ] && mv $file ${dirname}/test_${basename}
+    done
+}
+
+SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=master;tag=r${PV} \
+           file://0001-support-authentication-for-kickstart.patch \
+           file://0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch \
+           file://0003-comment-out-sections-shutdown-and-environment-in-gen.patch \
+           file://0004-load.py-retry-to-invoke-request-with-timeout.patch \
+           file://run-ptest \
+           "
+SRCREV = "6e0d1238cb4696a9040072a5a28a706e5775c552"
+
+UPSTREAM_CHECK_GITTAGREGEX = "r(?P<pver>\d+(\.\d+)+(-\d+)*)"
+