From ab611e03487708a099486281b74d4e0f09f77ee8c81cecd9a2706782fcb56fe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 3 Oct 2024 18:33:44 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main osinfo-db revision 06f0080ee53fe10a55a1e17d44c27bd3 --- add-opensuse-leap-15.6-support.patch | 15 +-- add-sle15sp6-support.patch | 17 +-- add-sle15sp7-support.patch | 110 ++++++++++++++++++ add-slem5.5-support.patch | 11 +- ...support.patch => add-slem6.0-support.patch | 30 ++--- add-slem6.1-support.patch | 80 +++++++++++++ adjust-tumbleweed-hardware-requirements.patch | 23 ++++ osinfo-db-20231215.tar.xz | 3 - osinfo-db-20240701.tar.xz | 3 + osinfo-db.changes | 54 +++++++++ osinfo-db.spec | 13 ++- 11 files changed, 319 insertions(+), 40 deletions(-) create mode 100644 add-sle15sp7-support.patch rename add-slm6.0-support.patch => add-slem6.0-support.patch (72%) create mode 100644 add-slem6.1-support.patch create mode 100644 adjust-tumbleweed-hardware-requirements.patch delete mode 100644 osinfo-db-20231215.tar.xz create mode 100644 osinfo-db-20240701.tar.xz diff --git a/add-opensuse-leap-15.6-support.patch b/add-opensuse-leap-15.6-support.patch index 038367b..5987f35 100644 --- a/add-opensuse-leap-15.6-support.patch +++ b/add-opensuse-leap-15.6-support.patch @@ -1,8 +1,8 @@ -Index: osinfo-db-20220727/os/opensuse.org/opensuse-15.6.xml +Index: osinfo-db-20240701/os/opensuse.org/opensuse-15.6.xml =================================================================== --- /dev/null -+++ osinfo-db-20220727/os/opensuse.org/opensuse-15.6.xml -@@ -0,0 +1,246 @@ ++++ osinfo-db-20240701/os/opensuse.org/opensuse-15.6.xml +@@ -0,0 +1,247 @@ + + + ++ ++ sle15sp7 ++ SUSE Linux Enterprise 15 SP7 ++ SUSE Linux Enterprise 15 SP7 ++ 수세 리눅스 기업용 15 SP7 ++ SUSE Linux Enterprise 15 SP7 ++ SUSE Linux Enterprise 15 SP7 ++ 15.7 ++ SUSE ++ SUSE ++ 수세 ++ SUSE ++ SUSE ++ SUSE ++ SUSE ++ SUSE ++ SUSE ++ SUSE ++ SUSE ++ SUSE ++ SUSE ++ linux ++ sle ++ ++ ++ 2024-11-28 ++ ++ ++ LINUX ++ SLE-15-SP7.*-x86_64.* ++ ++ boot/x86_64/loader/linux ++ boot/x86_64/loader/initrd ++ ++ ++ ++ LINUX ++ SLE-15-SP7.*-aarch64.* ++ ++ boot/aarch64/linux ++ boot/aarch64/initrd ++ ++ ++ ++ LINUX ++ SLE-15-SP7.*-ppc64le.* ++ ++ boot/ppc64le/linux ++ boot/ppc64le/initrd ++ ++ ++ ++ LINUX ++ SLE-15-SP7.*-s390x.* ++ ++ boot/s390x/linux ++ boot/s390x/initrd ++ ++ ++ ++ SUSE Linux Enterprise Server ++ 15.7 ++ x86_64 ++ ++ ++ ++ ++ SUSE Linux Enterprise Server ++ 15.7 ++ aarch64 ++ ++ ++ ++ ++ SUSE Linux Enterprise Server ++ 15.7 ++ ppc64le ++ ++ ++ ++ ++ SUSE Linux Enterprise Server ++ 15.7 ++ s390x ++ ++ ++ ++ ++ 500000000 ++ 1073741824 ++ 2147483648 ++ ++ ++ 2400000000 ++ 2 ++ 4294967296 ++ 34359738368 ++ ++ ++ ++ diff --git a/add-slem5.5-support.patch b/add-slem5.5-support.patch index b3bb9c7..c7c4dfa 100644 --- a/add-slem5.5-support.patch +++ b/add-slem5.5-support.patch @@ -1,6 +1,8 @@ ---- /dev/null 2023-08-07 05:04:54.296175996 -0600 -+++ osinfo-db-20230719/os/suse.com/slem-5.5.xml 2023-08-07 10:58:08.228681018 -0600 -@@ -0,0 +1,75 @@ +Index: osinfo-db-20240701/os/suse.com/slem-5.5.xml +=================================================================== +--- /dev/null ++++ osinfo-db-20240701/os/suse.com/slem-5.5.xml +@@ -0,0 +1,76 @@ + + + -+ -+ slm6.0 -+ SUSE Linux Micro 6.0 -+ SUSE Linux Micro 6.0 ++ ++ slem6.0 ++ SUSE Linux Enterprise Micro 6.0 ++ SUSE Linux Enterprise Micro 6.0 + 수세 리눅스 기업용 마이크로 6.0 -+ SUSE Linux Micro 6.0 -+ SUSE Linux Micro 6.0 ++ SUSE Linux Enterprise Micro 6.0 ++ SUSE Linux Enterprise Micro 6.0 + 6.0 + SUSE + SUSE @@ -27,13 +29,13 @@ + SUSE + SUSE + linux -+ slm ++ slem + -+ prerelease ++ 2024-06-08 + + + LINUX -+ SL-Micro-6.0-Packages-x86_64.* ++ SLE-Micro-6.0-DVD-x86_64.* + + boot/x86_64/loader/linux + boot/x86_64/loader/initrd @@ -41,7 +43,7 @@ + + + LINUX -+ SL-Micro-6.0-Packages-aarch64.* ++ SLE-Micro-6.0-DVD-aarch64.* + + boot/aarch64/linux + boot/aarch64/initrd @@ -49,7 +51,7 @@ + + + LINUX -+ SL-Micro-6.0-Packages-ppc64le.* ++ SLE-Micro-6.0-DVD-ppc64le.* + + boot/ppc64le/linux + boot/ppc64le/initrd @@ -57,7 +59,7 @@ + + + LINUX -+ SL-Micro-6.0-Packages-s390x.* ++ SLE-Micro-6.0-DVD-s390x.* + + boot/s390x/linux + boot/s390x/initrd diff --git a/add-slem6.1-support.patch b/add-slem6.1-support.patch new file mode 100644 index 0000000..04d5a7d --- /dev/null +++ b/add-slem6.1-support.patch @@ -0,0 +1,80 @@ +Index: osinfo-db-20240701/os/suse.com/slem-6.1.xml +=================================================================== +--- /dev/null ++++ osinfo-db-20240701/os/suse.com/slem-6.1.xml +@@ -0,0 +1,75 @@ ++ ++ ++ ++ ++ slem6.1 ++ SUSE Linux Enterprise Micro 6.1 ++ SUSE Linux Enterprise Micro 6.1 ++ 수세 리눅스 기업용 마이크로 6.1 ++ SUSE Linux Enterprise Micro 6.1 ++ SUSE Linux Enterprise Micro 6.1 ++ 6.1 ++ SUSE ++ SUSE ++ 수세 ++ SUSE ++ SUSE ++ SUSE ++ SUSE ++ SUSE ++ SUSE ++ SUSE ++ SUSE ++ SUSE ++ SUSE ++ linux ++ slem ++ ++ 2024-08-22 ++ ++ ++ LINUX ++ SLE-Micro-6.1-DVD-x86_64.* ++ ++ boot/x86_64/loader/linux ++ boot/x86_64/loader/initrd ++ ++ ++ ++ LINUX ++ SLE-Micro-6.1-DVD-aarch64.* ++ ++ boot/aarch64/linux ++ boot/aarch64/initrd ++ ++ ++ ++ LINUX ++ SLE-Micro-6.1-DVD-ppc64le.* ++ ++ boot/ppc64le/linux ++ boot/ppc64le/initrd ++ ++ ++ ++ LINUX ++ SLE-Micro-6.1-DVD-s390x.* ++ ++ boot/s390x/linux ++ boot/s390x/initrd ++ ++ ++ ++ 500000000 ++ 1073741824 ++ 12884901888 ++ ++ ++ 2400000000 ++ 4294967296 ++ 64424509440 ++ ++ ++ ++ diff --git a/adjust-tumbleweed-hardware-requirements.patch b/adjust-tumbleweed-hardware-requirements.patch new file mode 100644 index 0000000..dd5bfa5 --- /dev/null +++ b/adjust-tumbleweed-hardware-requirements.patch @@ -0,0 +1,23 @@ +--- osinfo-db-20240510/os/opensuse.org/opensuse-tumbleweed.xml.orig 2024-07-01 13:06:42.336848537 -0600 ++++ osinfo-db-20240510/os/opensuse.org/opensuse-tumbleweed.xml 2024-07-01 13:06:58.400848920 -0600 +@@ -134,14 +134,15 @@ + + + 1600000000 +- 1 +- 1073741824 +- 4294967296 ++ 2 ++ 2147483648 ++ 42949672960 + + + 2400000000 +- 2147483648 +- 21474836480 ++ 4 ++ 4294967296 ++ 64424509440 + + + diff --git a/osinfo-db-20231215.tar.xz b/osinfo-db-20231215.tar.xz deleted file mode 100644 index aa31f2e..0000000 --- a/osinfo-db-20231215.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dfb7c5975ce4efffd92aadd00094a0f7c593b41988fda539915f6459f7164554 -size 149836 diff --git a/osinfo-db-20240701.tar.xz b/osinfo-db-20240701.tar.xz new file mode 100644 index 0000000..a4f57f2 --- /dev/null +++ b/osinfo-db-20240701.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d7381a72f0c45f473befa4a92fa010a37fc4f7b2bb5d1f68e06da440ef6905d +size 152572 diff --git a/osinfo-db.changes b/osinfo-db.changes index 1452097..f575a1a 100644 --- a/osinfo-db.changes +++ b/osinfo-db.changes @@ -1,3 +1,57 @@ +------------------------------------------------------------------- +Tue Sep 17 07:21:53 MDT 2024 - carnold@suse.com + +- Add support for SLE Micro 6.1 (jsc#PED-8910) + add-slem6.1-support.patch +- Drop support for Leap 15.7. Next major version is Leap 16 + add-opensuse-leap-15.7-support.patch +- Adjust place holder release-date for sle15sp7 + add-sle15sp7-support.patch + +------------------------------------------------------------------- +Wed Sep 4 10:05:17 MDT 2024 - carnold@suse.com + +- Add support for openSUSE Leap 15.7 (jsc#PED-8910) + add-opensuse-leap-15.7-support.patch +- Add support for SLE-15-SP7 (jsc#PED-8910) (bsc#1230160) + add-sle15sp7-support.patch + +------------------------------------------------------------------- +Mon Jul 8 10:49:13 MDT 2024 - carnold@suse.com + +- Update the release dates in the definitions for the following + products + openSUSE leap 15.6, SLE 15-SP6, SLEM 5.5, SLEM 6.0 + +------------------------------------------------------------------- +Tue Jul 2 14:41:58 MDT 2024 - carnold@suse.com + +- Update to database version 20240701 + osinfo-db-20240701.tar.xz + +------------------------------------------------------------------- +Mon Jul 1 14:42:41 MDT 2024 - carnold@suse.com + +- Adjust some default hardware requirements (bsc#1227231) + adjust-tumbleweed-hardware-requirements.patch + add-opensuse-leap-15.6-support.patch + add-sle15sp6-support.patch + +------------------------------------------------------------------- +Fri Jun 28 14:05:03 MDT 2024 - carnold@suse.com + +- bsc#1227116 - osinfo still uses deprecated SL-Micro name + Reverse prior decision to drop the use of "Enterprise" in the + name of the SUSE Linux Micro product. + add-slem6.0-support.patch + Drop add-slm6.0-support.patch + +------------------------------------------------------------------- +Thu May 16 12:53:49 MDT 2024 - carnold@suse.com + +- Update to database version 20240510 + osinfo-db-20240510.tar.xz + ------------------------------------------------------------------- Tue May 7 10:59:39 MDT 2024 - carnold@suse.com diff --git a/osinfo-db.spec b/osinfo-db.spec index 8e3abca..0d531fd 100644 --- a/osinfo-db.spec +++ b/osinfo-db.spec @@ -17,7 +17,7 @@ Name: osinfo-db -Version: 20231215 +Version: 20240701 Release: 0 Summary: Osinfo database files License: LGPL-2.1-or-later AND GPL-2.0-or-later @@ -28,10 +28,13 @@ Patch21: add-oes-support.patch Patch22: add-caasp40-support.patch Patch23: add-win-2k19-media-info.patch Patch24: fix-tumbleweed-order.patch -Patch25: add-slem5.5-support.patch -Patch26: add-sle15sp6-support.patch -Patch27: add-opensuse-leap-15.6-support.patch -Patch28: add-slm6.0-support.patch +Patch25: adjust-tumbleweed-hardware-requirements.patch +Patch26: add-slem5.5-support.patch +Patch27: add-sle15sp6-support.patch +Patch28: add-sle15sp7-support.patch +Patch29: add-opensuse-leap-15.6-support.patch +Patch30: add-slem6.0-support.patch +Patch31: add-slem6.1-support.patch BuildRequires: intltool BuildRequires: osinfo-db-tools BuildArch: noarch