From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../python3-blivet/0001-comment-out-selinux.patch | 20 ++++---- .../0002-run_program-support-timeout.patch | 10 ++-- .../0003-support-infinit-timeout.patch | 16 +++--- .../0004-Mount-var-volatile-during-install.patch | 59 ---------------------- ...0004-fix-new.roots-object-is-not-iterable.patch | 28 ++++++++++ ...correct-timeout-while-system-time-changed.patch | 48 ++++++++++++++++++ .../0005-update-fstab-by-appending.patch | 32 ------------ ...0006-fix-new.roots-object-is-not-iterable.patch | 28 ---------- .../python3-blivet/0006-tweak-btrfs-packages.patch | 45 +++++++++++++++++ ...correct-timeout-while-system-time-changed.patch | 48 ------------------ ...0007-invoking-mount-with-infinite-timeout.patch | 31 ++++++++++++ .../python3-blivet/0008-tweak-btrfs-packages.patch | 45 ----------------- ...-use-oe-variable-to-replace-hardcoded-dir.patch | 34 +++++++++++++ .../0009-invoking-fsck-with-infinite-timeout.patch | 31 ++++++++++++ ...0009-invoking-mount-with-infinite-timeout.patch | 31 ------------ .../0010-invoking-mkfs-with-infinite-timeout.patch | 31 ++++++++++++ ...-use-oe-variable-to-replace-hardcoded-dir.patch | 34 ------------- .../0011-invoking-dd-with-infinite-timeout.patch | 31 ++++++++++++ .../0011-invoking-fsck-with-infinite-timeout.patch | 31 ------------ .../0012-invoking-mkfs-with-infinite-timeout.patch | 31 ------------ .../0012-remove-dmraid-dependency-check.patch | 31 ++++++++++++ ...evert-Adapt-to-logging-module-name-change.patch | 30 ----------- .../0013-add-Z-y-and-y-to-lvm.pvcreate.patch | 41 +++++++++++++++ .../0014-invoking-dd-with-infinite-timeout.patch | 31 ------------ .../python-blivet/python3-blivet_2.2.0.bb | 47 ----------------- .../python-blivet/python3-blivet_3.0.1.bb | 48 ++++++++++++++++++ .../python-blivet/python3-blivetgui_2.1.5.bb | 27 ---------- .../python-blivet/python3-blivetgui_2.1.8.bb | 27 ++++++++++ .../python-meh/python3-meh_0.46.bb | 17 ------- .../python-meh/python3-meh_0.47.bb | 17 +++++++ ...0001-support-authentication-for-kickstart.patch | 55 ++++++++++---------- ...-parser.py-add-lock-for-readKickstart-and.patch | 36 +++++-------- ...-sections-shutdown-and-environment-in-gen.patch | 10 ++-- ...d.py-retry-to-invoke-request-with-timeout.patch | 23 +++++---- .../files/0005-tweak-shebang-to-python3.patch | 25 --------- .../python-pykickstart/python3-pykickstart_2.35.bb | 24 --------- .../python-pykickstart/python3-pykickstart_3.15.bb | 25 +++++++++ .../recipes-extended/pywbem/python-pywbem.inc | 48 ++++++++++++++++++ .../pywbem/python-pywbem_0.11.0.bb | 13 +++++ .../pywbem/python3-pywbem_0.11.0.bb | 2 + .../recipes-extended/pywbem/pywbem_0.8.0.bb | 36 ------------- 41 files changed, 611 insertions(+), 666 deletions(-) delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch create mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0004-fix-new.roots-object-is-not-iterable.patch create mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0005-update-fstab-by-appending.patch delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch create mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0006-tweak-btrfs-packages.patch delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0007-fix-incorrect-timeout-while-system-time-changed.patch create mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0007-invoking-mount-with-infinite-timeout.patch delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0008-tweak-btrfs-packages.patch create mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch create mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-fsck-with-infinite-timeout.patch delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-mount-with-infinite-timeout.patch create mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0010-invoking-mkfs-with-infinite-timeout.patch delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0010-use-oe-variable-to-replace-hardcoded-dir.patch create mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-dd-with-infinite-timeout.patch delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-fsck-with-infinite-timeout.patch delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-invoking-mkfs-with-infinite-timeout.patch create mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-remove-dmraid-dependency-check.patch delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0013-Revert-Adapt-to-logging-module-name-change.patch create mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0013-add-Z-y-and-y-to-lvm.pvcreate.patch delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0014-invoking-dd-with-infinite-timeout.patch delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.0.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.8.bb delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.46.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.47.bb delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0005-tweak-shebang-to-python3.patch delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_2.35.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.15.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/pywbem/python-pywbem.inc create mode 100644 meta-openembedded/meta-python/recipes-extended/pywbem/python-pywbem_0.11.0.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.11.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-extended/pywbem/pywbem_0.8.0.bb (limited to 'meta-openembedded/meta-python/recipes-extended') diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch index 0ee32057c..c77b86a45 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch @@ -1,7 +1,7 @@ -From 7d483c27ac0a23ca3bba7f320918afc40013bd8e Mon Sep 17 00:00:00 2001 +From 648a18bfc447f076d48ae4147d984b8ef56e37aa Mon Sep 17 00:00:00 2001 From: Hongxu Jia -Date: Mon, 8 May 2017 14:25:52 +0800 -Subject: [PATCH 01/13] comment out selinux +Date: Mon, 30 Jul 2018 16:13:40 +0800 +Subject: [PATCH 01/11] comment out selinux Upstream-Status: Inappropriate [oe specific] @@ -12,7 +12,7 @@ Signed-off-by: Hongxu Jia 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/blivet/flags.py b/blivet/flags.py -index 06822db..b55a93f 100644 +index 1840121..8789390 100644 --- a/blivet/flags.py +++ b/blivet/flags.py @@ -20,7 +20,7 @@ @@ -24,7 +24,7 @@ index 06822db..b55a93f 100644 class Flags(object): -@@ -49,7 +49,8 @@ class Flags(object): +@@ -47,7 +47,8 @@ class Flags(object): # # enable/disable functionality # @@ -35,19 +35,19 @@ index 06822db..b55a93f 100644 self.dmraid = True self.ibft = True diff --git a/blivet/util.py b/blivet/util.py -index e3e71ce..0cf5188 100644 +index 7334ff6..0f2a995 100644 --- a/blivet/util.py +++ b/blivet/util.py -@@ -4,7 +4,7 @@ import glob +@@ -3,7 +3,7 @@ import functools + import glob import itertools import os - import shutil -import selinux +#import selinux import subprocess import re import sys -@@ -431,6 +431,8 @@ def get_cow_sysfs_path(dev_path, dev_sysfsPath): +@@ -430,6 +430,8 @@ def get_cow_sysfs_path(dev_path, dev_sysfsPath): def match_path_context(path): """ Return the default SELinux context for the given path. """ context = None @@ -56,7 +56,7 @@ index e3e71ce..0cf5188 100644 try: context = selinux.matchpathcon(os.path.normpath(path), 0)[1] except OSError as e: -@@ -455,6 +457,8 @@ def set_file_context(path, context, root=None): +@@ -454,6 +456,8 @@ def set_file_context(path, context, root=None): True if successful, False if not. """ diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch index 01e71be30..fea225407 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch @@ -1,7 +1,7 @@ -From 86744d408b91acdcb086a03d7779fcda152f2ac3 Mon Sep 17 00:00:00 2001 +From 596979ed58109141a7fee680ab95b27296c022b1 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 8 May 2017 14:39:56 +0800 -Subject: [PATCH 02/13] run_program support timeout +Subject: [PATCH 02/11] run_program support timeout Upstream-Status: Pending @@ -11,10 +11,10 @@ Signed-off-by: Hongxu Jia 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/blivet/util.py b/blivet/util.py -index 0cf5188..d4bd9bb 100644 +index 0f2a995..05a253c 100644 --- a/blivet/util.py +++ b/blivet/util.py -@@ -158,6 +158,30 @@ class Path(str): +@@ -157,6 +157,30 @@ class Path(str): def __hash__(self): return self._path.__hash__() @@ -45,7 +45,7 @@ index 0cf5188..d4bd9bb 100644 def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=False, binary_output=False): if env_prune is None: -@@ -180,36 +204,22 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa +@@ -179,36 +203,22 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa stderr_dir = subprocess.STDOUT else: stderr_dir = subprocess.PIPE diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch index 489fb56bb..38f061ed0 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch @@ -1,7 +1,7 @@ -From 923265e04df5920fc99393aa05f584032aa1b383 Mon Sep 17 00:00:00 2001 +From 325898f3f2951bbde07da47888175c427b11ddc3 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 8 May 2017 16:18:02 +0800 -Subject: [PATCH 03/13] support infinit timeout +Subject: [PATCH 03/11] support infinit timeout Upstream-Status: Pending @@ -11,10 +11,10 @@ Signed-off-by: Hongxu Jia 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/blivet/util.py b/blivet/util.py -index d4bd9bb..44a2da5 100644 +index 05a253c..d6804be 100644 --- a/blivet/util.py +++ b/blivet/util.py -@@ -158,6 +158,7 @@ class Path(str): +@@ -157,6 +157,7 @@ class Path(str): def __hash__(self): return self._path.__hash__() @@ -22,7 +22,7 @@ index d4bd9bb..44a2da5 100644 def timeout_command(argv, timeout, *args, **kwargs): """call shell-command and either return its output or kill it if it doesn't normally exit within timeout seconds and return None""" -@@ -169,7 +170,7 @@ def timeout_command(argv, timeout, *args, **kwargs): +@@ -168,7 +169,7 @@ def timeout_command(argv, timeout, *args, **kwargs): while proc.poll() is None: time.sleep(0.1) now = datetime.datetime.now() @@ -31,7 +31,7 @@ index d4bd9bb..44a2da5 100644 os.kill(proc.pid, signal.SIGKILL) os.waitpid(-1, os.WNOHANG) program_log.debug("%d seconds timeout" % timeout) -@@ -183,7 +184,7 @@ def timeout_command(argv, timeout, *args, **kwargs): +@@ -182,7 +183,7 @@ def timeout_command(argv, timeout, *args, **kwargs): program_log.debug("Return code: %d", proc.returncode) return (proc.returncode, proc.stdout.read()) @@ -40,7 +40,7 @@ index d4bd9bb..44a2da5 100644 if env_prune is None: env_prune = [] -@@ -192,7 +193,10 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa +@@ -191,7 +192,10 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa os.chroot(root) with program_log_lock: # pylint: disable=not-context-manager @@ -52,7 +52,7 @@ index d4bd9bb..44a2da5 100644 env = os.environ.copy() env.update({"LC_ALL": "C", -@@ -205,7 +209,7 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa +@@ -204,7 +208,7 @@ def _run_program(argv, root='/', stdin=None, env_prune=None, stderr_to_stdout=Fa else: stderr_dir = subprocess.PIPE diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch deleted file mode 100644 index cb837e286..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch +++ /dev/null @@ -1,59 +0,0 @@ -From c3959bd00665e24a955bbdbea1ef555e76372f12 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 8 May 2017 16:25:16 +0800 -Subject: [PATCH 04/13] Mount /var/volatile during install - -The installed system needs /var/volatile clean, otherwise it -caused systemd's journalctl failed to record boot log. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia ---- - blivet/osinstall.py | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/blivet/osinstall.py b/blivet/osinstall.py -index a4f9535..61819c2 100644 ---- a/blivet/osinstall.py -+++ b/blivet/osinstall.py -@@ -294,6 +294,7 @@ class FSSet(object): - self._sysfs = None - self._proc = None - self._devshm = None -+ self._volatile = None - self._usb = None - self._selinux = None - self._run = None -@@ -335,6 +336,12 @@ class FSSet(object): - return self._devshm - - @property -+ def volatile(self): -+ if not self._volatile: -+ self._volatile = NoDevice(fmt=get_format("tmpfs", device="tmpfs", mountpoint="/var/volatile")) -+ return self._volatile -+ -+ @property - def usb(self): - if not self._usb: - self._usb = NoDevice(fmt=get_format("usbfs", device="usbfs", mountpoint="/proc/bus/usb")) -@@ -591,6 +598,7 @@ class FSSet(object): - - devices = list(self.mountpoints.values()) + self.swap_devices - devices.extend([self.dev, self.devshm, self.devpts, self.sysfs, -+ self.volatile, - self.proc, self.selinux, self.usb, self.run]) - if isinstance(_platform, EFI): - devices.append(self.efivars) -@@ -650,6 +658,7 @@ class FSSet(object): - """ unmount filesystems, except swap if swapoff == False """ - devices = list(self.mountpoints.values()) + self.swap_devices - devices.extend([self.dev, self.devshm, self.devpts, self.sysfs, -+ self.volatile, - self.proc, self.usb, self.selinux, self.run]) - if isinstance(_platform, EFI): - devices.append(self.efivars) --- -2.7.4 - diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0004-fix-new.roots-object-is-not-iterable.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0004-fix-new.roots-object-is-not-iterable.patch new file mode 100644 index 000000000..be997ac4f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0004-fix-new.roots-object-is-not-iterable.patch @@ -0,0 +1,28 @@ +From c31df1c0f5323ddc70e0d1c6d11db2fbf7a024ad Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Mon, 8 May 2017 16:30:20 +0800 +Subject: [PATCH 04/11] fix new.roots object is not iterable + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia +--- + blivet/blivet.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/blivet/blivet.py b/blivet/blivet.py +index 3405810..f42b73b 100644 +--- a/blivet/blivet.py ++++ b/blivet/blivet.py +@@ -1198,7 +1198,7 @@ class Blivet(object): + p = partition.disk.format.parted_disk.getPartitionByPath(partition.path) + partition.parted_partition = p + +- for root in new.roots: ++ for root in new.roots or []: + root.swaps = [new.devicetree.get_device_by_id(d.id, hidden=True) for d in root.swaps] + root.swaps = [s for s in root.swaps if s] + +-- +2.7.4 + diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch new file mode 100644 index 000000000..ecb95039d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0005-fix-incorrect-timeout-while-system-time-changed.patch @@ -0,0 +1,48 @@ +From b30a74671ca603e6bfd514f72d4fd7fd6fceef54 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Fri, 26 Aug 2016 02:02:49 -0400 +Subject: [PATCH 05/11] fix incorrect timeout while system time changed + +While system time changed by NTP, invoking timeout_command +breaks with incorrect timeout. +-------- +|05:40:55,872 INFO program: Running... mount -t ext2 -o + defaults,ro /dev/sda2 /mnt/sysimage +|01:40:55,086 DEBUG program: 10 seconds timeout +-------- + +Use numbert count to replace current time count could workaround +the issue. + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia +--- + blivet/util.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/blivet/util.py b/blivet/util.py +index d6804be..bc08af5 100644 +--- a/blivet/util.py ++++ b/blivet/util.py +@@ -162,14 +162,14 @@ def timeout_command(argv, timeout, *args, **kwargs): + """call shell-command and either return its output or kill it + if it doesn't normally exit within timeout seconds and return None""" + import subprocess, datetime, os, time, signal +- start = datetime.datetime.now() ++ count = 0 + + try: + proc = subprocess.Popen(argv, *args, **kwargs) + while proc.poll() is None: + time.sleep(0.1) +- now = datetime.datetime.now() +- if timeout != -1 and (now - start).seconds> timeout: ++ count += 1 ++ if timeout != -1 and count > timeout*10: + os.kill(proc.pid, signal.SIGKILL) + os.waitpid(-1, os.WNOHANG) + program_log.debug("%d seconds timeout" % timeout) +-- +2.7.4 + diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0005-update-fstab-by-appending.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0005-update-fstab-by-appending.patch deleted file mode 100644 index 4f343b7d8..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0005-update-fstab-by-appending.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 386ff899763f8473eb93a7a1578fb7cc4f86f66d Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 8 May 2017 16:28:12 +0800 -Subject: [PATCH 05/13] update fstab by appending - -The 'storage.write()' has updated fstab by overwriting -the original one, we should update fstab by appending -to keep original tmpfs partitions. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia ---- - blivet/osinstall.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blivet/osinstall.py b/blivet/osinstall.py -index 61819c2..afa82db 100644 ---- a/blivet/osinstall.py -+++ b/blivet/osinstall.py -@@ -728,7 +728,7 @@ class FSSet(object): - # /etc/fstab - fstab_path = os.path.normpath("%s/etc/fstab" % get_sysroot()) - fstab = self.fstab() -- open(fstab_path, "w").write(fstab) -+ open(fstab_path, "a").write(fstab) - - # /etc/crypttab - crypttab_path = os.path.normpath("%s/etc/crypttab" % get_sysroot()) --- -2.7.4 - diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch deleted file mode 100644 index f5ff754d8..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cd92eea8fab37ba6b0c7f03daa5255343dc75716 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 8 May 2017 16:30:20 +0800 -Subject: [PATCH 06/13] fix new.roots object is not iterable - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia ---- - blivet/blivet.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blivet/blivet.py b/blivet/blivet.py -index 6a33e9c..79ae91a 100644 ---- a/blivet/blivet.py -+++ b/blivet/blivet.py -@@ -1761,7 +1761,7 @@ class Blivet(object): - p = partition.disk.format.parted_disk.getPartitionByPath(partition.path) - partition.parted_partition = p - -- for root in new.roots: -+ for root in new.roots or []: - root.swaps = [new.devicetree.get_device_by_id(d.id, hidden=True) for d in root.swaps] - root.swaps = [s for s in root.swaps if s] - --- -2.7.4 - diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0006-tweak-btrfs-packages.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0006-tweak-btrfs-packages.patch new file mode 100644 index 000000000..da568a4b0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0006-tweak-btrfs-packages.patch @@ -0,0 +1,45 @@ +From 0659d8a85bcdd76c0b23b8b5af6958783d35ac65 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Mon, 8 May 2017 16:33:15 +0800 +Subject: [PATCH 06/11] tweak btrfs packages + +In oe-cre/yocto, we name btrfs package with btrfs-tools, +rather than btrfs-progs. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + blivet/devices/btrfs.py | 2 +- + blivet/formats/fs.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py +index cada940..7e4d4b8 100644 +--- a/blivet/devices/btrfs.py ++++ b/blivet/devices/btrfs.py +@@ -55,7 +55,7 @@ class BTRFSDevice(StorageDevice): + + """ Base class for BTRFS volume and sub-volume devices. """ + _type = "btrfs" +- _packages = ["btrfs-progs"] ++ _packages = ["btrfs-tools"] + _external_dependencies = [availability.BLOCKDEV_BTRFS_PLUGIN] + + def __init__(self, *args, **kwargs): +diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py +index 81e367f..55e5d57 100644 +--- a/blivet/formats/fs.py ++++ b/blivet/formats/fs.py +@@ -926,7 +926,7 @@ class BTRFS(FS): + _formattable = True + _linux_native = True + _supported = True +- _packages = ["btrfs-progs"] ++ _packages = ["btrfs-tools"] + _min_size = Size("256 MiB") + _max_size = Size("16 EiB") + _mkfs_class = fsmkfs.BTRFSMkfs +-- +2.7.4 + diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0007-fix-incorrect-timeout-while-system-time-changed.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0007-fix-incorrect-timeout-while-system-time-changed.patch deleted file mode 100644 index 6512d8642..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0007-fix-incorrect-timeout-while-system-time-changed.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 78ee2b9090f9400ccc4f730e674f5ae972740ccb Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Fri, 26 Aug 2016 02:02:49 -0400 -Subject: [PATCH 07/13] fix incorrect timeout while system time changed - -While system time changed by NTP, invoking timeout_command -breaks with incorrect timeout. --------- -|05:40:55,872 INFO program: Running... mount -t ext2 -o - defaults,ro /dev/sda2 /mnt/sysimage -|01:40:55,086 DEBUG program: 10 seconds timeout --------- - -Use numbert count to replace current time count could workaround -the issue. - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia ---- - blivet/util.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/blivet/util.py b/blivet/util.py -index 44a2da5..b3c45ac 100644 ---- a/blivet/util.py -+++ b/blivet/util.py -@@ -163,14 +163,14 @@ def timeout_command(argv, timeout, *args, **kwargs): - """call shell-command and either return its output or kill it - if it doesn't normally exit within timeout seconds and return None""" - import subprocess, datetime, os, time, signal -- start = datetime.datetime.now() -+ count = 0 - - try: - proc = subprocess.Popen(argv, *args, **kwargs) - while proc.poll() is None: - time.sleep(0.1) -- now = datetime.datetime.now() -- if timeout != -1 and (now - start).seconds> timeout: -+ count += 1 -+ if timeout != -1 and count > timeout*10: - os.kill(proc.pid, signal.SIGKILL) - os.waitpid(-1, os.WNOHANG) - program_log.debug("%d seconds timeout" % timeout) --- -2.7.4 - diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0007-invoking-mount-with-infinite-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0007-invoking-mount-with-infinite-timeout.patch new file mode 100644 index 000000000..e30121948 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0007-invoking-mount-with-infinite-timeout.patch @@ -0,0 +1,31 @@ +From 9c7a15312259854f12137a30229e52c30fb7c770 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Wed, 31 Aug 2016 21:30:32 -0400 +Subject: [PATCH 07/11] invoking mount with infinite timeout + +This large timeout is needed when running on machines with +lots of disks, or with slow disks. + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia +--- + blivet/util.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/blivet/util.py b/blivet/util.py +index bc08af5..b672787 100644 +--- a/blivet/util.py ++++ b/blivet/util.py +@@ -256,7 +256,7 @@ def mount(device, mountpoint, fstype, options=None): + + argv = ["mount", "-t", fstype, "-o", options, device, mountpoint] + try: +- rc = run_program(argv) ++ rc = run_program(argv, timeout=-1) + except OSError: + raise + +-- +2.7.4 + diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0008-tweak-btrfs-packages.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0008-tweak-btrfs-packages.patch deleted file mode 100644 index 121336e4c..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0008-tweak-btrfs-packages.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6f661a511eea096c073888c7adb836a9a880b476 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 8 May 2017 16:33:15 +0800 -Subject: [PATCH 08/13] tweak btrfs packages - -In oe-cre/yocto, we name btrfs package with btrfs-tools, -rather than btrfs-progs. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia ---- - blivet/devices/btrfs.py | 2 +- - blivet/formats/fs.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py -index c5cb21f..9d417b2 100644 ---- a/blivet/devices/btrfs.py -+++ b/blivet/devices/btrfs.py -@@ -55,7 +55,7 @@ class BTRFSDevice(StorageDevice): - - """ Base class for BTRFS volume and sub-volume devices. """ - _type = "btrfs" -- _packages = ["btrfs-progs"] -+ _packages = ["btrfs-tools"] - _external_dependencies = [availability.BLOCKDEV_BTRFS_PLUGIN] - - def __init__(self, *args, **kwargs): -diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py -index a49826f..e8f216d 100644 ---- a/blivet/formats/fs.py -+++ b/blivet/formats/fs.py -@@ -918,7 +918,7 @@ class BTRFS(FS): - _formattable = True - _linux_native = True - _supported = True -- _packages = ["btrfs-progs"] -+ _packages = ["btrfs-tools"] - _min_size = Size("256 MiB") - _max_size = Size("16 EiB") - _mkfs_class = fsmkfs.BTRFSMkfs --- -2.7.4 - diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch new file mode 100644 index 000000000..feb5647ce --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch @@ -0,0 +1,34 @@ +From 7f57b2cd145d67c20beb02d5495b502f7af012cd Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Mon, 8 May 2017 03:54:12 -0400 +Subject: [PATCH 08/11] use oe variable to replace hardcoded dir + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia +--- + setup.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/setup.py b/setup.py +index 7edab2c..9be3187 100644 +--- a/setup.py ++++ b/setup.py +@@ -61,10 +61,10 @@ class blivet_sdist(sdist): + + + data_files = [ +- ('/etc/dbus-1/system.d', ['dbus/blivet.conf']), +- ('/usr/share/dbus-1/system-services', ['dbus/com.redhat.Blivet1.service']), +- ('/usr/libexec', ['dbus/blivetd']), +- ('/usr/lib/systemd/system', ['dbus/blivet.service']) ++ (os.environ.get('sysconfdir')+'/dbus-1/system.d', ['dbus/blivet.conf']), ++ (os.environ.get('datadir')+'/dbus-1/system-services', ['dbus/com.redhat.Blivet1.service']), ++ (os.environ.get('libexecdir'), ['dbus/blivetd']), ++ (os.environ.get('systemd_system_unitdir'), ['dbus/blivet.service']) + ] + + +-- +2.7.4 + diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-fsck-with-infinite-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-fsck-with-infinite-timeout.patch new file mode 100644 index 000000000..30d2d3ec9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-fsck-with-infinite-timeout.patch @@ -0,0 +1,31 @@ +From c757666f42f543baeed5df61269798c085665d9b Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Thu, 1 Jun 2017 16:05:27 +0800 +Subject: [PATCH 09/11] invoking fsck with infinite timeout + +This large timeout is needed when running on machines with +lots of disks, or with slow disks. + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia +--- + blivet/tasks/fsck.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/blivet/tasks/fsck.py b/blivet/tasks/fsck.py +index 5274f13..6e074c4 100644 +--- a/blivet/tasks/fsck.py ++++ b/blivet/tasks/fsck.py +@@ -77,7 +77,7 @@ class FSCK(task.BasicApplication, fstask.FSTask): + raise FSError("\n".join(error_msgs)) + + try: +- rc = util.run_program(self._fsck_command) ++ rc = util.run_program(self._fsck_command, timeout=-1) + except OSError as e: + raise FSError("filesystem check failed: %s" % e) + +-- +2.7.4 + diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-mount-with-infinite-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-mount-with-infinite-timeout.patch deleted file mode 100644 index fc084b129..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-mount-with-infinite-timeout.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a6ac2157ee6793302e23ddbc5e3b249fa7da5b7e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Wed, 31 Aug 2016 21:30:32 -0400 -Subject: [PATCH 09/13] invoking mount with infinite timeout - -This large timeout is needed when running on machines with -lots of disks, or with slow disks. - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia ---- - blivet/util.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blivet/util.py b/blivet/util.py -index b3c45ac..9f02b18 100644 ---- a/blivet/util.py -+++ b/blivet/util.py -@@ -257,7 +257,7 @@ def mount(device, mountpoint, fstype, options=None): - - argv = ["mount", "-t", fstype, "-o", options, device, mountpoint] - try: -- rc = run_program(argv) -+ rc = run_program(argv, timeout=-1) - except OSError: - raise - --- -2.7.4 - diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0010-invoking-mkfs-with-infinite-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0010-invoking-mkfs-with-infinite-timeout.patch new file mode 100644 index 000000000..b2f450149 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0010-invoking-mkfs-with-infinite-timeout.patch @@ -0,0 +1,31 @@ +From 42d8e57c748951098534bf7f52c4ebc790ef66e9 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Fri, 16 Jun 2017 15:43:00 +0800 +Subject: [PATCH 10/11] invoking mkfs with infinite timeout + +This large timeout is needed when running on machines with +lots of disks, or with slow disks. + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia +--- + blivet/tasks/fsmkfs.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/blivet/tasks/fsmkfs.py b/blivet/tasks/fsmkfs.py +index ad166aa..7bf5075 100644 +--- a/blivet/tasks/fsmkfs.py ++++ b/blivet/tasks/fsmkfs.py +@@ -170,7 +170,7 @@ class FSMkfs(task.BasicApplication, FSMkfsTask): + options = options or [] + cmd = self._mkfs_command(options, label, set_uuid) + try: +- ret = util.run_program(cmd) ++ ret = util.run_program(cmd, timeout=-1) + except OSError as e: + raise FSError(e) + +-- +2.7.4 + diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0010-use-oe-variable-to-replace-hardcoded-dir.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0010-use-oe-variable-to-replace-hardcoded-dir.patch deleted file mode 100644 index 45d8fabba..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0010-use-oe-variable-to-replace-hardcoded-dir.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e07133dbcf3c52e1ddd2f12797dcd16145269273 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 8 May 2017 03:54:12 -0400 -Subject: [PATCH 10/13] use oe variable to replace hardcoded dir - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia ---- - setup.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index 4d06a33..a994d06 100644 ---- a/setup.py -+++ b/setup.py -@@ -61,10 +61,10 @@ class blivet_sdist(sdist): - - - data_files = [ -- ('/etc/dbus-1/system.d', ['dbus/blivet.conf']), -- ('/usr/share/dbus-1/system-services', ['dbus/com.redhat.Blivet1.service']), -- ('/usr/libexec', ['dbus/blivetd']), -- ('/usr/lib/systemd/system', ['dbus/blivet.service']) -+ (os.environ.get('sysconfdir')+'/dbus-1/system.d', ['dbus/blivet.conf']), -+ (os.environ.get('datadir')+'/dbus-1/system-services', ['dbus/com.redhat.Blivet1.service']), -+ (os.environ.get('libexecdir'), ['dbus/blivetd']), -+ (os.environ.get('systemd_system_unitdir'), ['dbus/blivet.service']) - ] - - --- -2.7.4 - diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-dd-with-infinite-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-dd-with-infinite-timeout.patch new file mode 100644 index 000000000..f24ce0a80 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-dd-with-infinite-timeout.patch @@ -0,0 +1,31 @@ +From a4753b3cbbd5aee59dc53eb16564cafd9862763e Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Tue, 6 Mar 2018 17:28:56 +0800 +Subject: [PATCH 11/11] invoking dd with infinite timeout + +This large timeout is needed when running on machines with +lots of disks, or with slow disks. + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia +--- + blivet/devices/partition.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/blivet/devices/partition.py b/blivet/devices/partition.py +index 47ff547..0cd1614 100644 +--- a/blivet/devices/partition.py ++++ b/blivet/devices/partition.py +@@ -621,7 +621,7 @@ class PartitionDevice(StorageDevice): + cmd = ["dd", "if=/dev/zero", "of=%s" % device, "bs=%d" % bs, + "seek=%d" % start, "count=%d" % count] + try: +- util.run_program(cmd) ++ util.run_program(cmd, timeout=-1) + except OSError as e: + log.error(str(e)) + finally: +-- +2.7.4 + diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-fsck-with-infinite-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-fsck-with-infinite-timeout.patch deleted file mode 100644 index c61fe01b9..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-fsck-with-infinite-timeout.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e9ab4376a18cc1bd413c000b036320833eec80d7 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Thu, 1 Jun 2017 16:05:27 +0800 -Subject: [PATCH 11/13] invoking fsck with infinite timeout - -This large timeout is needed when running on machines with -lots of disks, or with slow disks. - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia ---- - blivet/tasks/fsck.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blivet/tasks/fsck.py b/blivet/tasks/fsck.py -index c4214dc..e13ac6b 100644 ---- a/blivet/tasks/fsck.py -+++ b/blivet/tasks/fsck.py -@@ -77,7 +77,7 @@ class FSCK(task.BasicApplication, fstask.FSTask): - raise FSError("\n".join(error_msgs)) - - try: -- rc = util.run_program(self._fsck_command) -+ rc = util.run_program(self._fsck_command, timeout=-1) - except OSError as e: - raise FSError("filesystem check failed: %s" % e) - --- -2.7.4 - diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-invoking-mkfs-with-infinite-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-invoking-mkfs-with-infinite-timeout.patch deleted file mode 100644 index 33bdbe812..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-invoking-mkfs-with-infinite-timeout.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9f5a048181cf29d241d96814e736b8235b3d42b1 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Fri, 16 Jun 2017 15:43:00 +0800 -Subject: [PATCH 12/13] invoking mkfs with infinite timeout - -This large timeout is needed when running on machines with -lots of disks, or with slow disks. - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia ---- - blivet/tasks/fsmkfs.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blivet/tasks/fsmkfs.py b/blivet/tasks/fsmkfs.py -index ad166aa..7bf5075 100644 ---- a/blivet/tasks/fsmkfs.py -+++ b/blivet/tasks/fsmkfs.py -@@ -170,7 +170,7 @@ class FSMkfs(task.BasicApplication, FSMkfsTask): - options = options or [] - cmd = self._mkfs_command(options, label, set_uuid) - try: -- ret = util.run_program(cmd) -+ ret = util.run_program(cmd, timeout=-1) - except OSError as e: - raise FSError(e) - --- -2.7.4 - diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-remove-dmraid-dependency-check.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-remove-dmraid-dependency-check.patch new file mode 100644 index 000000000..886e3ff93 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-remove-dmraid-dependency-check.patch @@ -0,0 +1,31 @@ +From 4476e846a1e64dde17df2e2370c803ce695514f9 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Mon, 6 Aug 2018 17:18:27 +0800 +Subject: [PATCH] remove dmraid dependency check + +OE does not support dmraid, remove it from dependency check + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + blivet/tasks/availability.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/blivet/tasks/availability.py b/blivet/tasks/availability.py +index 9a87cfd..843cf6a 100644 +--- a/blivet/tasks/availability.py ++++ b/blivet/tasks/availability.py +@@ -316,8 +316,7 @@ BLOCKDEV_DM_ALL_MODES = (blockdev.DMTechMode.CREATE_ACTIVATE | + blockdev.DMTechMode.QUERY) + BLOCKDEV_DM = BlockDevTechInfo(plugin_name="dm", + check_fn=blockdev.dm_is_tech_avail, +- technologies={blockdev.DMTech.MAP: BLOCKDEV_DM_ALL_MODES, +- blockdev.DMTech.RAID: BLOCKDEV_DM_ALL_MODES}) ++ technologies={blockdev.DMTech.MAP: BLOCKDEV_DM_ALL_MODES}) + BLOCKDEV_DM_TECH = BlockDevMethod(BLOCKDEV_DM) + + # libblockdev loop plugin required technologies and modes +-- +2.7.4 + diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0013-Revert-Adapt-to-logging-module-name-change.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0013-Revert-Adapt-to-logging-module-name-change.patch deleted file mode 100644 index 6bdf4ce94..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0013-Revert-Adapt-to-logging-module-name-change.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bfdaf79a2109ac6aed408f0c94f69766991e60e2 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Thu, 27 Jul 2017 14:34:30 +0800 -Subject: [PATCH 13/13] Revert "Adapt to logging module name change" - -Upstream-Status: Inappropriate [oe specific, sync with anaconda f26-release] - -This reverts commit c367d62a516e541ad28636c8259321f1c53417ce. - -Signed-off-by: Hongxu Jia ---- - blivet/__init__.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blivet/__init__.py b/blivet/__init__.py -index 49277cb..a01e487 100644 ---- a/blivet/__init__.py -+++ b/blivet/__init__.py -@@ -124,7 +124,7 @@ def enable_installer_mode(): - from pyanaconda.constants import ROOT_PATH # pylint: disable=redefined-outer-name,no-name-in-module - _storage_root = _sysroot = ROOT_PATH - -- from pyanaconda.anaconda_logging import program_log_lock -+ from pyanaconda.anaconda_log import program_log_lock - util.program_log_lock = program_log_lock - - flags.installer_mode = True --- -2.7.4 - diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0013-add-Z-y-and-y-to-lvm.pvcreate.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0013-add-Z-y-and-y-to-lvm.pvcreate.patch new file mode 100644 index 000000000..33b5f51f9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0013-add-Z-y-and-y-to-lvm.pvcreate.patch @@ -0,0 +1,41 @@ +From bddbfa499df16b108f2d892ee48d65617523c33d Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Thu, 9 Aug 2018 11:00:39 +0800 +Subject: [PATCH] add `-Z y' and `-y' to lvm.pvcreate + +While reinstall a crypt fs, it occasionally failed +[snip] +|gi.overrides.BlockDev.LVMError: Process reported exit code 5: +WARNING: atari signature detected on /dev/mapper/luks-0e5f891c +-7701-48bc-a41e-8d626b6ef953 at offset 466. Wipe it? [y/n]: +[snip] + +Add `-Z y' and `-y' to lvm.pvcreate + +Upstream-Status: Submitted [https://github.com/storaged-project/blivet/pull/714] + +Signed-off-by: Hongxu Jia +--- + blivet/formats/lvmpv.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/blivet/formats/lvmpv.py b/blivet/formats/lvmpv.py +index 260cc0b..4bbb46f 100644 +--- a/blivet/formats/lvmpv.py ++++ b/blivet/formats/lvmpv.py +@@ -120,9 +120,9 @@ class LVMPhysicalVolume(DeviceFormat): + log_method_call(self, device=self.device, + type=self.type, status=self.status) + +- # Consider use of -Z|--zero +- # -f|--force or -y|--yes may be required +- blockdev.lvm.pvcreate(self.device, data_alignment=self.data_alignment) ++ ea_zero = blockdev.ExtraArg.new("-Z", "y") ++ ea_yes = blockdev.ExtraArg.new("-y", "") ++ blockdev.lvm.pvcreate(self.device, data_alignment=self.data_alignment, extra=[ea_zero, ea_yes]) + + def _destroy(self, **kwargs): + log_method_call(self, device=self.device, +-- +2.7.4 + diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0014-invoking-dd-with-infinite-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0014-invoking-dd-with-infinite-timeout.patch deleted file mode 100644 index 12a9e4f54..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0014-invoking-dd-with-infinite-timeout.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 92fe7dfd01131c93a9b2013cabf77d5f46900fab Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Tue, 6 Mar 2018 17:28:56 +0800 -Subject: [PATCH] invoking dd with infinite timeout - -This large timeout is needed when running on machines with -lots of disks, or with slow disks. - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia ---- - blivet/devices/partition.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blivet/devices/partition.py b/blivet/devices/partition.py -index a7372fb..8947472 100644 ---- a/blivet/devices/partition.py -+++ b/blivet/devices/partition.py -@@ -594,7 +594,7 @@ class PartitionDevice(StorageDevice): - cmd = ["dd", "if=/dev/zero", "of=%s" % device, "bs=%d" % bs, - "seek=%d" % start, "count=%d" % count] - try: -- util.run_program(cmd) -+ util.run_program(cmd, timeout=-1) - except OSError as e: - log.error(str(e)) - finally: --- -1.8.3.1 - diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb deleted file mode 100644 index 46dc32de7..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb +++ /dev/null @@ -1,47 +0,0 @@ -DESCRIPTION = "A python module for system storage configuration" -HOMEPAGE = "http://fedoraproject.org/wiki/blivet" -LICENSE = "LGPLv2+" -SECTION = "devel/python" - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -S = "${WORKDIR}/git" -B = "${S}" - -SRCREV = "39db82f20d8d4904c0c4dc8912e595177c59e091" -SRC_URI = "git://github.com/rhinstaller/blivet;branch=2.2-devel \ - file://0001-comment-out-selinux.patch \ - file://0002-run_program-support-timeout.patch\ - file://0003-support-infinit-timeout.patch \ - file://0004-Mount-var-volatile-during-install.patch \ - file://0005-update-fstab-by-appending.patch \ - file://0006-fix-new.roots-object-is-not-iterable.patch \ - file://0007-fix-incorrect-timeout-while-system-time-changed.patch \ - file://0008-tweak-btrfs-packages.patch \ - file://0009-invoking-mount-with-infinite-timeout.patch \ - file://0010-use-oe-variable-to-replace-hardcoded-dir.patch \ - file://0011-invoking-fsck-with-infinite-timeout.patch \ - file://0012-invoking-mkfs-with-infinite-timeout.patch \ - file://0013-Revert-Adapt-to-logging-module-name-change.patch \ - file://0014-invoking-dd-with-infinite-timeout.patch \ -" - -inherit distro_features_check -REQUIRED_DISTRO_FEATURES = "systemd" - -inherit setuptools3 python3native - -RDEPENDS_${PN} = "python3-pykickstart python3-pyudev \ - parted python3-pyparted multipath-tools \ - lsof cryptsetup libblockdev \ - libbytesize \ -" - -FILES_${PN} += " \ - ${datadir}/dbus-1/system-services \ -" - -inherit systemd - -SYSTEMD_AUTO_ENABLE = "disable" -SYSTEMD_SERVICE_${PN} = "blivet.service" diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.0.1.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.0.1.bb new file mode 100644 index 000000000..75f02f13d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.0.1.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "A python module for system storage configuration" +HOMEPAGE = "http://fedoraproject.org/wiki/blivet" +LICENSE = "LGPLv2+" +SECTION = "devel/python" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +S = "${WORKDIR}/git" +B = "${S}" + +SRCREV = "ddc24c71bad10208b11ea0c45853898fadd7030b" +SRC_URI = "git://github.com/rhinstaller/blivet;branch=3.1-release \ + file://0001-comment-out-selinux.patch \ + file://0002-run_program-support-timeout.patch \ + file://0003-support-infinit-timeout.patch \ + file://0004-fix-new.roots-object-is-not-iterable.patch \ + file://0005-fix-incorrect-timeout-while-system-time-changed.patch \ + file://0006-tweak-btrfs-packages.patch \ + file://0007-invoking-mount-with-infinite-timeout.patch \ + file://0008-use-oe-variable-to-replace-hardcoded-dir.patch \ + file://0009-invoking-fsck-with-infinite-timeout.patch \ + file://0010-invoking-mkfs-with-infinite-timeout.patch \ + file://0011-invoking-dd-with-infinite-timeout.patch \ + file://0012-remove-dmraid-dependency-check.patch \ + file://0013-add-Z-y-and-y-to-lvm.pvcreate.patch \ +" + +UPSTREAM_CHECK_GITTAGREGEX = "blivet-(?P\d+(\.\d+)+)$" + +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "systemd" + +inherit setuptools3 python3native + +RDEPENDS_${PN} = "python3-pykickstart python3-pyudev \ + parted python3-pyparted multipath-tools \ + lsof cryptsetup libblockdev \ + libbytesize \ +" + +FILES_${PN} += " \ + ${datadir}/dbus-1/system-services \ +" + +inherit systemd + +SYSTEMD_AUTO_ENABLE = "disable" +SYSTEMD_SERVICE_${PN} = "blivet.service" diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb deleted file mode 100644 index 28c2565a1..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "GUI tool for storage configuration using blivet library" -HOMEPAGE = "https://github.com/rhinstaller/blivet-gui" -LICENSE = "GPLv2+" -SECTION = "devel/python" - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -S = "${WORKDIR}/git" -B = "${S}" - -SRCREV = "52ae8c000843c05abd1d8749f44bbe2e5d891d3d" -SRC_URI = "git://github.com/rhinstaller/blivet-gui;branch=master \ -" - -inherit distro_features_check -REQUIRED_DISTRO_FEATURES = "x11 systemd" - -inherit setuptools3 python3native - -RDEPENDS_${PN} = "python3-pygobject python3 \ - python3-blivet gtk+3 \ - python3-pid libreport \ -" - -FILES_${PN} += " \ - ${datadir}/* \ - " diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.8.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.8.bb new file mode 100644 index 000000000..91f0dff71 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.8.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "GUI tool for storage configuration using blivet library" +HOMEPAGE = "https://github.com/rhinstaller/blivet-gui" +LICENSE = "GPLv2+" +SECTION = "devel/python" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +S = "${WORKDIR}/git" +B = "${S}" + +SRCREV = "a4fd427ee2acc5a8f5fb030bf7816917cee63bd8" +SRC_URI = "git://github.com/rhinstaller/blivet-gui;branch=master \ +" + +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "x11 systemd" + +inherit setuptools3 python3native + +RDEPENDS_${PN} = "python3-pygobject python3 \ + python3-blivet gtk+3 \ + python3-pid libreport \ +" + +FILES_${PN} += " \ + ${datadir}/* \ + " diff --git a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.46.bb b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.46.bb deleted file mode 100644 index 40e2cbd4a..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.46.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "A python library for handling exceptions" -DESCRIPTION = "The python-meh package is a python library for handling, saving, and reporting \ -exceptions." -HOMEPAGE = "http://git.fedorahosted.org/git/?p=python-meh.git" -LICENSE = "GPLv2+" - -inherit setuptools3 - -S = "${WORKDIR}/git" - -SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=master \ -" -SRCREV = "bb1156728a4f76e5e3638ab20b9454a1568a99db" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -FILES_${PN} += "${datadir}/*" - diff --git a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.47.bb b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.47.bb new file mode 100644 index 000000000..95d6d183c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.47.bb @@ -0,0 +1,17 @@ +SUMMARY = "A python library for handling exceptions" +DESCRIPTION = "The python-meh package is a python library for handling, saving, and reporting \ +exceptions." +HOMEPAGE = "http://git.fedorahosted.org/git/?p=python-meh.git" +LICENSE = "GPLv2+" + +inherit setuptools3 + +S = "${WORKDIR}/git" + +SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=master \ +" +SRCREV = "78d868d99104317ce8820f39f61d207566e61a55" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +FILES_${PN} += "${datadir}/*" + diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch index 617699db0..e7533f476 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch @@ -1,6 +1,6 @@ -From d0d8890b5ef74c315381c9e1cff4b1d32892116b Mon Sep 17 00:00:00 2001 +From f05f5fc363e2510f6943532f3e14a6423f6a2cf1 Mon Sep 17 00:00:00 2001 From: Hongxu Jia -Date: Thu, 1 Jun 2017 15:07:36 +0800 +Date: Tue, 31 Jul 2018 17:24:47 +0800 Subject: [PATCH 1/4] support authentication for kickstart While download kickstart file from web server, @@ -13,30 +13,29 @@ Upstream-Status: inappropriate [oe specific] Signed-off-by: Hongxu Jia --- - pykickstart/errors.py | 19 +++++++++++++++++++ - pykickstart/load.py | 32 +++++++++++++++++++++++++++----- + pykickstart/errors.py | 17 +++++++++++++++++ + pykickstart/load.py | 34 ++++++++++++++++++++++++++++------ pykickstart/parser.py | 4 ++-- - 3 files changed, 48 insertions(+), 7 deletions(-) + 3 files changed, 47 insertions(+), 8 deletions(-) diff --git a/pykickstart/errors.py b/pykickstart/errors.py -index b76e84c..fd81bc8 100644 +index bf08ac5..aada7aa 100644 --- a/pykickstart/errors.py +++ b/pykickstart/errors.py -@@ -35,6 +35,10 @@ It also exports several exception classes: - +@@ -32,6 +32,9 @@ This module exports several exception classes: KickstartVersionError - An exception for errors relating to unsupported syntax versions. -+ + + KickstartAuthError - An exception for errors relating to authentication + failed while downloading kickstart from web server + - """ - import warnings + And some warning classes: -@@ -103,3 +107,18 @@ class KickstartVersionError(KickstartError): - - def __str__ (self): - return self.value + KickstartWarning - A generic warning class. +@@ -131,3 +134,17 @@ class KickstartDeprecationWarning(KickstartParseWarning, DeprecationWarning): + commands and options. + """ + pass + +class KickstartAuthError(KickstartError): + """An exception for errors relating to authentication failed while @@ -51,9 +50,8 @@ index b76e84c..fd81bc8 100644 + + def __str__(self): + return self.value -+ diff --git a/pykickstart/load.py b/pykickstart/load.py -index 1f69b9c..0f5741b 100644 +index fb935f2..41a2e9e 100644 --- a/pykickstart/load.py +++ b/pykickstart/load.py @@ -18,10 +18,13 @@ @@ -71,7 +69,7 @@ index 1f69b9c..0f5741b 100644 from pykickstart.i18n import _ from requests.exceptions import SSLError, RequestException -@@ -29,7 +32,7 @@ _is_url = lambda location: '://' in location # RFC 3986 +@@ -29,7 +32,7 @@ _is_url = lambda location: '://' in location # RFC 3986 SSL_VERIFY = True @@ -89,10 +87,12 @@ index 1f69b9c..0f5741b 100644 else: return _load_file(location) -@@ -71,13 +74,32 @@ def load_to_file(location, destination): +@@ -70,11 +73,30 @@ def load_to_file(location, destination): _copy_file(location, destination) return destination +-def _load_url(location): +- '''Load a location (URL or filename) and return contents as string''' +def _get_auth(location, user=None, passwd=None): + + auth = None @@ -109,15 +109,12 @@ index 1f69b9c..0f5741b 100644 + auth = HTTPBasicAuth(user, passwd) + elif auth_type == "Digest": + auth=HTTPDigestAuth(user, passwd) - --def _load_url(location): ++ + return auth + +def _load_url(location, user=None, passwd=None): - '''Load a location (URL or filename) and return contents as string''' - ++ '''Load a location (URL or filename) and return contents as string''' + 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) @@ -125,26 +122,26 @@ index 1f69b9c..0f5741b 100644 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 d2b0fbe..26b5de9 100644 +index d8880eb..22d14cb 100644 --- a/pykickstart/parser.py +++ b/pykickstart/parser.py -@@ -773,7 +773,7 @@ class KickstartParser(object): +@@ -787,7 +787,7 @@ class KickstartParser(object): i = PutBackIterator(s.splitlines(True) + [""]) - self._stateMachine (i) + self._stateMachine(i) - def readKickstart(self, f, reset=True): + def readKickstart(self, f, reset=True, username=None, password=None): """Process a kickstart file, given by the filename f.""" if reset: self._reset() -@@ -794,7 +794,7 @@ class KickstartParser(object): +@@ -808,7 +808,7 @@ class KickstartParser(object): self.currentdir[self._includeDepth] = cd try: - s = load_to_str(f) + s = load_to_str(f, user=username, passwd=password) except KickstartError as e: - raise KickstartError(formatErrorMsg(0, msg=_("Unable to open input kickstart file: %s") % str(e))) + raise KickstartError(_("Unable to open input kickstart file: %s") % str(e), lineno=0) -- 2.7.4 diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch index cb2123546..4a001f338 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch @@ -1,28 +1,26 @@ -From e6e747b883114bfad51ad93f823e65f5a4d6438a Mon Sep 17 00:00:00 2001 +From 62fdead139edb0f29b2f222efcb8f39be15b057e Mon Sep 17 00:00:00 2001 From: Hongxu Jia -Date: Thu, 1 Jun 2017 15:12:29 +0800 -Subject: [PATCH 2/4] pykickstart/parser.py: add lock for readKickstart and +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 - Add lock for readKickstart to fix race issue - Support to download kickstart file through https without certification -Upstream-Status: Inappropriate[oe specific] - Signed-off-by: Hongxu Jia --- pykickstart/load.py | 2 +- - pykickstart/parser.py | 24 ++++++++++++++++++++++++ - 2 files changed, 25 insertions(+), 1 deletion(-) + pykickstart/parser.py | 18 ++++++++++++++++++ + 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pykickstart/load.py b/pykickstart/load.py -index 0f5741b..48c8276 100644 +index c6f013f..7adb751 100644 --- a/pykickstart/load.py +++ b/pykickstart/load.py @@ -30,7 +30,7 @@ from requests.exceptions import SSLError, RequestException - _is_url = lambda location: '://' in location # RFC 3986 + _is_url = lambda location: '://' in location # RFC 3986 -SSL_VERIFY = True +SSL_VERIFY = False @@ -30,38 +28,32 @@ index 0f5741b..48c8276 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 26b5de9..264ba05 100644 +index e44099b..e68174d 100644 --- a/pykickstart/parser.py +++ b/pykickstart/parser.py -@@ -57,6 +57,26 @@ STATE_COMMANDS = "commands" - - ver = version.DEVEL +@@ -55,6 +55,20 @@ from pykickstart.i18n import _ + STATE_END = "end" + STATE_COMMANDS = "commands" -+import logging -+log = logging.getLogger("anaconda") -+ -+import inspect +import threading +_private_ks_lock = threading.RLock() + +class KsLock(object): + def __enter__(self): -+ log.info("%s %s" % (self.__class__.__name__, inspect.stack()[0][3])) + _private_ks_lock.acquire() + return _private_ks_lock + + def __exit__(self, exc_type, exc_val, exc_tb): -+ log.info("%s %s" % (self.__class__.__name__, inspect.stack()[0][3])) + _private_ks_lock.release() + + +_ks_lock = KsLock() + - def _preprocessStateMachine (lineIter): + def _preprocessStateMachine(lineIter): l = None lineno = 0 -@@ -774,6 +794,10 @@ class KickstartParser(object): - self._stateMachine (i) +@@ -788,6 +802,10 @@ class KickstartParser(object): + self._stateMachine(i) def readKickstart(self, f, reset=True, username=None, password=None): + with _ks_lock: diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch index 9fb25fb18..81e351b11 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch @@ -1,4 +1,4 @@ -From be6012a5dd49ae5e8ac035654ab1c6f37f0dc8f4 Mon Sep 17 00:00:00 2001 +From 44226393812399c61de9ca9281efa002ad4f4c01 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 1 Jun 2017 15:15:15 +0800 Subject: [PATCH 3/4] comment out sections shutdown and environment in @@ -17,10 +17,10 @@ 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 88799ba..2d0cea9 100644 +index 2c1b1c0..b3ec717 100644 --- a/pykickstart/commands/reboot.py +++ b/pykickstart/commands/reboot.py -@@ -41,6 +41,9 @@ class FC3_Reboot(KickstartCommand): +@@ -43,6 +43,9 @@ class FC3_Reboot(KickstartCommand): elif self.action == KS_SHUTDOWN: retval += "# Shutdown after installation\nshutdown" retval += self._getArgsAsStr() + "\n" @@ -31,10 +31,10 @@ index 88799ba..2d0cea9 100644 return retval diff --git a/pykickstart/parser.py b/pykickstart/parser.py -index 264ba05..b3f33d7 100644 +index e68174d..efd78a6 100644 --- a/pykickstart/parser.py +++ b/pykickstart/parser.py -@@ -383,7 +383,7 @@ class Packages(KickstartObject): +@@ -385,7 +385,7 @@ class Packages(KickstartObject): if not self.default: if self.environment: diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch index 70254f6fd..6ed15ab09 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch @@ -1,6 +1,6 @@ -From c0e63f0d3c09bdabb0ad2c88b7cc73e7618dd86a Mon Sep 17 00:00:00 2001 +From ffe06c6dd812b604d6482e4353d5564fad78bc90 Mon Sep 17 00:00:00 2001 From: Hongxu Jia -Date: Thu, 15 Jun 2017 17:35:33 +0800 +Date: Mon, 30 Jul 2018 15:52:21 +0800 Subject: [PATCH 4/4] load.py: retry to invoke request with timeout While networkless, use request to fetch kickstart file from @@ -12,11 +12,11 @@ Upstream-Status: inappropriate [oe specific] Signed-off-by: Hongxu Jia --- - pykickstart/load.py | 30 ++++++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) + pykickstart/load.py | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) diff --git a/pykickstart/load.py b/pykickstart/load.py -index 48c8276..74b266b 100644 +index ad3bad1..a5cbbc5 100644 --- a/pykickstart/load.py +++ b/pykickstart/load.py @@ -21,6 +21,7 @@ import requests @@ -32,12 +32,12 @@ index 48c8276..74b266b 100644 from requests.exceptions import SSLError, RequestException +import logging -+log = logging.getLogger("anaconda") ++log = logging.getLogger("anaconda.main") + - _is_url = lambda location: '://' in location # RFC 3986 + _is_url = lambda location: '://' in location # RFC 3986 SSL_VERIFY = False -@@ -74,6 +78,29 @@ def load_to_file(location, destination): +@@ -73,6 +77,29 @@ def load_to_file(location, destination): _copy_file(location, destination) return destination @@ -67,16 +67,17 @@ index 48c8276..74b266b 100644 def _get_auth(location, user=None, passwd=None): auth = None -@@ -96,6 +123,9 @@ def _get_auth(location, user=None, passwd=None): +@@ -94,6 +121,10 @@ 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)) + auth = _get_auth(location, user=user, passwd=passwd) - try: + request = requests.get(location, verify=SSL_VERIFY, auth=auth) -- 2.7.4 diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0005-tweak-shebang-to-python3.patch b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0005-tweak-shebang-to-python3.patch deleted file mode 100644 index 3d614955b..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0005-tweak-shebang-to-python3.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8a1f598223bd4cbcc877eb2aba3f5586c75c9d14 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 21 Aug 2017 10:05:06 +0800 -Subject: [PATCH] tweak shebang to python3 - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia ---- - tools/ksvalidator.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/ksvalidator.py b/tools/ksvalidator.py -index d6051d5..c3682e8 100755 ---- a/tools/ksvalidator.py -+++ b/tools/ksvalidator.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # - # Chris Lumens - # --- -1.8.3.1 - diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_2.35.bb b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_2.35.bb deleted file mode 100644 index 7fe603b55..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_2.35.bb +++ /dev/null @@ -1,24 +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=pykickstart-2 \ - 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://0005-tweak-shebang-to-python3.patch \ - " -SRCREV = "b2787a818540e678c2f9c5dca0c6bbd65b8b55e5" - -inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.15.bb b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.15.bb new file mode 100644 index 000000000..07876a984 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.15.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 = "07c4d89129fa6b460acc86daf58eb5ff64cdc832" + +UPSTREAM_CHECK_GITTAGREGEX = "r(?P\d+(\.\d+)+(-\d+)*)" + +inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/python-pywbem.inc b/meta-openembedded/meta-python/recipes-extended/pywbem/python-pywbem.inc new file mode 100644 index 000000000..5151c33ea --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/pywbem/python-pywbem.inc @@ -0,0 +1,48 @@ +SUMMARY = "Python WBEM Client and Provider Interface" +DESCRIPTION = "\ +A Python library for making CIM (Common Information Model) operations over \ +HTTP using the WBEM CIM-XML protocol. It is based on the idea that a good \ +WBEM client should be easy to use and not necessarily require a large amount \ +of programming knowledge. It is suitable for a large range of tasks from \ +simply poking around to writing web and GUI applications. \ +\ +WBEM, or Web Based Enterprise Management is a manageability protocol, like \ +SNMP, standardised by the Distributed Management Task Force (DMTF) available \ +at http://www.dmtf.org/standards/wbem. \ +\ +It also provides a Python provider interface, and is the fastest and easiest \ +way to write providers on the planet." +HOMEPAGE = "http://pywbem.github.io" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://pywbem/LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" +SRC_URI[md5sum] = "1465dfa92e4cbe558c773838b9b00711" +SRC_URI[sha256sum] = "2a05f2c1a6ab4b08560a6da55fdaabd0f52f4d1e6df6e288b9ed927bf5c289ed" + +inherit pypi + +DEPENDS += " \ + ${PYTHON_PN}-ply-native \ + ${PYTHON_PN}-pyyaml-native \ + ${PYTHON_PN}-six-native \ +" + +do_install_append() { + mv ${D}${bindir}/wbemcli.py ${D}${bindir}/pywbemcli + + rm -f ${D}${bindir}/*.bat +} + +RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-ply \ + ${PYTHON_PN}-pyyaml \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-stringold \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-unixadmin \ + ${PYTHON_PN}-xml \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/python-pywbem_0.11.0.bb b/meta-openembedded/meta-python/recipes-extended/pywbem/python-pywbem_0.11.0.bb new file mode 100644 index 000000000..741074907 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/pywbem/python-pywbem_0.11.0.bb @@ -0,0 +1,13 @@ +require python-pywbem.inc +inherit setuptools + +DEPENDS += " \ + ${PYTHON_PN}-m2crypto-native \ + ${PYTHON_PN}-typing-native \ +" + +RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-argparse \ + ${PYTHON_PN}-m2crypto \ + ${PYTHON_PN}-subprocess \ +" diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.11.0.bb b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.11.0.bb new file mode 100644 index 000000000..6a35a8744 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.11.0.bb @@ -0,0 +1,2 @@ +require python-pywbem.inc +inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/pywbem_0.8.0.bb b/meta-openembedded/meta-python/recipes-extended/pywbem/pywbem_0.8.0.bb deleted file mode 100644 index 7f1986e51..000000000 --- a/meta-openembedded/meta-python/recipes-extended/pywbem/pywbem_0.8.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Python WBEM Client and Provider Interface" -DESCRIPTION = "\ -A Python library for making CIM (Common Information Model) operations over \ -HTTP using the WBEM CIM-XML protocol. It is based on the idea that a good \ -WBEM client should be easy to use and not necessarily require a large amount \ -of programming knowledge. It is suitable for a large range of tasks from \ -simply poking around to writing web and GUI applications. \ -\ -WBEM, or Web Based Enterprise Management is a manageability protocol, like \ -SNMP, standardised by the Distributed Management Task Force (DMTF) available \ -at http://www.dmtf.org/standards/wbem. \ -\ -It also provides a Python provider interface, and is the fastest and easiest \ -way to write providers on the planet." -HOMEPAGE = "http://pywbem.sf.net/" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://pywbem/LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" -SECTION = "Development/Libraries" -DEPENDS = "python-m2crypto-native python-typing-native" -SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BPN}/${BP}/${BP}-dev.r704.zip" -SRC_URI[md5sum] = "84072451dcdd1aa9ee82363848faf7ad" -SRC_URI[sha256sum] = "898035866d3cc741bbcd62c4ac26e633ad07b7c11d89db2472b9f923f3fd3ed8" - -S = "${WORKDIR}/${BP}-dev" - -inherit setuptools python-dir - -do_install_append() { - mv ${D}${bindir}/wbemcli.py ${D}${bindir}/pywbemcli - mv ${D}${bindir}/mof_compiler.py ${D}${bindir}/mofcomp - - rm ${D}${libdir}/python2.7/site-packages/${BPN}/wbemcli.py* - rm ${D}${libdir}/python2.7/site-packages/${BPN}/mof_compiler.py* -} - -BBCLASSEXTEND = "native" -- cgit v1.2.3