- Update to 293

* Add manifest condition for the Python bridge
  * Vsock device support
  * Apply watchdog changes on next boot if hotplug fails
  * Option to use RAW volume during VM creation
  * Redesign VM’s CPU configuration
  * Indicate need for shutdown
  * Delete storage file upon disk detachment
  * Show an alert when virtualization is disabled in BIOS/EFI
  * Create VM based on cloud image and start it later
  * Option to forcefully revert a snapshot
  * Support dark theme
  * Translation updates
  * Stability and performance updates
- 1088.patch: WIP for PF5 changes in cockpit
- hide-docs.patch, load-css-overrides.patch: refreshed
- suse-vv-install.patch: upstreamed, removed

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit-machines?expand=0&rev=20
This commit is contained in:
Adam Majer 2023-06-16 12:39:53 +00:00 committed by Git OBS Bridge
parent 23a22fbb92
commit 59b7d0d0ee
13 changed files with 6048 additions and 11676 deletions

2527
1088.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,22 +1,7 @@
<services> <services>
<service name="obs_scm" mode="manual">
<param name="versionformat">@PARENT_TAG@</param>
<param name="url">http://github.com/cockpit-project/cockpit-machines.git</param>
<param name="scm">git</param>
<param name="revision">270.2</param>
<param name="filename">cockpit-machines</param>
<param name="without-version">enable</param>
</service>
<service name="node_modules" mode="manual"> <service name="node_modules" mode="manual">
<param name="cpio">node_modules.obscpio</param> <param name="cpio">node_modules.obscpio</param>
<param name="output">node_modules.spec.inc</param> <param name="output">node_modules.spec.inc</param>
<param name="source-offset">1000</param> <param name="source-offset">1000</param>
</service> </service>
<service mode="buildtime" name="tar">
<param name="obsinfo">cockpit-machines.obsinfo</param>
<param name="filename">cockpit-machines</param>
</service>
<service mode="buildtime" name="set_version">
<param name="basename">cockpit-machines</param>
</service>
</services> </services>

BIN
cockpit-machines-292.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Fri Jun 16 12:07:39 UTC 2023 - Adam Majer <adam.majer@suse.de>
- Update to 293
* Add manifest condition for the Python bridge
* Vsock device support
* Apply watchdog changes on next boot if hotplug fails
* Option to use RAW volume during VM creation
* Redesign VMs CPU configuration
* Indicate need for shutdown
* Delete storage file upon disk detachment
* Show an alert when virtualization is disabled in BIOS/EFI
* Create VM based on cloud image and start it later
* Option to forcefully revert a snapshot
* Support dark theme
* Translation updates
* Stability and performance updates
- 1088.patch: WIP for PF5 changes in cockpit
- hide-docs.patch, load-css-overrides.patch: refreshed
- suse-vv-install.patch: upstreamed, removed
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 23 10:30:20 UTC 2022 - Jacek Tomasiak <jtomasiak@suse.com> Fri Sep 23 10:30:20 UTC 2022 - Jacek Tomasiak <jtomasiak@suse.com>

BIN
cockpit-machines.obscpio (Stored with Git LFS)

Binary file not shown.

View File

@ -1,4 +0,0 @@
name: cockpit-machines
version: 270.2
mtime: 1654779334
commit: bad85ac4543fb74380eac82717440773a06d8df3

View File

