From 9ddb163540a97fa5fba2e0e1e74eca466fb51258 Mon Sep 17 00:00:00 2001 From: Zang Ruochen Date: Thu, 21 Nov 2019 10:14:49 +0800 Subject: python3-pykickstart: upgrade 3.20 -> 3.22 -Refresh the following patch: 0003-comment-out-sections-shutdown-and-environment-in-gen.patch Signed-off-by: Zang Ruochen Signed-off-by: Khem Raj --- ...-sections-shutdown-and-environment-in-gen.patch | 10 ++++----- .../python-pykickstart/python3-pykickstart_3.20.bb | 25 ---------------------- .../python-pykickstart/python3-pykickstart_3.22.bb | 25 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.20.bb create mode 100644 meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb diff --git a/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch b/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch index 81e351b11f..7ab7346860 100644 --- a/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch +++ b/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch @@ -17,7 +17,7 @@ fixup! add comments of shutdown for user 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pykickstart/commands/reboot.py b/pykickstart/commands/reboot.py -index 2c1b1c0..b3ec717 100644 +index 75a6d916..edfe83ff 100644 --- a/pykickstart/commands/reboot.py +++ b/pykickstart/commands/reboot.py @@ -43,6 +43,9 @@ class FC3_Reboot(KickstartCommand): @@ -31,18 +31,18 @@ index 2c1b1c0..b3ec717 100644 return retval diff --git a/pykickstart/parser.py b/pykickstart/parser.py -index e68174d..efd78a6 100644 +index bc59131b..b2d09d45 100644 --- a/pykickstart/parser.py +++ b/pykickstart/parser.py -@@ -385,7 +385,7 @@ class Packages(KickstartObject): +@@ -428,7 +428,7 @@ class Packages(KickstartObject): if not self.default: if self.environment: - pkgs += "@^%s\n" % self.environment + pkgs += "#@^%s\n" % self.environment - grps = self.groupList - grps.sort() + grps = self.groupList + grps.sort() -- 2.7.4 diff --git a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.20.bb b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.20.bb deleted file mode 100644 index ed10ce958c..0000000000 --- a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.20.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "A python library for manipulating kickstart files" -HOMEPAGE = "http://fedoraproject.org/wiki/pykickstart" -LICENSE = "GPLv2+" - -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 = "487edfded19d5969db0673b200ee4272b7dc6697" - -UPSTREAM_CHECK_GITTAGREGEX = "r(?P\d+(\.\d+)+(-\d+)*)" - -inherit setuptools3 diff --git a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb new file mode 100644 index 0000000000..041abd3e8d --- /dev/null +++ b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "A python library for manipulating kickstart files" +HOMEPAGE = "http://fedoraproject.org/wiki/pykickstart" +LICENSE = "GPLv2+" + +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 = "674c17b1e231f56a0d8a5ced4a204cdbc4c1edf3" + +UPSTREAM_CHECK_GITTAGREGEX = "r(?P\d+(\.\d+)+(-\d+)*)" + +inherit setuptools3 -- cgit 1.2.3-korg