Accepting request 795528 from Base:System

OBS-URL: https://build.opensuse.org/request/show/795528
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/parted?expand=0&rev=130
This commit is contained in:
Dominique Leuenberger 2020-04-25 18:07:51 +00:00 committed by Git OBS Bridge
commit 6e4396bb3e
4 changed files with 59 additions and 2 deletions

View File

@ -0,0 +1,15 @@
libparted/arch/linux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: parted-3.3/libparted/arch/linux.c
===================================================================
--- parted-3.3.orig/libparted/arch/linux.c
+++ parted-3.3/libparted/arch/linux.c
@@ -2489,7 +2489,7 @@ _device_get_part_path (PedDevice const *
dev->type == PED_DEVICE_CPQARRAY ||
dev->type == PED_DEVICE_DAC960 ||
dev->type == PED_DEVICE_NVME ||
- dev->type == PED_DEVICE_PMEM ||
+ ((dev->type == PED_DEVICE_PMEM) && (!isdigit (devpath[path_len -1 ]))) ||
dev->type == PED_DEVICE_SDMMC)
p = "p";
else if (dev->type == PED_DEVICE_DM)

View File

@ -0,0 +1,24 @@
From: Anna Maresova <anicka@suse.cz>
Date: Wed Mar 25 18:17:28 CET 2020
Subject: parted: print maximum number of partitions for yast
Patch-mainline: no, custom SUSE patch
Index: parted-3.3/parted/parted.c
===================================================================
--- parted-3.3.orig/parted/parted.c
+++ parted-3.3/parted/parted.c
@@ -1125,10 +1125,13 @@ _print_disk_info (const PedDevice *dev,
break;
}
- printf ("%s:%s:%s:%lld:%lld:%s:%s:%s;\n",
+ printf ("%s:%s:%s:%lld:%lld:%s:%s:%s",
path, end, transport[dev->type],
dev->sector_size, dev->phys_sector_size,
pt_name, dev->model, disk_flags);
+ if (getenv("PARTED_PRINT_NUMBER_OF_PARTITION_SLOTS"))
+ printf(":%lld", diskp && diskp->type->ops->get_max_primary_partition_count ? diskp->type->ops->get_max_primary_partition_count(diskp) : 0);
+ printf(";\n");
free(path);
} else {
printf (_("Model: %s (%s)\n"),

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Apr 8 17:37:47 UTC 2020 - Anna Maresova <anicka@suse.com>
- print maximum number of partitions for yast
(bsc#1168756, bsc#1161783)
- add parted-print-max-partitions-for-yast.patch
- make parted work with pmemXs devices (bsc#1164260)
- add libparted-linux-pmem-path.patch
-------------------------------------------------------------------
Fri Jan 3 14:46:27 UTC 2020 - Anna Maresova <anicka@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package parted
#
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,7 +22,7 @@ Release: 0
Summary: GNU partitioner
License: GPL-3.0-or-later
Group: System/Filesystems
Url: http://www.gnu.org/software/parted/
URL: http://www.gnu.org/software/parted/
Source0: ftp://ftp.gnu.org/gnu/parted/%{name}-%{version}.tar.xz
Source1: ftp://ftp.gnu.org/gnu/parted/%{name}-%{version}.tar.xz.sig
Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=parted&download=1#/%{name}.keyring
@ -63,6 +63,13 @@ Patch32: parted-fix-resizepart-and-rm-command.patch
Patch33: libparted-use-BLKRRPART-only-when-needed.patch
Patch34: libparted-canonicalize-dev-md-paths.patch
Patch35: parted-fix-end_input-usage.patch
# bsc#1168756
Patch36: libparted-linux-pmem-path.patch
# bsc#1164260
Patch37: parted-print-max-partitions-for-yast.patch
# Fatresize
Patch100: parted-fatresize-autoconf.patch
Patch101: fatresize-fix-getting-dev-name.patch
@ -149,6 +156,8 @@ to develop applications that require these.
%patch33 -p1
%patch34 -p1
%patch35 -p1
%patch36 -p1
%patch37 -p1
%patch100 -p1
%patch101 -p1
%patch156 -p1