@ -1,7 +1,7 @@
# #
# spec file for package cockpit-machines # spec file for package cockpit-machines
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,21 +17,20 @@
Name: cockpit-machines Name: cockpit-machines
Version: 270.2 Version: 292
Release: 0 Release: 0
Summary: Cockpit user interface for virtual machines Summary: Cockpit user interface for virtual machines
License: LGPL-2.1-or-later AND MIT License: LGPL-2.1-or-later AND MIT
URL: https://github.com/cockpit-project/cockpit-machines URL: https://github.com/cockpit-project/cockpit-machines
# source_validator insists that if obscpio has no version then # source_validator insists that if obscpio has no version then
# tarball must neither # tarball must neither
Source: cockpit-machines.tar Source: https://github.com/cockpit-project/cockpit-machines/archive/refs/tags/%{version}.tar.gz#/cockpit-machines-%{version}.tar.gz
Source10: package-lock.json Source10: package-lock.json
Source11: node_modules.spec.inc Source11: node_modules.spec.inc
%include %_sourcedir/node_modules.spec.inc %include %_sourcedir/node_modules.spec.inc
Patch0: hide-docs.patch Patch1: 1088.patch
Patch1: load-css-overrides.patch Patch10: hide-docs.patch
# patches for node modules start with 100 Patch11: load-css-overrides.patch
Patch100: suse-vv-install.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: appstream-glib BuildRequires: appstream-glib
BuildRequires: make BuildRequires: make
@ -52,7 +51,7 @@ Requires: virt-install
Recommends: libosinfo Recommends: libosinfo
Recommends: python3-gobject-base Recommends: python3-gobject-base
# #
BuildRequires: cockpit-devel >= 271 BuildRequires: cockpit-devel >= 293
BuildRequires: local-npm-registry BuildRequires: local-npm-registry
BuildRequires: sassc BuildRequires: sassc
@ -62,25 +61,27 @@ Cockpit component for managing virtual machines.
If "virt-install" is installed, you can also create new virtual machines. If "virt-install" is installed, you can also create new virtual machines.
%prep %prep
%setup -n %{name} %setup
%patch0 -p1
%patch1 -p1 %patch1 -p1
%patch10 -p1
%patch11 -p1
rm -f package-lock.json rm -f package-lock.json
local-npm-registry %{_sourcedir} install --with=dev --legacy-peer-deps || ( find ~/.npm/_logs -name '*-debug.log' -print0 | xargs -0 cat; false) local-npm-registry %{_sourcedir} install --with=dev --legacy-peer-deps || ( find ~/.npm/_logs -name '*-debug.log' -print0 | xargs -0 cat; false)
%patch100 -p1
%build %build
export PREFIX=%_prefix
mkdir -p pkg/lib mkdir -p pkg/lib
cp -r %{_datadir}/cockpit/devel/lib/* pkg/lib cp -r %{_datadir}/cockpit/devel/lib/* pkg/lib
NODE_ENV=production npm run build NODE_ENV=production npm run build
%install %install
export PREFIX=%_prefix
%make_install %make_install
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/* appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*
%files %files
%doc README.md %doc README.md
%license LICENSE dist/index.js.LICENSE.txt.gz %license LICENSE
%{_datadir}/cockpit %{_datadir}/cockpit
%{_datadir}/metainfo/* %{_datadir}/metainfo/*

View File

@ -1,9 +1,9 @@
diff --git a/src/manifest.json b/src/manifest.json Index: cockpit-machines-292/src/manifest.json
index a945d46..3980eb2 100644 ===================================================================
--- a/src/manifest.json --- cockpit-machines-292.orig/src/manifest.json
+++ b/src/manifest.json +++ cockpit-machines-292/src/manifest.json
@@ -8,7 +8,7 @@ @@ -11,7 +11,7 @@
"label": "Virtual Machines", "label": "Virtual machines",
"path": "index.html", "path": "index.html",
"order": 60, "order": 60,
- "docs": [ - "docs": [

View File

@ -9,18 +9,15 @@ described at https://github.com/cockpit-project/cockpit/pull/17437
src/index.html | 1 + src/index.html | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/src/index.html b/src/index.html Index: cockpit-machines-292/src/index.html
index 8c5380c..5be6daa 100644 ===================================================================
--- a/src/index.html --- cockpit-machines-292.orig/src/index.html
+++ b/src/index.html +++ cockpit-machines-292/src/index.html
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="index.css"> <link rel="stylesheet" href="index.css">
+ <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet"> + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet">
<script type="text/javascript" src="../base1/cockpit.js"></script> <script type="text/javascript" src="index.js"></script>
<script type="text/javascript" src="../*/po.js"></script> <script type="text/javascript" src="po.js"></script>
--
2.36.1

BIN
node_modules.obscpio (Stored with Git LFS)

Binary file not shown.

File diff suppressed because it is too large Load Diff

13913
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,36 +0,0 @@
diff --git a/node_modules/@patternfly/react-console/dist/esm/components/DesktopViewer/MoreInformationDefaultContent.js b/node_modules/@patternfly/react-console/dist/esm/components/DesktopViewer/MoreInformationDefaultContent.js
index fef60fe..47f02b6 100644
--- a/node_modules/@patternfly/react-console/dist/esm/components/DesktopViewer/MoreInformationDefaultContent.js
+++ b/node_modules/@patternfly/react-console/dist/esm/components/DesktopViewer/MoreInformationDefaultContent.js
@@ -12,6 +12,7 @@ export const MoreInformationDefaultContent = ({ textMoreInfoContent = (React.cre
React.createElement(DescriptionList, { isHorizontal: true },
React.createElement(MoreInformationInstallVariant, { os: "RHEL, CentOS", content: "sudo yum install virt-viewer" }),
React.createElement(MoreInformationInstallVariant, { os: "Fedora", content: "sudo dnf install virt-viewer" }),
+ React.createElement(MoreInformationInstallVariant, { os: "SLE, openSUSE", content: "sudo zypper install virt-viewer" }),
React.createElement(MoreInformationInstallVariant, { os: "Ubuntu, Debian", content: "sudo apt-get install virt-viewer" }),
React.createElement(MoreInformationInstallVariant, { os: "Windows" },
React.createElement("div", null,
diff --git a/node_modules/@patternfly/react-console/dist/js/components/DesktopViewer/MoreInformationDefaultContent.js b/node_modules/@patternfly/react-console/dist/js/components/DesktopViewer/MoreInformationDefaultContent.js
index d74617f..30e58aa 100644
--- a/node_modules/@patternfly/react-console/dist/js/components/DesktopViewer/MoreInformationDefaultContent.js
+++ b/node_modules/@patternfly/react-console/dist/js/components/DesktopViewer/MoreInformationDefaultContent.js
@@ -16,6 +16,7 @@ exports.MoreInformationDefaultContent = ({ textMoreInfoContent = (react_1.defaul
react_1.default.createElement(react_core_1.DescriptionList, { isHorizontal: true },
react_1.default.createElement(MoreInformationInstallVariant_1.MoreInformationInstallVariant, { os: "RHEL, CentOS", content: "sudo yum install virt-viewer" }),
react_1.default.createElement(MoreInformationInstallVariant_1.MoreInformationInstallVariant, { os: "Fedora", content: "sudo dnf install virt-viewer" }),
+ react_1.default.createElement(MoreInformationInstallVariant_1.MoreInformationInstallVariant, { os: "SLE, openSUSE", content: "sudo zypper install virt-viewer" }),
react_1.default.createElement(MoreInformationInstallVariant_1.MoreInformationInstallVariant, { os: "Ubuntu, Debian", content: "sudo apt-get install virt-viewer" }),
react_1.default.createElement(MoreInformationInstallVariant_1.MoreInformationInstallVariant, { os: "Windows" },
react_1.default.createElement("div", null,
diff --git a/node_modules/@patternfly/react-console/src/components/DesktopViewer/MoreInformationDefaultContent.tsx b/node_modules/@patternfly/react-console/src/components/DesktopViewer/MoreInformationDefaultContent.tsx
index 02db247..68fb507 100644
--- a/node_modules/@patternfly/react-console/src/components/DesktopViewer/MoreInformationDefaultContent.tsx
+++ b/node_modules/@patternfly/react-console/src/components/DesktopViewer/MoreInformationDefaultContent.tsx
@@ -24,6 +24,7 @@ export const MoreInformationDefaultContent: React.FunctionComponent<MoreInformat
<DescriptionList isHorizontal>
<MoreInformationInstallVariant os="RHEL, CentOS" content="sudo yum install virt-viewer" />
<MoreInformationInstallVariant os="Fedora" content="sudo dnf install virt-viewer" />
+ <MoreInformationInstallVariant os="SLE, openSUSE" content="sudo zypper install virt-viewer" />
<MoreInformationInstallVariant os="Ubuntu, Debian" content="sudo apt-get install virt-viewer" />
<MoreInformationInstallVariant os="Windows">
<div>